[AXON-45] chore: speed up iteration on UI with --watch (devprod)

atlassian · Jan 13, 2025 · a21497a · a21497a
1 parent 0b92893
commit a21497a
Show file tree

Hide file tree

Showing 4 changed files with 212 additions and 11 deletions.
diff --git a/.vscode/launch.json.example b/.vscode/launch.json.example
@@ -11,21 +11,21 @@
             "request": "launch",
             "program": "${workspaceFolder}/node_modules/.bin/extest",
             "windows": {
-              "program": "${workspaceFolder}/node_modules/vscode-extension-tester/out/cli.js",
+                "program": "${workspaceFolder}/node_modules/vscode-extension-tester/out/cli.js",
             },
             "args": [
-              "run-tests",
-              "${workspaceFolder}/.generated/atlascode/e2e/tests/*.test.js",
-              "--code_settings",
-              "${workspaceFolder}/e2e/test-settings.json",
-              "--extensions_dir",
-              ".test-extensions",
-              "--mocha_config",
-              "${workspaceFolder}/.mocharc.js"
+                "run-tests",
+                "${workspaceFolder}/.generated/atlascode/e2e/tests/*.test.js",
+                "--code_settings",
+                "${workspaceFolder}/e2e/test-settings.json",
+                "--extensions_dir",
+                ".test-extensions",
+                "--mocha_config",
+                "${workspaceFolder}/.mocharc.js"
             ],
             "console": "integratedTerminal",
             "internalConsoleOptions": "neverOpen"
-          },
+        },
         {
             "name": "Extension",
             "type": "extensionHost",
@@ -38,6 +38,20 @@
                 "${workspaceFolder}/build/**/*.js"
             ],
             "preLaunchTask": "npm: devcompile"
+        },
+        {
+            // This configuration requires npm run dev to be running externally
+            // It will pick up the re-compiled extension code but not hot-swap it 
+            "name": "Extension (watch/external)",
+            "type": "extensionHost",
+            "request": "launch",
+            "runtimeExecutable": "${execPath}",
+            "args": [
+                "--extensionDevelopmentPath=${workspaceFolder}"
+            ],
+            "outFiles": [
+                "${workspaceFolder}/build/**/*.js"
+            ],
         }
     ]
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -71,6 +71,12 @@
         "devcompile": "npm-run-all --parallel devcompile:react devcompile:extension",
         "devcompile:react": "webpack --mode development --config webpack.react.dev.js",
         "devcompile:extension": "webpack --mode development --config webpack.extension.dev.js",
+
+        "watch": "concurrently -r \"npm:watch:*\"",
+        "watch:extension": "WATCH=true webpack --mode development --config webpack.react.dev.js --progress --watch",
+        "watch:react": "WATCH=true webpack --mode development --config webpack.extension.dev.js --progress --watch",
+        "dev": "concurrently -r npm:watch:extension npm:watch:react",
+
         "mui:atlascodeSettings:dark": "cross-env PAGETSX=\"config/ConfigPage.tsx\" VIEW=\"atlascodeSettingsV2\" THEME=\"dark\" webpack-dev-server --open --config webpack.mui.webview.js",
         "mui:atlascodeSettings:light": "cross-env PAGETSX=\"config/ConfigPage.tsx\" VIEW=\"atlascodeSettingsV2\" THEME=\"light\" webpack-dev-server --open --config webpack.mui.webview.js",
         "mui:atlascodeOnboarding:dark": "cross-env PAGETSX=\"onboarding/OnboardingPage.tsx\" VIEW=\"atlascodeOnboardingV2\" THEME=\"dark\" webpack-dev-server --open --config webpack.mui.webview.js",
@@ -1523,6 +1529,7 @@
         "autoprefixer": "^10.4.20",
         "babel-loader": "^9.2.1",
         "chai": "^4",
+        "concurrently": "^9.1.2",
         "cross-env": "^7.0.2",
         "css-loader": "^7.1.2",
         "css-minimizer-webpack-plugin": "^7.0.0",

diff --git a/webpack.extension.dev.js b/webpack.extension.dev.js
@@ -13,7 +13,7 @@ dotenv.config();
 
 module.exports = [
     {
-        bail: true,
+        bail: !process.env.WATCH,
         name: 'extension',
         mode: 'development',
         target: 'node',