Merge branch 'master' into tcp-incoming-request-server

REditorSupport · May 20, 2024 · 75ec0e2 · 75ec0e2
2 parents cfdeb37 + 964b586
commit 75ec0e2
Show file tree

Hide file tree

Showing 7 changed files with 150 additions and 177 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
       - run: yarn install
       - name: Run tests
         uses: GabrielBB/[email protected]
@@ -40,7 +40,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
       - run: yarn install
       - run: yarn run lint
   markdownlint-cli:
@@ -76,7 +76,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
       - run: yarn install
       - name: Run devreplay
         run: ./node_modules/.bin/devreplay ./src devreplay.json
diff --git a/.vscodeignore b/.vscodeignore
@@ -19,9 +19,6 @@ webpack.config.js
 .markdownlint.json
 .eslintignore
 
-# node_modules #withWebpack
-# out/ #withWebpack
+ node_modules 
+ out/ 
 
-# withoutWebpack:
-dist
-# /withoutWebpack
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@
 
 You can check all of our changes from [Release Page](https://github.com/REditorSupport/vscode-R/releases)
 
+## [2.8.4](https://github.com/REditorSupport/vscode-R/releases/tag/v2.8.4)
+
+* Upgrade dependencies
+
 ## [2.8.3](https://github.com/REditorSupport/vscode-R/releases/tag/v2.8.3)
 
 Enhancements:

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "r",
   "displayName": "R",
   "description": "R Extension for Visual Studio Code",
-  "version": "2.8.3",
+  "version": "2.8.4",
   "author": "REditorSupport",
   "license": "SEE LICENSE IN LICENSE",
   "publisher": "REditorSupport",
@@ -26,51 +26,14 @@
     "R Markdown"
   ],
   "engines": {
-    "vscode": "^1.67.0"
+    "vscode": "^1.75.0"
   },
   "activationEvents": [
-    "onLanguage:r",
-    "onLanguage:rd",
-    "onLanguage:rmd",
-    "onLanguage:debian-control.r",
-    "onLanguage:namespace.r",
-    "onLanguage:buildignore.r",
     "workspaceContains:**/*.{rproj,Rproj,r,R,rd,Rd,rmd,Rmd}",
-    "onCommand:r.createRTerm",
-    "onCommand:r.runSource",
-    "onCommand:r.knitRmd",
-    "onCommand:r.knitRmdToPdf",
-    "onCommand:r.knitRmdToHtml",
-    "onCommand:r.knitRmdToAll",
-    "onCommand:r.runSourcewithEcho",
-    "onCommand:r.runSelection",
     "onCommand:r.runSelectionInActiveTerm",
-    "onCommand:r.selectCurrentChunk",
-    "onCommand:r.runCurrentChunk",
-    "onCommand:r.runCurrentChunkAndMove",
-    "onCommand:r.runPreviousChunk",
-    "onCommand:r.runNextChunk",
-    "onCommand:r.runAboveChunks",
-    "onCommand:r.runCurrentAndBelowChunks",
-    "onCommand:r.runBelowChunks",
-    "onCommand:r.runAllChunks",
-    "onCommand:r.goToPreviousChunk",
-    "onCommand:r.goToNextChunk",
-    "onCommand:r.createGitignore",
-    "onCommand:r.createLintrConfig",
-    "onCommand:r.generateCCppProperties",
-    "onCommand:r.runCommandWithSelectionOrWord",
-    "onCommand:r.runCommandWithEditorPath",
-    "onCommand:r.runCommand",
-    "onCommand:r.showHelp",
-    "onCommand:r.helpPanel.back",
-    "onCommand:r.helpPanel.forward",
-    "onCommand:r.helpPanel.openForSelection",
-    "onCommand:r.plot.openUrl",
-    "onWebviewPanel:rhelp",
-    "onTerminalProfile:r.terminal-profile"
+    "onWebviewPanel:rhelp"
   ],
