Merge master into feature/cw-proactive-scan

Author: aws-toolkit-automation

.gitignore

@@ -31,6 +31,7 @@ packages/core/src/shared/telemetry/clienttelemetry.d.ts
 packages/core/src/codewhisperer/client/codewhispererclient.d.ts
 packages/core/src/codewhisperer/client/codewhispereruserclient.d.ts
 packages/core/src/amazonqFeatureDev/client/featuredevproxyclient.d.ts
+packages/core/src/auth/sso/oidcclientpkce.d.ts
 
 # Generated by tests
 packages/core/src/testFixtures/**/bin
@@ -42,6 +43,7 @@ packages/*/LICENSE
 packages/*/NOTICE
 packages/toolkit/package.nls.json
 packages/toolkit/resources
+packages/amazonq/resources
 
 # Icons
 packages/*/resources/icons/cloud9/generated/**

packages/amazonq/.vscode/tasks.json

@@ -13,27 +13,37 @@
                 "kind": "build",
                 "isDefault": true
             },
-            "dependsOn": ["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": "$tsc-watch",
+            "options": {
+                "cwd": "../core"
+            }
+        },
+        {
+            "label": "webpackCore",
+            "command": "npm run webpackDev -- --watch",
+            "type": "shell",
+            "isBackground": true,
+            "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": {
-                "owner": "custom",
-                "pattern": {
-                    "regexp": ".",
-                    "file": 1,
-                    "location": 2,
-                    "message": 3
-                },
-                "background": {
-                    "activeOnStart": true,
-                    "beginsPattern": "Project is running at",
-                    "endsPattern": "compiled successfully"
-                }
+            "problemMatcher": "$ts-webpack-watch",
+            "options": {
+                "cwd": "../core"
             }
         },
         {

packages/amazonq/webpack.config.js

@@ -9,7 +9,6 @@
 
 const baseConfigFactory = require('../webpack.base.config')
 const baseVueConfigFactory = require('../webpack.vue.config')
-const baseWebConfigFactory = require('../webpack.web.config')
 
 module.exports = (env, argv) => {
     const config = {
@@ -28,12 +27,5 @@ module.exports = (env, argv) => {
         },
     }
 
-    const webConfig = {
-        ...baseWebConfigFactory(env, argv),
-        entry: {
-            'src/extensionWeb': './src/extensionWeb.ts',
-        },
-    }
-
-    return [config, vueConfig, webConfig]
+    return [config, vueConfig]
 }

packages/toolkit/package.json

@@ -71,7 +71,6 @@
         "lint": "echo 'Nothing to lint yet!'",
         "createRelease": "ts-node ./scripts/build/createRelease.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"
     },