Merge branch 'master' into hkobew/ec2/cwl

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

@@ -43,7 +43,7 @@
         "@playwright/browser-chromium": "^1.43.1",
         "@types/vscode": "^1.68.0",
         "@types/vscode-webview": "^1.57.1",
-        "@types/webpack-env": "^1.18.1",
+        "@types/webpack-env": "^1.18.5",
         "@typescript-eslint/eslint-plugin": "^7.14.1",
         "@typescript-eslint/parser": "^7.14.1",
         "@vscode/codicons": "^0.0.33",
@@ -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": "^22.7.5",
         "vscode-nls": "^5.2.0",
         "vscode-nls-dev": "^4.0.4"
     }

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

@@ -423,7 +423,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",

packages/core/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`
@@ -46,27 +46,28 @@ 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 () => {
+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/core/scripts/build/copyFiles.ts

@@ -18,31 +18,20 @@ import {
 import { UserCredentialsUtils } from '../../../shared/credentials/userCredentialsUtils'
 import { EnvironmentVariables } from '../../../shared/environmentVariables'
 import { makeTemporaryToolkitFolder } from '../../../shared/filesystemUtilities'
-import { getConfigFilename, getCredentialsFilename } from '../../../auth/credentials/sharedCredentialsFile'
 import { fs } from '../../../shared'
 
 describe('UserCredentialsUtils', function () {
     let tempFolder: string
-    let defaultConfigFileName: string
-    let defaultCredentialsFilename: string
 
-    before(async function () {
-        defaultConfigFileName = getConfigFilename()
-        defaultCredentialsFilename = getCredentialsFilename()
+    beforeEach(async function () {
         // Make a temp folder for all these tests
         // Stick some temp credentials files in there to load from
         tempFolder = await makeTemporaryToolkitFolder()
     })
 
     afterEach(async function () {
-        await fs.delete(defaultConfigFileName, { recursive: true })
-        await fs.delete(defaultCredentialsFilename, { recursive: true })
-
-        sinon.restore()
-    })
-
-    after(async function () {
         await fs.delete(tempFolder, { recursive: true })
+        sinon.restore()
     })
 
     describe('findExistingCredentialsFilenames', function () {

packages/core/src/test/shared/credentials/userCredentialsUtils.test.ts

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Fix userCredentialsUtils.test.ts so it won't remove the actual aws config"
+}