-  "main": "./out/extension",
+  "main": "./dist/extension",
   "contributes": {
     "terminal": {
       "profiles": [
@@ -1486,7 +1449,7 @@
           "default": [],
           "markdownDescription": "Additional library paths to launch R background processes (R languageserver, help server, etc.). These paths will be appended to `.libPaths()` on process startup. It could be useful for projects with [renv](https://rstudio.github.io/renv/index.html) enabled."
         },
-        "r.useRenvLibPath" : {
+        "r.useRenvLibPath": {
           "type": "boolean",
           "default": false,
           "markdownDescription": "Use renv library paths to launch R background processes (R languageserver, help server, etc.)."
@@ -2140,28 +2103,15 @@
     ]
   },
   "scripts": {
-    "vscode:prepublish": "tsc -p . && tsc -p ./html/help && tsc -p ./html/httpgd",
-    "compile": "tsc -p . && tsc -p ./html/help && tsc -p ./html/httpgd",
-    "watch": "tsc -p . --watch",
+    "vscode:prepublish": "tsc -p ./html/help && tsc -p ./html/httpgd && webpack --mode production",
+    "compile": "tsc -p ./html/help && tsc -p ./html/httpgd && webpack --mode none",
+    "watch": "webpack --mode none --watch",
     "watchHelp": "tsc -p ./html/help --watch",
     "watchHttpgd": "tsc -p ./html/httpgd --watch",
     "pretest": "tsc -p ./",
     "test": "node ./out/test/runTest.js",
     "lint": "eslint src --ext ts"
   },
-  "withWebpack": {
-    "scripts": {
-      "vscode:prepublish": "tsc -p ./html/help && tsc -p ./html/httpgd && webpack --mode production",
-      "compile": "tsc -p ./html/help && tsc -p ./html/httpgd && webpack --mode none",
-      "watch": "webpack --mode none --watch",
-      "watchHelp": "tsc -p ./html/help --watch",
-      "watchHttpgd": "tsc -p ./html/httpgd --watch",
-      "pretest": "tsc -p ./",
-      "test": "node ./out/test/runTest.js",
-      "lint": "eslint src --ext ts"
-    },
-    "main": "./dist/extension"
-  },
   "devDependencies": {
     "@types/cheerio": "^0.22.29",
     "@types/ejs": "^3.0.6",
@@ -2170,15 +2120,16 @@
     "@types/glob": "^8.0.0",
     "@types/js-yaml": "^4.0.2",
     "@types/mocha": "^8.2.2",
-    "@types/node": "^16.11.7",
+    "@types/node": "^18.17.1",
     "@types/node-fetch": "^2.5.10",
     "@types/sinon": "^10.0.13",
     "@types/tmp": "^0.2.3",
-    "@types/vscode": "^1.67.0",
+    "@types/vscode": "^1.75.0",
     "@types/winreg": "^1.2.31",
     "@typescript-eslint/eslint-plugin": "^5.30.0",
     "@typescript-eslint/parser": "^5.30.0",
     "@vscode/test-electron": "^2.2.3",
+    "@types/highlight.js": "^10.1.0",
     "copy-webpack-plugin": "^9.0.0",
     "devreplay": "^1.9.31",
     "eslint": "^7.28.0",
@@ -2191,14 +2142,14 @@
     "webpack-cli": "^4.7.2"
   },
   "dependencies": {
-    "ag-grid-community": "^30.2.0",
-    "cheerio": "1.0.0-rc.10",
+    "ag-grid-community": "^31.3.2",
+    "cheerio": "1.0.0-rc.12",
     "crypto": "^1.0.1",
     "ejs": "^3.1.10",
     "fs-extra": "^10.0.0",
-    "highlight.js": "^10.7.3",
+    "highlight.js": "^11.9.0",
     "httpgd": "^0.1.6",
-    "jquery": "^3.6.0",
+    "jquery": "^3.7.1",
     "jquery.json-viewer": "^1.5.0",
     "js-yaml": "^4.1.0",
     "node-fetch": "^2.6.7",

diff --git a/src/helpViewer/helpPreviewer.ts b/src/helpViewer/helpPreviewer.ts
@@ -146,14 +146,17 @@ export class RLocalHelpPreviewer {
             this.cachedPackageInfo = undefined;
             this.callPreviewListener();
         };
-        const manDirListener: fs.WatchListener<string> = (event: fs.WatchEventType, filename: string) => {
+        const manDirListener: fs.WatchListener<string | null> = (event: fs.WatchEventType, filename: string | null) => {
             if(this.isDisposed){
                 return;
             }
             if(!isDirSafe(this.manDir)){
                 this.dispose(true);
                 return;
             }
+            if (filename === null) {
+                return;
+            }
             const fullPath = path.join(this.manDir, filename);
             // The cache is only initialized when it is needed for the first time:
             if(this.cachedRdAliases){

diff --git a/src/helpViewer/index.ts b/src/helpViewer/index.ts
@@ -730,7 +730,7 @@ function pimpMyHelp(helpFile: HelpFile): HelpFile {
 
             // apply syntax highlighting to each code section:
             codeSections.each((i, section) => {
-                const styledCode = hljs.highlight($(section).text() || '', {
+                const styledCode = hljs.default.highlight($(section).text() || '', {
                     language: 'r',
                 });
                 $(section).html(styledCode.value);