Merge branch 'master' into custom-lsp-command

Author: Tal Hadad

.github/workflows/issues.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: 18
-      - run: yarn install
+      - run: npm install
       - name: Run tests
         uses: GabrielBB/xvfb-action@v1.0
         with:
@@ -26,11 +26,11 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - run: node $SCRIPT_DIR/enableWebpack.js
-      - run: yarn install
-      - uses: lannonbr/vsce-action@master
+      - run: npm install
+      - uses: lannonbr/vsce-action@4.0.0
         with:
           args: "package -o $VSIX_FILE"
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ env.VSIX_FILE }}
           path: ${{ env.VSIX_FILE }}
@@ -41,8 +41,8 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: 18
-      - run: yarn install
-      - run: yarn run lint
+      - run: npm install
+      - run: npm run lint
   markdownlint-cli:
     runs-on: ubuntu-latest
     steps:
@@ -52,31 +52,23 @@ jobs:
           files: .
           config_file: ".markdownlint.json"
           ignore_files: "node_modules/*"
-  lintr:
-    runs-on: ubuntu-latest
-    container:
-      image: rocker/tidyverse:latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install apt-get dependencies
-        run: |
-          apt-get update
-          apt-get install git ssh curl bzip2 -y
-      - name: Install lintr
-        run: |
-          Rscript -e "install.packages('lintr', repos = 'https://cloud.r-project.org')"
-        shell: bash
-      - name: Running lintr
-        run: |
-          Rscript -e "stopifnot(length(print(lintr::lint_dir('./R'))) == 0)"
-        shell: bash
-  devreplay:
+  lint:
     runs-on: ubuntu-latest
+    env:
+      GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+
+      - uses: r-lib/actions/setup-r@v2
         with:
-          node-version: 18
-      - run: yarn install
-      - name: Run devreplay
-        run: ./node_modules/.bin/devreplay ./src devreplay.json
+          use-public-rspm: true
+
+      - name: Install lintr
+        run: install.packages("lintr")
+        shell: Rscript {0}
+
+      - name: Lint root directory
+        run: lintr::lint_dir("./R")
+        shell: Rscript {0}
+        env:
+          LINTR_ERROR_ON_LINT: true

.github/workflows/main.yml

@@ -16,11 +16,11 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - run: node $SCRIPT_DIR/enableWebpack.js
-      - run: yarn install
-      - uses: lannonbr/vsce-action@master
+      - run: npm install
+      - uses: lannonbr/vsce-action@4.0.0
         with:
           args: "package -o $FILE_OUT"
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: "${{ env.FILE_OUT }}"
           path: "${{ env.FILE_OUT }}"
@@ -38,7 +38,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Download artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4.1.7
         with:
           path: "artifacts/"
       - name: Upload artifacts

.github/workflows/pre-release.yml

@@ -16,14 +16,14 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - run: node $SCRIPT_DIR/enableWebpack.js
-      - run: yarn install
-      - uses: lannonbr/vsce-action@master
+      - run: npm install
+      - uses: lannonbr/vsce-action@4.0.0
         with:
           args: "package"
       - name: Identify output file # can be retrieved as steps.filenames.outputs.file_out
         id: filenames
         run: echo "::set-output name=file_out::$(ls | grep "^.*\.vsix$" | head -1)"
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.filenames.outputs.file_out }}
           path: ${{ steps.filenames.outputs.file_out }}
@@ -35,7 +35,7 @@ jobs:
 
     steps:
       - name: Download artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4.1.7
         with:
           path: "artifacts/"
       - name: Get version from tag
@@ -57,7 +57,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - run: node $SCRIPT_DIR/enableWebpack.js
-      - run: yarn install
+      - run: npm install
       - name: Publish to Open VSX Registry
         uses: HaaLeo/publish-vscode-extension@v1
         id: publishToOpenVSX

.github/workflows/release.yml

@@ -1,8 +1,3 @@
 {
-        "recommendations": [
-                "dbaeumer.vscode-eslint",
-                "GrapeCity.gc-excelviewer",
-                "ikuyadeu.devreplay",
-		"DavidAnson.vscode-markdownlint"
-	]
+
 }

.vscode/extensions.json

@@ -15,7 +15,6 @@
       "outFiles": [
         "${workspaceFolder}/out/src/**/*.js"
       ],
-      "preLaunchTask": "watchAll"
     },
     {
       "name": "Launch Extension (--disable-extensions)",
@@ -29,7 +28,6 @@
       "outFiles": [
         "${workspaceFolder}/out/src/**/*.js"
       ],
-      "preLaunchTask": "watchAll"
     },
     {
       "name": "Extension Tests",

.vscode/launch.json

@@ -9,6 +9,6 @@
     "typescript.tsdk": "./node_modules/typescript/lib", // we want to use the TS server from our node_modules folder to control its version
     "r.lsp.diagnostics": true,
     "editor.codeActionsOnSave": {
-        "source.fixAll.markdownlint": true
+        "source.fixAll.markdownlint": "explicit"
     }
 }

.vscode/settings.json

@@ -10,7 +10,6 @@
       "command": "vsce",
       "args": [
         "package",
-        "--yarn",
         "-o",
         "${workspaceFolderBasename}.vsix"
       ]
@@ -33,19 +32,17 @@
     },
     {
       "type": "npm",
-      "script": "compile",
+      "script": "build",
       "problemMatcher": "$tsc"
     },
-    {
+		{
       "type": "npm",
       "script": "watch",
-      "problemMatcher": "$tsc-watch",
-      "isBackground": true,
-      "presentation": {
-        "reveal": "never"
-      },
-      "group": "build"
-    },
+      "group": "build",
+      // install https://marketplace.visualstudio.com/items?itemName=eamodio.tsl-problem-matcher
+      "problemMatcher": ["$ts-webpack-watch"],
+      "isBackground": true
+		},
     {
       "type": "npm",
       "script": "watchHelp",

.vscode/tasks.json

@@ -7,7 +7,6 @@
 .xls
 .xlsx
 **/*.map
-devreplay.json
 html/**/*.ts
 out/test/**
 src/