diff --git a/buildspec/shared/linux-pre_build.sh b/buildspec/shared/linux-pre_build.sh index 25e9f0c879f..102103ff30c 100644 --- a/buildspec/shared/linux-pre_build.sh +++ b/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.' diff --git a/package-lock.json b/package-lock.json index 93e117524fb..404c95a936e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,6 +15,7 @@ "plugins/*" ], "dependencies": { + "@types/node": "^22.7.5", "vscode-nls": "^5.2.0", "vscode-nls-dev": "^4.0.4" }, @@ -7058,8 +7059,13 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "14.18.63", - "license": "MIT" + "version": "22.7.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.5.tgz", + "integrity": "sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ==", + "license": "MIT", + "dependencies": { + "undici-types": "~6.19.2" + } }, "node_modules/@types/node-fetch": { "version": "2.6.9", @@ -17778,6 +17784,12 @@ "dev": true, "license": "MIT" }, + "node_modules/undici-types": { + "version": "6.19.8", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", + "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==", + "license": "MIT" + }, "node_modules/unescape-html": { "version": "1.1.0", "license": "MIT" @@ -19394,7 +19406,7 @@ }, "engines": { "npm": "^10.1.0", - "vscode": "^1.68.0" + "vscode": "^1.83.0" } }, "packages/core/node_modules/@types/node": { diff --git a/package.json b/package.json index 869e7e5fe70..8de4db99c14 100644 --- a/package.json +++ b/package.json @@ -69,6 +69,7 @@ "webpack-merge": "^5.10.0" }, "dependencies": { + "@types/node": "^22.7.5", "vscode-nls": "^5.2.0", "vscode-nls-dev": "^4.0.4" } diff --git a/packages/amazonq/scripts/build/copyFiles.ts b/packages/amazonq/scripts/build/copyFiles.ts index c1b0861321d..725c66ad7c0 100644 --- a/packages/amazonq/scripts/build/copyFiles.ts +++ b/packages/amazonq/scripts/build/copyFiles.ts @@ -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,14 +73,14 @@ const tasks: CopyTask[] = [ }, ] -async function copy(task: CopyTask): Promise { +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) { @@ -88,18 +88,20 @@ async function copy(task: CopyTask): Promise { } } -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() diff --git a/packages/amazonq/test/e2e/amazonq/framework/jsdomInjector.ts b/packages/amazonq/test/e2e/amazonq/framework/jsdomInjector.ts index ef92521b1d9..f5d2d1c2770 100644 --- a/packages/amazonq/test/e2e/amazonq/framework/jsdomInjector.ts +++ b/packages/amazonq/test/e2e/amazonq/framework/jsdomInjector.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)) } diff --git a/packages/core/scripts/build/copyFiles.ts b/packages/core/scripts/build/copyFiles.ts index ee5c9492bcb..e926a6d9963 100644 --- a/packages/core/scripts/build/copyFiles.ts +++ b/packages/core/scripts/build/copyFiles.ts @@ -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 { +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() diff --git a/packages/toolkit/scripts/build/copyFiles.ts b/packages/toolkit/scripts/build/copyFiles.ts index 99c79124637..6cea899b4ca 100644 --- a/packages/toolkit/scripts/build/copyFiles.ts +++ b/packages/toolkit/scripts/build/copyFiles.ts @@ -4,7 +4,7 @@ */ /* eslint-disable no-restricted-imports */ -import * as fs from 'fs-extra' +import fs from 'fs' import * as path from 'path' // Copies various dependencies into "dist/". @@ -100,27 +100,28 @@ const tasks: CopyTask[] = [ }, ] -async function copy(task: CopyTask): Promise { +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()