Update to TS 5, Node 18, webpack 5

TypeFox · Oct 25, 2024 · dbe3ddd · dbe3ddd
1 parent bbcd093
commit dbe3ddd
Show file tree

Hide file tree

Showing 8 changed files with 851 additions and 3,359 deletions.
diff --git a/.vscodeignore b/.vscodeignore
@@ -1,4 +1,4 @@
-.*
+**/.*
 .*/
 images/*.gif
 examples/

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Change Log
 
+## v2.3.3
+
+* Update [yang-lsp][yang-lsp] to version [0.7.6](https://github.com/TypeFox/yang-lsp/releases/tag/v0.7.6)
+* Dependencies updated.
+
 ## v2.3.2
 
 * Update [yang-lsp][yang-lsp] to version [0.7.4](https://github.com/TypeFox/yang-lsp/releases/tag/v0.7.4)

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "yang-vscode",
     "displayName": "Yangster",
     "description": "YANG editor support and diagrams for VS Code",
-    "version": "2.3.2",
+    "version": "2.3.3",
     "publisher": "typefox",
     "license": "Apache-2.0",
     "icon": "images/yin_yang.png",
@@ -136,20 +136,20 @@
         "vscode-languageclient": "^7.0.0"
     },
     "devDependencies": {
-        "@types/node": "^10.17.16",
+        "@types/node": "^18.0.0",
         "@types/vscode": "1.22.0",
-        "@types/webpack": "^4.41.8",
+        "@types/webpack": "^5.28.5",
         "reflect-metadata": "^0.1.13",
-        "ts-loader": "^6.2.2",
+        "ts-loader": "^9.5.1",
         "tslint": "^6.1.3",
-        "typescript": "^3.8.3",
-        "webpack": "^4.42.1",
-        "webpack-cli": "^3.3.11"
+        "typescript": "^5.6.3",
+        "webpack": "^5.94.0",
+        "webpack-cli": "^5.1.4"
     },
     "scripts": {
         "prepare": "yarn --cwd webview && yarn install:languageserver",
-        "install:languageserver": "rm -rf ./server && yarn download:languageserver && unzip yang-language-server.zip && mv yang-language-server-0.7.4 server",
-        "download:languageserver": "curl -L -o yang-language-server.zip https://github.com/TypeFox/yang-lsp/releases/download/v0.7.4/yang-language-server_diagram-extension_0.7.4.zip",
+        "install:languageserver": "rm -rf ./server && yarn download:languageserver && unzip yang-language-server.zip && mv yang-language-server-0.7.6 server",
+        "download:languageserver": "curl -L -o yang-language-server.zip https://github.com/TypeFox/yang-lsp/releases/download/v0.7.6/yang-language-server_diagram-extension_0.7.6.zip",
         "vscode:prepublish": "yarn clean && yarn lint && webpack --mode=production && yarn --cwd webview vscode:prepublish",
         "clean": "rm -rf ./extension/lib ./extension/pack",
         "build": "webpack --mode=development && yarn lint",

diff --git a/webpack.config.js b/webpack.config.js
@@ -3,15 +3,17 @@
 
 const path = require('path');
 
-/**@type {import('webpack').Configuration}*/
+/** @type {import('webpack').Configuration} */
 const config = {
     target: 'node',
 
     entry: './extension/src/extension.ts',
     output: {
         path: path.resolve(__dirname, 'extension', 'pack'),
         filename: 'extension.js',
-        libraryTarget: 'commonjs2',
+        library: {
+            type: 'commonjs2'
+        },
         devtoolModuleFilenameTemplate: info => {
             return `webpack:///${info.resourcePath.replace(/^\.\.\//, '')}`;
         },
@@ -24,12 +26,25 @@ const config = {
         extensions: ['.ts', '.js']
     },
     module: {
-        rules: [{
-            test: /\.ts$/,
-            exclude: /node_modules/,
-            use: ['ts-loader']
-        }]
+        rules: [
+            {
+                test: /\.ts$/,
+                exclude: /node_modules/,
+                use: 'ts-loader'
+            }
+        ]
+    },
+    optimization: {
+        // Add any optimization options here if needed
+    },
+    performance: {
+        hints: false
     },
+    node: {
+        __dirname: false,
+        __filename: false,
+        global: true,
+    }
 };
 
 module.exports = config;
diff --git a/webview/package.json b/webview/package.json
@@ -16,10 +16,10 @@
     "rimraf": "^3.0.2",
     "source-map-loader": "^0.2.4",
     "style-loader": "^1.1.3",
-    "tslint": "^6.1.1",
-    "typescript": "^3.8.3",
+    "tslint": "^6.1.3",
+    "typescript": "^5.6.3",
     "webpack": "^5.94.0",
-    "webpack-cli": "^3.3.11",
+    "webpack-cli": "^5.1.4",
     "file-loader": "^6.2.0"
   },
   "scripts": {

diff --git a/webview/webpack.config.js b/webview/webpack.config.js
@@ -32,11 +32,13 @@ const config = {
         ]
     },
     devtool: 'eval-source-map',
-    node: {
-        fs: 'empty',
-        child_process: 'empty',
-        net: 'empty',
-        crypto: 'empty'
+    resolve: {
+        fallback: {
+            fs: false,
+            child_process: false,
+            net: false,
+            crypto: false
+        }
     }
 };