Merge branch 'master' into master

Author: ecmel

package.json

@@ -81,24 +81,25 @@
 		"deploy": "vsce publish"
 	},
 	"devDependencies": {
-		"@types/vscode": "^1.58.0",
 		"@types/glob": "^7.1.3",
 		"@types/mocha": "^8.0.4",
 		"@types/node": "^12.11.7",
-		"eslint": "^7.19.0",
+		"@types/node-fetch": "^2.5.8",
+		"@types/vscode": "^1.53.0",
 		"@typescript-eslint/eslint-plugin": "^4.14.1",
 		"@typescript-eslint/parser": "^4.14.1",
+		"css-tree": "^1.1.2",
+		"eslint": "^7.19.0",
 		"glob": "^7.1.6",
 		"mocha": "^8.2.1",
+		"node-fetch": "^2.6.1",
+		"path-browserify": "^1.0.1",
+		"process": "^0.11.10",
+		"ts-loader": "^8.3.0",
 		"typescript": "^4.1.3",
+		"vsce": "^1.85.0",
 		"vscode-test": "^1.5.0",
-		"ts-loader": "^8.0.14",
-		"webpack": "^5.19.0",
-		"webpack-cli": "^4.4.0",
-		"@types/css-tree": "^1.0.5",
-		"@types/node-fetch": "^2.5.8",
-		"css-tree": "^1.1.2",
-		"node-fetch": "^2.6.1",
-		"vsce": "^1.85.0"
+		"webpack": "^5.51.1",
+		"webpack-cli": "^4.8.0"
 	}
 }

webpack.config.js

@@ -3,18 +3,12 @@
 "use strict";
 
 const path = require("path");
+const webpack = require("webpack");
 
 /**@type {import('webpack').Configuration}*/
-const config = {
-    target: "node",
+const baseConfig = {
     mode: "none",
-
     entry: "./src/extension.ts",
-    output: {
-        path: path.resolve(__dirname, "dist"),
-        filename: "extension.js",
-        libraryTarget: "commonjs2"
-    },
     devtool: "nosources-source-map",
     externals: {
         vscode: "commonjs vscode"
@@ -36,4 +30,35 @@ const config = {
         ]
     }
 };
-module.exports = config;
+
+const nodeConfig = {
+    ...baseConfig,
+    target: "node",
+    output: {
+        path: path.resolve(__dirname, "dist"),
+        filename: "extension.js",
+        libraryTarget: "commonjs2"
+    }
+};
+
+const webConfig = {
+    ...baseConfig,
+    target: "webworker",
+    output: {
+        path: path.resolve(__dirname, "dist"),
+        filename: "extension-web.js",
+        libraryTarget: "commonjs2"
+    },
+    resolve: {
+        fallback: {
+            "path": require.resolve("path-browserify")
+        }
+    },
+    plugins: [
+		new webpack.ProvidePlugin({
+			process: "process/browser",
+		})
+	]
+};
+
+module.exports = [ nodeConfig, webConfig ];