Merge branch 'aws:master' into feature/abtesting

Author: laileni-aws

.changes/2.20.0.json

@@ -0,0 +1,26 @@
+{
+	"date": "2024-04-19",
+	"version": "2.20.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q CodeTransform may fail if JAVA_HOME has leading or trailing whitespace"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q FeatureDev: code generation may fail with \"conversation id not found\" error"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Code Transformation: show error messages in chat"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Code Transformation - Omit Maven metadata files when uploading dependencies to fix certain build failures in backend."
+		},
+		{
+			"type": "Feature",
+			"description": "Enable Amazon Q feature development and Amazon Q transform capabilities (/dev and /transform) for AWS Builder ID users."
+		}
+	]
+}

.changes/next-release/Bug Fix-1be65539-66a5-4443-ae5e-2a93a67fe436.json

@@ -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/**

.changes/next-release/Bug Fix-5d6c3406-8213-4aec-ba80-a488e9728e3a.json

@@ -1,3 +1,11 @@
+## 2.20.0 2024-04-19
+
+- **Bug Fix** Amazon Q CodeTransform may fail if JAVA_HOME has leading or trailing whitespace
+- **Bug Fix** Amazon Q FeatureDev: code generation may fail with "conversation id not found" error
+- **Bug Fix** Amazon Q Code Transformation: show error messages in chat
+- **Bug Fix** Amazon Q Code Transformation - Omit Maven metadata files when uploading dependencies to fix certain build failures in backend.
+- **Feature** Enable Amazon Q feature development and Amazon Q transform capabilities (/dev and /transform) for AWS Builder ID users.
+
 ## 2.19.0 2024-04-15
 
 - **Bug Fix** Amazon Q: Fixed quick action command list inconsistency between Q tabs

.changes/next-release/Bug Fix-ffcf9c8e-bd5e-4b34-a418-469717d913f6.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"
             }
         },
         {

.changes/next-release/Feature-51070f02-21b0-447b-9743-e7ce616337fe.json

@@ -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]
 }