Merge branch 'master' into feature/standalone

Signed-off-by: Nikolas Komonen <[email protected]>

Author: nkomonen-amazon

packages/amazonq/.vscode/tasks.json

@@ -13,53 +13,35 @@
                 "kind": "build",
                 "isDefault": true
             },
-            "dependsOn": ["watchCore", "serve"]
+            "dependsOn": ["watchCore", "webpackCore", "serveVueCore"]
         },
         {
-            "label": "serve",
-            "type": "npm",
-            "script": "serve",
-            "group": "build",
+            "label": "watchCore",
+            "command": "npm run compileOnly -- --watch",
+            "type": "shell",
             "isBackground": true,
-            "problemMatcher": {
-                "owner": "custom",
-                "pattern": {
-                    "regexp": ".",
-                    "file": 1,
-                    "location": 2,
-                    "message": 3
-                },
-                "background": {
-                    "activeOnStart": true,
-                    "beginsPattern": "Project is running at",
-                    "endsPattern": "compiled"
-                }
-            },
+            "problemMatcher": "$tsc-watch",
             "options": {
-                "env": {
-                    "NODE_OPTIONS": "--max_old_space_size=5120"
-                }
+                "cwd": "../core"
             }
         },
         {
-            "label": "watchCore",
-            "command": "npm run compileLite -- --watch",
+            "label": "webpackCore",
+            "command": "npm run webpackDev -- --watch",
             "type": "shell",
             "isBackground": true,
-            "problemMatcher": {
-                "owner": "custom",
-                "pattern": {
-                    "regexp": ".",
-                    "file": 1,
-                    "location": 2,
-                    "message": 3
-                },
-                "background": {
-                    "activeOnStart": true,
-                    "beginsPattern": "Starting compilation",
-                    "endsPattern": "Watching for file changes."
-                }
-            },
+            "problemMatcher": "$ts-webpack-watch",
+            "options": {
+                "cwd": "../core"
+            }
+        },
+        {
+            "label": "serveVueCore",
+            "command": "npm run serveVue",
+            "type": "shell",
+            "detail": "Webpack + local server for Vue webview files from `core`.",
+            "isBackground": true,
+            "problemMatcher": "$ts-webpack-watch",
             "options": {
                 "cwd": "../core"
             }

packages/toolkit/package.json

@@ -70,7 +70,6 @@
         "createRelease": "ts-node ../../scripts/createRelease.ts",
         "newChange": "ts-node ../../scripts/newChange.ts",
         "watch": "npm run clean && npm run buildScripts && tsc -watch -p ./",
-        "serve": "webpack serve --config-name mainServe --mode development",
         "copyPackageJson": "ts-node ./scripts/build/handlePackageJson",
         "restorePackageJson": "ts-node ./scripts/build/handlePackageJson --restore"
     },