From 9db24aeedde9459f9da520fe418ece66856d270d Mon Sep 17 00:00:00 2001 From: josefaidt Date: Mon, 7 Oct 2024 09:44:31 -0700 Subject: [PATCH 01/21] force esm via tsconfig, remove package.json creation --- .../package_manager_controller_base.ts | 4 ++-- .../create-amplify/src/initial_project_file_generator.ts | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/packages/cli-core/src/package-manager-controller/package_manager_controller_base.ts b/packages/cli-core/src/package-manager-controller/package_manager_controller_base.ts index d722ef84f57..04c5a5fab51 100644 --- a/packages/cli-core/src/package-manager-controller/package_manager_controller_base.ts +++ b/packages/cli-core/src/package-manager-controller/package_manager_controller_base.ts @@ -96,8 +96,8 @@ export abstract class PackageManagerControllerBase const tsConfigTemplate = { compilerOptions: { target: 'es2022', - module: 'es2022', - moduleResolution: 'bundler', + module: 'preserve', + moduleDetection: 'force', resolveJsonModule: true, esModuleInterop: true, forceConsistentCasingInFileNames: true, diff --git a/packages/create-amplify/src/initial_project_file_generator.ts b/packages/create-amplify/src/initial_project_file_generator.ts index 0c782726e56..fcba7b319a2 100644 --- a/packages/create-amplify/src/initial_project_file_generator.ts +++ b/packages/create-amplify/src/initial_project_file_generator.ts @@ -29,12 +29,6 @@ export class InitialProjectFileGenerator { { recursive: true } ); - const packageJsonContent = { type: 'module' }; - await this.fsp.writeFile( - this.path.resolve(targetDir, 'package.json'), - JSON.stringify(packageJsonContent, null, 2) - ); - await this.packageManagerController.initializeTsConfig(targetDir); }; } From 63898fd5ea63e63aa0485c5304506aa0158e5596 Mon Sep 17 00:00:00 2001 From: josefaidt Date: Mon, 7 Oct 2024 09:50:26 -0700 Subject: [PATCH 02/21] npm run update:api --- packages/client-config/API.md | 2 +- packages/platform-core/API.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/client-config/API.md b/packages/client-config/API.md index 397419f74fd..d002b131fdc 100644 --- a/packages/client-config/API.md +++ b/packages/client-config/API.md @@ -473,7 +473,7 @@ export type CustomClientConfig = { export const DEFAULT_CLIENT_CONFIG_VERSION: ClientConfigVersion; // @public -export const generateClientConfig: (backendIdentifier: DeployedBackendIdentifier, version: T, awsClientProvider?: AWSClientProvider<{ +export const generateClientConfig: (backendIdentifier: DeployedBackendIdentifier, version: T, awsClientProvider?: AWSClientProvider<{ getS3Client: S3Client; getAmplifyClient: AmplifyClient; getCloudFormationClient: CloudFormationClient; diff --git a/packages/platform-core/API.md b/packages/platform-core/API.md index 928d4ada67a..bfacf645559 100644 --- a/packages/platform-core/API.md +++ b/packages/platform-core/API.md @@ -165,12 +165,12 @@ export const packageJsonSchema: z.ZodObject<{ type: z.ZodOptional, z.ZodLiteral<"commonjs">]>>; }, "strip", z.ZodTypeAny, { name?: string | undefined; - type?: "module" | "commonjs" | undefined; version?: string | undefined; + type?: "module" | "commonjs" | undefined; }, { name?: string | undefined; - type?: "module" | "commonjs" | undefined; version?: string | undefined; + type?: "module" | "commonjs" | undefined; }>; // @public From aa26514c4cd4f737b3b6488ab0554698d82d4ba8 Mon Sep 17 00:00:00 2001 From: josefaidt Date: Fri, 1 Nov 2024 16:08:22 -0700 Subject: [PATCH 03/21] revert client-config api update --- packages/client-config/API.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client-config/API.md b/packages/client-config/API.md index d002b131fdc..397419f74fd 100644 --- a/packages/client-config/API.md +++ b/packages/client-config/API.md @@ -473,7 +473,7 @@ export type CustomClientConfig = { export const DEFAULT_CLIENT_CONFIG_VERSION: ClientConfigVersion; // @public -export const generateClientConfig: (backendIdentifier: DeployedBackendIdentifier, version: T, awsClientProvider?: AWSClientProvider<{ +export const generateClientConfig: (backendIdentifier: DeployedBackendIdentifier, version: T, awsClientProvider?: AWSClientProvider<{ getS3Client: S3Client; getAmplifyClient: AmplifyClient; getCloudFormationClient: CloudFormationClient; From db7fe8ea2af1f0cbf2cfb9bec3f7b4696d840a65 Mon Sep 17 00:00:00 2001 From: josefaidt Date: Fri, 1 Nov 2024 16:11:45 -0700 Subject: [PATCH 04/21] revert change to platform-core api --- packages/platform-core/API.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/platform-core/API.md b/packages/platform-core/API.md index bfacf645559..928d4ada67a 100644 --- a/packages/platform-core/API.md +++ b/packages/platform-core/API.md @@ -165,12 +165,12 @@ export const packageJsonSchema: z.ZodObject<{ type: z.ZodOptional, z.ZodLiteral<"commonjs">]>>; }, "strip", z.ZodTypeAny, { name?: string | undefined; - version?: string | undefined; type?: "module" | "commonjs" | undefined; + version?: string | undefined; }, { name?: string | undefined; - version?: string | undefined; type?: "module" | "commonjs" | undefined; + version?: string | undefined; }>; // @public From 4fbfce6227bd7dea152e0b335f666f6d03fae673 Mon Sep 17 00:00:00 2001 From: josefaidt Date: Fri, 1 Nov 2024 16:13:04 -0700 Subject: [PATCH 05/21] add changeset --- .changeset/thirty-starfishes-smash.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changeset/thirty-starfishes-smash.md diff --git a/.changeset/thirty-starfishes-smash.md b/.changeset/thirty-starfishes-smash.md new file mode 100644 index 00000000000..c41a08fdbaf --- /dev/null +++ b/.changeset/thirty-starfishes-smash.md @@ -0,0 +1,6 @@ +--- +'create-amplify': patch +'@aws-amplify/cli-core': patch +--- + +update create-amplify flow to init a tsconfig that forces module context, removes creation of package.json in the amplify directory From 2949c118e108a311348c1b0e022e2a330812a705 Mon Sep 17 00:00:00 2001 From: josefaidt Date: Mon, 4 Nov 2024 15:52:35 -0800 Subject: [PATCH 06/21] bump minimum typescript req to 5.4 in create-amplify --- packages/create-amplify/src/amplify_project_creator.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create-amplify/src/amplify_project_creator.ts b/packages/create-amplify/src/amplify_project_creator.ts index 45cfc9d5949..ed998afa391 100644 --- a/packages/create-amplify/src/amplify_project_creator.ts +++ b/packages/create-amplify/src/amplify_project_creator.ts @@ -18,7 +18,7 @@ export class AmplifyProjectCreator { 'aws-cdk@^2', 'aws-cdk-lib@^2', 'constructs@^10.0.0', - 'typescript@^5.0.0', + 'typescript@^5.4.0', 'tsx', 'esbuild', ]; From f0232a6a0fbb14ee5854b41819ac65c45fb5df39 Mon Sep 17 00:00:00 2001 From: josefaidt Date: Mon, 4 Nov 2024 15:57:42 -0800 Subject: [PATCH 07/21] re-add moduleResolution: bundler to defer resolution logic to tsx --- .../package_manager_controller_base.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/cli-core/src/package-manager-controller/package_manager_controller_base.ts b/packages/cli-core/src/package-manager-controller/package_manager_controller_base.ts index b7a5416b402..c6fae5f2bae 100644 --- a/packages/cli-core/src/package-manager-controller/package_manager_controller_base.ts +++ b/packages/cli-core/src/package-manager-controller/package_manager_controller_base.ts @@ -98,6 +98,7 @@ export abstract class PackageManagerControllerBase target: 'es2022', module: 'preserve', moduleDetection: 'force', + moduleResolution: 'bundler', resolveJsonModule: true, esModuleInterop: true, forceConsistentCasingInFileNames: true, From 5e5ebe20bd0250a22a15bbe60f41da9e823ffcde Mon Sep 17 00:00:00 2001 From: josefaidt Date: Mon, 4 Nov 2024 16:17:20 -0800 Subject: [PATCH 08/21] remove snippet from tests for package.json --- .../src/initial_project_file_generator.test.ts | 8 -------- 1 file changed, 8 deletions(-) diff --git a/packages/create-amplify/src/initial_project_file_generator.test.ts b/packages/create-amplify/src/initial_project_file_generator.test.ts index 8fcfb9190ac..e6e37b1770b 100644 --- a/packages/create-amplify/src/initial_project_file_generator.test.ts +++ b/packages/create-amplify/src/initial_project_file_generator.test.ts @@ -40,14 +40,6 @@ void describe('InitialProjectFileGenerator', () => { path.join(process.cwd(), 'testDir', 'amplify'), { recursive: true }, ]); - assert.equal( - fsMock.writeFile.mock.calls[0].arguments[0], - path.join(process.cwd(), 'testDir', 'amplify', 'package.json') - ); - assert.deepStrictEqual( - JSON.parse(fsMock.writeFile.mock.calls[0].arguments[1]), - { type: 'module' } - ); }); void it('creates default tsconfig file', async () => { From f09f724552605ea23b799f92f91e06d6bf096962 Mon Sep 17 00:00:00 2001 From: josefaidt Date: Tue, 5 Nov 2024 08:57:10 -0800 Subject: [PATCH 09/21] run e2e From 8e4dae0813b4bc6d4f1bde0c842480737f957e7f Mon Sep 17 00:00:00 2001 From: josefaidt Date: Tue, 5 Nov 2024 08:57:23 -0800 Subject: [PATCH 10/21] run e2e From b0a204ba0dca3611586e11e8386c5f7e84d7fd99 Mon Sep 17 00:00:00 2001 From: josefaidt Date: Tue, 5 Nov 2024 12:47:29 -0800 Subject: [PATCH 11/21] fix integration tests --- .../src/test-project-setup/setup_dir_as_esm_module.ts | 3 ++- scripts/setup_test_project.ts | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/integration-tests/src/test-project-setup/setup_dir_as_esm_module.ts b/packages/integration-tests/src/test-project-setup/setup_dir_as_esm_module.ts index 71bd859e8d0..9a26c19d6e8 100644 --- a/packages/integration-tests/src/test-project-setup/setup_dir_as_esm_module.ts +++ b/packages/integration-tests/src/test-project-setup/setup_dir_as_esm_module.ts @@ -14,7 +14,8 @@ export const setupDirAsEsmModule = async (absoluteDirPath: string) => { const tsConfigTemplate = { compilerOptions: { target: 'es2022', - module: 'es2022', + module: 'preserve', + moduleDetection: 'force', moduleResolution: 'bundler', resolveJsonModule: true, // eslint-disable-next-line spellcheck/spell-checker diff --git a/scripts/setup_test_project.ts b/scripts/setup_test_project.ts index fb2714a630b..5fd51c5b553 100644 --- a/scripts/setup_test_project.ts +++ b/scripts/setup_test_project.ts @@ -44,7 +44,7 @@ const tsConfig = { extends: '../../../tsconfig.base.json', compilerOptions: { moduleResolution: 'bundler', - module: 'es2022', + module: 'preserve', }, }; From b1497152f5a969c90d1f47cca4e0e7bfb51f750b Mon Sep 17 00:00:00 2001 From: josefaidt Date: Tue, 5 Nov 2024 15:33:10 -0800 Subject: [PATCH 12/21] fix e2e tests --- .../integration-tests/src/package_manager_sanity_checks.test.ts | 1 - packages/integration-tests/src/test-e2e/create_amplify.test.ts | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/integration-tests/src/package_manager_sanity_checks.test.ts b/packages/integration-tests/src/package_manager_sanity_checks.test.ts index cc90bcd05d0..018e1752c9d 100644 --- a/packages/integration-tests/src/package_manager_sanity_checks.test.ts +++ b/packages/integration-tests/src/package_manager_sanity_checks.test.ts @@ -107,7 +107,6 @@ void describe('getting started happy path', async () => { path.join('auth', 'resource.ts'), 'backend.ts', path.join('data', 'resource.ts'), - 'package.json', 'tsconfig.json', ]; diff --git a/packages/integration-tests/src/test-e2e/create_amplify.test.ts b/packages/integration-tests/src/test-e2e/create_amplify.test.ts index 189405ef6f0..2d7d57bacb1 100644 --- a/packages/integration-tests/src/test-e2e/create_amplify.test.ts +++ b/packages/integration-tests/src/test-e2e/create_amplify.test.ts @@ -156,7 +156,7 @@ void describe( ).replace(/\/\*[\s\S]*?\*\/|([^:]|^)\/\/.*$/gm, ''); const tsConfigObject = JSON.parse(tsConfigContent); - assert.equal(tsConfigObject.compilerOptions.module, 'es2022'); + assert.equal(tsConfigObject.compilerOptions.module, 'preserve'); assert.equal( tsConfigObject.compilerOptions.moduleResolution, 'bundler' From 3114a41056eb7913bb6be3c8319027453876b67b Mon Sep 17 00:00:00 2001 From: josefaidt Date: Wed, 6 Nov 2024 13:33:09 -0800 Subject: [PATCH 13/21] rm package.json from expected file list, fix create-amplify e2e --- packages/integration-tests/src/test-e2e/create_amplify.test.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/integration-tests/src/test-e2e/create_amplify.test.ts b/packages/integration-tests/src/test-e2e/create_amplify.test.ts index 2d7d57bacb1..d1992459ea4 100644 --- a/packages/integration-tests/src/test-e2e/create_amplify.test.ts +++ b/packages/integration-tests/src/test-e2e/create_amplify.test.ts @@ -178,7 +178,6 @@ void describe( path.join('auth', 'resource.ts'), 'backend.ts', path.join('data', 'resource.ts'), - 'package.json', 'tsconfig.json', ]; From ce0617d40579f18fd58e6c0ad07a450a4db86248 Mon Sep 17 00:00:00 2001 From: josefaidt Date: Wed, 6 Nov 2024 14:52:42 -0800 Subject: [PATCH 14/21] rm package.json creation from integration test bootstrap --- .../src/test-project-setup/setup_dir_as_esm_module.ts | 6 ------ 1 file changed, 6 deletions(-) diff --git a/packages/integration-tests/src/test-project-setup/setup_dir_as_esm_module.ts b/packages/integration-tests/src/test-project-setup/setup_dir_as_esm_module.ts index 9a26c19d6e8..58e173abc5b 100644 --- a/packages/integration-tests/src/test-project-setup/setup_dir_as_esm_module.ts +++ b/packages/integration-tests/src/test-project-setup/setup_dir_as_esm_module.ts @@ -5,12 +5,6 @@ import * as fs from 'fs/promises'; * Configures a minimal package.json and tsconfig.json to make the specified directory compile as an ESM module */ export const setupDirAsEsmModule = async (absoluteDirPath: string) => { - const packageJsonContent = { type: 'module' }; - await fs.writeFile( - path.resolve(absoluteDirPath, 'package.json'), - JSON.stringify(packageJsonContent, null, 2) - ); - const tsConfigTemplate = { compilerOptions: { target: 'es2022', From ce219172695b767aa135786aa5bec27b0422b641 Mon Sep 17 00:00:00 2001 From: josefaidt Date: Wed, 6 Nov 2024 15:39:29 -0800 Subject: [PATCH 15/21] add e2e check for moduleDetection value --- packages/integration-tests/src/test-e2e/create_amplify.test.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/integration-tests/src/test-e2e/create_amplify.test.ts b/packages/integration-tests/src/test-e2e/create_amplify.test.ts index d1992459ea4..6c78c6093b8 100644 --- a/packages/integration-tests/src/test-e2e/create_amplify.test.ts +++ b/packages/integration-tests/src/test-e2e/create_amplify.test.ts @@ -161,6 +161,7 @@ void describe( tsConfigObject.compilerOptions.moduleResolution, 'bundler' ); + assert.equal(tsConfigObject.compilerOptions.moduleDetection, 'force'); assert.equal(tsConfigObject.compilerOptions.resolveJsonModule, true); assert.deepStrictEqual(tsConfigObject.compilerOptions.paths, { // The path here is coupled with backend-function's generated typedef file path @@ -176,8 +177,8 @@ void describe( const expectedAmplifyFiles = [ path.join('auth', 'resource.ts'), - 'backend.ts', path.join('data', 'resource.ts'), + 'backend.ts', 'tsconfig.json', ]; From 75e38f11f06ae0648bc0c7a6ae3de1f4158907d8 Mon Sep 17 00:00:00 2001 From: josefaidt Date: Thu, 7 Nov 2024 08:22:29 -0800 Subject: [PATCH 16/21] rearrange order of expected files to satisfy deepStrictEqual --- packages/integration-tests/src/test-e2e/create_amplify.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/integration-tests/src/test-e2e/create_amplify.test.ts b/packages/integration-tests/src/test-e2e/create_amplify.test.ts index 6c78c6093b8..c382bbc3a80 100644 --- a/packages/integration-tests/src/test-e2e/create_amplify.test.ts +++ b/packages/integration-tests/src/test-e2e/create_amplify.test.ts @@ -177,8 +177,8 @@ void describe( const expectedAmplifyFiles = [ path.join('auth', 'resource.ts'), - path.join('data', 'resource.ts'), 'backend.ts', + path.join('data', 'resource.ts'), 'tsconfig.json', ]; From 1ded2d1bd5f261209c347d4e0437590f0296292b Mon Sep 17 00:00:00 2001 From: josefaidt Date: Fri, 15 Nov 2024 15:12:15 -0800 Subject: [PATCH 17/21] fix registry settings for yarn modern in tests --- .../src/setup_package_manager.ts | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/packages/integration-tests/src/setup_package_manager.ts b/packages/integration-tests/src/setup_package_manager.ts index ad72f3270fa..ad224e3f4ae 100644 --- a/packages/integration-tests/src/setup_package_manager.ts +++ b/packages/integration-tests/src/setup_package_manager.ts @@ -5,6 +5,7 @@ import * as path from 'path'; import * as os from 'os'; const customRegistry = 'http://localhost:4873'; +const customRegistryAuthToken = 'garbage'; // TODO: refactor into `type PackageManagerInitializer` and have sub-types with a factory. export type PackageManager = 'npm' | 'yarn-classic' | 'yarn-modern' | 'pnpm'; @@ -34,6 +35,7 @@ const initializeYarnClassic = async (execaOptions: { }) => { const packageManager = 'yarn'; await execa('npm', ['install', '-g', packageManager], { stdio: 'inherit' }); + await execa('yarn', ['set', 'version', 'classic'], { stdio: 'inherit' }); await execa( packageManager, ['config', 'set', 'registry', customRegistry], @@ -54,10 +56,16 @@ const initializeYarnModern = async (execaOptions: { }) => { const packageManager = 'yarn'; await execa('npm', ['install', '-g', packageManager], { stdio: 'inherit' }); - await execa('yarn', ['init', '-2'], execaOptions); + await execa('yarn', ['set', 'version', 'latest'], { stdio: 'inherit' }); + await execa('yarn', ['init'], execaOptions); await execa( packageManager, - ['config', 'set', 'npmRegistryServer', customRegistry], + [ + 'config', + 'set', + `npmRegistries.${customRegistry}.npmAuthToken`, + customRegistryAuthToken, + ], execaOptions ); await execa( @@ -65,11 +73,6 @@ const initializeYarnModern = async (execaOptions: { ['config', 'set', 'unsafeHttpWhitelist', 'localhost'], execaOptions ); - await execa( - packageManager, - ['config', 'set', 'nodeLinker', 'node-modules'], - execaOptions - ); await execa(packageManager, ['cache', 'clean'], execaOptions); }; From 6cc893296e8c3e51ca1099995dfe25f6f8b3b5f7 Mon Sep 17 00:00:00 2001 From: josefaidt Date: Fri, 15 Nov 2024 15:22:58 -0800 Subject: [PATCH 18/21] rm stale yarn init --- packages/integration-tests/src/setup_package_manager.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/integration-tests/src/setup_package_manager.ts b/packages/integration-tests/src/setup_package_manager.ts index ad224e3f4ae..32286539ba0 100644 --- a/packages/integration-tests/src/setup_package_manager.ts +++ b/packages/integration-tests/src/setup_package_manager.ts @@ -57,7 +57,6 @@ const initializeYarnModern = async (execaOptions: { const packageManager = 'yarn'; await execa('npm', ['install', '-g', packageManager], { stdio: 'inherit' }); await execa('yarn', ['set', 'version', 'latest'], { stdio: 'inherit' }); - await execa('yarn', ['init'], execaOptions); await execa( packageManager, [ From 74ba7162f643caaacf286adaec1f9cce06b80ae5 Mon Sep 17 00:00:00 2001 From: josefaidt Date: Fri, 15 Nov 2024 15:32:13 -0800 Subject: [PATCH 19/21] set version latest -> set version stable --- packages/integration-tests/src/setup_package_manager.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/integration-tests/src/setup_package_manager.ts b/packages/integration-tests/src/setup_package_manager.ts index 32286539ba0..20cc14b6d81 100644 --- a/packages/integration-tests/src/setup_package_manager.ts +++ b/packages/integration-tests/src/setup_package_manager.ts @@ -56,7 +56,7 @@ const initializeYarnModern = async (execaOptions: { }) => { const packageManager = 'yarn'; await execa('npm', ['install', '-g', packageManager], { stdio: 'inherit' }); - await execa('yarn', ['set', 'version', 'latest'], { stdio: 'inherit' }); + await execa('yarn', ['set', 'version', 'stable'], { stdio: 'inherit' }); await execa( packageManager, [ From 4b355210aa49f13f8244603432ea7f814dc9abf9 Mon Sep 17 00:00:00 2001 From: josefaidt Date: Fri, 15 Nov 2024 16:11:35 -0800 Subject: [PATCH 20/21] yarn set version -> yarn init --- packages/integration-tests/src/setup_package_manager.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/integration-tests/src/setup_package_manager.ts b/packages/integration-tests/src/setup_package_manager.ts index 20cc14b6d81..acb94476fc6 100644 --- a/packages/integration-tests/src/setup_package_manager.ts +++ b/packages/integration-tests/src/setup_package_manager.ts @@ -35,7 +35,6 @@ const initializeYarnClassic = async (execaOptions: { }) => { const packageManager = 'yarn'; await execa('npm', ['install', '-g', packageManager], { stdio: 'inherit' }); - await execa('yarn', ['set', 'version', 'classic'], { stdio: 'inherit' }); await execa( packageManager, ['config', 'set', 'registry', customRegistry], @@ -56,7 +55,7 @@ const initializeYarnModern = async (execaOptions: { }) => { const packageManager = 'yarn'; await execa('npm', ['install', '-g', packageManager], { stdio: 'inherit' }); - await execa('yarn', ['set', 'version', 'stable'], { stdio: 'inherit' }); + await execa('yarn', ['init', '-2'], execaOptions); await execa( packageManager, [ From 6331f8cc79dbb920dc6602c10099848b4d2dea85 Mon Sep 17 00:00:00 2001 From: josefaidt Date: Mon, 18 Nov 2024 13:29:02 -0800 Subject: [PATCH 21/21] try fix yarn modern config settings --- packages/integration-tests/src/setup_package_manager.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/integration-tests/src/setup_package_manager.ts b/packages/integration-tests/src/setup_package_manager.ts index acb94476fc6..305997ace4b 100644 --- a/packages/integration-tests/src/setup_package_manager.ts +++ b/packages/integration-tests/src/setup_package_manager.ts @@ -56,12 +56,18 @@ const initializeYarnModern = async (execaOptions: { const packageManager = 'yarn'; await execa('npm', ['install', '-g', packageManager], { stdio: 'inherit' }); await execa('yarn', ['init', '-2'], execaOptions); + await execa(packageManager, [ + 'config', + 'set', + 'npmRegistryServer', + customRegistry, + ]); await execa( packageManager, [ 'config', 'set', - `npmRegistries.${customRegistry}.npmAuthToken`, + `"npmRegistries['${customRegistry}'].npmAuthToken`, customRegistryAuthToken, ], execaOptions