unify desktop and web extension

.vscode/launch.json

@@ -13,20 +13,7 @@
         "--extensionDevelopmentPath=${workspaceFolder}"
       ],
       "outFiles": [
-        "${workspaceFolder}/out/**/*.js"
-      ],
-      "preLaunchTask": "${defaultBuildTask}"
-    },
-    {
-      "name": "Extension Tests",
-      "type": "extensionHost",
-      "request": "launch",
-      "args": [
-        "--extensionDevelopmentPath=${workspaceFolder}",
-        "--extensionTestsPath=${workspaceFolder}/out/test/suite/index"
-      ],
-      "outFiles": [
-        "${workspaceFolder}/out/test/**/*.js"
+        "${workspaceFolder}/**/*.js"
       ],
       "preLaunchTask": "${defaultBuildTask}"
     }

.vscode/tasks.json

@@ -5,7 +5,7 @@
   "tasks": [
     {
       "type": "npm",
-      "script": "watch",
+      "script": "compile-dev",
       "problemMatcher": "$tsc-watch",
       "isBackground": true,
       "presentation": {

.vscodeignore

@@ -0,0 +1,7 @@
+.vscode
+node_modules
+out/
+src/
+*.js.map
+tsconfig.json
+webpack.config.js

package.json

@@ -33,7 +33,7 @@
   "activationEvents": [
     "workspaceContains:kcide.project.json"
   ],
-  "main": "./out/extension.js",
+  "main": "./dist/web/extension.js",
   "browser": "./dist/web/extension.js",
   "preview": true,
   "contributes": {
@@ -213,14 +213,12 @@
     ]
   },
   "scripts": {
-    "vscode:prepublish": "npm run clean && npm run compile && npm run compile-web",
+    "vscode:prepublish": "npm run clean && npm run compile",
     "clean": "rimraf out dist",
-    "compile": "tsc -p ./",
-    "compile-web": "webpack",
-    "watch": "tsc -watch -p ./",
+    "compile": "webpack --mode production",
+    "compile-dev": "webpack --mode development",
     "pretest": "npm run compile && npm run lint",
-    "lint": "eslint src --ext ts && tsc --noEmit",
-    "test": "node ./out/test/runTest.js"
+    "lint": "eslint src --ext ts && tsc --noEmit"
   },
   "devDependencies": {
     "@types/mocha": "^10.0.3",

webpack.config.js

@@ -13,7 +13,7 @@ const webExtensionConfig = {
     filename: '[name].js',
     path: path.join(__dirname, './dist/web'),
     libraryTarget: 'commonjs',
-    devtoolModuleFilenameTemplate: '../../[resource-path]'
+    devtoolModuleFilenameTemplate: 'file:///[absolute-resource-path]'
   },
   resolve: {
     mainFields: ['browser', 'module', 'main'], // look for `browser` entry point in imported node modules
@@ -54,6 +54,6 @@ const webExtensionConfig = {
   performance: {
     hints: false
   },
-  devtool: 'nosources-source-map' // create a source map that points to the original source file
+  devtool: 'source-map' // create a source map that points to the original source file
 };
 module.exports = [webExtensionConfig];