Merge branch 'master' into notInTelemetry

Author: Hweinstock

buildspec/shared/linux-pre_build.sh

@@ -22,5 +22,5 @@ if [ "$TOOLKITS_CODEARTIFACT_DOMAIN" ] && [ "$TOOLKITS_CODEARTIFACT_REPO" ] && [
 fi
 
 # TODO: move this to the "install" phase?
-export NODE_OPTIONS=--max-old-space-size=8192
+export NODE_OPTIONS='--max-old-space-size=8192'
 npm 2>&1 ci | run_and_report 2 'npm WARN deprecated' 'Deprecated dependencies must be updated.'

docs/TESTPLAN.md

@@ -42,6 +42,11 @@ The test suite has the following categories of tests:
     -   Live in `src/testE2E`
     -   These tests are heavier than Integration tests.
     -   Some E2E tests have a more complicated architecture, described in [TEST_E2E](./TEST_E2E.md)
+-   Performance Tests: **slow** tests
+    -   Live in `src/testInteg/perf`.
+    -   A subset of integration tests focused on catching performance regressions.
+    -   Use a combination of operation counting and system usage statistics such as cpu usage, memory usage, and duration.
+    -   Each test is often repeated 10 or more times for less variant system usage statistics, then median of runs is used.
 
 ## Test files
 

package-lock.json

@@ -63,12 +63,13 @@
         "pretty-quick": "^4.0.0",
         "ts-node": "^10.9.1",
         "typescript": "^5.0.4",
-        "webpack": "^5.83.0",
+        "webpack": "^5.95.0",
         "webpack-cli": "^5.1.4",
         "webpack-dev-server": "^4.15.1",
         "webpack-merge": "^5.10.0"
     },
     "dependencies": {
+        "@types/node": "^18.19.55",
         "vscode-nls": "^5.2.0",
         "vscode-nls-dev": "^4.0.4"
     }

package.json

@@ -0,0 +1,10 @@
+{
+	"date": "2024-10-17",
+	"version": "1.30.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Various fixes and changes"
+		}
+	]
+}

packages/amazonq/.changes/1.30.0.json

@@ -1,3 +1,7 @@
+## 1.30.0 2024-10-17
+
+- **Bug Fix** Various fixes and changes
+
 ## 1.29.0 2024-10-10
 
 - **Bug Fix** Amazon Q /dev: include telemetry for workspace usage when generating new files

packages/amazonq/CHANGELOG.md

@@ -2,7 +2,7 @@
     "name": "amazon-q-vscode",
     "displayName": "Amazon Q",
     "description": "Amazon Q is your generative AI-powered assistant across the software development lifecycle.",
-    "version": "1.30.0-SNAPSHOT",
+    "version": "1.31.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],

packages/amazonq/package.json

@@ -4,7 +4,7 @@
  */
 
 /* eslint-disable no-restricted-imports */
-import * as fs from 'fs-extra'
+import fs from 'fs'
 import * as path from 'path'
 
 // Moves all dependencies into `dist`
@@ -73,33 +73,35 @@ const tasks: CopyTask[] = [
     },
 ]
 
-async function copy(task: CopyTask): Promise<void> {
+function copy(task: CopyTask): void {
     const src = path.resolve(projectRoot, task.target)
     const dst = path.resolve(outRoot, task.destination ?? task.target)
 
     try {
-        await fs.copy(src, dst, {
+        fs.cpSync(src, dst, {
             recursive: true,
-            overwrite: true,
+            force: true,
             errorOnExist: false,
         })
     } catch (error) {
         throw new Error(`Copy "${src}" to "${dst}" failed: ${error instanceof Error ? error.message : error}`)
     }
 }
 
-void (async () => {
-    const args = process.argv.slice(2)
-    if (args.includes('--vueHr')) {
-        vueHr = true
-        console.log('Using Vue Hot Reload webpacks from core/')
-    }
+const args = process.argv.slice(2)
+if (args.includes('--vueHr')) {
+    vueHr = true
+    console.log('Using Vue Hot Reload webpacks from core/')
+}
 
+function main() {
     try {
-        await Promise.all(tasks.map(copy))
+        tasks.map(copy)
     } catch (error) {
         console.error('`copyFiles.ts` failed')
         console.error(error)
         process.exit(1)
     }
-})()
+}
+
+void main()

packages/amazonq/scripts/build/copyFiles.ts

@@ -34,5 +34,5 @@ export function injectJSDOM() {
     })
 
     // jsdom doesn't have support for structuredClone. See https://github.com/jsdom/jsdom/issues/3363
-    global.structuredClone = (val) => JSON.parse(JSON.stringify(val))
+    global.structuredClone = (val: any) => JSON.parse(JSON.stringify(val))
 }

packages/amazonq/test/e2e/amazonq/framework/jsdomInjector.ts

@@ -411,7 +411,6 @@
         "@types/circular-dependency-plugin": "^5.0.8",
         "@types/cross-spawn": "^6.0.6",
         "@types/diff": "^5.0.7",
-        "@types/fs-extra": "^9.0.11",
         "@types/glob": "^8.1.0",
         "@types/js-yaml": "^4.0.5",
         "@types/jsdom": "^21.1.6",
@@ -423,7 +422,7 @@
         "@types/node-fetch": "^2.6.8",
         "@types/prismjs": "^1.26.0",
         "@types/proper-lockfile": "^4.1.4",
-        "@types/readline-sync": "^1.4.3",
+        "@types/readline-sync": "^1.4.8",
         "@types/semver": "^7.5.0",
         "@types/sinon": "^10.0.5",
         "@types/sinonjs__fake-timers": "^8.1.2",
@@ -488,7 +487,6 @@
         "cross-fetch": "^4.0.0",
         "cross-spawn": "^7.0.3",
         "fast-json-patch": "^3.1.1",
-        "fs-extra": "^10.0.1",
         "glob": "^10.3.10",
         "got": "^11.8.5",
         "highlight.js": "^11.9.0",