Fix build

Signed-off-by: paulober <[email protected]>

Author: paulober

.vscode/launch.json

@@ -13,7 +13,7 @@
         "--extensionDevelopmentPath=${workspaceFolder}"
       ],
       "outFiles": [
-        "${workspaceFolder}/dist/**/*.js"
+        "${workspaceFolder}/dist/extension.js"
       ],
       "preLaunchTask": "${defaultBuildTask}"
     },

.vscode/tasks.json

@@ -6,7 +6,7 @@
     {
       "type": "npm",
       "script": "watch",
-      "problemMatcher": "$tsc-watch",
+      "problemMatcher": "$ts-webpack-watch",
       "isBackground": true,
       "presentation": {
         "reveal": "never",

package.json

@@ -54,7 +54,7 @@
     "workspaceContains:.micropico",
     "onFileSystem:pico"
   ],
-  "main": "./dist/extension",
+  "main": "./dist/extension.js",
   "os": [
     "win32",
     "darwin",
@@ -648,8 +648,8 @@
     "vscode:prepublish": "npm run package",
     "postinstall": "patch-package && node ./scripts/postinstall.mjs",
     "cp-prebuilds": "node -e \"const fs=require('fs');fs.rmSync('prebuilds',{recursive:true,force:true});fs.cpSync('node_modules/@serialport/bindings-cpp/prebuilds','prebuilds',{recursive:true});\"",
-    "compile": "tsc --build tsconfig.json",
-    "watch": "npm run cp-prebuilds && tsc --build tsconfig.json --watch",
+    "compile": "tsc --build tsconfig.json --noEmit false",
+    "watch": "npm run cp-prebuilds && webpack --watch --mode development",
     "clean": "node -e \"require('fs').rmSync('dist',{recursive:true,force:true})\"",
     "package-local": "npm run clean && webpack --mode production && npm run cp-prebuilds",
     "package": "npm run clean && webpack --mode production",

tsconfig.json

@@ -5,18 +5,20 @@
     "lib": [
       "ES2022"
     ],
-    "sourceMap": false,
-    "inlineSourceMap": true,
+    "sourceMap": true,
+    "inlineSourceMap": false,
+    "noEmit": true,
     "removeComments": true,
     "noUnusedLocals": true,
     "strictNullChecks": true,
     "strictPropertyInitialization": true,
     "rootDir": "src",
-    "outDir": "dist",
+    "outDir": "out",
     "strict": true,
     "noImplicitAny": true,
     "noImplicitReturns": true,
     "forceConsistentCasingInFileNames": true,
-    "moduleResolution": "node16"
+    "moduleResolution": "node16",
+    "esModuleInterop": true
   }
 }

webpack.config.js

@@ -2,76 +2,80 @@
 
 'use strict';
 
-const path = require('path');
+const path = require('node:path');
 
-/**@type {import('webpack').Configuration}*/
-const config = {
-  target: 'node',
-  entry: './src/extension.mts',
-  output: {
-    path: path.resolve(__dirname, "dist"),
-    filename: 'extension.js',
-    libraryTarget: 'commonjs2',
-    devtoolModuleFilenameTemplate: '../[resource-path]',
-  },
-  node: {
-    __dirname: false,
-  },
-  devtool: 'source-map',
-  externals: {
-    vscode: "commonjs vscode"
-  },
-  resolve: {
-    extensions: ['.mts', '.ts', '.mjs', '.js'],
-    mainFields: ['main', 'module'],
-    extensionAlias: {
-      '.mjs': ['.mts', '.mjs'], // allow imports written as ./file.mjs to resolve ./file.mts
-      '.js': ['.ts', '.js'],  // allow imports written as ./file.js  to resolve ./file.ts
+//@ts-ignore
+module.exports = (_env, argv) => {
+  const isProd = argv.mode === 'production';
+
+  /** @type {import('webpack').Configuration} */
+  const config = {
+    name: 'extension',
+    target: 'node',
+    entry: './src/extension.mts',
+    mode: isProd ? 'production' : 'development',
+    output: {
+      path: path.resolve(__dirname, "dist"),
+      filename: 'extension.js',
+      libraryTarget: 'commonjs2',
+    },
+    node: {
+      __dirname: false,
+    },
+    devtool: 'source-map',
+    externals: {
+      vscode: "commonjs vscode"
     },
-  },
-  module: {
-    rules: [{
-      test: /\.[cm]?ts$/,
-      exclude: /node_modules/,
-      use: [{
-        // configure TypeScript loader:
-        // * enable sources maps for end-to-end source maps
-        loader: 'ts-loader',
-        options: {
-          compilerOptions: {
-            "inlineSourceMap": true,
+    resolve: {
+      extensions: ['.mts', '.ts', '.mjs', '.js'],
+      mainFields: ['main', 'module'],
+      extensionAlias: {
+        '.mjs': ['.mts', '.mjs'], // allow imports written as ./file.mjs to resolve ./file.mts
+        '.js': ['.ts', '.js'],  // allow imports written as ./file.js  to resolve ./file.ts
+      },
+    },
+    module: {
+      rules: [{
+        test: /\.[cm]?ts$/,
+        exclude: /node_modules/,
+        use: [{
+          // configure TypeScript loader:
+          // * enable sources maps for end-to-end source maps
+          loader: 'ts-loader',
+          options: {
+            transpileOnly: true
           }
-        }
+        }]
+      }, {
+        test: /.node$/,
+        loader: 'node-loader',
       }]
-    }, {
-      test: /.node$/,
-      loader: 'node-loader',
-    }]
-  },
-  optimization: {
-    minimize: true
-  },
-  stats: {
-    warnings: false
-  }
-};
+    },
+    optimization: {
+      minimize: isProd
+    },
+    stats: {
+      warnings: false
+    }
+  };
 
-const uninstallerEsm = {
-  name: 'uninstaller',
-  target: 'node',
-  mode: 'production',
-  entry: './vscodeUninstall.mjs',       // your existing file with TLA
-  experiments: { outputModule: true, topLevelAwait: true },
-  output: {
-    path: path.resolve(__dirname, 'dist'),
-    filename: 'vscodeUninstall.mjs',
-    library: { type: 'module' },
-    chunkFormat: 'module',
-    clean: false,
-  },
-  devtool: false,
-  resolve: { extensions: ['.mjs', '.js'] },
-};
+  /** @type {import('webpack').Configuration} */
+  const uninstallerEsm = {
+    name: 'uninstaller',
+    target: 'node',
+    mode: 'production',
+    entry: './vscodeUninstall.mjs',       // your existing file with TLA
+    experiments: { outputModule: true, topLevelAwait: true },
+    output: {
+      path: path.resolve(__dirname, 'dist'),
+      filename: 'vscodeUninstall.mjs',
+      library: { type: 'module' },
+      chunkFormat: 'module',
+      clean: false,
+    },
+    devtool: false,
+    resolve: { extensions: ['.mjs', '.js'] },
+  };
 
-// @ts-ignore
-module.exports = [config, uninstallerEsm];
+  return [config, uninstallerEsm];
+};