Merge branch 'master' into code-fix-error-handling

Author: ctlai95

buildspec/linuxE2ETests.yml

@@ -37,7 +37,7 @@ phases:
         commands:
             - export HOME=/home/codebuild-user
             # Ignore failure until throttling issues are fixed.
-            - xvfb-run npm run testE2E
+            - xvfb-run npm run testE2E; npm run mergeReports -- "$?"
             - VCS_COMMIT_ID="${CODEBUILD_RESOLVED_SOURCE_VERSION}"
             - CI_BUILD_URL=$(echo $CODEBUILD_BUILD_URL | sed 's/#/%23/g')
             - CI_BUILD_ID="${CODEBUILD_BUILD_ID}"

buildspec/linuxIntegrationTests.yml

@@ -92,7 +92,7 @@ phases:
     build:
         commands:
             - export HOME=/home/codebuild-user
-            - xvfb-run npm run testInteg
+            - xvfb-run npm run testInteg; npm run mergeReports -- "$?"
             - VCS_COMMIT_ID="${CODEBUILD_RESOLVED_SOURCE_VERSION}"
             - CI_BUILD_URL=$(echo $CODEBUILD_BUILD_URL | sed 's/#/%23/g')
             - CI_BUILD_ID="${CODEBUILD_BUILD_ID}"

buildspec/linuxTests.yml

@@ -41,7 +41,7 @@ phases:
                     # Ensure that "foo | run_and_report" fails correctly.
                     set -o pipefail
                     . buildspec/shared/common.sh
-                    2>&1 xvfb-run npm test --silent | run_and_report 2 \
+                    { 2>&1 xvfb-run npm test --silent; npm run mergeReports -- "$?"; } | run_and_report 2 \
                         'rejected promise not handled' \
                         'This typically indicates a bug. Read https://developer.mozilla.org/docs/Web/JavaScript/Guide/Using_promises#error_handling'
                 }

package-lock.json

@@ -36,7 +36,8 @@
         "lintfix": "eslint -c .eslintrc.js --ignore-path .gitignore --ignore-pattern '**/*.json' --ignore-pattern '**/*.gen.ts' --ignore-pattern '**/types/*.d.ts' --ignore-pattern '**/src/testFixtures/**' --ignore-pattern '**/resources/js/graphStateMachine.js' --fix --ext .ts packages plugins",
         "clean": "npm run clean -w packages/ -w plugins/",
         "reset": "npm run clean && ts-node ./scripts/clean.ts node_modules && npm install",
-        "generateNonCodeFiles": "npm run generateNonCodeFiles -w packages/ --if-present"
+        "generateNonCodeFiles": "npm run generateNonCodeFiles -w packages/ --if-present",
+        "mergeReports": "ts-node ./scripts/mergeReports.ts"
     },
     "devDependencies": {
         "@aws-toolkits/telemetry": "^1.0.289",

package.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q /dev: Fix issue when files are deleted while preparing context"
+}

packages/amazonq/.changes/next-release/Bug Fix-4f85fc73-11cd-4033-bc93-b49ff3c3e45e.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Fix context menu displaying when typing @, even though input is disallowed"
+}

packages/amazonq/.changes/next-release/Bug Fix-8434a098-361d-4e8d-9de4-c616da38ccbf.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q can update mvn and gradle build files"
+}

packages/amazonq/.changes/next-release/Bug Fix-993929aa-5dd5-440a-9150-8ae5ba5f56ac.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Up/down history navigation only triggering on first/last line of prompt input"
+}

packages/amazonq/.changes/next-release/Bug Fix-acf80397-e84d-430e-b7e2-fec67736338b.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Amazon Q: new code syntax highlighter for improved accuracy"
+}