From 6577ebf904f16d6a2b504a21e69114d87e857fb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=E2=98=94?= Date: Mon, 27 Nov 2023 17:46:35 -0800 Subject: [PATCH 01/38] chore: change branch to poc/pms-create-amplify --- .github/workflows/poc-e2e-flow-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/poc-e2e-flow-test.yml b/.github/workflows/poc-e2e-flow-test.yml index 63fd37e8ea..f1e13d651b 100644 --- a/.github/workflows/poc-e2e-flow-test.yml +++ b/.github/workflows/poc-e2e-flow-test.yml @@ -5,7 +5,7 @@ name: 'poc-e2e-flow-test' on: # TODO: need to change the trigger push: branches: - - poc/e2e-create-amplify + - poc/pms-create-amplify jobs: install: From 63e498be99b2a11d25bab2490a3712b7c0ac0e38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=E2=98=94?= Date: Mon, 27 Nov 2023 19:23:00 -0800 Subject: [PATCH 02/38] fix: gitIgnore test --- packages/integration-tests/src/test-e2e/create_amplify.test.ts | 1 + 1 file changed, 1 insertion(+) 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 3f18df0795..39413a3d76 100644 --- a/packages/integration-tests/src/test-e2e/create_amplify.test.ts +++ b/packages/integration-tests/src/test-e2e/create_amplify.test.ts @@ -180,6 +180,7 @@ void describe('create-amplify script', () => { .split(os.EOL) .filter((s) => s.trim()); assert.deepStrictEqual(gitIgnoreContent.sort(), [ + '# amplify', '.amplify', 'amplifyconfiguration*', 'node_modules', From b12306f84d31fd0069700828f4087d1f05c8cf4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=E2=98=94?= Date: Mon, 27 Nov 2023 21:20:42 -0800 Subject: [PATCH 03/38] fix: refactor e2e for pms --- .../src/test-e2e/create_amplify.test.ts | 132 +++++++++++++++--- 1 file changed, 112 insertions(+), 20 deletions(-) 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 505e14ee9b..663e9a156b 100644 --- a/packages/integration-tests/src/test-e2e/create_amplify.test.ts +++ b/packages/integration-tests/src/test-e2e/create_amplify.test.ts @@ -8,31 +8,109 @@ import assert from 'assert'; import { glob } from 'glob'; import { testConcurrencyLevel } from './test_concurrency.js'; +type PackageManagerExecutable = 'npm' | 'yarn' | 'yarn-stable' | 'pnpm'; + +const packageManagerSetup = async ( + packageManagerExecutable: PackageManagerExecutable, + dir: string +) => { + const execaOptions = { + cwd: dir, + stdio: 'inherit' as const, + }; + + if (packageManagerExecutable === 'npm') { + // nuke the npx cache to ensure we are installing packages from the npm proxy + const { stdout } = await execa('npm', ['config', 'get', 'cache']); + const npxCacheLocation = path.join(stdout.toString().trim(), '_npx'); + + if (existsSync(npxCacheLocation)) { + await fs.rm(npxCacheLocation, { recursive: true }); + } + } else if (packageManagerExecutable.startsWith('yarn')) { + if (packageManagerExecutable === 'yarn-stable') { + await execa('yarn', ['set', 'version', 'stable'], execaOptions); + await execa('npm', ['pkg', 'set', 'type=module'], execaOptions); // `npm pkg set type="module"` only run when package.json does not exist, so we need to run it manually here + + await execa( + 'yarn', + ['config', 'set', 'npmRegistryServer', 'http://localhost:4873'], + execaOptions + ); + await execa( + 'yarn', + ['config', 'set', 'unsafeHttpWhitelist', 'localhost'], + execaOptions + ); + } else { + await execa( + packageManagerExecutable, + ['config', 'set', 'registry', 'http://localhost:4873'], + execaOptions + ); + await execa( + packageManagerExecutable, + ['config', 'get', 'registry'], + execaOptions + ); + } + await execa( + packageManagerExecutable === 'yarn-stable' + ? 'yarn' + : packageManagerExecutable, + ['cache', 'clean'], + execaOptions + ); + } else if (packageManagerExecutable === 'pnpm') { + await execa(packageManagerExecutable, ['--version']); + await execa(packageManagerExecutable, [ + 'config', + 'set', + 'registry', + 'http://localhost:4873', + ]); + await execa(packageManagerExecutable, ['config', 'get', 'registry']); + + await execa(packageManagerExecutable, ['store', 'clear']); + } +}; + void describe( 'create-amplify script', { concurrency: testConcurrencyLevel }, () => { + const { PACKAGE_MANAGER_EXECUTABLE = 'npm' } = process.env; + const packageManagerExecutable = + PACKAGE_MANAGER_EXECUTABLE === 'yarn-stable' + ? 'yarn' + : PACKAGE_MANAGER_EXECUTABLE; + before(async () => { // start a local npm proxy and publish the current codebase to the proxy await execa('npm', ['run', 'clean:npm-proxy'], { stdio: 'inherit' }); await execa('npm', ['run', 'vend'], { stdio: 'inherit' }); - // nuke the npx cache to ensure we are installing packages from the npm proxy - const { stdout } = await execa('npm', ['config', 'get', 'cache']); - const npxCacheLocation = path.join(stdout.toString().trim(), '_npx'); - - if (existsSync(npxCacheLocation)) { - await fs.rm(npxCacheLocation, { recursive: true }); + // install package manager + if (PACKAGE_MANAGER_EXECUTABLE.startsWith('yarn')) { + await execa('npm', ['install', '-g', 'yarn'], { stdio: 'inherit' }); + } else if (PACKAGE_MANAGER_EXECUTABLE === 'pnpm') { + await execa('npm', ['install', '-g', PACKAGE_MANAGER_EXECUTABLE], { + stdio: 'inherit', + }); } // Force 'create-amplify' installation in npx cache by executing help command // before tests run. Otherwise, installing 'create-amplify' concurrently // may lead to race conditions and corrupted npx cache. - await execa('npm', ['create', 'amplify', '--yes', '--', '--help'], { - // Command must run outside of 'amplify-backend' workspace. - cwd: os.homedir(), - stdio: 'inherit', - }); + await execa( + packageManagerExecutable, + ['create', 'amplify', '--yes', '--', '--help'], + { + // Command must run outside of 'amplify-backend' workspace. + cwd: os.homedir(), + stdio: 'inherit', + } + ); }); after(async () => { @@ -49,6 +127,12 @@ void describe( tempDir = await fs.mkdtemp( path.join(os.tmpdir(), 'test-create-amplify') ); + + // nuke the npx cache to ensure we are installing packages from the npm proxy + await packageManagerSetup( + PACKAGE_MANAGER_EXECUTABLE as PackageManagerExecutable, + tempDir + ); }); afterEach(async () => { @@ -71,10 +155,14 @@ void describe( ); } - await execa('npm', ['create', 'amplify', '--yes'], { - cwd: tempDir, - stdio: 'inherit', - }); + await execa( + packageManagerExecutable, + ['create', 'amplify', '--yes'], + { + cwd: tempDir, + stdio: 'inherit', + } + ); const packageJsonPath = path.resolve(tempDir, 'package.json'); const packageJsonObject = JSON.parse( await fs.readFile(packageJsonPath, 'utf-8') @@ -192,11 +280,15 @@ void describe( const amplifyDirPath = path.join(tempDir, 'amplify'); await fs.mkdir(amplifyDirPath, { recursive: true }); - const result = await execa('npm', ['create', 'amplify', '--yes'], { - cwd: tempDir, - stdio: 'pipe', - reject: false, - }); + const result = await execa( + packageManagerExecutable, + ['create', 'amplify', '--yes'], + { + cwd: tempDir, + stdio: 'pipe', + reject: false, + } + ); assert.equal(result.exitCode, 1); assert.ok( result.stderr From 0fdb1326c62fd93cd2e3c4658b36b8fb1bc3a1be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=E2=98=94?= Date: Mon, 27 Nov 2023 21:24:53 -0800 Subject: [PATCH 04/38] chore: update package.lock --- package-lock.json | 124 +++++++++++++++++++++++----------------------- 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/package-lock.json b/package-lock.json index 54a2aa8c25..e7eeda12e5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19997,12 +19997,12 @@ }, "packages/auth-construct": { "name": "@aws-amplify/auth-construct-alpha", - "version": "0.4.1", + "version": "0.4.2", "license": "Apache-2.0", "dependencies": { "@aws-amplify/backend-output-schemas": "^0.4.0", - "@aws-amplify/backend-output-storage": "^0.2.4", - "@aws-amplify/plugin-types": "^0.4.1" + "@aws-amplify/backend-output-storage": "^0.2.6", + "@aws-amplify/plugin-types": "^0.4.2" }, "peerDependencies": { "aws-cdk-lib": "^2.110.1", @@ -20011,19 +20011,19 @@ }, "packages/backend": { "name": "@aws-amplify/backend", - "version": "0.5.4", + "version": "0.5.5", "license": "Apache-2.0", "dependencies": { - "@aws-amplify/backend-auth": "^0.3.4", - "@aws-amplify/backend-data": "^0.8.1", - "@aws-amplify/backend-function": "^0.2.4", + "@aws-amplify/backend-auth": "^0.3.5", + "@aws-amplify/backend-data": "^0.8.2", + "@aws-amplify/backend-function": "^0.2.5", "@aws-amplify/backend-output-schemas": "^0.4.0", - "@aws-amplify/backend-output-storage": "^0.2.5", + "@aws-amplify/backend-output-storage": "^0.2.6", "@aws-amplify/backend-secret": "^0.3.1", - "@aws-amplify/backend-storage": "^0.3.0", + "@aws-amplify/backend-storage": "^0.3.1", "@aws-amplify/data-schema": "^0.12.9", - "@aws-amplify/platform-core": "^0.3.0", - "@aws-amplify/plugin-types": "^0.4.1", + "@aws-amplify/platform-core": "^0.3.1", + "@aws-amplify/plugin-types": "^0.4.2", "@aws-sdk/client-amplify": "^3.440.0" }, "devDependencies": { @@ -20037,16 +20037,16 @@ }, "packages/backend-auth": { "name": "@aws-amplify/backend-auth", - "version": "0.3.4", + "version": "0.3.5", "license": "Apache-2.0", "dependencies": { - "@aws-amplify/auth-construct-alpha": "^0.4.1", - "@aws-amplify/backend-output-storage": "0.2.5", - "@aws-amplify/plugin-types": "^0.4.1" + "@aws-amplify/auth-construct-alpha": "^0.4.2", + "@aws-amplify/backend-output-storage": "0.2.6", + "@aws-amplify/plugin-types": "^0.4.2" }, "devDependencies": { - "@aws-amplify/backend-platform-test-stubs": "^0.3.0", - "@aws-amplify/platform-core": "^0.3.0" + "@aws-amplify/backend-platform-test-stubs": "^0.3.1", + "@aws-amplify/platform-core": "^0.3.1" }, "peerDependencies": { "aws-cdk-lib": "^2.110.1", @@ -20055,19 +20055,19 @@ }, "packages/backend-data": { "name": "@aws-amplify/backend-data", - "version": "0.8.1", + "version": "0.8.2", "license": "Apache-2.0", "dependencies": { "@aws-amplify/backend-output-schemas": "^0.4.0", - "@aws-amplify/backend-output-storage": "0.2.5", + "@aws-amplify/backend-output-storage": "0.2.6", "@aws-amplify/data-construct": "^1.4.1", "@aws-amplify/data-schema-types": "^0.6.6", - "@aws-amplify/plugin-types": "^0.4.1" + "@aws-amplify/plugin-types": "^0.4.2" }, "devDependencies": { - "@aws-amplify/backend-platform-test-stubs": "^0.3.0", + "@aws-amplify/backend-platform-test-stubs": "^0.3.1", "@aws-amplify/data-schema": "^0.12.9", - "@aws-amplify/platform-core": "^0.3.0" + "@aws-amplify/platform-core": "^0.3.1" }, "peerDependencies": { "aws-cdk-lib": "^2.110.1", @@ -20076,11 +20076,11 @@ }, "packages/backend-deployer": { "name": "@aws-amplify/backend-deployer", - "version": "0.3.3", + "version": "0.3.4", "license": "Apache-2.0", "dependencies": { - "@aws-amplify/platform-core": "^0.3.0", - "@aws-amplify/plugin-types": "^0.4.0", + "@aws-amplify/platform-core": "^0.3.1", + "@aws-amplify/plugin-types": "^0.4.2", "execa": "^7.2.0", "tsx": "^3.12.6" }, @@ -20091,17 +20091,17 @@ }, "packages/backend-function": { "name": "@aws-amplify/backend-function", - "version": "0.2.4", + "version": "0.2.5", "license": "Apache-2.0", "dependencies": { - "@aws-amplify/backend-output-storage": "0.2.5", - "@aws-amplify/function-construct-alpha": "^0.2.0", - "@aws-amplify/plugin-types": "^0.4.1", + "@aws-amplify/backend-output-storage": "0.2.6", + "@aws-amplify/function-construct-alpha": "^0.2.1", + "@aws-amplify/plugin-types": "^0.4.2", "execa": "^7.1.1" }, "devDependencies": { - "@aws-amplify/backend-platform-test-stubs": "^0.3.0", - "@aws-amplify/platform-core": "^0.3.0" + "@aws-amplify/backend-platform-test-stubs": "^0.3.1", + "@aws-amplify/platform-core": "^0.3.1" }, "peerDependencies": { "aws-cdk-lib": "^2.110.1", @@ -20113,7 +20113,7 @@ "version": "0.4.0", "license": "Apache-2.0", "devDependencies": { - "@aws-amplify/plugin-types": "0.4.1" + "@aws-amplify/plugin-types": "0.4.2" }, "peerDependencies": { "zod": "^3.21.4" @@ -20121,11 +20121,11 @@ }, "packages/backend-output-storage": { "name": "@aws-amplify/backend-output-storage", - "version": "0.2.5", + "version": "0.2.6", "license": "Apache-2.0", "dependencies": { "@aws-amplify/backend-output-schemas": "^0.4.0", - "@aws-amplify/platform-core": "^0.3.0" + "@aws-amplify/platform-core": "^0.3.1" }, "peerDependencies": { "aws-cdk-lib": "^2.110.1" @@ -20133,7 +20133,7 @@ }, "packages/backend-platform-test-stubs": { "name": "@aws-amplify/backend-platform-test-stubs", - "version": "0.3.0", + "version": "0.3.1", "license": "Apache-2.0", "dependencies": { "aws-cdk-lib": "^2.110.1", @@ -20155,16 +20155,16 @@ }, "packages/backend-storage": { "name": "@aws-amplify/backend-storage", - "version": "0.3.0", + "version": "0.3.1", "license": "Apache-2.0", "dependencies": { - "@aws-amplify/backend-output-storage": "^0.2.5", - "@aws-amplify/plugin-types": "^0.4.0", - "@aws-amplify/storage-construct-alpha": "^0.2.1" + "@aws-amplify/backend-output-storage": "^0.2.6", + "@aws-amplify/plugin-types": "^0.4.2", + "@aws-amplify/storage-construct-alpha": "^0.2.3" }, "devDependencies": { - "@aws-amplify/backend-platform-test-stubs": "^0.3.0", - "@aws-amplify/platform-core": "^0.3.0" + "@aws-amplify/backend-platform-test-stubs": "^0.3.1", + "@aws-amplify/platform-core": "^0.3.1" }, "peerDependencies": { "aws-cdk-lib": "^2.110.1", @@ -20173,7 +20173,7 @@ }, "packages/cli": { "name": "@aws-amplify/backend-cli", - "version": "0.9.0", + "version": "0.9.1", "license": "Apache-2.0", "dependencies": { "@aws-amplify/backend-output-schemas": "^0.4.0", @@ -20181,7 +20181,7 @@ "@aws-amplify/cli-core": "^0.2.0", "@aws-amplify/client-config": "^0.4.2", "@aws-amplify/deployed-backend-client": "^0.3.3", - "@aws-amplify/form-generator": "^0.5.0", + "@aws-amplify/form-generator": "^0.6.0", "@aws-amplify/model-generator": "^0.2.3", "@aws-amplify/platform-core": "^0.3.0", "@aws-amplify/sandbox": "^0.3.5", @@ -20372,11 +20372,11 @@ } }, "packages/create-amplify": { - "version": "0.3.7", + "version": "0.3.8", "license": "Apache-2.0", "dependencies": { "@aws-amplify/cli-core": "^0.2.0", - "@aws-amplify/platform-core": "0.3.0", + "@aws-amplify/platform-core": "0.3.1", "execa": "^7.2.0", "yargs": "^17.7.2" }, @@ -20503,7 +20503,7 @@ }, "packages/form-generator": { "name": "@aws-amplify/form-generator", - "version": "0.5.0", + "version": "0.6.0", "license": "Apache-2.0", "dependencies": { "@aws-amplify/appsync-modelgen-plugin": "^2.6.0", @@ -20522,10 +20522,10 @@ }, "packages/function-construct": { "name": "@aws-amplify/function-construct-alpha", - "version": "0.2.0", + "version": "0.2.1", "license": "Apache-2.0", "dependencies": { - "@aws-amplify/backend-output-storage": "^0.2.0" + "@aws-amplify/backend-output-storage": "^0.2.6" }, "peerDependencies": { "aws-cdk-lib": "^2.110.1", @@ -20534,16 +20534,16 @@ }, "packages/integration-tests": { "name": "@aws-amplify/integration-tests", - "version": "0.3.6", + "version": "0.3.7", "license": "Apache-2.0", "devDependencies": { - "@aws-amplify/backend": "0.5.4", - "@aws-amplify/backend-auth": "0.3.4", + "@aws-amplify/backend": "0.5.5", + "@aws-amplify/backend-auth": "0.3.5", "@aws-amplify/backend-secret": "^0.3.1", - "@aws-amplify/backend-storage": "0.3.0", + "@aws-amplify/backend-storage": "0.3.1", "@aws-amplify/client-config": "^0.4.0", "@aws-amplify/data-schema": "^0.12.9", - "@aws-amplify/platform-core": "^0.3.0", + "@aws-amplify/platform-core": "^0.3.1", "@aws-sdk/client-amplify": "^3.440.0", "@aws-sdk/client-cloudformation": "^3.421.0", "execa": "^8.0.1", @@ -20625,10 +20625,10 @@ }, "packages/platform-core": { "name": "@aws-amplify/platform-core", - "version": "0.3.0", + "version": "0.3.1", "license": "Apache-2.0", "dependencies": { - "@aws-amplify/plugin-types": "^0.4.0", + "@aws-amplify/plugin-types": "^0.4.2", "@aws-sdk/client-sts": "3.445.0", "is-ci": "^3.0.1", "uuid": "9.0.1", @@ -21048,7 +21048,7 @@ }, "packages/plugin-types": { "name": "@aws-amplify/plugin-types", - "version": "0.4.1", + "version": "0.4.2", "license": "Apache-2.0", "peerDependencies": { "aws-cdk-lib": "^2.110.1", @@ -21057,15 +21057,15 @@ }, "packages/sandbox": { "name": "@aws-amplify/sandbox", - "version": "0.3.5", + "version": "0.3.6", "license": "Apache-2.0", "dependencies": { - "@aws-amplify/backend-deployer": "0.3.3", + "@aws-amplify/backend-deployer": "0.3.4", "@aws-amplify/backend-secret": "^0.3.1", "@aws-amplify/cli-core": "^0.2.0", "@aws-amplify/client-config": "0.4.2", "@aws-amplify/deployed-backend-client": "^0.3.3", - "@aws-amplify/platform-core": "^0.3.0", + "@aws-amplify/platform-core": "^0.3.1", "@aws-sdk/client-cloudformation": "^3.421.0", "@aws-sdk/credential-providers": "^3.382.0", "@aws-sdk/types": "^3.378.0", @@ -21085,14 +21085,14 @@ }, "packages/storage-construct": { "name": "@aws-amplify/storage-construct-alpha", - "version": "0.2.2", + "version": "0.2.3", "license": "Apache-2.0", "dependencies": { "@aws-amplify/backend-output-schemas": "^0.4.0", - "@aws-amplify/backend-output-storage": "^0.2.2" + "@aws-amplify/backend-output-storage": "^0.2.6" }, "devDependencies": { - "@aws-amplify/plugin-types": "^0.4.1" + "@aws-amplify/plugin-types": "^0.4.2" }, "peerDependencies": { "aws-cdk-lib": "^2.110.1", From 5023934689ff06518e1cc140692d58036d1c886c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=E2=98=94?= Date: Tue, 28 Nov 2023 16:14:25 -0800 Subject: [PATCH 05/38] chore: update package.lock --- package-lock.json | 2028 +++++++++++++++++++++++---------------------- 1 file changed, 1059 insertions(+), 969 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4beb73b7a8..afa57e8dfa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -509,9 +509,9 @@ } }, "node_modules/@aws-amplify/data-construct": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/@aws-amplify/data-construct/-/data-construct-1.4.2.tgz", - "integrity": "sha512-Pk99yI+JAy8J+ukH8nFHR05vqqynxhePakOo8/hnrgDmN3kcNCKUCAba0M0csPzJRdI3gf5ulOuRxoOLs1VjeA==", + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/@aws-amplify/data-construct/-/data-construct-1.4.3.tgz", + "integrity": "sha512-1+v2MMTa7i+a2YMdxqEtHj+ISnexQcjPpK4MuksIt0AFemCSdf5Wqq1Im9BhMBlPqJqWRiiyTq4qyGyfG+3Hag==", "bundleDependencies": [ "@aws-amplify/backend-output-schemas", "@aws-amplify/backend-output-storage", @@ -554,21 +554,21 @@ "dependencies": { "@aws-amplify/backend-output-schemas": "^0.4.0", "@aws-amplify/backend-output-storage": "^0.2.2", - "@aws-amplify/graphql-api-construct": "1.4.2", - "@aws-amplify/graphql-auth-transformer": "3.2.2", - "@aws-amplify/graphql-default-value-transformer": "2.1.11", - "@aws-amplify/graphql-function-transformer": "2.1.10", - "@aws-amplify/graphql-http-transformer": "2.1.10", - "@aws-amplify/graphql-index-transformer": "2.2.2", - "@aws-amplify/graphql-maps-to-transformer": "3.3.2", - "@aws-amplify/graphql-model-transformer": "2.3.2", - "@aws-amplify/graphql-predictions-transformer": "2.1.10", - "@aws-amplify/graphql-relational-transformer": "2.2.2", - "@aws-amplify/graphql-searchable-transformer": "2.3.2", - "@aws-amplify/graphql-sql-transformer": "0.1.2", - "@aws-amplify/graphql-transformer": "1.3.2", - "@aws-amplify/graphql-transformer-core": "2.3.2", - "@aws-amplify/graphql-transformer-interfaces": "3.3.0", + "@aws-amplify/graphql-api-construct": "1.4.3", + "@aws-amplify/graphql-auth-transformer": "3.2.3", + "@aws-amplify/graphql-default-value-transformer": "2.1.12", + "@aws-amplify/graphql-function-transformer": "2.1.11", + "@aws-amplify/graphql-http-transformer": "2.1.11", + "@aws-amplify/graphql-index-transformer": "2.2.3", + "@aws-amplify/graphql-maps-to-transformer": "3.3.3", + "@aws-amplify/graphql-model-transformer": "2.3.3", + "@aws-amplify/graphql-predictions-transformer": "2.1.11", + "@aws-amplify/graphql-relational-transformer": "2.2.3", + "@aws-amplify/graphql-searchable-transformer": "2.3.3", + "@aws-amplify/graphql-sql-transformer": "0.1.3", + "@aws-amplify/graphql-transformer": "1.3.3", + "@aws-amplify/graphql-transformer-core": "2.3.3", + "@aws-amplify/graphql-transformer-interfaces": "3.3.1", "@aws-amplify/platform-core": "^0.2.0", "@aws-amplify/plugin-types": "^0.4.1", "charenc": "^0.0.2", @@ -617,14 +617,14 @@ } }, "node_modules/@aws-amplify/data-construct/node_modules/@aws-amplify/graphql-auth-transformer": { - "version": "3.2.2", + "version": "3.2.3", "inBundle": true, "license": "Apache-2.0", "dependencies": { - "@aws-amplify/graphql-model-transformer": "2.3.2", - "@aws-amplify/graphql-relational-transformer": "2.2.2", - "@aws-amplify/graphql-transformer-core": "2.3.2", - "@aws-amplify/graphql-transformer-interfaces": "3.3.0", + "@aws-amplify/graphql-model-transformer": "2.3.3", + "@aws-amplify/graphql-relational-transformer": "2.2.3", + "@aws-amplify/graphql-transformer-core": "2.3.3", + "@aws-amplify/graphql-transformer-interfaces": "3.3.1", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.12", "graphql-transformer-common": "4.26.2", @@ -637,12 +637,12 @@ } }, "node_modules/@aws-amplify/data-construct/node_modules/@aws-amplify/graphql-default-value-transformer": { - "version": "2.1.11", + "version": "2.1.12", "inBundle": true, "license": "Apache-2.0", "dependencies": { - "@aws-amplify/graphql-transformer-core": "2.3.2", - "@aws-amplify/graphql-transformer-interfaces": "3.3.0", + "@aws-amplify/graphql-transformer-core": "2.3.3", + "@aws-amplify/graphql-transformer-interfaces": "3.3.1", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.12", "graphql-transformer-common": "4.26.2", @@ -650,12 +650,12 @@ } }, "node_modules/@aws-amplify/data-construct/node_modules/@aws-amplify/graphql-function-transformer": { - "version": "2.1.10", + "version": "2.1.11", "inBundle": true, "license": "Apache-2.0", "dependencies": { - "@aws-amplify/graphql-transformer-core": "2.3.2", - "@aws-amplify/graphql-transformer-interfaces": "3.3.0", + "@aws-amplify/graphql-transformer-core": "2.3.3", + "@aws-amplify/graphql-transformer-interfaces": "3.3.1", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.12", "graphql-transformer-common": "4.26.2" @@ -666,12 +666,12 @@ } }, "node_modules/@aws-amplify/data-construct/node_modules/@aws-amplify/graphql-http-transformer": { - "version": "2.1.10", + "version": "2.1.11", "inBundle": true, "license": "Apache-2.0", "dependencies": { - "@aws-amplify/graphql-transformer-core": "2.3.2", - "@aws-amplify/graphql-transformer-interfaces": "3.3.0", + "@aws-amplify/graphql-transformer-core": "2.3.3", + "@aws-amplify/graphql-transformer-interfaces": "3.3.1", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.12", "graphql-transformer-common": "4.26.2" @@ -682,13 +682,13 @@ } }, "node_modules/@aws-amplify/data-construct/node_modules/@aws-amplify/graphql-index-transformer": { - "version": "2.2.2", + "version": "2.2.3", "inBundle": true, "license": "Apache-2.0", "dependencies": { - "@aws-amplify/graphql-model-transformer": "2.3.2", - "@aws-amplify/graphql-transformer-core": "2.3.2", - "@aws-amplify/graphql-transformer-interfaces": "3.3.0", + "@aws-amplify/graphql-model-transformer": "2.3.3", + "@aws-amplify/graphql-transformer-core": "2.3.3", + "@aws-amplify/graphql-transformer-interfaces": "3.3.1", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.12", "graphql-transformer-common": "4.26.2" @@ -699,12 +699,12 @@ } }, "node_modules/@aws-amplify/data-construct/node_modules/@aws-amplify/graphql-maps-to-transformer": { - "version": "3.3.2", + "version": "3.3.3", "inBundle": true, "license": "Apache-2.0", "dependencies": { - "@aws-amplify/graphql-transformer-core": "2.3.2", - "@aws-amplify/graphql-transformer-interfaces": "3.3.0", + "@aws-amplify/graphql-transformer-core": "2.3.3", + "@aws-amplify/graphql-transformer-interfaces": "3.3.1", "graphql-mapping-template": "4.20.12", "graphql-transformer-common": "4.26.2" }, @@ -714,12 +714,12 @@ } }, "node_modules/@aws-amplify/data-construct/node_modules/@aws-amplify/graphql-model-transformer": { - "version": "2.3.2", + "version": "2.3.3", "inBundle": true, "license": "Apache-2.0", "dependencies": { - "@aws-amplify/graphql-transformer-core": "2.3.2", - "@aws-amplify/graphql-transformer-interfaces": "3.3.0", + "@aws-amplify/graphql-transformer-core": "2.3.3", + "@aws-amplify/graphql-transformer-interfaces": "3.3.1", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.12", "graphql-transformer-common": "4.26.2" @@ -730,12 +730,12 @@ } }, "node_modules/@aws-amplify/data-construct/node_modules/@aws-amplify/graphql-predictions-transformer": { - "version": "2.1.10", + "version": "2.1.11", "inBundle": true, "license": "Apache-2.0", "dependencies": { - "@aws-amplify/graphql-transformer-core": "2.3.2", - "@aws-amplify/graphql-transformer-interfaces": "3.3.0", + "@aws-amplify/graphql-transformer-core": "2.3.3", + "@aws-amplify/graphql-transformer-interfaces": "3.3.1", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.12", "graphql-transformer-common": "4.26.2" @@ -746,14 +746,14 @@ } }, "node_modules/@aws-amplify/data-construct/node_modules/@aws-amplify/graphql-relational-transformer": { - "version": "2.2.2", + "version": "2.2.3", "inBundle": true, "license": "Apache-2.0", "dependencies": { - "@aws-amplify/graphql-index-transformer": "2.2.2", - "@aws-amplify/graphql-model-transformer": "2.3.2", - "@aws-amplify/graphql-transformer-core": "2.3.2", - "@aws-amplify/graphql-transformer-interfaces": "3.3.0", + "@aws-amplify/graphql-index-transformer": "2.2.3", + "@aws-amplify/graphql-model-transformer": "2.3.3", + "@aws-amplify/graphql-transformer-core": "2.3.3", + "@aws-amplify/graphql-transformer-interfaces": "3.3.1", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.12", "graphql-transformer-common": "4.26.2", @@ -765,13 +765,13 @@ } }, "node_modules/@aws-amplify/data-construct/node_modules/@aws-amplify/graphql-searchable-transformer": { - "version": "2.3.2", + "version": "2.3.3", "inBundle": true, "license": "Apache-2.0", "dependencies": { - "@aws-amplify/graphql-model-transformer": "2.3.2", - "@aws-amplify/graphql-transformer-core": "2.3.2", - "@aws-amplify/graphql-transformer-interfaces": "3.3.0", + "@aws-amplify/graphql-model-transformer": "2.3.3", + "@aws-amplify/graphql-transformer-core": "2.3.3", + "@aws-amplify/graphql-transformer-interfaces": "3.3.1", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.12", "graphql-transformer-common": "4.26.2" @@ -782,13 +782,13 @@ } }, "node_modules/@aws-amplify/data-construct/node_modules/@aws-amplify/graphql-sql-transformer": { - "version": "0.1.2", + "version": "0.1.3", "inBundle": true, "license": "Apache-2.0", "dependencies": { - "@aws-amplify/graphql-model-transformer": "2.3.2", - "@aws-amplify/graphql-transformer-core": "2.3.2", - "@aws-amplify/graphql-transformer-interfaces": "3.3.0", + "@aws-amplify/graphql-model-transformer": "2.3.3", + "@aws-amplify/graphql-transformer-core": "2.3.3", + "@aws-amplify/graphql-transformer-interfaces": "3.3.1", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.12", "graphql-transformer-common": "4.26.2" @@ -799,23 +799,23 @@ } }, "node_modules/@aws-amplify/data-construct/node_modules/@aws-amplify/graphql-transformer": { - "version": "1.3.2", + "version": "1.3.3", "inBundle": true, "license": "Apache-2.0", "dependencies": { - "@aws-amplify/graphql-auth-transformer": "3.2.2", - "@aws-amplify/graphql-default-value-transformer": "2.1.11", - "@aws-amplify/graphql-function-transformer": "2.1.10", - "@aws-amplify/graphql-http-transformer": "2.1.10", - "@aws-amplify/graphql-index-transformer": "2.2.2", - "@aws-amplify/graphql-maps-to-transformer": "3.3.2", - "@aws-amplify/graphql-model-transformer": "2.3.2", - "@aws-amplify/graphql-predictions-transformer": "2.1.10", - "@aws-amplify/graphql-relational-transformer": "2.2.2", - "@aws-amplify/graphql-searchable-transformer": "2.3.2", - "@aws-amplify/graphql-sql-transformer": "0.1.2", - "@aws-amplify/graphql-transformer-core": "2.3.2", - "@aws-amplify/graphql-transformer-interfaces": "3.3.0" + "@aws-amplify/graphql-auth-transformer": "3.2.3", + "@aws-amplify/graphql-default-value-transformer": "2.1.12", + "@aws-amplify/graphql-function-transformer": "2.1.11", + "@aws-amplify/graphql-http-transformer": "2.1.11", + "@aws-amplify/graphql-index-transformer": "2.2.3", + "@aws-amplify/graphql-maps-to-transformer": "3.3.3", + "@aws-amplify/graphql-model-transformer": "2.3.3", + "@aws-amplify/graphql-predictions-transformer": "2.1.11", + "@aws-amplify/graphql-relational-transformer": "2.2.3", + "@aws-amplify/graphql-searchable-transformer": "2.3.3", + "@aws-amplify/graphql-sql-transformer": "0.1.3", + "@aws-amplify/graphql-transformer-core": "2.3.3", + "@aws-amplify/graphql-transformer-interfaces": "3.3.1" }, "peerDependencies": { "aws-cdk-lib": "^2.80.0", @@ -823,11 +823,11 @@ } }, "node_modules/@aws-amplify/data-construct/node_modules/@aws-amplify/graphql-transformer-core": { - "version": "2.3.2", + "version": "2.3.3", "inBundle": true, "license": "Apache-2.0", "dependencies": { - "@aws-amplify/graphql-transformer-interfaces": "3.3.0", + "@aws-amplify/graphql-transformer-interfaces": "3.3.1", "fs-extra": "^8.1.0", "graphql": "^15.5.0", "graphql-transformer-common": "4.26.2", @@ -843,7 +843,7 @@ } }, "node_modules/@aws-amplify/data-construct/node_modules/@aws-amplify/graphql-transformer-interfaces": { - "version": "3.3.0", + "version": "3.3.1", "inBundle": true, "license": "Apache-2.0", "dependencies": { @@ -1089,9 +1089,9 @@ "link": true }, "node_modules/@aws-amplify/graphql-api-construct": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/@aws-amplify/graphql-api-construct/-/graphql-api-construct-1.4.2.tgz", - "integrity": "sha512-MZglRlIk6ScZoD2FQDUcrfiXiJzCuTkTLW0n3kJdrEydERQvMcXePCbJWiDQN0/scbB0vU7foDRNZfbdTxv8GA==", + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/@aws-amplify/graphql-api-construct/-/graphql-api-construct-1.4.3.tgz", + "integrity": "sha512-pem9OcUnLc2bzaV8uiT+nOaLfBvKYVA6jZZwQ5pEmKqMfqA1gYKjjowfOXTWXXFLXUQ0fJXCfcOl1Qg+St15rQ==", "bundleDependencies": [ "@aws-amplify/backend-output-schemas", "@aws-amplify/backend-output-storage", @@ -1134,20 +1134,20 @@ "dependencies": { "@aws-amplify/backend-output-schemas": "^0.4.0", "@aws-amplify/backend-output-storage": "^0.2.2", - "@aws-amplify/graphql-auth-transformer": "3.2.2", - "@aws-amplify/graphql-default-value-transformer": "2.1.11", - "@aws-amplify/graphql-function-transformer": "2.1.10", - "@aws-amplify/graphql-http-transformer": "2.1.10", - "@aws-amplify/graphql-index-transformer": "2.2.2", - "@aws-amplify/graphql-maps-to-transformer": "3.3.2", - "@aws-amplify/graphql-model-transformer": "2.3.2", - "@aws-amplify/graphql-predictions-transformer": "2.1.10", - "@aws-amplify/graphql-relational-transformer": "2.2.2", - "@aws-amplify/graphql-searchable-transformer": "2.3.2", - "@aws-amplify/graphql-sql-transformer": "0.1.2", - "@aws-amplify/graphql-transformer": "1.3.2", - "@aws-amplify/graphql-transformer-core": "2.3.2", - "@aws-amplify/graphql-transformer-interfaces": "3.3.0", + "@aws-amplify/graphql-auth-transformer": "3.2.3", + "@aws-amplify/graphql-default-value-transformer": "2.1.12", + "@aws-amplify/graphql-function-transformer": "2.1.11", + "@aws-amplify/graphql-http-transformer": "2.1.11", + "@aws-amplify/graphql-index-transformer": "2.2.3", + "@aws-amplify/graphql-maps-to-transformer": "3.3.3", + "@aws-amplify/graphql-model-transformer": "2.3.3", + "@aws-amplify/graphql-predictions-transformer": "2.1.11", + "@aws-amplify/graphql-relational-transformer": "2.2.3", + "@aws-amplify/graphql-searchable-transformer": "2.3.3", + "@aws-amplify/graphql-sql-transformer": "0.1.3", + "@aws-amplify/graphql-transformer": "1.3.3", + "@aws-amplify/graphql-transformer-core": "2.3.3", + "@aws-amplify/graphql-transformer-interfaces": "3.3.1", "@aws-amplify/platform-core": "^0.2.0", "@aws-amplify/plugin-types": "^0.4.1", "charenc": "^0.0.2", @@ -1196,14 +1196,14 @@ } }, "node_modules/@aws-amplify/graphql-api-construct/node_modules/@aws-amplify/graphql-auth-transformer": { - "version": "3.2.2", + "version": "3.2.3", "inBundle": true, "license": "Apache-2.0", "dependencies": { - "@aws-amplify/graphql-model-transformer": "2.3.2", - "@aws-amplify/graphql-relational-transformer": "2.2.2", - "@aws-amplify/graphql-transformer-core": "2.3.2", - "@aws-amplify/graphql-transformer-interfaces": "3.3.0", + "@aws-amplify/graphql-model-transformer": "2.3.3", + "@aws-amplify/graphql-relational-transformer": "2.2.3", + "@aws-amplify/graphql-transformer-core": "2.3.3", + "@aws-amplify/graphql-transformer-interfaces": "3.3.1", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.12", "graphql-transformer-common": "4.26.2", @@ -1216,12 +1216,12 @@ } }, "node_modules/@aws-amplify/graphql-api-construct/node_modules/@aws-amplify/graphql-default-value-transformer": { - "version": "2.1.11", + "version": "2.1.12", "inBundle": true, "license": "Apache-2.0", "dependencies": { - "@aws-amplify/graphql-transformer-core": "2.3.2", - "@aws-amplify/graphql-transformer-interfaces": "3.3.0", + "@aws-amplify/graphql-transformer-core": "2.3.3", + "@aws-amplify/graphql-transformer-interfaces": "3.3.1", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.12", "graphql-transformer-common": "4.26.2", @@ -1229,12 +1229,12 @@ } }, "node_modules/@aws-amplify/graphql-api-construct/node_modules/@aws-amplify/graphql-function-transformer": { - "version": "2.1.10", + "version": "2.1.11", "inBundle": true, "license": "Apache-2.0", "dependencies": { - "@aws-amplify/graphql-transformer-core": "2.3.2", - "@aws-amplify/graphql-transformer-interfaces": "3.3.0", + "@aws-amplify/graphql-transformer-core": "2.3.3", + "@aws-amplify/graphql-transformer-interfaces": "3.3.1", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.12", "graphql-transformer-common": "4.26.2" @@ -1245,12 +1245,12 @@ } }, "node_modules/@aws-amplify/graphql-api-construct/node_modules/@aws-amplify/graphql-http-transformer": { - "version": "2.1.10", + "version": "2.1.11", "inBundle": true, "license": "Apache-2.0", "dependencies": { - "@aws-amplify/graphql-transformer-core": "2.3.2", - "@aws-amplify/graphql-transformer-interfaces": "3.3.0", + "@aws-amplify/graphql-transformer-core": "2.3.3", + "@aws-amplify/graphql-transformer-interfaces": "3.3.1", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.12", "graphql-transformer-common": "4.26.2" @@ -1261,13 +1261,13 @@ } }, "node_modules/@aws-amplify/graphql-api-construct/node_modules/@aws-amplify/graphql-index-transformer": { - "version": "2.2.2", + "version": "2.2.3", "inBundle": true, "license": "Apache-2.0", "dependencies": { - "@aws-amplify/graphql-model-transformer": "2.3.2", - "@aws-amplify/graphql-transformer-core": "2.3.2", - "@aws-amplify/graphql-transformer-interfaces": "3.3.0", + "@aws-amplify/graphql-model-transformer": "2.3.3", + "@aws-amplify/graphql-transformer-core": "2.3.3", + "@aws-amplify/graphql-transformer-interfaces": "3.3.1", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.12", "graphql-transformer-common": "4.26.2" @@ -1278,12 +1278,12 @@ } }, "node_modules/@aws-amplify/graphql-api-construct/node_modules/@aws-amplify/graphql-maps-to-transformer": { - "version": "3.3.2", + "version": "3.3.3", "inBundle": true, "license": "Apache-2.0", "dependencies": { - "@aws-amplify/graphql-transformer-core": "2.3.2", - "@aws-amplify/graphql-transformer-interfaces": "3.3.0", + "@aws-amplify/graphql-transformer-core": "2.3.3", + "@aws-amplify/graphql-transformer-interfaces": "3.3.1", "graphql-mapping-template": "4.20.12", "graphql-transformer-common": "4.26.2" }, @@ -1293,12 +1293,12 @@ } }, "node_modules/@aws-amplify/graphql-api-construct/node_modules/@aws-amplify/graphql-model-transformer": { - "version": "2.3.2", + "version": "2.3.3", "inBundle": true, "license": "Apache-2.0", "dependencies": { - "@aws-amplify/graphql-transformer-core": "2.3.2", - "@aws-amplify/graphql-transformer-interfaces": "3.3.0", + "@aws-amplify/graphql-transformer-core": "2.3.3", + "@aws-amplify/graphql-transformer-interfaces": "3.3.1", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.12", "graphql-transformer-common": "4.26.2" @@ -1309,12 +1309,12 @@ } }, "node_modules/@aws-amplify/graphql-api-construct/node_modules/@aws-amplify/graphql-predictions-transformer": { - "version": "2.1.10", + "version": "2.1.11", "inBundle": true, "license": "Apache-2.0", "dependencies": { - "@aws-amplify/graphql-transformer-core": "2.3.2", - "@aws-amplify/graphql-transformer-interfaces": "3.3.0", + "@aws-amplify/graphql-transformer-core": "2.3.3", + "@aws-amplify/graphql-transformer-interfaces": "3.3.1", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.12", "graphql-transformer-common": "4.26.2" @@ -1325,14 +1325,14 @@ } }, "node_modules/@aws-amplify/graphql-api-construct/node_modules/@aws-amplify/graphql-relational-transformer": { - "version": "2.2.2", + "version": "2.2.3", "inBundle": true, "license": "Apache-2.0", "dependencies": { - "@aws-amplify/graphql-index-transformer": "2.2.2", - "@aws-amplify/graphql-model-transformer": "2.3.2", - "@aws-amplify/graphql-transformer-core": "2.3.2", - "@aws-amplify/graphql-transformer-interfaces": "3.3.0", + "@aws-amplify/graphql-index-transformer": "2.2.3", + "@aws-amplify/graphql-model-transformer": "2.3.3", + "@aws-amplify/graphql-transformer-core": "2.3.3", + "@aws-amplify/graphql-transformer-interfaces": "3.3.1", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.12", "graphql-transformer-common": "4.26.2", @@ -1344,13 +1344,13 @@ } }, "node_modules/@aws-amplify/graphql-api-construct/node_modules/@aws-amplify/graphql-searchable-transformer": { - "version": "2.3.2", + "version": "2.3.3", "inBundle": true, "license": "Apache-2.0", "dependencies": { - "@aws-amplify/graphql-model-transformer": "2.3.2", - "@aws-amplify/graphql-transformer-core": "2.3.2", - "@aws-amplify/graphql-transformer-interfaces": "3.3.0", + "@aws-amplify/graphql-model-transformer": "2.3.3", + "@aws-amplify/graphql-transformer-core": "2.3.3", + "@aws-amplify/graphql-transformer-interfaces": "3.3.1", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.12", "graphql-transformer-common": "4.26.2" @@ -1361,13 +1361,13 @@ } }, "node_modules/@aws-amplify/graphql-api-construct/node_modules/@aws-amplify/graphql-sql-transformer": { - "version": "0.1.2", + "version": "0.1.3", "inBundle": true, "license": "Apache-2.0", "dependencies": { - "@aws-amplify/graphql-model-transformer": "2.3.2", - "@aws-amplify/graphql-transformer-core": "2.3.2", - "@aws-amplify/graphql-transformer-interfaces": "3.3.0", + "@aws-amplify/graphql-model-transformer": "2.3.3", + "@aws-amplify/graphql-transformer-core": "2.3.3", + "@aws-amplify/graphql-transformer-interfaces": "3.3.1", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.12", "graphql-transformer-common": "4.26.2" @@ -1378,23 +1378,23 @@ } }, "node_modules/@aws-amplify/graphql-api-construct/node_modules/@aws-amplify/graphql-transformer": { - "version": "1.3.2", + "version": "1.3.3", "inBundle": true, "license": "Apache-2.0", "dependencies": { - "@aws-amplify/graphql-auth-transformer": "3.2.2", - "@aws-amplify/graphql-default-value-transformer": "2.1.11", - "@aws-amplify/graphql-function-transformer": "2.1.10", - "@aws-amplify/graphql-http-transformer": "2.1.10", - "@aws-amplify/graphql-index-transformer": "2.2.2", - "@aws-amplify/graphql-maps-to-transformer": "3.3.2", - "@aws-amplify/graphql-model-transformer": "2.3.2", - "@aws-amplify/graphql-predictions-transformer": "2.1.10", - "@aws-amplify/graphql-relational-transformer": "2.2.2", - "@aws-amplify/graphql-searchable-transformer": "2.3.2", - "@aws-amplify/graphql-sql-transformer": "0.1.2", - "@aws-amplify/graphql-transformer-core": "2.3.2", - "@aws-amplify/graphql-transformer-interfaces": "3.3.0" + "@aws-amplify/graphql-auth-transformer": "3.2.3", + "@aws-amplify/graphql-default-value-transformer": "2.1.12", + "@aws-amplify/graphql-function-transformer": "2.1.11", + "@aws-amplify/graphql-http-transformer": "2.1.11", + "@aws-amplify/graphql-index-transformer": "2.2.3", + "@aws-amplify/graphql-maps-to-transformer": "3.3.3", + "@aws-amplify/graphql-model-transformer": "2.3.3", + "@aws-amplify/graphql-predictions-transformer": "2.1.11", + "@aws-amplify/graphql-relational-transformer": "2.2.3", + "@aws-amplify/graphql-searchable-transformer": "2.3.3", + "@aws-amplify/graphql-sql-transformer": "0.1.3", + "@aws-amplify/graphql-transformer-core": "2.3.3", + "@aws-amplify/graphql-transformer-interfaces": "3.3.1" }, "peerDependencies": { "aws-cdk-lib": "^2.80.0", @@ -1402,11 +1402,11 @@ } }, "node_modules/@aws-amplify/graphql-api-construct/node_modules/@aws-amplify/graphql-transformer-core": { - "version": "2.3.2", + "version": "2.3.3", "inBundle": true, "license": "Apache-2.0", "dependencies": { - "@aws-amplify/graphql-transformer-interfaces": "3.3.0", + "@aws-amplify/graphql-transformer-interfaces": "3.3.1", "fs-extra": "^8.1.0", "graphql": "^15.5.0", "graphql-transformer-common": "4.26.2", @@ -1422,7 +1422,7 @@ } }, "node_modules/@aws-amplify/graphql-api-construct/node_modules/@aws-amplify/graphql-transformer-interfaces": { - "version": "3.3.0", + "version": "3.3.1", "inBundle": true, "license": "Apache-2.0", "dependencies": { @@ -2608,25 +2608,25 @@ "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, "node_modules/@aws-sdk/client-amplify": { - "version": "3.454.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-amplify/-/client-amplify-3.454.0.tgz", - "integrity": "sha512-VHxtZEh7/q5rrUssfkuv20fQoB4WDlRB5Tz4VsiY1qQiIYWfvYUFs8wV0VNiggIKGfXCYQPs6AmqUZftMNx6Gw==", + "version": "3.461.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-amplify/-/client-amplify-3.461.0.tgz", + "integrity": "sha512-KR2UpMUkiMzStyNhRsXnl5oOjAKcKimxmOJF3FJt+j3nVJKRV0j3BRqTyjnLcrekgu2QOZcQBRIQsoKslXgJWg==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/client-sts": "3.454.0", + "@aws-sdk/client-sts": "3.461.0", "@aws-sdk/core": "3.451.0", - "@aws-sdk/credential-provider-node": "3.451.0", - "@aws-sdk/middleware-host-header": "3.451.0", - "@aws-sdk/middleware-logger": "3.451.0", - "@aws-sdk/middleware-recursion-detection": "3.451.0", - "@aws-sdk/middleware-signing": "3.451.0", - "@aws-sdk/middleware-user-agent": "3.451.0", + "@aws-sdk/credential-provider-node": "3.460.0", + "@aws-sdk/middleware-host-header": "3.460.0", + "@aws-sdk/middleware-logger": "3.460.0", + "@aws-sdk/middleware-recursion-detection": "3.460.0", + "@aws-sdk/middleware-signing": "3.461.0", + "@aws-sdk/middleware-user-agent": "3.460.0", "@aws-sdk/region-config-resolver": "3.451.0", - "@aws-sdk/types": "3.451.0", - "@aws-sdk/util-endpoints": "3.451.0", - "@aws-sdk/util-user-agent-browser": "3.451.0", - "@aws-sdk/util-user-agent-node": "3.451.0", + "@aws-sdk/types": "3.460.0", + "@aws-sdk/util-endpoints": "3.460.0", + "@aws-sdk/util-user-agent-browser": "3.460.0", + "@aws-sdk/util-user-agent-node": "3.460.0", "@smithy/config-resolver": "^2.0.18", "@smithy/fetch-http-handler": "^2.2.6", "@smithy/hash-node": "^2.0.15", @@ -2657,25 +2657,25 @@ } }, "node_modules/@aws-sdk/client-amplifyuibuilder": { - "version": "3.454.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-amplifyuibuilder/-/client-amplifyuibuilder-3.454.0.tgz", - "integrity": "sha512-eIaLb46vA7/8lwUHOzba8TFT7PtgSooq4Yj7VPzZ+wGSFoDwPaP8H0viONKIsQnsGc1k0dV6jkA4hRmqgBIsRg==", + "version": "3.461.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-amplifyuibuilder/-/client-amplifyuibuilder-3.461.0.tgz", + "integrity": "sha512-5PejKafdSKAmfq1FCHoAN5qRwMo7gy/O2Fo/pGBdgUby1OycybvsZb5qBLoiio7nk3hctwsZIhS8g2hUznmJpQ==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/client-sts": "3.454.0", + "@aws-sdk/client-sts": "3.461.0", "@aws-sdk/core": "3.451.0", - "@aws-sdk/credential-provider-node": "3.451.0", - "@aws-sdk/middleware-host-header": "3.451.0", - "@aws-sdk/middleware-logger": "3.451.0", - "@aws-sdk/middleware-recursion-detection": "3.451.0", - "@aws-sdk/middleware-signing": "3.451.0", - "@aws-sdk/middleware-user-agent": "3.451.0", + "@aws-sdk/credential-provider-node": "3.460.0", + "@aws-sdk/middleware-host-header": "3.460.0", + "@aws-sdk/middleware-logger": "3.460.0", + "@aws-sdk/middleware-recursion-detection": "3.460.0", + "@aws-sdk/middleware-signing": "3.461.0", + "@aws-sdk/middleware-user-agent": "3.460.0", "@aws-sdk/region-config-resolver": "3.451.0", - "@aws-sdk/types": "3.451.0", - "@aws-sdk/util-endpoints": "3.451.0", - "@aws-sdk/util-user-agent-browser": "3.451.0", - "@aws-sdk/util-user-agent-node": "3.451.0", + "@aws-sdk/types": "3.460.0", + "@aws-sdk/util-endpoints": "3.460.0", + "@aws-sdk/util-user-agent-browser": "3.460.0", + "@aws-sdk/util-user-agent-node": "3.460.0", "@smithy/config-resolver": "^2.0.18", "@smithy/fetch-http-handler": "^2.2.6", "@smithy/hash-node": "^2.0.15", @@ -2706,26 +2706,34 @@ "node": ">=14.0.0" } }, + "node_modules/@aws-sdk/client-amplifyuibuilder/node_modules/uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "bin": { + "uuid": "dist/bin/uuid" + } + }, "node_modules/@aws-sdk/client-appsync": { - "version": "3.454.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-appsync/-/client-appsync-3.454.0.tgz", - "integrity": "sha512-M8BpD2oXg+/V/nsrHx9VMviOuIZfHzST8Nx+ilClIqNGTNx5IDUmacbnKzUqogeQn/utjAwePb87k5whzkDR5A==", + "version": "3.461.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-appsync/-/client-appsync-3.461.0.tgz", + "integrity": "sha512-PSmLxON0/h3tEtDzKoQKPR4YOTOM1iwaDv3g9mZiDlasN/MVckrccTqAY2m2mCTcGoiBIAieuU6m0reI5C6EvA==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/client-sts": "3.454.0", + "@aws-sdk/client-sts": "3.461.0", "@aws-sdk/core": "3.451.0", - "@aws-sdk/credential-provider-node": "3.451.0", - "@aws-sdk/middleware-host-header": "3.451.0", - "@aws-sdk/middleware-logger": "3.451.0", - "@aws-sdk/middleware-recursion-detection": "3.451.0", - "@aws-sdk/middleware-signing": "3.451.0", - "@aws-sdk/middleware-user-agent": "3.451.0", + "@aws-sdk/credential-provider-node": "3.460.0", + "@aws-sdk/middleware-host-header": "3.460.0", + "@aws-sdk/middleware-logger": "3.460.0", + "@aws-sdk/middleware-recursion-detection": "3.460.0", + "@aws-sdk/middleware-signing": "3.461.0", + "@aws-sdk/middleware-user-agent": "3.460.0", "@aws-sdk/region-config-resolver": "3.451.0", - "@aws-sdk/types": "3.451.0", - "@aws-sdk/util-endpoints": "3.451.0", - "@aws-sdk/util-user-agent-browser": "3.451.0", - "@aws-sdk/util-user-agent-node": "3.451.0", + "@aws-sdk/types": "3.460.0", + "@aws-sdk/util-endpoints": "3.460.0", + "@aws-sdk/util-user-agent-browser": "3.460.0", + "@aws-sdk/util-user-agent-node": "3.460.0", "@smithy/config-resolver": "^2.0.18", "@smithy/fetch-http-handler": "^2.2.6", "@smithy/hash-node": "^2.0.15", @@ -2757,25 +2765,25 @@ } }, "node_modules/@aws-sdk/client-cloudformation": { - "version": "3.454.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-cloudformation/-/client-cloudformation-3.454.0.tgz", - "integrity": "sha512-CKOE5u2gLt/BjHYX6a0uKGsWPBic9uOzlTwqnpqXEmVSb25xv5ULHOUmYfmSyw2TWXwxEe4a6ZwBL0MYJGrEUw==", + "version": "3.461.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-cloudformation/-/client-cloudformation-3.461.0.tgz", + "integrity": "sha512-A2u9B9IxSfx+NpWMRA/3rRTcddm3pj0set87pMmOgpmaQRxo9s7DHc6/0MANkd/y65ckEtP6wdPabt53yOEl5w==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/client-sts": "3.454.0", + "@aws-sdk/client-sts": "3.461.0", "@aws-sdk/core": "3.451.0", - "@aws-sdk/credential-provider-node": "3.451.0", - "@aws-sdk/middleware-host-header": "3.451.0", - "@aws-sdk/middleware-logger": "3.451.0", - "@aws-sdk/middleware-recursion-detection": "3.451.0", - "@aws-sdk/middleware-signing": "3.451.0", - "@aws-sdk/middleware-user-agent": "3.451.0", + "@aws-sdk/credential-provider-node": "3.460.0", + "@aws-sdk/middleware-host-header": "3.460.0", + "@aws-sdk/middleware-logger": "3.460.0", + "@aws-sdk/middleware-recursion-detection": "3.460.0", + "@aws-sdk/middleware-signing": "3.461.0", + "@aws-sdk/middleware-user-agent": "3.460.0", "@aws-sdk/region-config-resolver": "3.451.0", - "@aws-sdk/types": "3.451.0", - "@aws-sdk/util-endpoints": "3.451.0", - "@aws-sdk/util-user-agent-browser": "3.451.0", - "@aws-sdk/util-user-agent-node": "3.451.0", + "@aws-sdk/types": "3.460.0", + "@aws-sdk/util-endpoints": "3.460.0", + "@aws-sdk/util-user-agent-browser": "3.460.0", + "@aws-sdk/util-user-agent-node": "3.460.0", "@smithy/config-resolver": "^2.0.18", "@smithy/fetch-http-handler": "^2.2.6", "@smithy/hash-node": "^2.0.15", @@ -2808,26 +2816,34 @@ "node": ">=14.0.0" } }, + "node_modules/@aws-sdk/client-cloudformation/node_modules/uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "bin": { + "uuid": "dist/bin/uuid" + } + }, "node_modules/@aws-sdk/client-cognito-identity": { - "version": "3.454.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.454.0.tgz", - "integrity": "sha512-6Z3xYsgONJsZrn6P5XvKAgWxmUittGmp5jdX64LSz5OoPgkn0uGd01c2EACSKVivHUBc190gPg8Hg2BBmWjsMA==", + "version": "3.461.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.461.0.tgz", + "integrity": "sha512-rttO5tsvNqZghQwUgPk67LSo+0Yy4ItmsI3sgl81WDUP2A9Q4rwB8L99gLWroUz1uJtBujQ/HoYu6GN4kRa3MQ==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/client-sts": "3.454.0", + "@aws-sdk/client-sts": "3.461.0", "@aws-sdk/core": "3.451.0", - "@aws-sdk/credential-provider-node": "3.451.0", - "@aws-sdk/middleware-host-header": "3.451.0", - "@aws-sdk/middleware-logger": "3.451.0", - "@aws-sdk/middleware-recursion-detection": "3.451.0", - "@aws-sdk/middleware-signing": "3.451.0", - "@aws-sdk/middleware-user-agent": "3.451.0", + "@aws-sdk/credential-provider-node": "3.460.0", + "@aws-sdk/middleware-host-header": "3.460.0", + "@aws-sdk/middleware-logger": "3.460.0", + "@aws-sdk/middleware-recursion-detection": "3.460.0", + "@aws-sdk/middleware-signing": "3.461.0", + "@aws-sdk/middleware-user-agent": "3.460.0", "@aws-sdk/region-config-resolver": "3.451.0", - "@aws-sdk/types": "3.451.0", - "@aws-sdk/util-endpoints": "3.451.0", - "@aws-sdk/util-user-agent-browser": "3.451.0", - "@aws-sdk/util-user-agent-node": "3.451.0", + "@aws-sdk/types": "3.460.0", + "@aws-sdk/util-endpoints": "3.460.0", + "@aws-sdk/util-user-agent-browser": "3.460.0", + "@aws-sdk/util-user-agent-node": "3.460.0", "@smithy/config-resolver": "^2.0.18", "@smithy/fetch-http-handler": "^2.2.6", "@smithy/hash-node": "^2.0.15", @@ -2858,26 +2874,26 @@ } }, "node_modules/@aws-sdk/client-cognito-identity-provider": { - "version": "3.454.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity-provider/-/client-cognito-identity-provider-3.454.0.tgz", - "integrity": "sha512-puWrIjMboMAuJ/0poB1TNKZyr9Lpv1jHcSFrUIRezDPxs+lLi/Mvkcb7GVt5WHaC4+PHsk7UglbhNQIm3fRo4A==", + "version": "3.461.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity-provider/-/client-cognito-identity-provider-3.461.0.tgz", + "integrity": "sha512-sRXdjVLj72oOsRT75wfm5CWnPxdS7bu69X/2Dh+dhKnDz0IvQeRtpMR3dvMGJ8rqG6cWncAgcah6fegJtdF3ag==", "dev": true, "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/client-sts": "3.454.0", + "@aws-sdk/client-sts": "3.461.0", "@aws-sdk/core": "3.451.0", - "@aws-sdk/credential-provider-node": "3.451.0", - "@aws-sdk/middleware-host-header": "3.451.0", - "@aws-sdk/middleware-logger": "3.451.0", - "@aws-sdk/middleware-recursion-detection": "3.451.0", - "@aws-sdk/middleware-signing": "3.451.0", - "@aws-sdk/middleware-user-agent": "3.451.0", + "@aws-sdk/credential-provider-node": "3.460.0", + "@aws-sdk/middleware-host-header": "3.460.0", + "@aws-sdk/middleware-logger": "3.460.0", + "@aws-sdk/middleware-recursion-detection": "3.460.0", + "@aws-sdk/middleware-signing": "3.461.0", + "@aws-sdk/middleware-user-agent": "3.460.0", "@aws-sdk/region-config-resolver": "3.451.0", - "@aws-sdk/types": "3.451.0", - "@aws-sdk/util-endpoints": "3.451.0", - "@aws-sdk/util-user-agent-browser": "3.451.0", - "@aws-sdk/util-user-agent-node": "3.451.0", + "@aws-sdk/types": "3.460.0", + "@aws-sdk/util-endpoints": "3.460.0", + "@aws-sdk/util-user-agent-browser": "3.460.0", + "@aws-sdk/util-user-agent-node": "3.460.0", "@smithy/config-resolver": "^2.0.18", "@smithy/fetch-http-handler": "^2.2.6", "@smithy/hash-node": "^2.0.15", @@ -2908,33 +2924,33 @@ } }, "node_modules/@aws-sdk/client-s3": { - "version": "3.454.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.454.0.tgz", - "integrity": "sha512-vBx4iB1c4mEz+twMnl6angC1/IpnmXaT8L6Kl9uNiurFsb6N4tCyrJ24kECdsOSTM7ePXvE1fKst8zAh6MW5ZA==", + "version": "3.461.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.461.0.tgz", + "integrity": "sha512-pvEWMb2djn3bjD9lelYQhyG8KKKrUMm5MlSaSPwqVTL97iKm/Zbk+Ord6n8qMyPl5JHGmNdfg0tZFxC1qXeHTw==", "dependencies": { "@aws-crypto/sha1-browser": "3.0.0", "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/client-sts": "3.454.0", + "@aws-sdk/client-sts": "3.461.0", "@aws-sdk/core": "3.451.0", - "@aws-sdk/credential-provider-node": "3.451.0", - "@aws-sdk/middleware-bucket-endpoint": "3.451.0", - "@aws-sdk/middleware-expect-continue": "3.451.0", - "@aws-sdk/middleware-flexible-checksums": "3.451.0", - "@aws-sdk/middleware-host-header": "3.451.0", - "@aws-sdk/middleware-location-constraint": "3.451.0", - "@aws-sdk/middleware-logger": "3.451.0", - "@aws-sdk/middleware-recursion-detection": "3.451.0", - "@aws-sdk/middleware-sdk-s3": "3.451.0", - "@aws-sdk/middleware-signing": "3.451.0", - "@aws-sdk/middleware-ssec": "3.451.0", - "@aws-sdk/middleware-user-agent": "3.451.0", + "@aws-sdk/credential-provider-node": "3.460.0", + "@aws-sdk/middleware-bucket-endpoint": "3.460.0", + "@aws-sdk/middleware-expect-continue": "3.460.0", + "@aws-sdk/middleware-flexible-checksums": "3.461.0", + "@aws-sdk/middleware-host-header": "3.460.0", + "@aws-sdk/middleware-location-constraint": "3.461.0", + "@aws-sdk/middleware-logger": "3.460.0", + "@aws-sdk/middleware-recursion-detection": "3.460.0", + "@aws-sdk/middleware-sdk-s3": "3.461.0", + "@aws-sdk/middleware-signing": "3.461.0", + "@aws-sdk/middleware-ssec": "3.460.0", + "@aws-sdk/middleware-user-agent": "3.460.0", "@aws-sdk/region-config-resolver": "3.451.0", - "@aws-sdk/signature-v4-multi-region": "3.451.0", - "@aws-sdk/types": "3.451.0", - "@aws-sdk/util-endpoints": "3.451.0", - "@aws-sdk/util-user-agent-browser": "3.451.0", - "@aws-sdk/util-user-agent-node": "3.451.0", + "@aws-sdk/signature-v4-multi-region": "3.461.0", + "@aws-sdk/types": "3.460.0", + "@aws-sdk/util-endpoints": "3.460.0", + "@aws-sdk/util-user-agent-browser": "3.460.0", + "@aws-sdk/util-user-agent-node": "3.460.0", "@aws-sdk/xml-builder": "3.310.0", "@smithy/config-resolver": "^2.0.18", "@smithy/eventstream-serde-browser": "^2.0.13", @@ -2975,25 +2991,25 @@ } }, "node_modules/@aws-sdk/client-ssm": { - "version": "3.454.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-ssm/-/client-ssm-3.454.0.tgz", - "integrity": "sha512-Vrf93hOzB4FAUpkGHvKywZ0yOVbghS0KbCsnlN1Mka780zmyc185YXGYSLv6B+yrI2tMj0cBvEad3M0qk69qVw==", + "version": "3.461.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-ssm/-/client-ssm-3.461.0.tgz", + "integrity": "sha512-9ChDfqWWqYMtOHz0MCAjBLgEEpdwSgAUaW6qw0JHqOUkheUvqGCYXbrQRg6B/djol9ySjXrOXb7k50pbc9z56w==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/client-sts": "3.454.0", + "@aws-sdk/client-sts": "3.461.0", "@aws-sdk/core": "3.451.0", - "@aws-sdk/credential-provider-node": "3.451.0", - "@aws-sdk/middleware-host-header": "3.451.0", - "@aws-sdk/middleware-logger": "3.451.0", - "@aws-sdk/middleware-recursion-detection": "3.451.0", - "@aws-sdk/middleware-signing": "3.451.0", - "@aws-sdk/middleware-user-agent": "3.451.0", + "@aws-sdk/credential-provider-node": "3.460.0", + "@aws-sdk/middleware-host-header": "3.460.0", + "@aws-sdk/middleware-logger": "3.460.0", + "@aws-sdk/middleware-recursion-detection": "3.460.0", + "@aws-sdk/middleware-signing": "3.461.0", + "@aws-sdk/middleware-user-agent": "3.460.0", "@aws-sdk/region-config-resolver": "3.451.0", - "@aws-sdk/types": "3.451.0", - "@aws-sdk/util-endpoints": "3.451.0", - "@aws-sdk/util-user-agent-browser": "3.451.0", - "@aws-sdk/util-user-agent-node": "3.451.0", + "@aws-sdk/types": "3.460.0", + "@aws-sdk/util-endpoints": "3.460.0", + "@aws-sdk/util-user-agent-browser": "3.460.0", + "@aws-sdk/util-user-agent-node": "3.460.0", "@smithy/config-resolver": "^2.0.18", "@smithy/fetch-http-handler": "^2.2.6", "@smithy/hash-node": "^2.0.15", @@ -3025,23 +3041,31 @@ "node": ">=14.0.0" } }, + "node_modules/@aws-sdk/client-ssm/node_modules/uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "bin": { + "uuid": "dist/bin/uuid" + } + }, "node_modules/@aws-sdk/client-sso": { - "version": "3.451.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.451.0.tgz", - "integrity": "sha512-KkYSke3Pdv3MfVH/5fT528+MKjMyPKlcLcd4zQb0x6/7Bl7EHrPh1JZYjzPLHelb+UY5X0qN8+cb8iSu1eiwIQ==", + "version": "3.460.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.460.0.tgz", + "integrity": "sha512-p5D9C8LKJs5yoBn5cCs2Wqzrp5YP5BYcP774bhGMFEu/LCIUyWzudwN3+/AObSiq8R8SSvBY2zQD4h+k3NjgTQ==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", "@aws-sdk/core": "3.451.0", - "@aws-sdk/middleware-host-header": "3.451.0", - "@aws-sdk/middleware-logger": "3.451.0", - "@aws-sdk/middleware-recursion-detection": "3.451.0", - "@aws-sdk/middleware-user-agent": "3.451.0", + "@aws-sdk/middleware-host-header": "3.460.0", + "@aws-sdk/middleware-logger": "3.460.0", + "@aws-sdk/middleware-recursion-detection": "3.460.0", + "@aws-sdk/middleware-user-agent": "3.460.0", "@aws-sdk/region-config-resolver": "3.451.0", - "@aws-sdk/types": "3.451.0", - "@aws-sdk/util-endpoints": "3.451.0", - "@aws-sdk/util-user-agent-browser": "3.451.0", - "@aws-sdk/util-user-agent-node": "3.451.0", + "@aws-sdk/types": "3.460.0", + "@aws-sdk/util-endpoints": "3.460.0", + "@aws-sdk/util-user-agent-browser": "3.460.0", + "@aws-sdk/util-user-agent-node": "3.460.0", "@smithy/config-resolver": "^2.0.18", "@smithy/fetch-http-handler": "^2.2.6", "@smithy/hash-node": "^2.0.15", @@ -3072,25 +3096,25 @@ } }, "node_modules/@aws-sdk/client-sts": { - "version": "3.454.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.454.0.tgz", - "integrity": "sha512-0fDvr8WeB6IYO8BUCzcivWmahgGl/zDbaYfakzGnt4mrl5ztYaXE875WI6b7+oFcKMRvN+KLvwu5TtyFuNY+GQ==", + "version": "3.461.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.461.0.tgz", + "integrity": "sha512-1u+t31m23vuc9zkiUk51L4QbwuRQEuBeMArHK/thmq4V+A0VmjoAr/x2D0eQ0deOuBqG5YC62oaqUfIhj03SIw==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", "@aws-sdk/core": "3.451.0", - "@aws-sdk/credential-provider-node": "3.451.0", - "@aws-sdk/middleware-host-header": "3.451.0", - "@aws-sdk/middleware-logger": "3.451.0", - "@aws-sdk/middleware-recursion-detection": "3.451.0", - "@aws-sdk/middleware-sdk-sts": "3.451.0", - "@aws-sdk/middleware-signing": "3.451.0", - "@aws-sdk/middleware-user-agent": "3.451.0", + "@aws-sdk/credential-provider-node": "3.460.0", + "@aws-sdk/middleware-host-header": "3.460.0", + "@aws-sdk/middleware-logger": "3.460.0", + "@aws-sdk/middleware-recursion-detection": "3.460.0", + "@aws-sdk/middleware-sdk-sts": "3.461.0", + "@aws-sdk/middleware-signing": "3.461.0", + "@aws-sdk/middleware-user-agent": "3.460.0", "@aws-sdk/region-config-resolver": "3.451.0", - "@aws-sdk/types": "3.451.0", - "@aws-sdk/util-endpoints": "3.451.0", - "@aws-sdk/util-user-agent-browser": "3.451.0", - "@aws-sdk/util-user-agent-node": "3.451.0", + "@aws-sdk/types": "3.460.0", + "@aws-sdk/util-endpoints": "3.460.0", + "@aws-sdk/util-user-agent-browser": "3.460.0", + "@aws-sdk/util-user-agent-node": "3.460.0", "@smithy/config-resolver": "^2.0.18", "@smithy/fetch-http-handler": "^2.2.6", "@smithy/hash-node": "^2.0.15", @@ -3134,12 +3158,12 @@ } }, "node_modules/@aws-sdk/credential-provider-cognito-identity": { - "version": "3.454.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.454.0.tgz", - "integrity": "sha512-sRxDhZKgFasAVajNvpqJMEOCvtCUfofVcUO5vIp8jgPHNw5yrN5REZStjVjgYO5riFKXFI8qqHHtzttx+HhsZg==", + "version": "3.461.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.461.0.tgz", + "integrity": "sha512-D3bayvoEMxxheSpLug0VpAmGiVsDdYU4GsT8ls6389NjgQsAhPrmHd5wAxf1AtZYxghO9cT2rsZK60u0VQ1Q1w==", "dependencies": { - "@aws-sdk/client-cognito-identity": "3.454.0", - "@aws-sdk/types": "3.451.0", + "@aws-sdk/client-cognito-identity": "3.461.0", + "@aws-sdk/types": "3.460.0", "@smithy/property-provider": "^2.0.0", "@smithy/types": "^2.5.0", "tslib": "^2.5.0" @@ -3149,11 +3173,11 @@ } }, "node_modules/@aws-sdk/credential-provider-env": { - "version": "3.451.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.451.0.tgz", - "integrity": "sha512-9dAav7DcRgaF7xCJEQR5ER9ErXxnu/tdnVJ+UPmb1NPeIZdESv1A3lxFDEq1Fs8c4/lzAj9BpshGyJVIZwZDKg==", + "version": "3.460.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.460.0.tgz", + "integrity": "sha512-WWdaRJFuYRc2Ue9NKDy2NIf8pQRNx/QRVmrsk6EkIID8uWlQIOePk3SWTVV0TZIyPrbfSEaSnJRZoShphJ6PAg==", "dependencies": { - "@aws-sdk/types": "3.451.0", + "@aws-sdk/types": "3.460.0", "@smithy/property-provider": "^2.0.0", "@smithy/types": "^2.5.0", "tslib": "^2.5.0" @@ -3163,11 +3187,11 @@ } }, "node_modules/@aws-sdk/credential-provider-http": { - "version": "3.451.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.451.0.tgz", - "integrity": "sha512-q82kEzymqimkJ2dHmuN2RGpi9HTFSxwwoXALnzPRaRcvR/v+YY8FMgSTfwXzPkHUDf/q8J+aDz6lPcYlnsP3sQ==", + "version": "3.460.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.460.0.tgz", + "integrity": "sha512-tLnuLDsGcBRemj8jxt1MkerjwsQlYdwnlfQXvrYOO8qMrbFP2sEjAx165GeCbsjmY/y0w1UFQEV+xRpFg5dxUw==", "dependencies": { - "@aws-sdk/types": "3.451.0", + "@aws-sdk/types": "3.460.0", "@smithy/fetch-http-handler": "^2.2.6", "@smithy/node-http-handler": "^2.1.9", "@smithy/property-provider": "^2.0.0", @@ -3182,15 +3206,15 @@ } }, "node_modules/@aws-sdk/credential-provider-ini": { - "version": "3.451.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.451.0.tgz", - "integrity": "sha512-TySt64Ci5/ZbqFw1F9Z0FIGvYx5JSC9e6gqDnizIYd8eMnn8wFRUscRrD7pIHKfrhvVKN5h0GdYovmMO/FMCBw==", - "dependencies": { - "@aws-sdk/credential-provider-env": "3.451.0", - "@aws-sdk/credential-provider-process": "3.451.0", - "@aws-sdk/credential-provider-sso": "3.451.0", - "@aws-sdk/credential-provider-web-identity": "3.451.0", - "@aws-sdk/types": "3.451.0", + "version": "3.460.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.460.0.tgz", + "integrity": "sha512-1IEUmyaWzt2M3mONO8QyZtPy0f9ccaEjCo48ZQLgptWxUI+Ohga9gPK0mqu1kTJOjv4JJGACYHzLwEnnpltGlA==", + "dependencies": { + "@aws-sdk/credential-provider-env": "3.460.0", + "@aws-sdk/credential-provider-process": "3.460.0", + "@aws-sdk/credential-provider-sso": "3.460.0", + "@aws-sdk/credential-provider-web-identity": "3.460.0", + "@aws-sdk/types": "3.460.0", "@smithy/credential-provider-imds": "^2.0.0", "@smithy/property-provider": "^2.0.0", "@smithy/shared-ini-file-loader": "^2.0.6", @@ -3202,16 +3226,16 @@ } }, "node_modules/@aws-sdk/credential-provider-node": { - "version": "3.451.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.451.0.tgz", - "integrity": "sha512-AEwM1WPyxUdKrKyUsKyFqqRFGU70e4qlDyrtBxJnSU9NRLZI8tfEZ67bN7fHSxBUBODgDXpMSlSvJiBLh5/3pw==", - "dependencies": { - "@aws-sdk/credential-provider-env": "3.451.0", - "@aws-sdk/credential-provider-ini": "3.451.0", - "@aws-sdk/credential-provider-process": "3.451.0", - "@aws-sdk/credential-provider-sso": "3.451.0", - "@aws-sdk/credential-provider-web-identity": "3.451.0", - "@aws-sdk/types": "3.451.0", + "version": "3.460.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.460.0.tgz", + "integrity": "sha512-PbPo92WIgNlF6V4eWKehYGYjTqf0gU9vr09LeQUc3bTm1DJhJw1j+HU/3PfQ8LwTkBQePO7MbJ5A2n6ckMwfMg==", + "dependencies": { + "@aws-sdk/credential-provider-env": "3.460.0", + "@aws-sdk/credential-provider-ini": "3.460.0", + "@aws-sdk/credential-provider-process": "3.460.0", + "@aws-sdk/credential-provider-sso": "3.460.0", + "@aws-sdk/credential-provider-web-identity": "3.460.0", + "@aws-sdk/types": "3.460.0", "@smithy/credential-provider-imds": "^2.0.0", "@smithy/property-provider": "^2.0.0", "@smithy/shared-ini-file-loader": "^2.0.6", @@ -3223,11 +3247,11 @@ } }, "node_modules/@aws-sdk/credential-provider-process": { - "version": "3.451.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.451.0.tgz", - "integrity": "sha512-HQywSdKeD5PErcLLnZfSyCJO+6T+ZyzF+Lm/QgscSC+CbSUSIPi//s15qhBRVely/3KBV6AywxwNH+5eYgt4lQ==", + "version": "3.460.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.460.0.tgz", + "integrity": "sha512-ng+0FMc4EaxLAwdttCwf2nzNf4AgcqAHZ8pKXUf8qF/KVkoyTt3UZKW7P2FJI01zxwP+V4yAwVt95PBUKGn4YQ==", "dependencies": { - "@aws-sdk/types": "3.451.0", + "@aws-sdk/types": "3.460.0", "@smithy/property-provider": "^2.0.0", "@smithy/shared-ini-file-loader": "^2.0.6", "@smithy/types": "^2.5.0", @@ -3238,13 +3262,13 @@ } }, "node_modules/@aws-sdk/credential-provider-sso": { - "version": "3.451.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.451.0.tgz", - "integrity": "sha512-Usm/N51+unOt8ID4HnQzxIjUJDrkAQ1vyTOC0gSEEJ7h64NSSPGD5yhN7il5WcErtRd3EEtT1a8/GTC5TdBctg==", + "version": "3.460.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.460.0.tgz", + "integrity": "sha512-KnrQieOw17+aHEzE3SwfxjeSQ5ZTe2HeAzxkaZF++GxhNul/PkVnLzjGpIuB9bn71T9a2oNfG3peDUA+m2l2kw==", "dependencies": { - "@aws-sdk/client-sso": "3.451.0", - "@aws-sdk/token-providers": "3.451.0", - "@aws-sdk/types": "3.451.0", + "@aws-sdk/client-sso": "3.460.0", + "@aws-sdk/token-providers": "3.460.0", + "@aws-sdk/types": "3.460.0", "@smithy/property-provider": "^2.0.0", "@smithy/shared-ini-file-loader": "^2.0.6", "@smithy/types": "^2.5.0", @@ -3255,11 +3279,11 @@ } }, "node_modules/@aws-sdk/credential-provider-web-identity": { - "version": "3.451.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.451.0.tgz", - "integrity": "sha512-Xtg3Qw65EfDjWNG7o2xD6sEmumPfsy3WDGjk2phEzVg8s7hcZGxf5wYwe6UY7RJvlEKrU0rFA+AMn6Hfj5oOzg==", + "version": "3.460.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.460.0.tgz", + "integrity": "sha512-7OeaZgC3HmJZGE0I0ZiKInUMF2LyA0IZiW85AYFnAZzAIfv1cXk/1UnDAoFIQhOZfnUBXivStagz892s480ryw==", "dependencies": { - "@aws-sdk/types": "3.451.0", + "@aws-sdk/types": "3.460.0", "@smithy/property-provider": "^2.0.0", "@smithy/types": "^2.5.0", "tslib": "^2.5.0" @@ -3269,22 +3293,22 @@ } }, "node_modules/@aws-sdk/credential-providers": { - "version": "3.454.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.454.0.tgz", - "integrity": "sha512-y+ieaocH6T5pjGx7l2NUTb2n29URUYO3uYSvvwoWKx/KK17QJEVKMbARHBHyvDIbybeHidJTO58Jz5AY7rcTQA==", - "dependencies": { - "@aws-sdk/client-cognito-identity": "3.454.0", - "@aws-sdk/client-sso": "3.451.0", - "@aws-sdk/client-sts": "3.454.0", - "@aws-sdk/credential-provider-cognito-identity": "3.454.0", - "@aws-sdk/credential-provider-env": "3.451.0", - "@aws-sdk/credential-provider-http": "3.451.0", - "@aws-sdk/credential-provider-ini": "3.451.0", - "@aws-sdk/credential-provider-node": "3.451.0", - "@aws-sdk/credential-provider-process": "3.451.0", - "@aws-sdk/credential-provider-sso": "3.451.0", - "@aws-sdk/credential-provider-web-identity": "3.451.0", - "@aws-sdk/types": "3.451.0", + "version": "3.461.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.461.0.tgz", + "integrity": "sha512-sJjGjJxs0KajPK+WbdIRSuidWqm1xobX/Uv0x7TTQCCj1Fsuyq03pNP1aLRbJnLazKx+qyJef7rEFwQeFEAiNA==", + "dependencies": { + "@aws-sdk/client-cognito-identity": "3.461.0", + "@aws-sdk/client-sso": "3.460.0", + "@aws-sdk/client-sts": "3.461.0", + "@aws-sdk/credential-provider-cognito-identity": "3.461.0", + "@aws-sdk/credential-provider-env": "3.460.0", + "@aws-sdk/credential-provider-http": "3.460.0", + "@aws-sdk/credential-provider-ini": "3.460.0", + "@aws-sdk/credential-provider-node": "3.460.0", + "@aws-sdk/credential-provider-process": "3.460.0", + "@aws-sdk/credential-provider-sso": "3.460.0", + "@aws-sdk/credential-provider-web-identity": "3.460.0", + "@aws-sdk/types": "3.460.0", "@smithy/credential-provider-imds": "^2.0.0", "@smithy/property-provider": "^2.0.0", "@smithy/types": "^2.5.0", @@ -3295,11 +3319,11 @@ } }, "node_modules/@aws-sdk/middleware-bucket-endpoint": { - "version": "3.451.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.451.0.tgz", - "integrity": "sha512-KWyZ1JGnYz2QbHuJtYTP1BVnMOfVopR8rP8dTinVb/JR5HfAYz4imICJlJUbOYRjN7wpA3PrRI8dNRjrSBjWJg==", + "version": "3.460.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.460.0.tgz", + "integrity": "sha512-AmrCDT/r+m7q3OogZ3UeWpVdllMeR4Wdo+3YEfefPfcZc6SilnP2uCBUHletxbw3tXhNt56bUMUzQ+SUhyuUmA==", "dependencies": { - "@aws-sdk/types": "3.451.0", + "@aws-sdk/types": "3.460.0", "@aws-sdk/util-arn-parser": "3.310.0", "@smithy/node-config-provider": "^2.1.5", "@smithy/protocol-http": "^3.0.9", @@ -3312,11 +3336,11 @@ } }, "node_modules/@aws-sdk/middleware-expect-continue": { - "version": "3.451.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.451.0.tgz", - "integrity": "sha512-vwG8o2Uk6biLDlOZnqXemsO4dS2HvrprUdxyouwu6hlzLFskg8nL122butn19JqXJKgcVLuSSLzT+xwqBWy2Rg==", + "version": "3.460.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.460.0.tgz", + "integrity": "sha512-8VxMFTR+IszcMZLUZvxVCBOO1CUBmIWmDIQKd7w/U9xyMEXmBA0cx6ZEfMOIZF9NNh9OGCzTvwK+++8OTGBwAw==", "dependencies": { - "@aws-sdk/types": "3.451.0", + "@aws-sdk/types": "3.460.0", "@smithy/protocol-http": "^3.0.9", "@smithy/types": "^2.5.0", "tslib": "^2.5.0" @@ -3326,13 +3350,13 @@ } }, "node_modules/@aws-sdk/middleware-flexible-checksums": { - "version": "3.451.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.451.0.tgz", - "integrity": "sha512-eOkpcC2zgAvqs1w7Yp5nsk9LBIj6qLU5kaZuZEBOiFbNKIrTnPo6dQuhgvDcKHD6Y5W/cUjSBiFMs/ROb5aoug==", + "version": "3.461.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.461.0.tgz", + "integrity": "sha512-MNY7xMl2Qzoinj6Pos23TgD+WQtC9/G/VkNW/v8Ky5faRAt7bbS+ZEkkK3KcCrjnb8x4Bl/FzYNTCZRzRoQOtA==", "dependencies": { "@aws-crypto/crc32": "3.0.0", "@aws-crypto/crc32c": "3.0.0", - "@aws-sdk/types": "3.451.0", + "@aws-sdk/types": "3.460.0", "@smithy/is-array-buffer": "^2.0.0", "@smithy/protocol-http": "^3.0.9", "@smithy/types": "^2.5.0", @@ -3344,11 +3368,11 @@ } }, "node_modules/@aws-sdk/middleware-host-header": { - "version": "3.451.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.451.0.tgz", - "integrity": "sha512-j8a5jAfhWmsK99i2k8oR8zzQgXrsJtgrLxc3js6U+525mcZytoiDndkWTmD5fjJ1byU1U2E5TaPq+QJeDip05Q==", + "version": "3.460.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.460.0.tgz", + "integrity": "sha512-qBeDyuJkEuHe87Xk6unvFO9Zg5j6zM8bQOOZITocTLfu9JN0u5V4GQ/yopvpv+nQHmC/MGr0G7p+kIXMrg/Q2A==", "dependencies": { - "@aws-sdk/types": "3.451.0", + "@aws-sdk/types": "3.460.0", "@smithy/protocol-http": "^3.0.9", "@smithy/types": "^2.5.0", "tslib": "^2.5.0" @@ -3358,11 +3382,11 @@ } }, "node_modules/@aws-sdk/middleware-location-constraint": { - "version": "3.451.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.451.0.tgz", - "integrity": "sha512-R4U2G7mybP0BMiQBJWTcB47g49F4PSXTiCsvMDp5WOEhpWvGQuO1ZIhTxCl5s5lgTSne063Os8W6KSdK2yG2TQ==", + "version": "3.461.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.461.0.tgz", + "integrity": "sha512-dibimciNOV2kuhBBmHbS+29X559xNw4BdZviGzjGAQPkqPx+7Adgvp5BHqSDgh7FIJpgN2+QGbrubIQ+V1Bn4A==", "dependencies": { - "@aws-sdk/types": "3.451.0", + "@aws-sdk/types": "3.460.0", "@smithy/types": "^2.5.0", "tslib": "^2.5.0" }, @@ -3371,11 +3395,11 @@ } }, "node_modules/@aws-sdk/middleware-logger": { - "version": "3.451.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.451.0.tgz", - "integrity": "sha512-0kHrYEyVeB2QBfP6TfbI240aRtatLZtcErJbhpiNUb+CQPgEL3crIjgVE8yYiJumZ7f0jyjo8HLPkwD1/2APaw==", + "version": "3.460.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.460.0.tgz", + "integrity": "sha512-w2AJ6HOJ+Ggx9+VDKuWBHk5S0ZxYEo2EY2IFh0qtCQ1RDix/ur1QEzOOL5vNjHlZKPv/dseIwhgsTCac8UHXbQ==", "dependencies": { - "@aws-sdk/types": "3.451.0", + "@aws-sdk/types": "3.460.0", "@smithy/types": "^2.5.0", "tslib": "^2.5.0" }, @@ -3384,11 +3408,11 @@ } }, "node_modules/@aws-sdk/middleware-recursion-detection": { - "version": "3.451.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.451.0.tgz", - "integrity": "sha512-J6jL6gJ7orjHGM70KDRcCP7so/J2SnkN4vZ9YRLTeeZY6zvBuHDjX8GCIgSqPn/nXFXckZO8XSnA7u6+3TAT0w==", + "version": "3.460.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.460.0.tgz", + "integrity": "sha512-wmzm1/2NzpcCVCAsGqqiTBK+xNyLmQwTOq63rcW6eeq6gYOO0cyTZROOkVRrrsKWPBigrSFFHvDrEvonOMtKAg==", "dependencies": { - "@aws-sdk/types": "3.451.0", + "@aws-sdk/types": "3.460.0", "@smithy/protocol-http": "^3.0.9", "@smithy/types": "^2.5.0", "tslib": "^2.5.0" @@ -3398,15 +3422,18 @@ } }, "node_modules/@aws-sdk/middleware-sdk-s3": { - "version": "3.451.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.451.0.tgz", - "integrity": "sha512-XF4Cw8HrYUwGLKOqKtWs6ss1WXoxvQUcgGLACGSqn9a0p51446NiS5671x7qJUsfBuygdKlIKcOc8pPr9a+5Ow==", + "version": "3.461.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.461.0.tgz", + "integrity": "sha512-sOFUBWROq0xQxNoXp+3eepXrUAuMc/JPH+sI/r5QOznk7JVemYoBj99lknbTzJ4ssSK0yVrSUxxwGiGvDQb0Gg==", "dependencies": { - "@aws-sdk/types": "3.451.0", + "@aws-sdk/types": "3.460.0", "@aws-sdk/util-arn-parser": "3.310.0", + "@smithy/node-config-provider": "^2.1.5", "@smithy/protocol-http": "^3.0.9", + "@smithy/signature-v4": "^2.0.0", "@smithy/smithy-client": "^2.1.15", "@smithy/types": "^2.5.0", + "@smithy/util-config-provider": "^2.0.0", "tslib": "^2.5.0" }, "engines": { @@ -3414,12 +3441,12 @@ } }, "node_modules/@aws-sdk/middleware-sdk-sts": { - "version": "3.451.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.451.0.tgz", - "integrity": "sha512-UJ6UfVUEgp0KIztxpAeelPXI5MLj9wUtUCqYeIMP7C1ZhoEMNm3G39VLkGN43dNhBf1LqjsV9jkKMZbVfYXuwg==", + "version": "3.461.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.461.0.tgz", + "integrity": "sha512-sgNxkwKdJ/NZm7SJZBnbYPkbspmzn3lDyRSJH7PTCvyzDBzY2PB6yS/dfnGkitR+PYwromuOYMha37W4su2SOw==", "dependencies": { - "@aws-sdk/middleware-signing": "3.451.0", - "@aws-sdk/types": "3.451.0", + "@aws-sdk/middleware-signing": "3.461.0", + "@aws-sdk/types": "3.460.0", "@smithy/types": "^2.5.0", "tslib": "^2.5.0" }, @@ -3428,11 +3455,11 @@ } }, "node_modules/@aws-sdk/middleware-signing": { - "version": "3.451.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.451.0.tgz", - "integrity": "sha512-s5ZlcIoLNg1Huj4Qp06iKniE8nJt/Pj1B/fjhWc6cCPCM7XJYUCejCnRh6C5ZJoBEYodjuwZBejPc1Wh3j+znA==", + "version": "3.461.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.461.0.tgz", + "integrity": "sha512-aM/7VupHlsgeRG1UZSAQMWJX+2Jam4GG8ZGVAbLfBr9yh9cBwnUUndpUpYI9rU7atA8n+vISr162EbR7WTiFhQ==", "dependencies": { - "@aws-sdk/types": "3.451.0", + "@aws-sdk/types": "3.460.0", "@smithy/property-provider": "^2.0.0", "@smithy/protocol-http": "^3.0.9", "@smithy/signature-v4": "^2.0.0", @@ -3445,11 +3472,11 @@ } }, "node_modules/@aws-sdk/middleware-ssec": { - "version": "3.451.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.451.0.tgz", - "integrity": "sha512-hDkeBUiRsvuDbvsPha0/uJHE680WDzjAOoE6ZnLBoWsw7ry+Bw1ULMj0sCmpBVrQ7Gpivi/6zbezhClVmt3ITw==", + "version": "3.460.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.460.0.tgz", + "integrity": "sha512-1PSCmkq9BRX8isxyDyf785xvjldtwhdUzI+37oZ1qfDXGmRyB+KjtRBNnz5Fz+VSiOfVzfhp3sjrc4fs4BfJ0w==", "dependencies": { - "@aws-sdk/types": "3.451.0", + "@aws-sdk/types": "3.460.0", "@smithy/types": "^2.5.0", "tslib": "^2.5.0" }, @@ -3458,12 +3485,12 @@ } }, "node_modules/@aws-sdk/middleware-user-agent": { - "version": "3.451.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.451.0.tgz", - "integrity": "sha512-8NM/0JiKLNvT9wtAQVl1DFW0cEO7OvZyLSUBLNLTHqyvOZxKaZ8YFk7d8PL6l76LeUKRxq4NMxfZQlUIRe0eSA==", + "version": "3.460.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.460.0.tgz", + "integrity": "sha512-0gBSOCr+RtwRUCSRLn9H3RVnj9ercvk/QKTHIr33CgfEdyZtIGpHWUSs6uqiQydPTRzjCm5SfUa6ESGhRVMM6A==", "dependencies": { - "@aws-sdk/types": "3.451.0", - "@aws-sdk/util-endpoints": "3.451.0", + "@aws-sdk/types": "3.460.0", + "@aws-sdk/util-endpoints": "3.460.0", "@smithy/protocol-http": "^3.0.9", "@smithy/types": "^2.5.0", "tslib": "^2.5.0" @@ -3488,11 +3515,12 @@ } }, "node_modules/@aws-sdk/signature-v4-multi-region": { - "version": "3.451.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.451.0.tgz", - "integrity": "sha512-qQKY7/txeNUTLyRL3WxUWEwaZ5sf76EIZgu9kLaR96cAYSxwQi/qQB3ijbfD6u7sJIA8aROMxeYK0VmRsQg0CA==", + "version": "3.461.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.461.0.tgz", + "integrity": "sha512-9tsdJ5KMPZzJN1x28AZKoS9J3xfwftFwutqcU1qsXXeouck0CztLfX+wr3etO4acPQO2zU305fnR2ulSsnns4g==", "dependencies": { - "@aws-sdk/types": "3.451.0", + "@aws-sdk/middleware-sdk-s3": "3.461.0", + "@aws-sdk/types": "3.460.0", "@smithy/protocol-http": "^3.0.9", "@smithy/signature-v4": "^2.0.0", "@smithy/types": "^2.5.0", @@ -3503,21 +3531,21 @@ } }, "node_modules/@aws-sdk/token-providers": { - "version": "3.451.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.451.0.tgz", - "integrity": "sha512-ij1L5iUbn6CwxVOT1PG4NFjsrsKN9c4N1YEM0lkl6DwmaNOscjLKGSNyj9M118vSWsOs1ZDbTwtj++h0O/BWrQ==", + "version": "3.460.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.460.0.tgz", + "integrity": "sha512-EvSIPMI1gXk3gEkdtbZCW+p3Bjmt2gOR1m7ibQD7qLj4l0dKXhp4URgTqB1ExH3S4qUq0M/XSGKbGLZpvunHNg==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/middleware-host-header": "3.451.0", - "@aws-sdk/middleware-logger": "3.451.0", - "@aws-sdk/middleware-recursion-detection": "3.451.0", - "@aws-sdk/middleware-user-agent": "3.451.0", + "@aws-sdk/middleware-host-header": "3.460.0", + "@aws-sdk/middleware-logger": "3.460.0", + "@aws-sdk/middleware-recursion-detection": "3.460.0", + "@aws-sdk/middleware-user-agent": "3.460.0", "@aws-sdk/region-config-resolver": "3.451.0", - "@aws-sdk/types": "3.451.0", - "@aws-sdk/util-endpoints": "3.451.0", - "@aws-sdk/util-user-agent-browser": "3.451.0", - "@aws-sdk/util-user-agent-node": "3.451.0", + "@aws-sdk/types": "3.460.0", + "@aws-sdk/util-endpoints": "3.460.0", + "@aws-sdk/util-user-agent-browser": "3.460.0", + "@aws-sdk/util-user-agent-node": "3.460.0", "@smithy/config-resolver": "^2.0.18", "@smithy/fetch-http-handler": "^2.2.6", "@smithy/hash-node": "^2.0.15", @@ -3550,9 +3578,9 @@ } }, "node_modules/@aws-sdk/types": { - "version": "3.451.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.451.0.tgz", - "integrity": "sha512-rhK+qeYwCIs+laJfWCcrYEjay2FR/9VABZJ2NRM89jV/fKqGVQR52E5DQqrI+oEIL5JHMhhnr4N4fyECMS35lw==", + "version": "3.460.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.460.0.tgz", + "integrity": "sha512-MyZSWS/FV8Bnux5eD9en7KLgVxevlVrGNEP3X2D7fpnUlLhl0a7k8+OpSI2ozEQB8hIU2DLc/XXTKRerHSefxQ==", "dependencies": { "@smithy/types": "^2.5.0", "tslib": "^2.5.0" @@ -3573,11 +3601,11 @@ } }, "node_modules/@aws-sdk/util-endpoints": { - "version": "3.451.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.451.0.tgz", - "integrity": "sha512-giqLGBTnRIcKkDqwU7+GQhKbtJ5Ku35cjGQIfMyOga6pwTBUbaK0xW1Sdd8sBQ1GhApscnChzI9o/R9x0368vw==", + "version": "3.460.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.460.0.tgz", + "integrity": "sha512-myH6kM5WP4IWULHDHMYf2Q+BCYVGlzqJgiBmO10kQEtJSeAGZZ49eoFFYgKW8ZAYB5VnJ+XhXVB1TRA+vR4l5A==", "dependencies": { - "@aws-sdk/types": "3.451.0", + "@aws-sdk/types": "3.460.0", "@smithy/util-endpoints": "^1.0.4", "tslib": "^2.5.0" }, @@ -3611,22 +3639,22 @@ } }, "node_modules/@aws-sdk/util-user-agent-browser": { - "version": "3.451.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.451.0.tgz", - "integrity": "sha512-Ws5mG3J0TQifH7OTcMrCTexo7HeSAc3cBgjfhS/ofzPUzVCtsyg0G7I6T7wl7vJJETix2Kst2cpOsxygPgPD9w==", + "version": "3.460.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.460.0.tgz", + "integrity": "sha512-FRCzW+TyjKnvxsargPVrjayBfp/rvObYHZyZ2OSqrVw8lkkPCb4e/WZOeIiXZuhdhhoah7wMuo6zGwtFF3bYKg==", "dependencies": { - "@aws-sdk/types": "3.451.0", + "@aws-sdk/types": "3.460.0", "@smithy/types": "^2.5.0", "bowser": "^2.11.0", "tslib": "^2.5.0" } }, "node_modules/@aws-sdk/util-user-agent-node": { - "version": "3.451.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.451.0.tgz", - "integrity": "sha512-TBzm6P+ql4mkGFAjPlO1CI+w3yUT+NulaiALjl/jNX/nnUp6HsJsVxJf4nVFQTG5KRV0iqMypcs7I3KIhH+LmA==", + "version": "3.460.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.460.0.tgz", + "integrity": "sha512-+kSoR9ABGpJ5Xc7v0VwpgTQbgyI4zuezC8K4pmKAGZsSsVWg4yxptoy2bDqoFL7qfRlWviMVTkQRMvR4D44WxA==", "dependencies": { - "@aws-sdk/types": "3.451.0", + "@aws-sdk/types": "3.460.0", "@smithy/node-config-provider": "^2.1.5", "@smithy/types": "^2.5.0", "tslib": "^2.5.0" @@ -4489,16 +4517,16 @@ "dev": true }, "node_modules/@changesets/apply-release-plan": { - "version": "6.1.4", - "resolved": "https://registry.npmjs.org/@changesets/apply-release-plan/-/apply-release-plan-6.1.4.tgz", - "integrity": "sha512-FMpKF1fRlJyCZVYHr3CbinpZZ+6MwvOtWUuO8uo+svcATEoc1zRDcj23pAurJ2TZ/uVz1wFHH6K3NlACy0PLew==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/@changesets/apply-release-plan/-/apply-release-plan-7.0.0.tgz", + "integrity": "sha512-vfi69JR416qC9hWmFGSxj7N6wA5J222XNBmezSVATPWDVPIF7gkd4d8CpbEbXmRWbVrkoli3oerGS6dcL/BGsQ==", "dev": true, "dependencies": { "@babel/runtime": "^7.20.1", - "@changesets/config": "^2.3.1", - "@changesets/get-version-range-type": "^0.3.2", - "@changesets/git": "^2.0.0", - "@changesets/types": "^5.2.1", + "@changesets/config": "^3.0.0", + "@changesets/get-version-range-type": "^0.4.0", + "@changesets/git": "^3.0.0", + "@changesets/types": "^6.0.0", "@manypkg/get-packages": "^1.1.3", "detect-indent": "^6.0.0", "fs-extra": "^7.0.1", @@ -4542,58 +4570,57 @@ } }, "node_modules/@changesets/assemble-release-plan": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/@changesets/assemble-release-plan/-/assemble-release-plan-5.2.4.tgz", - "integrity": "sha512-xJkWX+1/CUaOUWTguXEbCDTyWJFECEhmdtbkjhn5GVBGxdP/JwaHBIU9sW3FR6gD07UwZ7ovpiPclQZs+j+mvg==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@changesets/assemble-release-plan/-/assemble-release-plan-6.0.0.tgz", + "integrity": "sha512-4QG7NuisAjisbW4hkLCmGW2lRYdPrKzro+fCtZaILX+3zdUELSvYjpL4GTv0E4aM9Mef3PuIQp89VmHJ4y2bfw==", "dev": true, "dependencies": { "@babel/runtime": "^7.20.1", - "@changesets/errors": "^0.1.4", - "@changesets/get-dependents-graph": "^1.3.6", - "@changesets/types": "^5.2.1", + "@changesets/errors": "^0.2.0", + "@changesets/get-dependents-graph": "^2.0.0", + "@changesets/types": "^6.0.0", "@manypkg/get-packages": "^1.1.3", "semver": "^7.5.3" } }, "node_modules/@changesets/changelog-git": { - "version": "0.1.14", - "resolved": "https://registry.npmjs.org/@changesets/changelog-git/-/changelog-git-0.1.14.tgz", - "integrity": "sha512-+vRfnKtXVWsDDxGctOfzJsPhaCdXRYoe+KyWYoq5X/GqoISREiat0l3L8B0a453B2B4dfHGcZaGyowHbp9BSaA==", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@changesets/changelog-git/-/changelog-git-0.2.0.tgz", + "integrity": "sha512-bHOx97iFI4OClIT35Lok3sJAwM31VbUM++gnMBV16fdbtBhgYu4dxsphBF/0AZZsyAHMrnM0yFcj5gZM1py6uQ==", "dev": true, "dependencies": { - "@changesets/types": "^5.2.1" + "@changesets/types": "^6.0.0" } }, "node_modules/@changesets/cli": { - "version": "2.26.2", - "resolved": "https://registry.npmjs.org/@changesets/cli/-/cli-2.26.2.tgz", - "integrity": "sha512-dnWrJTmRR8bCHikJHl9b9HW3gXACCehz4OasrXpMp7sx97ECuBGGNjJhjPhdZNCvMy9mn4BWdplI323IbqsRig==", + "version": "2.27.1", + "resolved": "https://registry.npmjs.org/@changesets/cli/-/cli-2.27.1.tgz", + "integrity": "sha512-iJ91xlvRnnrJnELTp4eJJEOPjgpF3NOh4qeQehM6Ugiz9gJPRZ2t+TsXun6E3AMN4hScZKjqVXl0TX+C7AB3ZQ==", "dev": true, "dependencies": { "@babel/runtime": "^7.20.1", - "@changesets/apply-release-plan": "^6.1.4", - "@changesets/assemble-release-plan": "^5.2.4", - "@changesets/changelog-git": "^0.1.14", - "@changesets/config": "^2.3.1", - "@changesets/errors": "^0.1.4", - "@changesets/get-dependents-graph": "^1.3.6", - "@changesets/get-release-plan": "^3.0.17", - "@changesets/git": "^2.0.0", - "@changesets/logger": "^0.0.5", - "@changesets/pre": "^1.0.14", - "@changesets/read": "^0.5.9", - "@changesets/types": "^5.2.1", - "@changesets/write": "^0.2.3", + "@changesets/apply-release-plan": "^7.0.0", + "@changesets/assemble-release-plan": "^6.0.0", + "@changesets/changelog-git": "^0.2.0", + "@changesets/config": "^3.0.0", + "@changesets/errors": "^0.2.0", + "@changesets/get-dependents-graph": "^2.0.0", + "@changesets/get-release-plan": "^4.0.0", + "@changesets/git": "^3.0.0", + "@changesets/logger": "^0.1.0", + "@changesets/pre": "^2.0.0", + "@changesets/read": "^0.6.0", + "@changesets/types": "^6.0.0", + "@changesets/write": "^0.3.0", "@manypkg/get-packages": "^1.1.3", - "@types/is-ci": "^3.0.0", "@types/semver": "^7.5.0", "ansi-colors": "^4.1.3", "chalk": "^2.1.0", + "ci-info": "^3.7.0", "enquirer": "^2.3.0", "external-editor": "^3.1.0", "fs-extra": "^7.0.1", "human-id": "^1.0.2", - "is-ci": "^3.0.1", "meow": "^6.0.0", "outdent": "^0.5.0", "p-limit": "^2.2.0", @@ -4641,15 +4668,15 @@ } }, "node_modules/@changesets/config": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@changesets/config/-/config-2.3.1.tgz", - "integrity": "sha512-PQXaJl82CfIXddUOppj4zWu+987GCw2M+eQcOepxN5s+kvnsZOwjEJO3DH9eVy+OP6Pg/KFEWdsECFEYTtbg6w==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@changesets/config/-/config-3.0.0.tgz", + "integrity": "sha512-o/rwLNnAo/+j9Yvw9mkBQOZySDYyOr/q+wptRLcAVGlU6djOeP9v1nlalbL9MFsobuBVQbZCTp+dIzdq+CLQUA==", "dev": true, "dependencies": { - "@changesets/errors": "^0.1.4", - "@changesets/get-dependents-graph": "^1.3.6", - "@changesets/logger": "^0.0.5", - "@changesets/types": "^5.2.1", + "@changesets/errors": "^0.2.0", + "@changesets/get-dependents-graph": "^2.0.0", + "@changesets/logger": "^0.1.0", + "@changesets/types": "^6.0.0", "@manypkg/get-packages": "^1.1.3", "fs-extra": "^7.0.1", "micromatch": "^4.0.2" @@ -4688,21 +4715,21 @@ } }, "node_modules/@changesets/errors": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/@changesets/errors/-/errors-0.1.4.tgz", - "integrity": "sha512-HAcqPF7snsUJ/QzkWoKfRfXushHTu+K5KZLJWPb34s4eCZShIf8BFO3fwq6KU8+G7L5KdtN2BzQAXOSXEyiY9Q==", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@changesets/errors/-/errors-0.2.0.tgz", + "integrity": "sha512-6BLOQUscTpZeGljvyQXlWOItQyU71kCdGz7Pi8H8zdw6BI0g3m43iL4xKUVPWtG+qrrL9DTjpdn8eYuCQSRpow==", "dev": true, "dependencies": { "extendable-error": "^0.1.5" } }, "node_modules/@changesets/get-dependents-graph": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/@changesets/get-dependents-graph/-/get-dependents-graph-1.3.6.tgz", - "integrity": "sha512-Q/sLgBANmkvUm09GgRsAvEtY3p1/5OCzgBE5vX3vgb5CvW0j7CEljocx5oPXeQSNph6FXulJlXV3Re/v3K3P3Q==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@changesets/get-dependents-graph/-/get-dependents-graph-2.0.0.tgz", + "integrity": "sha512-cafUXponivK4vBgZ3yLu944mTvam06XEn2IZGjjKc0antpenkYANXiiE6GExV/yKdsCnE8dXVZ25yGqLYZmScA==", "dev": true, "dependencies": { - "@changesets/types": "^5.2.1", + "@changesets/types": "^6.0.0", "@manypkg/get-packages": "^1.1.3", "chalk": "^2.1.0", "fs-extra": "^7.0.1", @@ -4742,35 +4769,35 @@ } }, "node_modules/@changesets/get-release-plan": { - "version": "3.0.17", - "resolved": "https://registry.npmjs.org/@changesets/get-release-plan/-/get-release-plan-3.0.17.tgz", - "integrity": "sha512-6IwKTubNEgoOZwDontYc2x2cWXfr6IKxP3IhKeK+WjyD6y3M4Gl/jdQvBw+m/5zWILSOCAaGLu2ZF6Q+WiPniw==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@changesets/get-release-plan/-/get-release-plan-4.0.0.tgz", + "integrity": "sha512-9L9xCUeD/Tb6L/oKmpm8nyzsOzhdNBBbt/ZNcjynbHC07WW4E1eX8NMGC5g5SbM5z/V+MOrYsJ4lRW41GCbg3w==", "dev": true, "dependencies": { "@babel/runtime": "^7.20.1", - "@changesets/assemble-release-plan": "^5.2.4", - "@changesets/config": "^2.3.1", - "@changesets/pre": "^1.0.14", - "@changesets/read": "^0.5.9", - "@changesets/types": "^5.2.1", + "@changesets/assemble-release-plan": "^6.0.0", + "@changesets/config": "^3.0.0", + "@changesets/pre": "^2.0.0", + "@changesets/read": "^0.6.0", + "@changesets/types": "^6.0.0", "@manypkg/get-packages": "^1.1.3" } }, "node_modules/@changesets/get-version-range-type": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@changesets/get-version-range-type/-/get-version-range-type-0.3.2.tgz", - "integrity": "sha512-SVqwYs5pULYjYT4op21F2pVbcrca4qA/bAA3FmFXKMN7Y+HcO8sbZUTx3TAy2VXulP2FACd1aC7f2nTuqSPbqg==", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/@changesets/get-version-range-type/-/get-version-range-type-0.4.0.tgz", + "integrity": "sha512-hwawtob9DryoGTpixy1D3ZXbGgJu1Rhr+ySH2PvTLHvkZuQ7sRT4oQwMh0hbqZH1weAooedEjRsbrWcGLCeyVQ==", "dev": true }, "node_modules/@changesets/git": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@changesets/git/-/git-2.0.0.tgz", - "integrity": "sha512-enUVEWbiqUTxqSnmesyJGWfzd51PY4H7mH9yUw0hPVpZBJ6tQZFMU3F3mT/t9OJ/GjyiM4770i+sehAn6ymx6A==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@changesets/git/-/git-3.0.0.tgz", + "integrity": "sha512-vvhnZDHe2eiBNRFHEgMiGd2CT+164dfYyrJDhwwxTVD/OW0FUD6G7+4DIx1dNwkwjHyzisxGAU96q0sVNBns0w==", "dev": true, "dependencies": { "@babel/runtime": "^7.20.1", - "@changesets/errors": "^0.1.4", - "@changesets/types": "^5.2.1", + "@changesets/errors": "^0.2.0", + "@changesets/types": "^6.0.0", "@manypkg/get-packages": "^1.1.3", "is-subdir": "^1.1.1", "micromatch": "^4.0.2", @@ -4778,33 +4805,33 @@ } }, "node_modules/@changesets/logger": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/@changesets/logger/-/logger-0.0.5.tgz", - "integrity": "sha512-gJyZHomu8nASHpaANzc6bkQMO9gU/ib20lqew1rVx753FOxffnCrJlGIeQVxNWCqM+o6OOleCo/ivL8UAO5iFw==", + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@changesets/logger/-/logger-0.1.0.tgz", + "integrity": "sha512-pBrJm4CQm9VqFVwWnSqKEfsS2ESnwqwH+xR7jETxIErZcfd1u2zBSqrHbRHR7xjhSgep9x2PSKFKY//FAshA3g==", "dev": true, "dependencies": { "chalk": "^2.1.0" } }, "node_modules/@changesets/parse": { - "version": "0.3.16", - "resolved": "https://registry.npmjs.org/@changesets/parse/-/parse-0.3.16.tgz", - "integrity": "sha512-127JKNd167ayAuBjUggZBkmDS5fIKsthnr9jr6bdnuUljroiERW7FBTDNnNVyJ4l69PzR57pk6mXQdtJyBCJKg==", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/@changesets/parse/-/parse-0.4.0.tgz", + "integrity": "sha512-TS/9KG2CdGXS27S+QxbZXgr8uPsP4yNJYb4BC2/NeFUj80Rni3TeD2qwWmabymxmrLo7JEsytXH1FbpKTbvivw==", "dev": true, "dependencies": { - "@changesets/types": "^5.2.1", + "@changesets/types": "^6.0.0", "js-yaml": "^3.13.1" } }, "node_modules/@changesets/pre": { - "version": "1.0.14", - "resolved": "https://registry.npmjs.org/@changesets/pre/-/pre-1.0.14.tgz", - "integrity": "sha512-dTsHmxQWEQekHYHbg+M1mDVYFvegDh9j/kySNuDKdylwfMEevTeDouR7IfHNyVodxZXu17sXoJuf2D0vi55FHQ==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@changesets/pre/-/pre-2.0.0.tgz", + "integrity": "sha512-HLTNYX/A4jZxc+Sq8D1AMBsv+1qD6rmmJtjsCJa/9MSRybdxh0mjbTvE6JYZQ/ZiQ0mMlDOlGPXTm9KLTU3jyw==", "dev": true, "dependencies": { "@babel/runtime": "^7.20.1", - "@changesets/errors": "^0.1.4", - "@changesets/types": "^5.2.1", + "@changesets/errors": "^0.2.0", + "@changesets/types": "^6.0.0", "@manypkg/get-packages": "^1.1.3", "fs-extra": "^7.0.1" } @@ -4842,16 +4869,16 @@ } }, "node_modules/@changesets/read": { - "version": "0.5.9", - "resolved": "https://registry.npmjs.org/@changesets/read/-/read-0.5.9.tgz", - "integrity": "sha512-T8BJ6JS6j1gfO1HFq50kU3qawYxa4NTbI/ASNVVCBTsKquy2HYwM9r7ZnzkiMe8IEObAJtUVGSrePCOxAK2haQ==", + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@changesets/read/-/read-0.6.0.tgz", + "integrity": "sha512-ZypqX8+/im1Fm98K4YcZtmLKgjs1kDQ5zHpc2U1qdtNBmZZfo/IBiG162RoP0CUF05tvp2y4IspH11PLnPxuuw==", "dev": true, "dependencies": { "@babel/runtime": "^7.20.1", - "@changesets/git": "^2.0.0", - "@changesets/logger": "^0.0.5", - "@changesets/parse": "^0.3.16", - "@changesets/types": "^5.2.1", + "@changesets/git": "^3.0.0", + "@changesets/logger": "^0.1.0", + "@changesets/parse": "^0.4.0", + "@changesets/types": "^6.0.0", "chalk": "^2.1.0", "fs-extra": "^7.0.1", "p-filter": "^2.1.0" @@ -4890,19 +4917,19 @@ } }, "node_modules/@changesets/types": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/@changesets/types/-/types-5.2.1.tgz", - "integrity": "sha512-myLfHbVOqaq9UtUKqR/nZA/OY7xFjQMdfgfqeZIBK4d0hA6pgxArvdv8M+6NUzzBsjWLOtvApv8YHr4qM+Kpfg==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@changesets/types/-/types-6.0.0.tgz", + "integrity": "sha512-b1UkfNulgKoWfqyHtzKS5fOZYSJO+77adgL7DLRDr+/7jhChN+QcHnbjiQVOz/U+Ts3PGNySq7diAItzDgugfQ==", "dev": true }, "node_modules/@changesets/write": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/@changesets/write/-/write-0.2.3.tgz", - "integrity": "sha512-Dbamr7AIMvslKnNYsLFafaVORx4H0pvCA2MHqgtNCySMe1blImEyAEOzDmcgKAkgz4+uwoLz7demIrX+JBr/Xw==", + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@changesets/write/-/write-0.3.0.tgz", + "integrity": "sha512-slGLb21fxZVUYbyea+94uFiD6ntQW0M2hIKNznFizDhZPDgn2c/fv1UzzlW43RVzh1BEDuIqW6hzlJ1OflNmcw==", "dev": true, "dependencies": { "@babel/runtime": "^7.20.1", - "@changesets/types": "^5.2.1", + "@changesets/types": "^6.0.0", "fs-extra": "^7.0.1", "human-id": "^1.0.2", "prettier": "^2.7.1" @@ -5428,9 +5455,9 @@ } }, "node_modules/@graphql-codegen/core/node_modules/@graphql-tools/utils": { - "version": "10.0.8", - "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-10.0.8.tgz", - "integrity": "sha512-yjyA8ycSa1WRlJqyX/aLqXeE5DvF/H02+zXMUFnCzIDrj0UvLMUrxhmVFnMK0Q2n3bh4uuTeY3621m5za9ovXw==", + "version": "10.0.11", + "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-10.0.11.tgz", + "integrity": "sha512-vVjXgKn6zjXIlYBd7yJxCVMYGb5j18gE3hx3Qw3mNsSEsYQXbJbPdlwb7Fc9FogsJei5AaqiQerqH4kAosp1nQ==", "dependencies": { "@graphql-typed-document-node/core": "^3.1.1", "cross-inspect": "1.0.0", @@ -5703,9 +5730,9 @@ } }, "node_modules/@graphql-tools/apollo-engine-loader/node_modules/@graphql-tools/utils": { - "version": "10.0.8", - "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-10.0.8.tgz", - "integrity": "sha512-yjyA8ycSa1WRlJqyX/aLqXeE5DvF/H02+zXMUFnCzIDrj0UvLMUrxhmVFnMK0Q2n3bh4uuTeY3621m5za9ovXw==", + "version": "10.0.11", + "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-10.0.11.tgz", + "integrity": "sha512-vVjXgKn6zjXIlYBd7yJxCVMYGb5j18gE3hx3Qw3mNsSEsYQXbJbPdlwb7Fc9FogsJei5AaqiQerqH4kAosp1nQ==", "dependencies": { "@graphql-typed-document-node/core": "^3.1.1", "cross-inspect": "1.0.0", @@ -5720,11 +5747,11 @@ } }, "node_modules/@graphql-tools/merge": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/@graphql-tools/merge/-/merge-9.0.0.tgz", - "integrity": "sha512-J7/xqjkGTTwOJmaJQJ2C+VDBDOWJL3lKrHJN4yMaRLAJH3PosB7GiPRaSDZdErs0+F77sH2MKs2haMMkywzx7Q==", + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/@graphql-tools/merge/-/merge-9.0.1.tgz", + "integrity": "sha512-hIEExWO9fjA6vzsVjJ3s0cCQ+Q/BEeMVJZtMXd7nbaVefVy0YDyYlEkeoYYNV3NVVvu1G9lr6DM1Qd0DGo9Caw==", "dependencies": { - "@graphql-tools/utils": "^10.0.0", + "@graphql-tools/utils": "^10.0.10", "tslib": "^2.4.0" }, "engines": { @@ -5735,9 +5762,9 @@ } }, "node_modules/@graphql-tools/merge/node_modules/@graphql-tools/utils": { - "version": "10.0.8", - "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-10.0.8.tgz", - "integrity": "sha512-yjyA8ycSa1WRlJqyX/aLqXeE5DvF/H02+zXMUFnCzIDrj0UvLMUrxhmVFnMK0Q2n3bh4uuTeY3621m5za9ovXw==", + "version": "10.0.11", + "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-10.0.11.tgz", + "integrity": "sha512-vVjXgKn6zjXIlYBd7yJxCVMYGb5j18gE3hx3Qw3mNsSEsYQXbJbPdlwb7Fc9FogsJei5AaqiQerqH4kAosp1nQ==", "dependencies": { "@graphql-typed-document-node/core": "^3.1.1", "cross-inspect": "1.0.0", @@ -5788,12 +5815,12 @@ } }, "node_modules/@graphql-tools/schema": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/@graphql-tools/schema/-/schema-10.0.0.tgz", - "integrity": "sha512-kf3qOXMFcMs2f/S8Y3A8fm/2w+GaHAkfr3Gnhh2LOug/JgpY/ywgFVxO3jOeSpSEdoYcDKLcXVjMigNbY4AdQg==", + "version": "10.0.2", + "resolved": "https://registry.npmjs.org/@graphql-tools/schema/-/schema-10.0.2.tgz", + "integrity": "sha512-TbPsIZnWyDCLhgPGnDjt4hosiNU2mF/rNtSk5BVaXWnZqvKJ6gzJV4fcHcvhRIwtscDMW2/YTnK6dLVnk8pc4w==", "dependencies": { - "@graphql-tools/merge": "^9.0.0", - "@graphql-tools/utils": "^10.0.0", + "@graphql-tools/merge": "^9.0.1", + "@graphql-tools/utils": "^10.0.10", "tslib": "^2.4.0", "value-or-promise": "^1.0.12" }, @@ -5805,9 +5832,9 @@ } }, "node_modules/@graphql-tools/schema/node_modules/@graphql-tools/utils": { - "version": "10.0.8", - "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-10.0.8.tgz", - "integrity": "sha512-yjyA8ycSa1WRlJqyX/aLqXeE5DvF/H02+zXMUFnCzIDrj0UvLMUrxhmVFnMK0Q2n3bh4uuTeY3621m5za9ovXw==", + "version": "10.0.11", + "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-10.0.11.tgz", + "integrity": "sha512-vVjXgKn6zjXIlYBd7yJxCVMYGb5j18gE3hx3Qw3mNsSEsYQXbJbPdlwb7Fc9FogsJei5AaqiQerqH4kAosp1nQ==", "dependencies": { "@graphql-typed-document-node/core": "^3.1.1", "cross-inspect": "1.0.0", @@ -6100,9 +6127,9 @@ } }, "node_modules/@inquirer/core/node_modules/@types/node": { - "version": "20.9.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.9.3.tgz", - "integrity": "sha512-nk5wXLAXGBKfrhLB0cyHGbSqopS+nz0BUgZkUQqSHSSgdee0kssp1IAqlQOu333bW+gMNs2QREx7iynm19Abxw==", + "version": "20.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.0.tgz", + "integrity": "sha512-D0WfRmU9TQ8I9PFx9Yc+EBHw+vSpIub4IDvQivcp26PtPrdMGAq5SDcpXEo/epqa/DXotVpekHiLNTg3iaKXBQ==", "dependencies": { "undici-types": "~5.26.4" } @@ -7397,6 +7424,36 @@ "url": "https://opencollective.com/unts" } }, + "node_modules/@pkgr/utils/node_modules/define-lazy-prop": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz", + "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@pkgr/utils/node_modules/open": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/open/-/open-9.1.0.tgz", + "integrity": "sha512-OS+QTnw1/4vrf+9hh1jc1jnYjzSG4ttTBB8UxOwAnInG3Uo4ssetzC1ihqaIHjLJnA5GGlRl6QlZXOTQhRBUvg==", + "dev": true, + "dependencies": { + "default-browser": "^4.0.0", + "define-lazy-prop": "^3.0.0", + "is-inside-container": "^1.0.0", + "is-wsl": "^2.2.0" + }, + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/@rushstack/node-core-library": { "version": "3.61.0", "resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.61.0.tgz", @@ -7509,16 +7566,16 @@ } }, "node_modules/@shopify/eslint-plugin/node_modules/@typescript-eslint/eslint-plugin": { - "version": "6.12.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.12.0.tgz", - "integrity": "sha512-XOpZ3IyJUIV1b15M7HVOpgQxPPF7lGXgsfcEIu3yDxFPaf/xZKt7s9QO/pbk7vpWQyVulpJbu4E5LwpZiQo4kA==", + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.13.1.tgz", + "integrity": "sha512-5bQDGkXaxD46bPvQt08BUz9YSaO4S0fB1LB5JHQuXTfkGPI3+UUeS387C/e9jRie5GqT8u5kFTrMvAjtX4O5kA==", "dev": true, "dependencies": { "@eslint-community/regexpp": "^4.5.1", - "@typescript-eslint/scope-manager": "6.12.0", - "@typescript-eslint/type-utils": "6.12.0", - "@typescript-eslint/utils": "6.12.0", - "@typescript-eslint/visitor-keys": "6.12.0", + "@typescript-eslint/scope-manager": "6.13.1", + "@typescript-eslint/type-utils": "6.13.1", + "@typescript-eslint/utils": "6.13.1", + "@typescript-eslint/visitor-keys": "6.13.1", "debug": "^4.3.4", "graphemer": "^1.4.0", "ignore": "^5.2.4", @@ -7544,15 +7601,15 @@ } }, "node_modules/@shopify/eslint-plugin/node_modules/@typescript-eslint/parser": { - "version": "6.12.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.12.0.tgz", - "integrity": "sha512-s8/jNFPKPNRmXEnNXfuo1gemBdVmpQsK1pcu+QIvuNJuhFzGrpD7WjOcvDc/+uEdfzSYpNu7U/+MmbScjoQ6vg==", + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.13.1.tgz", + "integrity": "sha512-fs2XOhWCzRhqMmQf0eicLa/CWSaYss2feXsy7xBD/pLyWke/jCIVc2s1ikEAtSW7ina1HNhv7kONoEfVNEcdDQ==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "6.12.0", - "@typescript-eslint/types": "6.12.0", - "@typescript-eslint/typescript-estree": "6.12.0", - "@typescript-eslint/visitor-keys": "6.12.0", + "@typescript-eslint/scope-manager": "6.13.1", + "@typescript-eslint/types": "6.13.1", + "@typescript-eslint/typescript-estree": "6.13.1", + "@typescript-eslint/visitor-keys": "6.13.1", "debug": "^4.3.4" }, "engines": { @@ -7572,13 +7629,13 @@ } }, "node_modules/@shopify/eslint-plugin/node_modules/@typescript-eslint/scope-manager": { - "version": "6.12.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.12.0.tgz", - "integrity": "sha512-5gUvjg+XdSj8pcetdL9eXJzQNTl3RD7LgUiYTl8Aabdi8hFkaGSYnaS6BLc0BGNaDH+tVzVwmKtWvu0jLgWVbw==", + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.13.1.tgz", + "integrity": "sha512-BW0kJ7ceiKi56GbT2KKzZzN+nDxzQK2DS6x0PiSMPjciPgd/JRQGMibyaN2cPt2cAvuoH0oNvn2fwonHI+4QUQ==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.12.0", - "@typescript-eslint/visitor-keys": "6.12.0" + "@typescript-eslint/types": "6.13.1", + "@typescript-eslint/visitor-keys": "6.13.1" }, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -7589,13 +7646,13 @@ } }, "node_modules/@shopify/eslint-plugin/node_modules/@typescript-eslint/type-utils": { - "version": "6.12.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.12.0.tgz", - "integrity": "sha512-WWmRXxhm1X8Wlquj+MhsAG4dU/Blvf1xDgGaYCzfvStP2NwPQh6KBvCDbiOEvaE0filhranjIlK/2fSTVwtBng==", + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.13.1.tgz", + "integrity": "sha512-A2qPlgpxx2v//3meMqQyB1qqTg1h1dJvzca7TugM3Yc2USDY+fsRBiojAEo92HO7f5hW5mjAUF6qobOPzlBCBQ==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "6.12.0", - "@typescript-eslint/utils": "6.12.0", + "@typescript-eslint/typescript-estree": "6.13.1", + "@typescript-eslint/utils": "6.13.1", "debug": "^4.3.4", "ts-api-utils": "^1.0.1" }, @@ -7616,9 +7673,9 @@ } }, "node_modules/@shopify/eslint-plugin/node_modules/@typescript-eslint/types": { - "version": "6.12.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.12.0.tgz", - "integrity": "sha512-MA16p/+WxM5JG/F3RTpRIcuOghWO30//VEOvzubM8zuOOBYXsP+IfjoCXXiIfy2Ta8FRh9+IO9QLlaFQUU+10Q==", + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.13.1.tgz", + "integrity": "sha512-gjeEskSmiEKKFIbnhDXUyiqVma1gRCQNbVZ1C8q7Zjcxh3WZMbzWVfGE9rHfWd1msQtPS0BVD9Jz9jded44eKg==", "dev": true, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -7629,13 +7686,13 @@ } }, "node_modules/@shopify/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": { - "version": "6.12.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.12.0.tgz", - "integrity": "sha512-vw9E2P9+3UUWzhgjyyVczLWxZ3GuQNT7QpnIY3o5OMeLO/c8oHljGc8ZpryBMIyympiAAaKgw9e5Hl9dCWFOYw==", + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.13.1.tgz", + "integrity": "sha512-sBLQsvOC0Q7LGcUHO5qpG1HxRgePbT6wwqOiGLpR8uOJvPJbfs0mW3jPA3ujsDvfiVwVlWUDESNXv44KtINkUQ==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.12.0", - "@typescript-eslint/visitor-keys": "6.12.0", + "@typescript-eslint/types": "6.13.1", + "@typescript-eslint/visitor-keys": "6.13.1", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -7656,17 +7713,17 @@ } }, "node_modules/@shopify/eslint-plugin/node_modules/@typescript-eslint/utils": { - "version": "6.12.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.12.0.tgz", - "integrity": "sha512-LywPm8h3tGEbgfyjYnu3dauZ0U7R60m+miXgKcZS8c7QALO9uWJdvNoP+duKTk2XMWc7/Q3d/QiCuLN9X6SWyQ==", + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.13.1.tgz", + "integrity": "sha512-ouPn/zVoan92JgAegesTXDB/oUp6BP1v8WpfYcqh649ejNc9Qv+B4FF2Ff626kO1xg0wWwwG48lAJ4JuesgdOw==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", "@types/json-schema": "^7.0.12", "@types/semver": "^7.5.0", - "@typescript-eslint/scope-manager": "6.12.0", - "@typescript-eslint/types": "6.12.0", - "@typescript-eslint/typescript-estree": "6.12.0", + "@typescript-eslint/scope-manager": "6.13.1", + "@typescript-eslint/types": "6.13.1", + "@typescript-eslint/typescript-estree": "6.13.1", "semver": "^7.5.4" }, "engines": { @@ -7681,12 +7738,12 @@ } }, "node_modules/@shopify/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": { - "version": "6.12.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.12.0.tgz", - "integrity": "sha512-rg3BizTZHF1k3ipn8gfrzDXXSFKyOEB5zxYXInQ6z0hUvmQlhaZQzK+YmHmNViMA9HzW5Q9+bPPt90bU6GQwyw==", + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.13.1.tgz", + "integrity": "sha512-NDhQUy2tg6XGNBGDRm1XybOHSia8mcXmlbKWoQP+nm1BIIMxa55shyJfZkHpEBN62KNPLrocSM2PdPcaLgDKMQ==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.12.0", + "@typescript-eslint/types": "6.13.1", "eslint-visitor-keys": "^3.4.1" }, "engines": { @@ -7799,11 +7856,11 @@ "dev": true }, "node_modules/@smithy/abort-controller": { - "version": "2.0.13", - "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-2.0.13.tgz", - "integrity": "sha512-eeOPD+GF9BzF/Mjy3PICLePx4l0f3rG/nQegQHRLTloN5p1lSJJNZsyn+FzDnW8P2AduragZqJdtKNCxXozB1Q==", + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-2.0.14.tgz", + "integrity": "sha512-zXtteuYLWbSXnzI3O6xq3FYvigYZFW8mdytGibfarLL2lxHto9L3ILtGVnVGmFZa7SDh62l39EnU5hesLN87Fw==", "dependencies": { - "@smithy/types": "^2.5.0", + "@smithy/types": "^2.6.0", "tslib": "^2.5.0" }, "engines": { @@ -7828,14 +7885,14 @@ } }, "node_modules/@smithy/config-resolver": { - "version": "2.0.18", - "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-2.0.18.tgz", - "integrity": "sha512-761sJSgNbvsqcsKW6/WZbrZr4H+0Vp/QKKqwyrxCPwD8BsiPEXNHyYnqNgaeK9xRWYswjon0Uxbpe3DWQo0j/g==", + "version": "2.0.19", + "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-2.0.19.tgz", + "integrity": "sha512-JsghnQ5zjWmjEVY8TFOulLdEOCj09SjRLugrHlkPZTIBBm7PQitCFVLThbsKPZQOP7N3ME1DU1nKUc1UaVnBog==", "dependencies": { - "@smithy/node-config-provider": "^2.1.5", - "@smithy/types": "^2.5.0", + "@smithy/node-config-provider": "^2.1.6", + "@smithy/types": "^2.6.0", "@smithy/util-config-provider": "^2.0.0", - "@smithy/util-middleware": "^2.0.6", + "@smithy/util-middleware": "^2.0.7", "tslib": "^2.5.0" }, "engines": { @@ -7843,14 +7900,14 @@ } }, "node_modules/@smithy/credential-provider-imds": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-2.1.1.tgz", - "integrity": "sha512-gw5G3FjWC6sNz8zpOJgPpH5HGKrpoVFQpToNAwLwJVyI/LJ2jDJRjSKEsM6XI25aRpYjMSE/Qptxx305gN1vHw==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-2.1.2.tgz", + "integrity": "sha512-Y62jBWdoLPSYjr9fFvJf+KwTa1EunjVr6NryTEWCnwIY93OJxwV4t0qxjwdPl/XMsUkq79ppNJSEQN6Ohnhxjw==", "dependencies": { - "@smithy/node-config-provider": "^2.1.5", - "@smithy/property-provider": "^2.0.14", - "@smithy/types": "^2.5.0", - "@smithy/url-parser": "^2.0.13", + "@smithy/node-config-provider": "^2.1.6", + "@smithy/property-provider": "^2.0.15", + "@smithy/types": "^2.6.0", + "@smithy/url-parser": "^2.0.14", "tslib": "^2.5.0" }, "engines": { @@ -7858,23 +7915,23 @@ } }, "node_modules/@smithy/eventstream-codec": { - "version": "2.0.13", - "resolved": "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-2.0.13.tgz", - "integrity": "sha512-CExbelIYp+DxAHG8RIs0l9QL7ElqhG4ym9BNoSpkPa4ptBQfzJdep3LbOSVJIE2VUdBAeObdeL6EDB3Jo85n3g==", + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-2.0.14.tgz", + "integrity": "sha512-g/OU/MeWGfHDygoXgMWfG/Xb0QqDnAGcM9t2FRrVAhleXYRddGOEnfanR5cmHgB9ue52MJsyorqFjckzXsylaA==", "dependencies": { "@aws-crypto/crc32": "3.0.0", - "@smithy/types": "^2.5.0", + "@smithy/types": "^2.6.0", "@smithy/util-hex-encoding": "^2.0.0", "tslib": "^2.5.0" } }, "node_modules/@smithy/eventstream-serde-browser": { - "version": "2.0.13", - "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-2.0.13.tgz", - "integrity": "sha512-OJ/2g/VxkzA+mYZxV102oX3CsiE+igTSmqq/ir3oEVG2kSIdRC00ryttj/lmL14W06ExNi0ysmfLxQkL8XrAZQ==", + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-2.0.14.tgz", + "integrity": "sha512-41wmYE9smDGJi1ZXp+LogH6BR7MkSsQD91wneIFISF/mupKULvoOJUkv/Nf0NMRxWlM3Bf1Vvi9FlR2oV4KU8Q==", "dependencies": { - "@smithy/eventstream-serde-universal": "^2.0.13", - "@smithy/types": "^2.5.0", + "@smithy/eventstream-serde-universal": "^2.0.14", + "@smithy/types": "^2.6.0", "tslib": "^2.5.0" }, "engines": { @@ -7882,11 +7939,11 @@ } }, "node_modules/@smithy/eventstream-serde-config-resolver": { - "version": "2.0.13", - "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-2.0.13.tgz", - "integrity": "sha512-2BI1CbnYuEvAYoWSeWJtPNygbIKiWeSLxCmDLnyM6wQV32Of7VptiQlaFXPxXp4zqn/rs3ocZ/T29rxE4s4Gsg==", + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-2.0.14.tgz", + "integrity": "sha512-43IyRIzQ82s+5X+t/3Ood00CcWtAXQdmUIUKMed2Qg9REPk8SVIHhpm3rwewLwg+3G2Nh8NOxXlEQu6DsPUcMw==", "dependencies": { - "@smithy/types": "^2.5.0", + "@smithy/types": "^2.6.0", "tslib": "^2.5.0" }, "engines": { @@ -7894,12 +7951,12 @@ } }, "node_modules/@smithy/eventstream-serde-node": { - "version": "2.0.13", - "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-node/-/eventstream-serde-node-2.0.13.tgz", - "integrity": "sha512-7NbFwPafb924elFxCBDvm48jy/DeSrpFbFQN0uN2ThuY5HrEeubikS0t7WMva4Z4EnRoivpbuT0scb9vUIJKoA==", + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-node/-/eventstream-serde-node-2.0.14.tgz", + "integrity": "sha512-jVh9E2qAr6DxH5tWfCAl9HV6tI0pEQ3JVmu85JknDvYTC66djcjDdhctPV2EHuKWf2kjRiFJcMIn0eercW4THA==", "dependencies": { - "@smithy/eventstream-serde-universal": "^2.0.13", - "@smithy/types": "^2.5.0", + "@smithy/eventstream-serde-universal": "^2.0.14", + "@smithy/types": "^2.6.0", "tslib": "^2.5.0" }, "engines": { @@ -7907,12 +7964,12 @@ } }, "node_modules/@smithy/eventstream-serde-universal": { - "version": "2.0.13", - "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-2.0.13.tgz", - "integrity": "sha512-j0yFd5UfftM+ia9dxLRbheJDCkCZBHpcEzCsPO8BxVOTbdcX/auVJCv6ov/yvpCKsf4Hv3mOqi0Is1YogM2g3Q==", + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-2.0.14.tgz", + "integrity": "sha512-Ie35+AISNn1NmEjn5b2SchIE49pvKp4Q74bE9ME5RULWI1MgXyGkQUajWd5E6OBSr/sqGcs+rD3IjPErXnCm9g==", "dependencies": { - "@smithy/eventstream-codec": "^2.0.13", - "@smithy/types": "^2.5.0", + "@smithy/eventstream-codec": "^2.0.14", + "@smithy/types": "^2.6.0", "tslib": "^2.5.0" }, "engines": { @@ -7920,34 +7977,34 @@ } }, "node_modules/@smithy/fetch-http-handler": { - "version": "2.2.6", - "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-2.2.6.tgz", - "integrity": "sha512-PStY3XO1Ksjwn3wMKye5U6m6zxXpXrXZYqLy/IeCbh3nM9QB3Jgw/B0PUSLUWKdXg4U8qgEu300e3ZoBvZLsDg==", + "version": "2.2.7", + "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-2.2.7.tgz", + "integrity": "sha512-iSDBjxuH9TgrtMYAr7j5evjvkvgwLY3y+9D547uep+JNkZ1ZT+BaeU20j6I/bO/i26ilCWFImrlXTPsfQtZdIQ==", "dependencies": { - "@smithy/protocol-http": "^3.0.9", - "@smithy/querystring-builder": "^2.0.13", - "@smithy/types": "^2.5.0", + "@smithy/protocol-http": "^3.0.10", + "@smithy/querystring-builder": "^2.0.14", + "@smithy/types": "^2.6.0", "@smithy/util-base64": "^2.0.1", "tslib": "^2.5.0" } }, "node_modules/@smithy/hash-blob-browser": { - "version": "2.0.14", - "resolved": "https://registry.npmjs.org/@smithy/hash-blob-browser/-/hash-blob-browser-2.0.14.tgz", - "integrity": "sha512-yWdghyPJIEqLYsaE7YVgd3YhM7jN4Pv6eJQvTomnMsz5K2qRBlpjUx3T9fKlElp1qdeQ7DNc3sAat4i9CUBO7Q==", + "version": "2.0.15", + "resolved": "https://registry.npmjs.org/@smithy/hash-blob-browser/-/hash-blob-browser-2.0.15.tgz", + "integrity": "sha512-HX/7GIyPUT/HDWVYe2HYQu0iRnSYpF4uZVNhAhZsObPRawk5Mv0PbyluBgIFI2DDCCKgL/tloCYYwycff1GtQg==", "dependencies": { "@smithy/chunked-blob-reader": "^2.0.0", "@smithy/chunked-blob-reader-native": "^2.0.1", - "@smithy/types": "^2.5.0", + "@smithy/types": "^2.6.0", "tslib": "^2.5.0" } }, "node_modules/@smithy/hash-node": { - "version": "2.0.15", - "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-2.0.15.tgz", - "integrity": "sha512-t/qjEJZu/G46A22PAk1k/IiJZT4ncRkG5GOCNWN9HPPy5rCcSZUbh7gwp7CGKgJJ7ATMMg+0Td7i9o1lQTwOfQ==", + "version": "2.0.16", + "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-2.0.16.tgz", + "integrity": "sha512-Wbi9A0PacMYUOwjAulQP90Wl3mQ6NDwnyrZQzFjDz+UzjXOSyQMgBrTkUBz+pVoYVlX3DUu24gWMZBcit+wOGg==", "dependencies": { - "@smithy/types": "^2.5.0", + "@smithy/types": "^2.6.0", "@smithy/util-buffer-from": "^2.0.0", "@smithy/util-utf8": "^2.0.2", "tslib": "^2.5.0" @@ -7957,11 +8014,11 @@ } }, "node_modules/@smithy/hash-stream-node": { - "version": "2.0.15", - "resolved": "https://registry.npmjs.org/@smithy/hash-stream-node/-/hash-stream-node-2.0.15.tgz", - "integrity": "sha512-ZZ6kC/pHt5Dc2goXIIyC8uA7A4GUMSzdCynAabnZ3CSSaV6ctP8mlvVkqjPph0O3XzHlx/80gdLrNqi1GDPUsA==", + "version": "2.0.16", + "resolved": "https://registry.npmjs.org/@smithy/hash-stream-node/-/hash-stream-node-2.0.16.tgz", + "integrity": "sha512-4x24GFdeWos1Z49MC5sYdM1j+z32zcUr6oWM9Ggm3WudFAcRIcbG9uDQ1XgJ0Kl+ZTjpqLKniG0iuWvQb2Ud1A==", "dependencies": { - "@smithy/types": "^2.5.0", + "@smithy/types": "^2.6.0", "@smithy/util-utf8": "^2.0.2", "tslib": "^2.5.0" }, @@ -7970,11 +8027,11 @@ } }, "node_modules/@smithy/invalid-dependency": { - "version": "2.0.13", - "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-2.0.13.tgz", - "integrity": "sha512-XsGYhVhvEikX1Yz0kyIoLssJf2Rs6E0U2w2YuKdT4jSra5A/g8V2oLROC1s56NldbgnpesTYB2z55KCHHbKyjw==", + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-2.0.14.tgz", + "integrity": "sha512-d8ohpwZo9RzTpGlAfsWtfm1SHBSU7+N4iuZ6MzR10xDTujJJWtmXYHK1uzcr7rggbpUTaWyHpPFgnf91q0EFqQ==", "dependencies": { - "@smithy/types": "^2.5.0", + "@smithy/types": "^2.6.0", "tslib": "^2.5.0" } }, @@ -7990,22 +8047,22 @@ } }, "node_modules/@smithy/md5-js": { - "version": "2.0.15", - "resolved": "https://registry.npmjs.org/@smithy/md5-js/-/md5-js-2.0.15.tgz", - "integrity": "sha512-pAZaokib56XvhU0t/R9vAcr3L3bMhIakhF25X7EMSQ7LAURiLfce/tgON8I3x/dIbnZUyeRi8f2cx2azu6ATew==", + "version": "2.0.16", + "resolved": "https://registry.npmjs.org/@smithy/md5-js/-/md5-js-2.0.16.tgz", + "integrity": "sha512-YhWt9aKl+EMSNXyUTUo7I01WHf3HcCkPu/Hl2QmTNwrHT49eWaY7hptAMaERZuHFH0V5xHgPKgKZo2I93DFtgQ==", "dependencies": { - "@smithy/types": "^2.5.0", + "@smithy/types": "^2.6.0", "@smithy/util-utf8": "^2.0.2", "tslib": "^2.5.0" } }, "node_modules/@smithy/middleware-content-length": { - "version": "2.0.15", - "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-2.0.15.tgz", - "integrity": "sha512-xH4kRBw01gJgWiU+/mNTrnyFXeozpZHw39gLb3JKGsFDVmSrJZ8/tRqu27tU/ki1gKkxr2wApu+dEYjI3QwV1Q==", + "version": "2.0.16", + "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-2.0.16.tgz", + "integrity": "sha512-9ddDia3pp1d3XzLXKcm7QebGxLq9iwKf+J1LapvlSOhpF8EM9SjMeSrMOOFgG+2TfW5K3+qz4IAJYYm7INYCng==", "dependencies": { - "@smithy/protocol-http": "^3.0.9", - "@smithy/types": "^2.5.0", + "@smithy/protocol-http": "^3.0.10", + "@smithy/types": "^2.6.0", "tslib": "^2.5.0" }, "engines": { @@ -8013,16 +8070,16 @@ } }, "node_modules/@smithy/middleware-endpoint": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-2.2.0.tgz", - "integrity": "sha512-tddRmaig5URk2106PVMiNX6mc5BnKIKajHHDxb7K0J5MLdcuQluHMGnjkv18iY9s9O0tF+gAcPd/pDXA5L9DZw==", - "dependencies": { - "@smithy/middleware-serde": "^2.0.13", - "@smithy/node-config-provider": "^2.1.5", - "@smithy/shared-ini-file-loader": "^2.2.4", - "@smithy/types": "^2.5.0", - "@smithy/url-parser": "^2.0.13", - "@smithy/util-middleware": "^2.0.6", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-2.2.1.tgz", + "integrity": "sha512-dVDS7HNJl/wb0lpByXor6whqDbb1YlLoaoWYoelyYzLHioXOE7y/0iDwJWtDcN36/tVCw9EPBFZ3aans84jLpg==", + "dependencies": { + "@smithy/middleware-serde": "^2.0.14", + "@smithy/node-config-provider": "^2.1.6", + "@smithy/shared-ini-file-loader": "^2.2.5", + "@smithy/types": "^2.6.0", + "@smithy/url-parser": "^2.0.14", + "@smithy/util-middleware": "^2.0.7", "tslib": "^2.5.0" }, "engines": { @@ -8030,16 +8087,16 @@ } }, "node_modules/@smithy/middleware-retry": { - "version": "2.0.20", - "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-2.0.20.tgz", - "integrity": "sha512-X2yrF/SHDk2WDd8LflRNS955rlzQ9daz9UWSp15wW8KtzoTXg3bhHM78HbK1cjr48/FWERSJKh9AvRUUGlIawg==", - "dependencies": { - "@smithy/node-config-provider": "^2.1.5", - "@smithy/protocol-http": "^3.0.9", - "@smithy/service-error-classification": "^2.0.6", - "@smithy/types": "^2.5.0", - "@smithy/util-middleware": "^2.0.6", - "@smithy/util-retry": "^2.0.6", + "version": "2.0.21", + "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-2.0.21.tgz", + "integrity": "sha512-EZS1EXv1k6IJX6hyu/0yNQuPcPaXwG8SWljQHYueyRbOxmqYgoWMWPtfZj0xRRQ4YtLawQSpBgAeiJltq8/MPw==", + "dependencies": { + "@smithy/node-config-provider": "^2.1.6", + "@smithy/protocol-http": "^3.0.10", + "@smithy/service-error-classification": "^2.0.7", + "@smithy/types": "^2.6.0", + "@smithy/util-middleware": "^2.0.7", + "@smithy/util-retry": "^2.0.7", "tslib": "^2.5.0", "uuid": "^8.3.2" }, @@ -8047,12 +8104,20 @@ "node": ">=14.0.0" } }, + "node_modules/@smithy/middleware-retry/node_modules/uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "bin": { + "uuid": "dist/bin/uuid" + } + }, "node_modules/@smithy/middleware-serde": { - "version": "2.0.13", - "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-2.0.13.tgz", - "integrity": "sha512-tBGbeXw+XsE6pPr4UaXOh+UIcXARZeiA8bKJWxk2IjJcD1icVLhBSUQH9myCIZLNNzJIH36SDjUX8Wqk4xJCJg==", + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-2.0.14.tgz", + "integrity": "sha512-hFi3FqoYWDntCYA2IGY6gJ6FKjq2gye+1tfxF2HnIJB5uW8y2DhpRNBSUMoqP+qvYzRqZ6ntv4kgbG+o3pX57g==", "dependencies": { - "@smithy/types": "^2.5.0", + "@smithy/types": "^2.6.0", "tslib": "^2.5.0" }, "engines": { @@ -8060,11 +8125,11 @@ } }, "node_modules/@smithy/middleware-stack": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-2.0.7.tgz", - "integrity": "sha512-L1KLAAWkXbGx1t2jjCI/mDJ2dDNq+rp4/ifr/HcC6FHngxho5O7A5bQLpKHGlkfATH6fUnOEx0VICEVFA4sUzw==", + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-2.0.8.tgz", + "integrity": "sha512-7/N59j0zWqVEKExJcA14MrLDZ/IeN+d6nbkN8ucs+eURyaDUXWYlZrQmMOd/TyptcQv0+RDlgag/zSTTV62y/Q==", "dependencies": { - "@smithy/types": "^2.5.0", + "@smithy/types": "^2.6.0", "tslib": "^2.5.0" }, "engines": { @@ -8072,13 +8137,13 @@ } }, "node_modules/@smithy/node-config-provider": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-2.1.5.tgz", - "integrity": "sha512-3Omb5/h4tOCuKRx4p4pkYTvEYRCYoKk52bOYbKUyz/G/8gERbagsN8jFm4FjQubkrcIqQEghTpQaUw6uk+0edw==", + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-2.1.6.tgz", + "integrity": "sha512-HLqTs6O78m3M3z1cPLFxddxhEPv5MkVatfPuxoVO3A+cHZanNd/H5I6btcdHy6N2CB1MJ/lihJC92h30SESsBA==", "dependencies": { - "@smithy/property-provider": "^2.0.14", - "@smithy/shared-ini-file-loader": "^2.2.4", - "@smithy/types": "^2.5.0", + "@smithy/property-provider": "^2.0.15", + "@smithy/shared-ini-file-loader": "^2.2.5", + "@smithy/types": "^2.6.0", "tslib": "^2.5.0" }, "engines": { @@ -8086,14 +8151,14 @@ } }, "node_modules/@smithy/node-http-handler": { - "version": "2.1.9", - "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-2.1.9.tgz", - "integrity": "sha512-+K0q3SlNcocmo9OZj+fz67gY4lwhOCvIJxVbo/xH+hfWObvaxrMTx7JEzzXcluK0thnnLz++K3Qe7Z/8MDUreA==", + "version": "2.1.10", + "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-2.1.10.tgz", + "integrity": "sha512-lkALAwtN6odygIM4nB8aHDahINM6WXXjNrZmWQAh0RSossySRT2qa31cFv0ZBuAYVWeprskRk13AFvvLmf1WLw==", "dependencies": { - "@smithy/abort-controller": "^2.0.13", - "@smithy/protocol-http": "^3.0.9", - "@smithy/querystring-builder": "^2.0.13", - "@smithy/types": "^2.5.0", + "@smithy/abort-controller": "^2.0.14", + "@smithy/protocol-http": "^3.0.10", + "@smithy/querystring-builder": "^2.0.14", + "@smithy/types": "^2.6.0", "tslib": "^2.5.0" }, "engines": { @@ -8101,11 +8166,11 @@ } }, "node_modules/@smithy/property-provider": { - "version": "2.0.14", - "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-2.0.14.tgz", - "integrity": "sha512-k3D2qp9o6imTrLaXRj6GdLYEJr1sXqS99nLhzq8fYmJjSVOeMg/G+1KVAAc7Oxpu71rlZ2f8SSZxcSxkevuR0A==", + "version": "2.0.15", + "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-2.0.15.tgz", + "integrity": "sha512-YbRFBn8oiiC3o1Kn3a4KjGa6k47rCM9++5W9cWqYn9WnkyH+hBWgfJAckuxpyA2Hq6Ys4eFrWzXq6fqHEw7iew==", "dependencies": { - "@smithy/types": "^2.5.0", + "@smithy/types": "^2.6.0", "tslib": "^2.5.0" }, "engines": { @@ -8113,11 +8178,11 @@ } }, "node_modules/@smithy/protocol-http": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-3.0.9.tgz", - "integrity": "sha512-U1wl+FhYu4/BC+rjwh1lg2gcJChQhytiNQSggREgQ9G2FzmoK9sACBZvx7thyWMvRyHQTE22mO2d5UM8gMKDBg==", + "version": "3.0.10", + "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-3.0.10.tgz", + "integrity": "sha512-6+tjNk7rXW7YTeGo9qwxXj/2BFpJTe37kTj3EnZCoX/nH+NP/WLA7O83fz8XhkGqsaAhLUPo/bB12vvd47nsmg==", "dependencies": { - "@smithy/types": "^2.5.0", + "@smithy/types": "^2.6.0", "tslib": "^2.5.0" }, "engines": { @@ -8125,11 +8190,11 @@ } }, "node_modules/@smithy/querystring-builder": { - "version": "2.0.13", - "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-2.0.13.tgz", - "integrity": "sha512-JhXKwp3JtsFUe96XLHy/nUPEbaXqn6r7xE4sNaH8bxEyytE5q1fwt0ew/Ke6+vIC7gP87HCHgQpJHg1X1jN2Fw==", + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-2.0.14.tgz", + "integrity": "sha512-lQ4pm9vTv9nIhl5jt6uVMPludr6syE2FyJmHsIJJuOD7QPIJnrf9HhUGf1iHh9KJ4CUv21tpOU3X6s0rB6uJ0g==", "dependencies": { - "@smithy/types": "^2.5.0", + "@smithy/types": "^2.6.0", "@smithy/util-uri-escape": "^2.0.0", "tslib": "^2.5.0" }, @@ -8138,11 +8203,11 @@ } }, "node_modules/@smithy/querystring-parser": { - "version": "2.0.13", - "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-2.0.13.tgz", - "integrity": "sha512-TEiT6o8CPZVxJ44Rly/rrsATTQsE+b/nyBVzsYn2sa75xAaZcurNxsFd8z1haoUysONiyex24JMHoJY6iCfLdA==", + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-2.0.14.tgz", + "integrity": "sha512-+cbtXWI9tNtQjlgQg3CA+pvL3zKTAxPnG3Pj6MP89CR3vi3QMmD0SOWoq84tqZDnJCxlsusbgIXk1ngMReXo+A==", "dependencies": { - "@smithy/types": "^2.5.0", + "@smithy/types": "^2.6.0", "tslib": "^2.5.0" }, "engines": { @@ -8150,22 +8215,22 @@ } }, "node_modules/@smithy/service-error-classification": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-2.0.6.tgz", - "integrity": "sha512-fCQ36frtYra2fqY2/DV8+3/z2d0VB/1D1hXbjRcM5wkxTToxq6xHbIY/NGGY6v4carskMyG8FHACxgxturJ9Pg==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-2.0.7.tgz", + "integrity": "sha512-LLxgW12qGz8doYto15kZ4x1rHjtXl0BnCG6T6Wb8z2DI4PT9cJfOSvzbuLzy7+5I24PAepKgFeWHRd9GYy3Z9w==", "dependencies": { - "@smithy/types": "^2.5.0" + "@smithy/types": "^2.6.0" }, "engines": { "node": ">=14.0.0" } }, "node_modules/@smithy/shared-ini-file-loader": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-2.2.4.tgz", - "integrity": "sha512-9dRknGgvYlRIsoTcmMJXuoR/3ekhGwhRq4un3ns2/byre4Ql5hyUN4iS0x8eITohjU90YOnUCsbRwZRvCkbRfw==", + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-2.2.5.tgz", + "integrity": "sha512-LHA68Iu7SmNwfAVe8egmjDCy648/7iJR/fK1UnVw+iAOUJoEYhX2DLgVd5pWllqdDiRbQQzgaHLcRokM+UFR1w==", "dependencies": { - "@smithy/types": "^2.5.0", + "@smithy/types": "^2.6.0", "tslib": "^2.5.0" }, "engines": { @@ -8173,15 +8238,15 @@ } }, "node_modules/@smithy/signature-v4": { - "version": "2.0.15", - "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-2.0.15.tgz", - "integrity": "sha512-SRTEJSEhQYVlBKIIdZ9SZpqW+KFqxqcNnEcBX+8xkDdWx+DItme9VcCDkdN32yTIrICC+irUufnUdV7mmHPjoA==", + "version": "2.0.16", + "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-2.0.16.tgz", + "integrity": "sha512-ilLY85xS2kZZzTb83diQKYLIYALvart0KnBaKnIRnMBHAGEio5aHSlANQoxVn0VsonwmQ3CnWhnCT0sERD8uTg==", "dependencies": { - "@smithy/eventstream-codec": "^2.0.13", + "@smithy/eventstream-codec": "^2.0.14", "@smithy/is-array-buffer": "^2.0.0", - "@smithy/types": "^2.5.0", + "@smithy/types": "^2.6.0", "@smithy/util-hex-encoding": "^2.0.0", - "@smithy/util-middleware": "^2.0.6", + "@smithy/util-middleware": "^2.0.7", "@smithy/util-uri-escape": "^2.0.0", "@smithy/util-utf8": "^2.0.2", "tslib": "^2.5.0" @@ -8191,13 +8256,13 @@ } }, "node_modules/@smithy/smithy-client": { - "version": "2.1.15", - "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-2.1.15.tgz", - "integrity": "sha512-rngZcQu7Jvs9UbHihK1EI67RMPuzkc3CJmu4MBgB7D7yBnMGuFR86tq5rqHfL2gAkNnMelBN/8kzQVvZjNKefQ==", + "version": "2.1.16", + "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-2.1.16.tgz", + "integrity": "sha512-Lw67+yQSpLl4YkDLUzI2KgS8TXclXmbzSeOJUmRFS4ueT56B4pw3RZRF/SRzvgyxM/HxgkUan8oSHXCujPDafQ==", "dependencies": { - "@smithy/middleware-stack": "^2.0.7", - "@smithy/types": "^2.5.0", - "@smithy/util-stream": "^2.0.20", + "@smithy/middleware-stack": "^2.0.8", + "@smithy/types": "^2.6.0", + "@smithy/util-stream": "^2.0.21", "tslib": "^2.5.0" }, "engines": { @@ -8205,9 +8270,9 @@ } }, "node_modules/@smithy/types": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/@smithy/types/-/types-2.5.0.tgz", - "integrity": "sha512-/a31lYofrMBkJb3BuPlYJTMKDj0hUmKUP6JFZQu6YVuQVoAjubiY0A52U9S0Uysd33n/djexCUSNJ+G9bf3/aA==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@smithy/types/-/types-2.6.0.tgz", + "integrity": "sha512-PgqxJq2IcdMF9iAasxcqZqqoOXBHufEfmbEUdN1pmJrJltT42b0Sc8UiYSWWzKkciIp9/mZDpzYi4qYG1qqg6g==", "dependencies": { "tslib": "^2.5.0" }, @@ -8216,12 +8281,12 @@ } }, "node_modules/@smithy/url-parser": { - "version": "2.0.13", - "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-2.0.13.tgz", - "integrity": "sha512-okWx2P/d9jcTsZWTVNnRMpFOE7fMkzloSFyM53fA7nLKJQObxM2T4JlZ5KitKKuXq7pxon9J6SF2kCwtdflIrA==", + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-2.0.14.tgz", + "integrity": "sha512-kbu17Y1AFXi5lNlySdDj7ZzmvupyWKCX/0jNZ8ffquRyGdbDZb+eBh0QnWqsSmnZa/ctyWaTf7n4l/pXLExrnw==", "dependencies": { - "@smithy/querystring-parser": "^2.0.13", - "@smithy/types": "^2.5.0", + "@smithy/querystring-parser": "^2.0.14", + "@smithy/types": "^2.6.0", "tslib": "^2.5.0" } }, @@ -8280,13 +8345,13 @@ } }, "node_modules/@smithy/util-defaults-mode-browser": { - "version": "2.0.19", - "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.0.19.tgz", - "integrity": "sha512-VHP8xdFR7/orpiABJwgoTB0t8Zhhwpf93gXhNfUBiwAE9O0rvsv7LwpQYjgvbOUDDO8JfIYQB2GYJNkqqGWsXw==", + "version": "2.0.20", + "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.0.20.tgz", + "integrity": "sha512-QJtnbTIl0/BbEASkx1MUFf6EaoWqWW1/IM90N++8NNscePvPf77GheYfpoPis6CBQawUWq8QepTP2QUSAdrVkw==", "dependencies": { - "@smithy/property-provider": "^2.0.14", - "@smithy/smithy-client": "^2.1.15", - "@smithy/types": "^2.5.0", + "@smithy/property-provider": "^2.0.15", + "@smithy/smithy-client": "^2.1.16", + "@smithy/types": "^2.6.0", "bowser": "^2.11.0", "tslib": "^2.5.0" }, @@ -8295,16 +8360,16 @@ } }, "node_modules/@smithy/util-defaults-mode-node": { - "version": "2.0.25", - "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.0.25.tgz", - "integrity": "sha512-jkmep6/JyWmn2ADw9VULDeGbugR4N/FJCKOt+gYyVswmN1BJOfzF2umaYxQ1HhQDvna3kzm1Dbo1qIfBW4iuHA==", - "dependencies": { - "@smithy/config-resolver": "^2.0.18", - "@smithy/credential-provider-imds": "^2.1.1", - "@smithy/node-config-provider": "^2.1.5", - "@smithy/property-provider": "^2.0.14", - "@smithy/smithy-client": "^2.1.15", - "@smithy/types": "^2.5.0", + "version": "2.0.26", + "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.0.26.tgz", + "integrity": "sha512-lGFPOFCHv1ql019oegYqa54BZH7HREw6EBqjDLbAr0wquMX0BDi2sg8TJ6Eq+JGLijkZbJB73m4+aK8OFAapMg==", + "dependencies": { + "@smithy/config-resolver": "^2.0.19", + "@smithy/credential-provider-imds": "^2.1.2", + "@smithy/node-config-provider": "^2.1.6", + "@smithy/property-provider": "^2.0.15", + "@smithy/smithy-client": "^2.1.16", + "@smithy/types": "^2.6.0", "tslib": "^2.5.0" }, "engines": { @@ -8312,12 +8377,12 @@ } }, "node_modules/@smithy/util-endpoints": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-1.0.4.tgz", - "integrity": "sha512-FPry8j1xye5yzrdnf4xKUXVnkQErxdN7bUIaqC0OFoGsv2NfD9b2UUMuZSSt+pr9a8XWAqj0HoyVNUfPiZ/PvQ==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-1.0.5.tgz", + "integrity": "sha512-K7qNuCOD5K/90MjHvHm9kJldrfm40UxWYQxNEShMFxV/lCCCRIg8R4uu1PFAxRvPxNpIdcrh1uK6I1ISjDXZJw==", "dependencies": { - "@smithy/node-config-provider": "^2.1.5", - "@smithy/types": "^2.5.0", + "@smithy/node-config-provider": "^2.1.6", + "@smithy/types": "^2.6.0", "tslib": "^2.5.0" }, "engines": { @@ -8336,11 +8401,11 @@ } }, "node_modules/@smithy/util-middleware": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-2.0.6.tgz", - "integrity": "sha512-7W4uuwBvSLgKoLC1x4LfeArCVcbuHdtVaC4g30kKsD1erfICyQ45+tFhhs/dZNeQg+w392fhunCm/+oCcb6BSA==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-2.0.7.tgz", + "integrity": "sha512-tRINOTlf1G9B0ECarFQAtTgMhpnrMPSa+5j4ZEwEawCLfTFTavk6757sxhE4RY5RMlD/I3x+DCS8ZUiR8ho9Pw==", "dependencies": { - "@smithy/types": "^2.5.0", + "@smithy/types": "^2.6.0", "tslib": "^2.5.0" }, "engines": { @@ -8348,26 +8413,26 @@ } }, "node_modules/@smithy/util-retry": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-2.0.6.tgz", - "integrity": "sha512-PSO41FofOBmyhPQJwBQJ6mVlaD7Sp9Uff9aBbnfBJ9eqXOE/obrqQjn0PNdkfdvViiPXl49BINfnGcFtSP4kYw==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-2.0.7.tgz", + "integrity": "sha512-fIe5yARaF0+xVT1XKcrdnHKTJ1Vc4+3e3tLDjCuIcE9b6fkBzzGFY7AFiX4M+vj6yM98DrwkuZeHf7/hmtVp0Q==", "dependencies": { - "@smithy/service-error-classification": "^2.0.6", - "@smithy/types": "^2.5.0", + "@smithy/service-error-classification": "^2.0.7", + "@smithy/types": "^2.6.0", "tslib": "^2.5.0" }, "engines": { "node": ">= 14.0.0" } }, - "node_modules/@smithy/util-stream": { - "version": "2.0.20", - "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-2.0.20.tgz", - "integrity": "sha512-tT8VASuD8jJu0yjHEMTCPt1o5E3FVzgdsxK6FQLAjXKqVv5V8InCnc0EOsYrijgspbfDqdAJg7r0o2sySfcHVg==", - "dependencies": { - "@smithy/fetch-http-handler": "^2.2.6", - "@smithy/node-http-handler": "^2.1.9", - "@smithy/types": "^2.5.0", + "node_modules/@smithy/util-stream": { + "version": "2.0.21", + "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-2.0.21.tgz", + "integrity": "sha512-0BUE16d7n1x7pi1YluXJdB33jOTyBChT0j/BlOkFa9uxfg6YqXieHxjHNuCdJRARa7AZEj32LLLEPJ1fSa4inA==", + "dependencies": { + "@smithy/fetch-http-handler": "^2.2.7", + "@smithy/node-http-handler": "^2.1.10", + "@smithy/types": "^2.6.0", "@smithy/util-base64": "^2.0.1", "@smithy/util-buffer-from": "^2.0.0", "@smithy/util-hex-encoding": "^2.0.0", @@ -8522,12 +8587,12 @@ } }, "node_modules/@smithy/util-waiter": { - "version": "2.0.13", - "resolved": "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-2.0.13.tgz", - "integrity": "sha512-YovIQatiuM7giEsRFotqJa2i3EbU2EE3PgtpXgtLgpx5rXiZMAwPxXYDFVFhuO0lbqvc/Zx4n+ZIisXOHPSqyg==", + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-2.0.14.tgz", + "integrity": "sha512-Q6gSz4GUNjNGhrfNg+2Mjy+7K4pEI3r82x1b/+3dSc03MQqobMiUrRVN/YK/4nHVagvBELCoXsiHAFQJNQ5BeA==", "dependencies": { - "@smithy/abort-controller": "^2.0.13", - "@smithy/types": "^2.5.0", + "@smithy/abort-controller": "^2.0.14", + "@smithy/types": "^2.6.0", "tslib": "^2.5.0" }, "engines": { @@ -8541,9 +8606,9 @@ "dev": true }, "node_modules/@types/aws-lambda": { - "version": "8.10.126", - "resolved": "https://registry.npmjs.org/@types/aws-lambda/-/aws-lambda-8.10.126.tgz", - "integrity": "sha512-5eh4ffLdGYgGYI1Xr6W5L4IVse4RR7L2ns5OVUXA52nW5GFapIcGMcCzHAIMMOdpcQs3aGVxbvFlJNZH6IpgEQ==", + "version": "8.10.129", + "resolved": "https://registry.npmjs.org/@types/aws-lambda/-/aws-lambda-8.10.129.tgz", + "integrity": "sha512-0Rl7CpTPVws5cp0Ui1gZh4Q+TXC65bXVwTOGoI2RKW45dxWzyZGbjIX0uFjFYdIJ8vnD45y584rIIqvD2vBBfQ==", "dev": true }, "node_modules/@types/debounce-promise": { @@ -8618,9 +8683,9 @@ } }, "node_modules/@types/node": { - "version": "18.18.11", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.18.11.tgz", - "integrity": "sha512-c1vku6qnTeujJneYH94/4aq73XrVcsJe35UPyAsSok1ijiKrkRzK+AxQPSpNMUnC03roWBBwJx/9I8V7lQoxmA==", + "version": "18.18.13", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.18.13.tgz", + "integrity": "sha512-vXYZGRrSCreZmq1rEjMRLXJhiy8MrIeVasx+PCVlP414N7CJLHnMf+juVvjdprHyH+XRy3zKZLHeNueOpJCn0g==", "dependencies": { "undici-types": "~5.26.4" } @@ -9335,9 +9400,9 @@ } }, "node_modules/@whatwg-node/node-fetch": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/@whatwg-node/node-fetch/-/node-fetch-0.5.0.tgz", - "integrity": "sha512-q76lDAafvHNGWedNAVHrz/EyYTS8qwRLcwne8SJQdRN5P3HydxU6XROFvJfTML6KZXQX2FDdGY4/SnaNyd7M0Q==", + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/@whatwg-node/node-fetch/-/node-fetch-0.5.1.tgz", + "integrity": "sha512-sQz/s3NyyzIZxQ7PHxDFUMM1k4kQQbi2jU8ILdTbt5+S59ME8aI7XF30O9qohRIIYdSrUvm/OwKQmVP1y6e2WQ==", "dependencies": { "@whatwg-node/events": "^0.1.0", "busboy": "^1.6.0", @@ -9731,9 +9796,9 @@ } }, "node_modules/aws-cdk": { - "version": "2.110.1", - "resolved": "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.110.1.tgz", - "integrity": "sha512-/V0FOgsvD/FkFANrYnSmyb+XK56tm2oE86pUCoEggQ2tka6Zm0z9blKZQV4euMErNSkWz4ReSAKenaqk86Fr5Q==", + "version": "2.111.0", + "resolved": "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.111.0.tgz", + "integrity": "sha512-2f9DCfgzSF19mb2fPFUuYaHFaUXNeN5T1Nab/4gye6rVa+pmAvBGeTXKQR4Xmckz7rGLZCB0Ym5V3P1SIWXncw==", "peer": true, "bin": { "cdk": "bin/cdk" @@ -10085,20 +10150,6 @@ "node": ">= 6" } }, - "node_modules/aws-cdk/node_modules/fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], - "peer": true, - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, "node_modules/aws-lambda": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/aws-lambda/-/aws-lambda-1.0.7.tgz", @@ -10121,9 +10172,9 @@ "dev": true }, "node_modules/aws-sdk": { - "version": "2.1500.0", - "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1500.0.tgz", - "integrity": "sha512-e6ISdnxgHbq+QWYYILdSMfTuTJgLSR9PLKEz4RCxaybKIe05z75jYgc2WSPt9++3rQPSdqSc4wYSlwuE0m7jjA==", + "version": "2.1506.0", + "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1506.0.tgz", + "integrity": "sha512-jSBbofvPa7HJykyM7Xph9psMcWPl6UgdiKjG2E7fHJb6psW+BZN9ZvSGOBvRIlT8Y6+JGzI0qkouS1OLK9slhg==", "dev": true, "dependencies": { "buffer": "4.9.2", @@ -10810,9 +10861,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001563", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001563.tgz", - "integrity": "sha512-na2WUmOxnwIZtwnFI2CZ/3er0wdNzU7hN+cPYz/z2ajHThnkWjNBOpEPP4n+4r2WPM847JaMotaJE3bnfzjyKw==", + "version": "1.0.30001565", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001565.tgz", + "integrity": "sha512-xrE//a3O7TP0vaJ8ikzkD2c2NgcVUvsEe2IvFTntV4Yd1Z9FVzh+gW+enX96L0psrbaFMcVcH2l90xNuGDWc8w==", "funding": [ { "type": "opencollective", @@ -10948,9 +10999,9 @@ } }, "node_modules/cli-spinners": { - "version": "2.9.1", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.1.tgz", - "integrity": "sha512-jHgecW0pxkonBJdrKsqxgRX9AcG+u/5k0Q7WPDfi8AogLAdwxEkyYYNWwZ5GvVFoFx2uiY1eNcSK00fh+1+FyQ==", + "version": "2.9.2", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz", + "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==", "engines": { "node": ">=6" }, @@ -11576,14 +11627,11 @@ } }, "node_modules/define-lazy-prop": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz", - "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", + "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==", "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=8" } }, "node_modules/define-properties": { @@ -11774,9 +11822,9 @@ "dev": true }, "node_modules/electron-to-chromium": { - "version": "1.4.589", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.589.tgz", - "integrity": "sha512-zF6y5v/YfoFIgwf2dDfAqVlPPsyQeWNpEWXbAlDUS8Ax4Z2VoiiZpAPC0Jm9hXEkJm2vIZpwB6rc4KnLTQffbQ==" + "version": "1.4.596", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.596.tgz", + "integrity": "sha512-zW3zbZ40Icb2BCWjm47nxwcFGYlIgdXkAx85XDO7cyky9J4QQfq8t0W19/TLZqq3JPQXtlv8BPIGmfa9Jb4scg==" }, "node_modules/emoji-regex": { "version": "9.2.2", @@ -13509,9 +13557,9 @@ } }, "node_modules/fs-extra": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz", - "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==", + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz", + "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==", "dev": true, "dependencies": { "graceful-fs": "^4.2.0", @@ -13528,14 +13576,15 @@ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" }, "node_modules/fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", "hasInstallScript": true, "optional": true, "os": [ "darwin" ], + "peer": true, "engines": { "node": "^8.16.0 || ^10.6.0 || >=11.0.0" } @@ -14397,14 +14446,14 @@ } }, "node_modules/is-docker": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz", - "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", + "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", "bin": { "is-docker": "cli.js" }, "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + "node": ">=8" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -14496,6 +14545,20 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/is-inside-container/node_modules/is-docker": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz", + "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==", + "bin": { + "is-docker": "cli.js" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/is-lower-case": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/is-lower-case/-/is-lower-case-2.0.2.tgz", @@ -14758,20 +14821,6 @@ "node": ">=8" } }, - "node_modules/is-wsl/node_modules/is-docker": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", - "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", - "bin": { - "is-docker": "cli.js" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/isarray": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", @@ -16181,17 +16230,16 @@ } }, "node_modules/open": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/open/-/open-9.1.0.tgz", - "integrity": "sha512-OS+QTnw1/4vrf+9hh1jc1jnYjzSG4ttTBB8UxOwAnInG3Uo4ssetzC1ihqaIHjLJnA5GGlRl6QlZXOTQhRBUvg==", + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz", + "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==", "dependencies": { - "default-browser": "^4.0.0", - "define-lazy-prop": "^3.0.0", - "is-inside-container": "^1.0.0", + "define-lazy-prop": "^2.0.0", + "is-docker": "^2.1.1", "is-wsl": "^2.2.0" }, "engines": { - "node": ">=14.16" + "node": ">=12" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -16434,9 +16482,9 @@ } }, "node_modules/path-scurry/node_modules/lru-cache": { - "version": "10.0.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.3.tgz", - "integrity": "sha512-B7gr+F6MkqB3uzINHXNctGieGsRTMwIBgxkp0yq/5BwcuDzD4A8wQpHQW6vDAm1uKSLQghmRdD9sKqf2vJ1cEg==", + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.1.0.tgz", + "integrity": "sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==", "engines": { "node": "14 || >=16.14" } @@ -18756,6 +18804,19 @@ "fsevents": "~2.3.3" } }, + "node_modules/tsx/node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, "node_modules/tty-table": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/tty-table/-/tty-table-4.2.3.tgz", @@ -19066,9 +19127,9 @@ } }, "node_modules/typedoc": { - "version": "0.25.3", - "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.25.3.tgz", - "integrity": "sha512-Ow8Bo7uY1Lwy7GTmphRIMEo6IOZ+yYUyrc8n5KXIZg1svpqhZSWgni2ZrDhe+wLosFS8yswowUzljTAV/3jmWw==", + "version": "0.25.4", + "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.25.4.tgz", + "integrity": "sha512-Du9ImmpBCw54bX275yJrxPVnjdIyJO/84co0/L9mwe0R3G4FSR6rQ09AlXVRvZEGMUg09+z/usc8mgygQ1aidA==", "dev": true, "dependencies": { "lunr": "^2.3.9", @@ -19083,7 +19144,7 @@ "node": ">= 16" }, "peerDependencies": { - "typescript": "4.6.x || 4.7.x || 4.8.x || 4.9.x || 5.0.x || 5.1.x || 5.2.x" + "typescript": "4.6.x || 4.7.x || 4.8.x || 4.9.x || 5.0.x || 5.1.x || 5.2.x || 5.3.x" } }, "node_modules/typedoc/node_modules/brace-expansion": { @@ -19318,17 +19379,21 @@ } }, "node_modules/uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", + "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], "bin": { "uuid": "dist/bin/uuid" } }, "node_modules/v8-to-istanbul": { - "version": "9.1.3", - "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.3.tgz", - "integrity": "sha512-9lDD+EVI2fjFsMWXc6dy5JJzBsVTcQ2fVkfBvncZ6xJWG9wtBhOldG+mHkSL0+V1K/xgZz0JDO5UT5hFwHUghg==", + "version": "9.2.0", + "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.2.0.tgz", + "integrity": "sha512-/EH/sDgxU2eGxajKdwLCDmQ4FWq+kpi3uCmBGpw1xJtnAxEjlD8j8PEiGWpCIMIs3ciNAgH0d3TTJiUkYzyZjA==", "dev": true, "dependencies": { "@jridgewell/trace-mapping": "^0.3.12", @@ -20219,7 +20284,8 @@ }, "packages/cli/node_modules/ansi-styles": { "version": "4.3.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dependencies": { "color-convert": "^2.0.1" }, @@ -20232,7 +20298,8 @@ }, "packages/cli/node_modules/cliui": { "version": "8.0.1", - "license": "ISC", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.1", @@ -20244,7 +20311,8 @@ }, "packages/cli/node_modules/color-convert": { "version": "2.0.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dependencies": { "color-name": "~1.1.4" }, @@ -20254,57 +20322,26 @@ }, "packages/cli/node_modules/color-name": { "version": "1.1.4", - "license": "MIT" - }, - "packages/cli/node_modules/define-lazy-prop": { - "version": "2.0.0", - "license": "MIT", - "engines": { - "node": ">=8" - } + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "packages/cli/node_modules/emoji-regex": { "version": "8.0.0", - "license": "MIT" - }, - "packages/cli/node_modules/is-docker": { - "version": "2.2.1", - "license": "MIT", - "bin": { - "is-docker": "cli.js" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" }, "packages/cli/node_modules/is-fullwidth-code-point": { "version": "3.0.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "engines": { "node": ">=8" } }, - "packages/cli/node_modules/open": { - "version": "8.4.2", - "license": "MIT", - "dependencies": { - "define-lazy-prop": "^2.0.0", - "is-docker": "^2.1.1", - "is-wsl": "^2.2.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "packages/cli/node_modules/string-width": { "version": "4.2.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -20316,7 +20353,8 @@ }, "packages/cli/node_modules/wrap-ansi": { "version": "7.0.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -20331,7 +20369,8 @@ }, "packages/cli/node_modules/yargs": { "version": "17.7.2", - "license": "MIT", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", "dependencies": { "cliui": "^8.0.1", "escalade": "^3.1.1", @@ -20347,7 +20386,8 @@ }, "packages/cli/node_modules/yargs-parser": { "version": "21.1.1", - "license": "ISC", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", "engines": { "node": ">=12" } @@ -20389,7 +20429,8 @@ }, "packages/create-amplify/node_modules/ansi-styles": { "version": "4.3.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dependencies": { "color-convert": "^2.0.1" }, @@ -20402,7 +20443,8 @@ }, "packages/create-amplify/node_modules/cliui": { "version": "8.0.1", - "license": "ISC", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.1", @@ -20414,7 +20456,8 @@ }, "packages/create-amplify/node_modules/color-convert": { "version": "2.0.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dependencies": { "color-name": "~1.1.4" }, @@ -20424,22 +20467,26 @@ }, "packages/create-amplify/node_modules/color-name": { "version": "1.1.4", - "license": "MIT" + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "packages/create-amplify/node_modules/emoji-regex": { "version": "8.0.0", - "license": "MIT" + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" }, "packages/create-amplify/node_modules/is-fullwidth-code-point": { "version": "3.0.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "engines": { "node": ">=8" } }, "packages/create-amplify/node_modules/string-width": { "version": "4.2.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -20451,7 +20498,8 @@ }, "packages/create-amplify/node_modules/wrap-ansi": { "version": "7.0.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -20466,7 +20514,8 @@ }, "packages/create-amplify/node_modules/yargs": { "version": "17.7.2", - "license": "MIT", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", "dependencies": { "cliui": "^8.0.1", "escalade": "^3.1.1", @@ -20482,7 +20531,8 @@ }, "packages/create-amplify/node_modules/yargs-parser": { "version": "21.1.1", - "license": "ISC", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", "engines": { "node": ">=12" } @@ -20553,8 +20603,9 @@ }, "packages/integration-tests/node_modules/execa": { "version": "8.0.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz", + "integrity": "sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==", "dev": true, - "license": "MIT", "dependencies": { "cross-spawn": "^7.0.3", "get-stream": "^8.0.1", @@ -20575,8 +20626,9 @@ }, "packages/integration-tests/node_modules/get-stream": { "version": "8.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz", + "integrity": "sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==", "dev": true, - "license": "MIT", "engines": { "node": ">=16" }, @@ -20586,16 +20638,18 @@ }, "packages/integration-tests/node_modules/human-signals": { "version": "5.0.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-5.0.0.tgz", + "integrity": "sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==", "dev": true, - "license": "Apache-2.0", "engines": { "node": ">=16.17.0" } }, "packages/integration-tests/node_modules/signal-exit": { "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", "dev": true, - "license": "ISC", "engines": { "node": ">=14" }, @@ -20641,7 +20695,8 @@ }, "packages/platform-core/node_modules/@aws-sdk/client-sso": { "version": "3.445.0", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.445.0.tgz", + "integrity": "sha512-me4LvqNnu6kxi+sW7t0AgMv1Yi64ikas0x2+5jv23o6Csg32w0S0xOjCTKQYahOA5CMFunWvlkFIfxbqs+Uo7w==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", @@ -20686,7 +20741,8 @@ }, "packages/platform-core/node_modules/@aws-sdk/client-sts": { "version": "3.445.0", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.445.0.tgz", + "integrity": "sha512-ogbdqrS8x9O5BTot826iLnTQ6i4/F5BSi/74gycneCxYmAnYnyUBNOWVnynv6XZiEWyDJQCU2UtMd52aNGW1GA==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", @@ -20747,7 +20803,8 @@ }, "packages/platform-core/node_modules/@aws-sdk/credential-provider-env": { "version": "3.433.0", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.433.0.tgz", + "integrity": "sha512-Vl7Qz5qYyxBurMn6hfSiNJeUHSqfVUlMt0C1Bds3tCkl3IzecRWwyBOlxtxO3VCrgVeW3HqswLzCvhAFzPH6nQ==", "dependencies": { "@aws-sdk/types": "3.433.0", "@smithy/property-provider": "^2.0.0", @@ -20760,7 +20817,8 @@ }, "packages/platform-core/node_modules/@aws-sdk/credential-provider-ini": { "version": "3.445.0", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.445.0.tgz", + "integrity": "sha512-R7IYSGjNZ5KKJwQJ2HNPemjpAMWvdce91i8w+/aHfqeGfTXrmYJu99PeGRyyBTKEumBaojyjTRvmO8HzS+/l7g==", "dependencies": { "@aws-sdk/credential-provider-env": "3.433.0", "@aws-sdk/credential-provider-process": "3.433.0", @@ -20779,7 +20837,8 @@ }, "packages/platform-core/node_modules/@aws-sdk/credential-provider-node": { "version": "3.445.0", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.445.0.tgz", + "integrity": "sha512-zI4k4foSjQRKNEsouculRcz7IbLfuqdFxypDLYwn+qPNMqJwWJ7VxOOeBSPUpHFcd7CLSfbHN2JAhQ7M02gPTA==", "dependencies": { "@aws-sdk/credential-provider-env": "3.433.0", "@aws-sdk/credential-provider-ini": "3.445.0", @@ -20799,7 +20858,8 @@ }, "packages/platform-core/node_modules/@aws-sdk/credential-provider-process": { "version": "3.433.0", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.433.0.tgz", + "integrity": "sha512-W7FcGlQjio9Y/PepcZGRyl5Bpwb0uWU7qIUCh+u4+q2mW4D5ZngXg8V/opL9/I/p4tUH9VXZLyLGwyBSkdhL+A==", "dependencies": { "@aws-sdk/types": "3.433.0", "@smithy/property-provider": "^2.0.0", @@ -20813,7 +20873,8 @@ }, "packages/platform-core/node_modules/@aws-sdk/credential-provider-sso": { "version": "3.445.0", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.445.0.tgz", + "integrity": "sha512-gJz7kAiDecdhtApgXnxfZsXKsww8BnifDF9MAx9Dr4X6no47qYsCCS3XPuEyRiF9VebXvHOH0H260Zp3bVyniQ==", "dependencies": { "@aws-sdk/client-sso": "3.445.0", "@aws-sdk/token-providers": "3.438.0", @@ -20829,7 +20890,8 @@ }, "packages/platform-core/node_modules/@aws-sdk/credential-provider-web-identity": { "version": "3.433.0", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.433.0.tgz", + "integrity": "sha512-RlwjP1I5wO+aPpwyCp23Mk8nmRbRL33hqRASy73c4JA2z2YiRua+ryt6MalIxehhwQU6xvXUKulJnPG9VaMFZg==", "dependencies": { "@aws-sdk/types": "3.433.0", "@smithy/property-provider": "^2.0.0", @@ -20842,7 +20904,8 @@ }, "packages/platform-core/node_modules/@aws-sdk/middleware-host-header": { "version": "3.433.0", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.433.0.tgz", + "integrity": "sha512-mBTq3UWv1UzeHG+OfUQ2MB/5GEkt5LTKFaUqzL7ESwzW8XtpBgXnjZvIwu3Vcd3sEetMwijwaGiJhY0ae/YyaA==", "dependencies": { "@aws-sdk/types": "3.433.0", "@smithy/protocol-http": "^3.0.8", @@ -20855,7 +20918,8 @@ }, "packages/platform-core/node_modules/@aws-sdk/middleware-logger": { "version": "3.433.0", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.433.0.tgz", + "integrity": "sha512-We346Fb5xGonTGVZC9Nvqtnqy74VJzYuTLLiuuftA5sbNzftBDy/22QCfvYSTOAl3bvif+dkDUzQY2ihc5PwOQ==", "dependencies": { "@aws-sdk/types": "3.433.0", "@smithy/types": "^2.4.0", @@ -20867,7 +20931,8 @@ }, "packages/platform-core/node_modules/@aws-sdk/middleware-recursion-detection": { "version": "3.433.0", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.433.0.tgz", + "integrity": "sha512-HEvYC9PQlWY/ccUYtLvAlwwf1iCif2TSAmLNr3YTBRVa98x6jKL0hlCrHWYklFeqOGSKy6XhE+NGJMUII0/HaQ==", "dependencies": { "@aws-sdk/types": "3.433.0", "@smithy/protocol-http": "^3.0.8", @@ -20880,7 +20945,8 @@ }, "packages/platform-core/node_modules/@aws-sdk/middleware-sdk-sts": { "version": "3.433.0", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.433.0.tgz", + "integrity": "sha512-ORYbJnBejUyonFl5FwIqhvI3Cq6sAp9j+JpkKZtFNma9tFPdrhmYgfCeNH32H/wGTQV/tUoQ3luh0gA4cuk6DA==", "dependencies": { "@aws-sdk/middleware-signing": "3.433.0", "@aws-sdk/types": "3.433.0", @@ -20893,7 +20959,8 @@ }, "packages/platform-core/node_modules/@aws-sdk/middleware-signing": { "version": "3.433.0", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.433.0.tgz", + "integrity": "sha512-jxPvt59NZo/epMNLNTu47ikmP8v0q217I6bQFGJG7JVFnfl36zDktMwGw+0xZR80qiK47/2BWrNpta61Zd2FxQ==", "dependencies": { "@aws-sdk/types": "3.433.0", "@smithy/property-provider": "^2.0.0", @@ -20909,7 +20976,8 @@ }, "packages/platform-core/node_modules/@aws-sdk/middleware-user-agent": { "version": "3.438.0", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.438.0.tgz", + "integrity": "sha512-a+xHT1wOxT6EA6YyLmrfaroKWOkwwyiktUfXKM0FsUutGzNi4fKhb5NZ2al58NsXzHgHFrasSDp+Lqbd/X2cEw==", "dependencies": { "@aws-sdk/types": "3.433.0", "@aws-sdk/util-endpoints": "3.438.0", @@ -20938,7 +21006,8 @@ }, "packages/platform-core/node_modules/@aws-sdk/token-providers": { "version": "3.438.0", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.438.0.tgz", + "integrity": "sha512-G2fUfTtU6/1ayYRMu0Pd9Ln4qYSvwJOWCqJMdkDgvXSwdgcOSOLsnAIk1AHGJDAvgLikdCzuyOsdJiexr9Vnww==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", @@ -20984,7 +21053,8 @@ }, "packages/platform-core/node_modules/@aws-sdk/types": { "version": "3.433.0", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.433.0.tgz", + "integrity": "sha512-0jEE2mSrNDd8VGFjTc1otYrwYPIkzZJEIK90ZxisKvQ/EURGBhNzWn7ejWB9XCMFT6XumYLBR0V9qq5UPisWtA==", "dependencies": { "@smithy/types": "^2.4.0", "tslib": "^2.5.0" @@ -20995,7 +21065,8 @@ }, "packages/platform-core/node_modules/@aws-sdk/util-endpoints": { "version": "3.438.0", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.438.0.tgz", + "integrity": "sha512-6VyPTq1kN3GWxwFt5DdZfOsr6cJZPLjWh0troY/0uUv3hK74C9o3Y0Xf/z8UAUvQFkVqZse12O0/BgPVMImvfA==", "dependencies": { "@aws-sdk/types": "3.433.0", "@smithy/util-endpoints": "^1.0.2", @@ -21007,7 +21078,8 @@ }, "packages/platform-core/node_modules/@aws-sdk/util-user-agent-browser": { "version": "3.433.0", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.433.0.tgz", + "integrity": "sha512-2Cf/Lwvxbt5RXvWFXrFr49vXv0IddiUwrZoAiwhDYxvsh+BMnh+NUFot+ZQaTrk/8IPZVDeLPWZRdVy00iaVXQ==", "dependencies": { "@aws-sdk/types": "3.433.0", "@smithy/types": "^2.4.0", @@ -21017,7 +21089,8 @@ }, "packages/platform-core/node_modules/@aws-sdk/util-user-agent-node": { "version": "3.437.0", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.437.0.tgz", + "integrity": "sha512-JVEcvWaniamtYVPem4UthtCNoTBCfFTwYj7Y3CrWZ2Qic4TqrwLkAfaBGtI2TGrhIClVr77uzLI6exqMTN7orA==", "dependencies": { "@aws-sdk/types": "3.433.0", "@smithy/node-config-provider": "^2.1.3", @@ -21036,17 +21109,6 @@ } } }, - "packages/platform-core/node_modules/uuid": { - "version": "9.0.1", - "funding": [ - "https://github.com/sponsors/broofa", - "https://github.com/sponsors/ctavan" - ], - "license": "MIT", - "bin": { - "uuid": "dist/bin/uuid" - } - }, "packages/plugin-types": { "name": "@aws-amplify/plugin-types", "version": "0.4.2", @@ -21084,6 +21146,34 @@ "aws-cdk": "^2.110.1" } }, + "packages/sandbox/node_modules/define-lazy-prop": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz", + "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "packages/sandbox/node_modules/open": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/open/-/open-9.1.0.tgz", + "integrity": "sha512-OS+QTnw1/4vrf+9hh1jc1jnYjzSG4ttTBB8UxOwAnInG3Uo4ssetzC1ihqaIHjLJnA5GGlRl6QlZXOTQhRBUvg==", + "dependencies": { + "default-browser": "^4.0.0", + "define-lazy-prop": "^3.0.0", + "is-inside-container": "^1.0.0", + "is-wsl": "^2.2.0" + }, + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "packages/storage-construct": { "name": "@aws-amplify/storage-construct-alpha", "version": "0.2.3", From 12c183b6d844b4ed5c7754a8a36096907512bdc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=E2=98=94?= Date: Tue, 28 Nov 2023 15:52:10 -0800 Subject: [PATCH 06/38] temp: refactor --- .../src/test-e2e/create_amplify.test.ts | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) 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 663e9a156b..fb58376bad 100644 --- a/packages/integration-tests/src/test-e2e/create_amplify.test.ts +++ b/packages/integration-tests/src/test-e2e/create_amplify.test.ts @@ -12,10 +12,10 @@ type PackageManagerExecutable = 'npm' | 'yarn' | 'yarn-stable' | 'pnpm'; const packageManagerSetup = async ( packageManagerExecutable: PackageManagerExecutable, - dir: string + dir?: string ) => { const execaOptions = { - cwd: dir, + cwd: dir || os.homedir(), stdio: 'inherit' as const, }; @@ -99,6 +99,11 @@ void describe( }); } + // nuke the npx cache to ensure we are installing packages from the npm proxy + await packageManagerSetup( + PACKAGE_MANAGER_EXECUTABLE as PackageManagerExecutable + ); + // Force 'create-amplify' installation in npx cache by executing help command // before tests run. Otherwise, installing 'create-amplify' concurrently // may lead to race conditions and corrupted npx cache. @@ -127,12 +132,6 @@ void describe( tempDir = await fs.mkdtemp( path.join(os.tmpdir(), 'test-create-amplify') ); - - // nuke the npx cache to ensure we are installing packages from the npm proxy - await packageManagerSetup( - PACKAGE_MANAGER_EXECUTABLE as PackageManagerExecutable, - tempDir - ); }); afterEach(async () => { From 020f87a96263e353d3043ced4621a39b6ab12209 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=E2=98=94?= Date: Tue, 28 Nov 2023 17:04:38 -0800 Subject: [PATCH 07/38] temp: run 1 test --- .../src/test-e2e/create_amplify.test.ts | 73 ++++++++++--------- 1 file changed, 37 insertions(+), 36 deletions(-) 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 fb58376bad..85d4e0f5e9 100644 --- a/packages/integration-tests/src/test-e2e/create_amplify.test.ts +++ b/packages/integration-tests/src/test-e2e/create_amplify.test.ts @@ -125,13 +125,14 @@ void describe( const initialStates = ['empty', 'module', 'commonjs'] as const; - initialStates.forEach((initialState) => { + initialStates.slice(0, 1).forEach((initialState) => { void describe('installs expected packages and scaffolds expected files', () => { let tempDir: string; beforeEach(async () => { tempDir = await fs.mkdtemp( path.join(os.tmpdir(), 'test-create-amplify') ); + console.log('🗂️', tempDir); }); afterEach(async () => { @@ -263,40 +264,40 @@ void describe( }); }); - void describe('fails fast', () => { - let tempDir: string; - beforeEach(async () => { - tempDir = await fs.mkdtemp( - path.join(os.tmpdir(), 'test-create-amplify') - ); - }); - - afterEach(async () => { - await fs.rm(tempDir, { recursive: true }); - }); - - void it('if amplify path already exists', async () => { - const amplifyDirPath = path.join(tempDir, 'amplify'); - await fs.mkdir(amplifyDirPath, { recursive: true }); - - const result = await execa( - packageManagerExecutable, - ['create', 'amplify', '--yes'], - { - cwd: tempDir, - stdio: 'pipe', - reject: false, - } - ); - assert.equal(result.exitCode, 1); - assert.ok( - result.stderr - .toLocaleString() - .includes( - 'If you are trying to run an Amplify (Gen 2) command inside an Amplify (Gen 1) project we recommend creating the project in another directory' - ) - ); - }); - }); + // void describe('fails fast', () => { + // let tempDir: string; + // beforeEach(async () => { + // tempDir = await fs.mkdtemp( + // path.join(os.tmpdir(), 'test-create-amplify') + // ); + // }); + + // afterEach(async () => { + // await fs.rm(tempDir, { recursive: true }); + // }); + + // void it('if amplify path already exists', async () => { + // const amplifyDirPath = path.join(tempDir, 'amplify'); + // await fs.mkdir(amplifyDirPath, { recursive: true }); + + // const result = await execa( + // packageManagerExecutable, + // ['create', 'amplify', '--yes'], + // { + // cwd: tempDir, + // stdio: 'pipe', + // reject: false, + // } + // ); + // assert.equal(result.exitCode, 1); + // assert.ok( + // result.stderr + // .toLocaleString() + // .includes( + // 'If you are trying to run an Amplify (Gen 2) command inside an Amplify (Gen 1) project we recommend creating the project in another directory' + // ) + // ); + // }); + // }); } ); From 1ca1400081e4d7798b794aaadad5df82d60d1276 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=E2=98=94?= Date: Tue, 28 Nov 2023 17:15:45 -0800 Subject: [PATCH 08/38] temp: fix npx --- .../integration-tests/src/test-e2e/create_amplify.test.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 85d4e0f5e9..a8082b5760 100644 --- a/packages/integration-tests/src/test-e2e/create_amplify.test.ts +++ b/packages/integration-tests/src/test-e2e/create_amplify.test.ts @@ -224,7 +224,9 @@ void describe( // assert that project compiles successfully await execa( - 'npx', + packageManagerExecutable === 'npm' + ? 'npx' + : packageManagerExecutable, [ 'tsc', '--noEmit', @@ -241,7 +243,9 @@ void describe( // assert that project synthesizes successfully await execa( - 'npx', + packageManagerExecutable === 'npm' + ? 'npx' + : packageManagerExecutable, [ 'cdk', 'synth', From 307e6130d609fc5484b210bb5cda7455e208b855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=E2=98=94?= Date: Tue, 28 Nov 2023 18:18:48 -0800 Subject: [PATCH 09/38] temp: install packages for yarn --- .../src/test-e2e/create_amplify.test.ts | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) 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 a8082b5760..eda0b05868 100644 --- a/packages/integration-tests/src/test-e2e/create_amplify.test.ts +++ b/packages/integration-tests/src/test-e2e/create_amplify.test.ts @@ -241,6 +241,39 @@ void describe( } ); + if (PACKAGE_MANAGER_EXECUTABLE.startsWith('yarn')) { + await execa( + 'yarn', + ['add', 'aws-cdk', 'aws-cdk-lib', 'constructs'], + { + cwd: tempDir, + stdio: 'inherit', + } + ); + if (PACKAGE_MANAGER_EXECUTABLE === 'yarn-stable') { + await execa( + 'yarn', + [ + 'add', + '-D', + 'tsx', + 'graphql', + 'pluralize', + 'zod', + '@aws-amplify/platform-core', + ], + { + cwd: tempDir, + stdio: 'inherit', + } + ); + + await execa('node', ['--version'], { + cwd: tempDir, + }); + } + } + // assert that project synthesizes successfully await execa( packageManagerExecutable === 'npm' From 7d9537b1952b0957102a3de5f30c8b3932b794f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=E2=98=94?= Date: Tue, 28 Nov 2023 18:45:45 -0800 Subject: [PATCH 10/38] temp: update initial_project_file_generator --- .../src/initial_project_file_generator.ts | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/packages/create-amplify/src/initial_project_file_generator.ts b/packages/create-amplify/src/initial_project_file_generator.ts index 8126141631..09e1596bdc 100644 --- a/packages/create-amplify/src/initial_project_file_generator.ts +++ b/packages/create-amplify/src/initial_project_file_generator.ts @@ -17,6 +17,12 @@ export class InitialProjectFileGenerator { private readonly executeWithDebugLogger = _executeWithDebugLogger ) {} + private readonly executableName = !process.env.PACKAGE_MANAGER_EXECUTABLE + ? 'npm' + : process.env.PACKAGE_MANAGER_EXECUTABLE === 'yarn-stable' + ? 'yarn' + : process.env.PACKAGE_MANAGER_EXECUTABLE; // TODO: replace `process.env.PACKAGE_MANAGER_EXECUTABLE` with `getPackageManagerName()` once the test infra is ready. + /** * Copies the template directory to an amplify folder within the projectRoot */ @@ -52,6 +58,11 @@ export class InitialProjectFileGenerator { 'es2022', ]; - await this.executeWithDebugLogger(targetDir, 'npx', tscArgs, execa); + await this.executeWithDebugLogger( + targetDir, + this.executableName === 'npm' ? 'npx' : this.executableName, + tscArgs, + execa + ); }; } From 333d33db02545263538d1118a72234173381f0a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=E2=98=94?= Date: Tue, 28 Nov 2023 21:16:23 -0800 Subject: [PATCH 11/38] temp: install ts for yarn --- packages/create-amplify/src/amplify_project_creator.ts | 2 +- .../create-amplify/src/initial_project_file_generator.ts | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/packages/create-amplify/src/amplify_project_creator.ts b/packages/create-amplify/src/amplify_project_creator.ts index 6f2e005ae2..fbbe3545b1 100644 --- a/packages/create-amplify/src/amplify_project_creator.ts +++ b/packages/create-amplify/src/amplify_project_creator.ts @@ -14,7 +14,7 @@ export class AmplifyProjectCreator { private readonly defaultDevPackages = [ '@aws-amplify/backend', '@aws-amplify/backend-cli', - 'typescript@^5.0.0', + 'typescript@^5.0.0', // TODO: remove this line for yarn since it's installed in amplify/ ]; private readonly defaultProdPackages = ['aws-amplify']; diff --git a/packages/create-amplify/src/initial_project_file_generator.ts b/packages/create-amplify/src/initial_project_file_generator.ts index 09e1596bdc..88e73e9d6f 100644 --- a/packages/create-amplify/src/initial_project_file_generator.ts +++ b/packages/create-amplify/src/initial_project_file_generator.ts @@ -58,6 +58,15 @@ export class InitialProjectFileGenerator { 'es2022', ]; + if (this.executableName === 'yarn') { + await this.executeWithDebugLogger( + targetDir, + 'yarn', + ['add', 'typescript@^5'], + execa + ); + } + await this.executeWithDebugLogger( targetDir, this.executableName === 'npm' ? 'npx' : this.executableName, From ab0af4e28a50adeb16a2ffe92a1de7b4d7713e3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=E2=98=94?= Date: Tue, 28 Nov 2023 21:41:17 -0800 Subject: [PATCH 12/38] temp: ignore node_modules and yarn.lock --- packages/integration-tests/src/test-e2e/create_amplify.test.ts | 1 + 1 file changed, 1 insertion(+) 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 eda0b05868..16119892d3 100644 --- a/packages/integration-tests/src/test-e2e/create_amplify.test.ts +++ b/packages/integration-tests/src/test-e2e/create_amplify.test.ts @@ -207,6 +207,7 @@ void describe( // eslint-disable-next-line spellcheck/spell-checker nodir: true, windowsPathsNoEscape: true, + ignore: ['**/node_modules/**', '**/yarn.lock'], }); const expectedAmplifyFiles = [ From 43ec0c6c75d1afde58dba62dfdeaba77eadd0e84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=E2=98=94?= Date: Wed, 29 Nov 2023 08:44:25 -0800 Subject: [PATCH 13/38] temp: create yarn.lock for yarn stable --- .../src/initial_project_file_generator.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/packages/create-amplify/src/initial_project_file_generator.ts b/packages/create-amplify/src/initial_project_file_generator.ts index 88e73e9d6f..1b26e8aaf8 100644 --- a/packages/create-amplify/src/initial_project_file_generator.ts +++ b/packages/create-amplify/src/initial_project_file_generator.ts @@ -1,4 +1,5 @@ import path from 'path'; +import fs from 'fs'; import _fs from 'fs/promises'; import { executeWithDebugLogger as _executeWithDebugLogger } from './execute_with_logger.js'; import { execa } from 'execa'; @@ -41,6 +42,16 @@ export class InitialProjectFileGenerator { JSON.stringify(packageJsonContent, null, 2) ); + if (process.env.PACKAGE_MANAGER_EXECUTABLE === 'yarn-stable') { + fs.writeFile(path.resolve(targetDir, 'yarn.lock'), '', (err) => { + if (err) { + console.error(`Error creating ${targetDir}/${targetDir}`, err); + } else { + console.log(`${targetDir}/{yarn.lock created successfully.`); + } + }); + } + await this.initializeTsConfig(targetDir); }; From efcbca4c877de113a30190a4c8431f33fa6dd310 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=E2=98=94?= Date: Wed, 29 Nov 2023 09:02:10 -0800 Subject: [PATCH 14/38] temp: fix yarn-stable init --- packages/create-amplify/src/npm_project_initializer.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/create-amplify/src/npm_project_initializer.ts b/packages/create-amplify/src/npm_project_initializer.ts index 2653b4a113..861ee9e53b 100644 --- a/packages/create-amplify/src/npm_project_initializer.ts +++ b/packages/create-amplify/src/npm_project_initializer.ts @@ -17,8 +17,11 @@ export class NpmProjectInitializer { private readonly execa = _execa ) {} - private readonly executableName = - process.env.PACKAGE_MANAGER_EXECUTABLE || 'npm'; // TODO: replace `process.env.PACKAGE_MANAGER_EXECUTABLE` with `getPackageManagerName()` once the test infra is ready. + private readonly executableName = !process.env.PACKAGE_MANAGER_EXECUTABLE + ? 'npm' + : process.env.PACKAGE_MANAGER_EXECUTABLE === 'yarn-stable' + ? 'yarn' + : process.env.PACKAGE_MANAGER_EXECUTABLE; // TODO: replace `process.env.PACKAGE_MANAGER_EXECUTABLE` with `getPackageManagerName()` once the test infra is ready. /** * If package.json already exists, this is a noop. Otherwise, `npm init` is executed to create a package.json file From 5fc04caf0d0b2328e8e9ce85e7b7ba901aa1d6ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=E2=98=94?= Date: Wed, 29 Nov 2023 09:59:41 -0800 Subject: [PATCH 15/38] temp: fix --help --- .../create-amplify/src/initial_project_file_generator.ts | 6 +++--- .../src/test-e2e/create_amplify.test.ts | 9 ++++++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/packages/create-amplify/src/initial_project_file_generator.ts b/packages/create-amplify/src/initial_project_file_generator.ts index 1b26e8aaf8..7ffbcb5356 100644 --- a/packages/create-amplify/src/initial_project_file_generator.ts +++ b/packages/create-amplify/src/initial_project_file_generator.ts @@ -47,7 +47,7 @@ export class InitialProjectFileGenerator { if (err) { console.error(`Error creating ${targetDir}/${targetDir}`, err); } else { - console.log(`${targetDir}/{yarn.lock created successfully.`); + console.log(`${targetDir}/yarn.lock created successfully.`); } }); } @@ -68,8 +68,8 @@ export class InitialProjectFileGenerator { '--target', 'es2022', ]; - - if (this.executableName === 'yarn') { + console.log('🦋'); + if (this.executableName.startsWith('yarn')) { await this.executeWithDebugLogger( targetDir, 'yarn', 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 16119892d3..d1a681a350 100644 --- a/packages/integration-tests/src/test-e2e/create_amplify.test.ts +++ b/packages/integration-tests/src/test-e2e/create_amplify.test.ts @@ -109,7 +109,14 @@ void describe( // may lead to race conditions and corrupted npx cache. await execa( packageManagerExecutable, - ['create', 'amplify', '--yes', '--', '--help'], + [ + 'create', + 'amplify', + ...(PACKAGE_MANAGER_EXECUTABLE === 'yarn-stable' + ? [] + : ['--yes', '--']), + '--help', + ], { // Command must run outside of 'amplify-backend' workspace. cwd: os.homedir(), From 2ab3397b1de7c3ed88b0beda41d0451284eef102 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=E2=98=94?= Date: Wed, 29 Nov 2023 13:20:55 -0800 Subject: [PATCH 16/38] fix: assert for gitignore --- .../integration-tests/src/test-e2e/create_amplify.test.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 d1a681a350..a83407f98e 100644 --- a/packages/integration-tests/src/test-e2e/create_amplify.test.ts +++ b/packages/integration-tests/src/test-e2e/create_amplify.test.ts @@ -189,12 +189,16 @@ void describe( const gitIgnoreContent = (await fs.readFile(gitIgnorePath, 'utf-8')) .split(os.EOL) .filter((s) => s.trim()); - assert.deepStrictEqual(gitIgnoreContent.sort(), [ + const expectedGitIgnoreContent = [ '# amplify', '.amplify', 'amplifyconfiguration*', 'node_modules', - ]); + ]; + + expectedGitIgnoreContent.forEach((line) => { + assert.ok(gitIgnoreContent.includes(line)); + }); const amplifyPathPrefix = path.join(tempDir, 'amplify'); From d4e52ba465bbc733581ca9951d0899c466db0ab3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=E2=98=94?= Date: Thu, 30 Nov 2023 13:33:13 -0800 Subject: [PATCH 17/38] chore: change yarn stable install --- .../src/test-e2e/create_amplify.test.ts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) 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 a83407f98e..d0c86f4924 100644 --- a/packages/integration-tests/src/test-e2e/create_amplify.test.ts +++ b/packages/integration-tests/src/test-e2e/create_amplify.test.ts @@ -29,7 +29,6 @@ const packageManagerSetup = async ( } } else if (packageManagerExecutable.startsWith('yarn')) { if (packageManagerExecutable === 'yarn-stable') { - await execa('yarn', ['set', 'version', 'stable'], execaOptions); await execa('npm', ['pkg', 'set', 'type=module'], execaOptions); // `npm pkg set type="module"` only run when package.json does not exist, so we need to run it manually here await execa( @@ -91,8 +90,15 @@ void describe( await execa('npm', ['run', 'vend'], { stdio: 'inherit' }); // install package manager - if (PACKAGE_MANAGER_EXECUTABLE.startsWith('yarn')) { + if (PACKAGE_MANAGER_EXECUTABLE === 'yarn') { await execa('npm', ['install', '-g', 'yarn'], { stdio: 'inherit' }); + } else if (PACKAGE_MANAGER_EXECUTABLE === 'yarn-stable') { + await execa('corepack', ['enable'], { + stdio: 'inherit', + }); + await execa('yarn', ['init', '-2'], { + stdio: 'inherit', + }); } else if (PACKAGE_MANAGER_EXECUTABLE === 'pnpm') { await execa('npm', ['install', '-g', PACKAGE_MANAGER_EXECUTABLE], { stdio: 'inherit', From 4a1a8485aa3fee0fa14b0bc3310f5f84682087f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=E2=98=94?= Date: Thu, 30 Nov 2023 18:44:57 -0800 Subject: [PATCH 18/38] fix: not install yarn stable globally --- .../src/test-e2e/create_amplify.test.ts | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) 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 d0c86f4924..06b25c836b 100644 --- a/packages/integration-tests/src/test-e2e/create_amplify.test.ts +++ b/packages/integration-tests/src/test-e2e/create_amplify.test.ts @@ -29,7 +29,8 @@ const packageManagerSetup = async ( } } else if (packageManagerExecutable.startsWith('yarn')) { if (packageManagerExecutable === 'yarn-stable') { - await execa('npm', ['pkg', 'set', 'type=module'], execaOptions); // `npm pkg set type="module"` only run when package.json does not exist, so we need to run it manually here + await execa('corepack', ['enable'], execaOptions); + await execa('yarn', ['init', '-2'], execaOptions); await execa( 'yarn', @@ -92,13 +93,6 @@ void describe( // install package manager if (PACKAGE_MANAGER_EXECUTABLE === 'yarn') { await execa('npm', ['install', '-g', 'yarn'], { stdio: 'inherit' }); - } else if (PACKAGE_MANAGER_EXECUTABLE === 'yarn-stable') { - await execa('corepack', ['enable'], { - stdio: 'inherit', - }); - await execa('yarn', ['init', '-2'], { - stdio: 'inherit', - }); } else if (PACKAGE_MANAGER_EXECUTABLE === 'pnpm') { await execa('npm', ['install', '-g', PACKAGE_MANAGER_EXECUTABLE], { stdio: 'inherit', @@ -106,9 +100,11 @@ void describe( } // nuke the npx cache to ensure we are installing packages from the npm proxy - await packageManagerSetup( - PACKAGE_MANAGER_EXECUTABLE as PackageManagerExecutable - ); + if (PACKAGE_MANAGER_EXECUTABLE !== 'yarn-stable') { + await packageManagerSetup( + PACKAGE_MANAGER_EXECUTABLE as PackageManagerExecutable + ); + } // Force 'create-amplify' installation in npx cache by executing help command // before tests run. Otherwise, installing 'create-amplify' concurrently @@ -146,6 +142,13 @@ void describe( path.join(os.tmpdir(), 'test-create-amplify') ); console.log('🗂️', tempDir); + + if (PACKAGE_MANAGER_EXECUTABLE === 'yarn-stable') { + await packageManagerSetup( + PACKAGE_MANAGER_EXECUTABLE as PackageManagerExecutable, + tempDir + ); + } }); afterEach(async () => { From 15fa88780c6f6fcba6b51bb02d245822a7acbe5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=E2=98=94?= Date: Fri, 1 Dec 2023 19:17:47 -0800 Subject: [PATCH 19/38] add @yarnpkg/sdks base --- packages/integration-tests/src/test-e2e/create_amplify.test.ts | 1 + 1 file changed, 1 insertion(+) 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 06b25c836b..2e8525366b 100644 --- a/packages/integration-tests/src/test-e2e/create_amplify.test.ts +++ b/packages/integration-tests/src/test-e2e/create_amplify.test.ts @@ -42,6 +42,7 @@ const packageManagerSetup = async ( ['config', 'set', 'unsafeHttpWhitelist', 'localhost'], execaOptions ); + await execa('yarn', ['dlx', '@yarnpkg/sdks', 'base'], execaOptions); } else { await execa( packageManagerExecutable, From d25ba85fecd20f5c3e3dba05b75676b32c4bb519 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=E2=98=94?= Date: Sun, 3 Dec 2023 13:23:51 -0800 Subject: [PATCH 20/38] yarn stable use node-modules --- .../src/test-e2e/create_amplify.test.ts | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) 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 2e8525366b..a30d1c16e6 100644 --- a/packages/integration-tests/src/test-e2e/create_amplify.test.ts +++ b/packages/integration-tests/src/test-e2e/create_amplify.test.ts @@ -244,6 +244,30 @@ void describe( expectedAmplifyFiles.map((suffix) => path.join(pathPrefix, suffix)) ); + if (PACKAGE_MANAGER_EXECUTABLE === 'yarn-stable') { + await execa( + 'yarn', + ['config', 'set', 'nodeLinker', 'node-modules'], + { + cwd: `${tempDir}/amplify`, + stdio: 'inherit', + } + ); + + await fs.appendFile( + path.join(tempDir, '.yarnrc.yml'), + `pnpIgnorePatterns:\n - ./nm-packages/**` + ); + await execa('yarn', ['install'], { + cwd: tempDir, + stdin: 'inherit', + }); + await execa('yarn', ['add', '@aws-amplify/backend'], { + cwd: `${tempDir}/amplify`, + stdio: 'inherit', + }); + } + // assert that project compiles successfully await execa( packageManagerExecutable === 'npm' From 068c40bb3c05c3d951d17bda9e2e9f5e30168af0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=E2=98=94?= Date: Sun, 3 Dec 2023 14:25:09 -0800 Subject: [PATCH 21/38] remove emoji --- packages/create-amplify/src/initial_project_file_generator.ts | 2 +- packages/integration-tests/src/test-e2e/create_amplify.test.ts | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/create-amplify/src/initial_project_file_generator.ts b/packages/create-amplify/src/initial_project_file_generator.ts index 7ffbcb5356..a39f2bed3c 100644 --- a/packages/create-amplify/src/initial_project_file_generator.ts +++ b/packages/create-amplify/src/initial_project_file_generator.ts @@ -68,7 +68,7 @@ export class InitialProjectFileGenerator { '--target', 'es2022', ]; - console.log('🦋'); + if (this.executableName.startsWith('yarn')) { await this.executeWithDebugLogger( targetDir, 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 a30d1c16e6..692e4159b9 100644 --- a/packages/integration-tests/src/test-e2e/create_amplify.test.ts +++ b/packages/integration-tests/src/test-e2e/create_amplify.test.ts @@ -142,7 +142,6 @@ void describe( tempDir = await fs.mkdtemp( path.join(os.tmpdir(), 'test-create-amplify') ); - console.log('🗂️', tempDir); if (PACKAGE_MANAGER_EXECUTABLE === 'yarn-stable') { await packageManagerSetup( From 6a994f04843aed13f8182a8304f83948e35f1ad2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=E2=98=94?= Date: Sun, 3 Dec 2023 14:37:00 -0800 Subject: [PATCH 22/38] remove @yarnpkg/sdks --- 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 692e4159b9..6455768700 100644 --- a/packages/integration-tests/src/test-e2e/create_amplify.test.ts +++ b/packages/integration-tests/src/test-e2e/create_amplify.test.ts @@ -42,7 +42,6 @@ const packageManagerSetup = async ( ['config', 'set', 'unsafeHttpWhitelist', 'localhost'], execaOptions ); - await execa('yarn', ['dlx', '@yarnpkg/sdks', 'base'], execaOptions); } else { await execa( packageManagerExecutable, From 430f0a130b6472de6ab068d4b86a7144405e0d78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=E2=98=94?= Date: Sun, 3 Dec 2023 20:54:07 -0800 Subject: [PATCH 23/38] yarn stable use node 18.18 --- .github/workflows/poc-e2e-flow-test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/poc-e2e-flow-test.yml b/.github/workflows/poc-e2e-flow-test.yml index f1e13d651b..6dc3817b1c 100644 --- a/.github/workflows/poc-e2e-flow-test.yml +++ b/.github/workflows/poc-e2e-flow-test.yml @@ -42,13 +42,13 @@ jobs: include: - os: ubuntu-latest pkg-manager: yarn-stable - node-version: 19 # TODO: use Node 20 once https://github.com/yarnpkg/berry/pull/5961 is released + node-version: 18.18 # TODO: use Node 20 once https://github.com/yarnpkg/berry/pull/5961 is released - os: macos-latest pkg-manager: yarn-stable - node-version: 19 # TODO: use Node 20 once https://github.com/yarnpkg/berry/pull/5961 is released + node-version: 18.18 # TODO: use Node 20 once https://github.com/yarnpkg/berry/pull/5961 is released - os: windows-latest pkg-manager: yarn-stable - node-version: 19 # TODO: use Node 20 once https://github.com/yarnpkg/berry/pull/5961 is released + node-version: 18.18 # TODO: use Node 20 once https://github.com/yarnpkg/berry/pull/5961 is released env: ACKAGE_MANAGER_EXECUTABLE: ${{ matrix.pkg-manager }} # TODO: remove PACKAGE_MANAGER_EXECUTABLE once CLI is able to getPackageManager(). runs-on: ${{ matrix.os }} From f1eb76a7bc76a94118c4367460bc95321abae1f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=E2=98=94?= Date: Sun, 3 Dec 2023 21:01:05 -0800 Subject: [PATCH 24/38] yarn stable use node 20 --- .github/workflows/poc-e2e-flow-test.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/poc-e2e-flow-test.yml b/.github/workflows/poc-e2e-flow-test.yml index 6dc3817b1c..047c8bb295 100644 --- a/.github/workflows/poc-e2e-flow-test.yml +++ b/.github/workflows/poc-e2e-flow-test.yml @@ -37,18 +37,8 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest, windows-latest] - pkg-manager: [npm, yarn, pnpm] + pkg-manager: [npm, yarn, yarn-stable, pnpm] node-version: [20] - include: - - os: ubuntu-latest - pkg-manager: yarn-stable - node-version: 18.18 # TODO: use Node 20 once https://github.com/yarnpkg/berry/pull/5961 is released - - os: macos-latest - pkg-manager: yarn-stable - node-version: 18.18 # TODO: use Node 20 once https://github.com/yarnpkg/berry/pull/5961 is released - - os: windows-latest - pkg-manager: yarn-stable - node-version: 18.18 # TODO: use Node 20 once https://github.com/yarnpkg/berry/pull/5961 is released env: ACKAGE_MANAGER_EXECUTABLE: ${{ matrix.pkg-manager }} # TODO: remove PACKAGE_MANAGER_EXECUTABLE once CLI is able to getPackageManager(). runs-on: ${{ matrix.os }} From f7a167b769bc8804acc8329656fe3319556b05d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=E2=98=94?= Date: Sun, 3 Dec 2023 22:31:52 -0800 Subject: [PATCH 25/38] chore: re-enable all tests --- .../src/test-e2e/create_amplify.test.ts | 72 +++++++++---------- 1 file changed, 36 insertions(+), 36 deletions(-) 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 6455768700..c1475df24c 100644 --- a/packages/integration-tests/src/test-e2e/create_amplify.test.ts +++ b/packages/integration-tests/src/test-e2e/create_amplify.test.ts @@ -134,7 +134,7 @@ void describe( const initialStates = ['empty', 'module', 'commonjs'] as const; - initialStates.slice(0, 1).forEach((initialState) => { + initialStates.forEach((initialState) => { void describe('installs expected packages and scaffolds expected files', () => { let tempDir: string; beforeEach(async () => { @@ -345,40 +345,40 @@ void describe( }); }); - // void describe('fails fast', () => { - // let tempDir: string; - // beforeEach(async () => { - // tempDir = await fs.mkdtemp( - // path.join(os.tmpdir(), 'test-create-amplify') - // ); - // }); - - // afterEach(async () => { - // await fs.rm(tempDir, { recursive: true }); - // }); - - // void it('if amplify path already exists', async () => { - // const amplifyDirPath = path.join(tempDir, 'amplify'); - // await fs.mkdir(amplifyDirPath, { recursive: true }); - - // const result = await execa( - // packageManagerExecutable, - // ['create', 'amplify', '--yes'], - // { - // cwd: tempDir, - // stdio: 'pipe', - // reject: false, - // } - // ); - // assert.equal(result.exitCode, 1); - // assert.ok( - // result.stderr - // .toLocaleString() - // .includes( - // 'If you are trying to run an Amplify (Gen 2) command inside an Amplify (Gen 1) project we recommend creating the project in another directory' - // ) - // ); - // }); - // }); + void describe('fails fast', () => { + let tempDir: string; + beforeEach(async () => { + tempDir = await fs.mkdtemp( + path.join(os.tmpdir(), 'test-create-amplify') + ); + }); + + afterEach(async () => { + await fs.rm(tempDir, { recursive: true }); + }); + + void it('if amplify path already exists', async () => { + const amplifyDirPath = path.join(tempDir, 'amplify'); + await fs.mkdir(amplifyDirPath, { recursive: true }); + + const result = await execa( + packageManagerExecutable, + ['create', 'amplify', '--yes'], + { + cwd: tempDir, + stdio: 'pipe', + reject: false, + } + ); + assert.equal(result.exitCode, 1); + assert.ok( + result.stderr + .toLocaleString() + .includes( + 'If you are trying to run an Amplify (Gen 2) command inside an Amplify (Gen 1) project we recommend creating the project in another directory' + ) + ); + }); + }); } ); From 7d9bb7816e8c968415d2ef50d64c4c1d6d6147cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=E2=98=94?= Date: Sun, 3 Dec 2023 22:44:06 -0800 Subject: [PATCH 26/38] Revert "chore: re-enable all tests" This reverts commit f7a167b769bc8804acc8329656fe3319556b05d8. --- .../src/test-e2e/create_amplify.test.ts | 72 +++++++++---------- 1 file changed, 36 insertions(+), 36 deletions(-) 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 c1475df24c..6455768700 100644 --- a/packages/integration-tests/src/test-e2e/create_amplify.test.ts +++ b/packages/integration-tests/src/test-e2e/create_amplify.test.ts @@ -134,7 +134,7 @@ void describe( const initialStates = ['empty', 'module', 'commonjs'] as const; - initialStates.forEach((initialState) => { + initialStates.slice(0, 1).forEach((initialState) => { void describe('installs expected packages and scaffolds expected files', () => { let tempDir: string; beforeEach(async () => { @@ -345,40 +345,40 @@ void describe( }); }); - void describe('fails fast', () => { - let tempDir: string; - beforeEach(async () => { - tempDir = await fs.mkdtemp( - path.join(os.tmpdir(), 'test-create-amplify') - ); - }); - - afterEach(async () => { - await fs.rm(tempDir, { recursive: true }); - }); - - void it('if amplify path already exists', async () => { - const amplifyDirPath = path.join(tempDir, 'amplify'); - await fs.mkdir(amplifyDirPath, { recursive: true }); - - const result = await execa( - packageManagerExecutable, - ['create', 'amplify', '--yes'], - { - cwd: tempDir, - stdio: 'pipe', - reject: false, - } - ); - assert.equal(result.exitCode, 1); - assert.ok( - result.stderr - .toLocaleString() - .includes( - 'If you are trying to run an Amplify (Gen 2) command inside an Amplify (Gen 1) project we recommend creating the project in another directory' - ) - ); - }); - }); + // void describe('fails fast', () => { + // let tempDir: string; + // beforeEach(async () => { + // tempDir = await fs.mkdtemp( + // path.join(os.tmpdir(), 'test-create-amplify') + // ); + // }); + + // afterEach(async () => { + // await fs.rm(tempDir, { recursive: true }); + // }); + + // void it('if amplify path already exists', async () => { + // const amplifyDirPath = path.join(tempDir, 'amplify'); + // await fs.mkdir(amplifyDirPath, { recursive: true }); + + // const result = await execa( + // packageManagerExecutable, + // ['create', 'amplify', '--yes'], + // { + // cwd: tempDir, + // stdio: 'pipe', + // reject: false, + // } + // ); + // assert.equal(result.exitCode, 1); + // assert.ok( + // result.stderr + // .toLocaleString() + // .includes( + // 'If you are trying to run an Amplify (Gen 2) command inside an Amplify (Gen 1) project we recommend creating the project in another directory' + // ) + // ); + // }); + // }); } ); From 26fe239d7dfe2ac13f82f4a5d28f07138342857e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=E2=98=94?= Date: Mon, 4 Dec 2023 12:14:35 -0800 Subject: [PATCH 27/38] chore: uncomment test --- .../src/test-e2e/create_amplify.test.ts | 70 +++++++++---------- 1 file changed, 35 insertions(+), 35 deletions(-) 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 6455768700..9b32ff097e 100644 --- a/packages/integration-tests/src/test-e2e/create_amplify.test.ts +++ b/packages/integration-tests/src/test-e2e/create_amplify.test.ts @@ -345,40 +345,40 @@ void describe( }); }); - // void describe('fails fast', () => { - // let tempDir: string; - // beforeEach(async () => { - // tempDir = await fs.mkdtemp( - // path.join(os.tmpdir(), 'test-create-amplify') - // ); - // }); - - // afterEach(async () => { - // await fs.rm(tempDir, { recursive: true }); - // }); - - // void it('if amplify path already exists', async () => { - // const amplifyDirPath = path.join(tempDir, 'amplify'); - // await fs.mkdir(amplifyDirPath, { recursive: true }); - - // const result = await execa( - // packageManagerExecutable, - // ['create', 'amplify', '--yes'], - // { - // cwd: tempDir, - // stdio: 'pipe', - // reject: false, - // } - // ); - // assert.equal(result.exitCode, 1); - // assert.ok( - // result.stderr - // .toLocaleString() - // .includes( - // 'If you are trying to run an Amplify (Gen 2) command inside an Amplify (Gen 1) project we recommend creating the project in another directory' - // ) - // ); - // }); - // }); + void describe('fails fast', () => { + let tempDir: string; + beforeEach(async () => { + tempDir = await fs.mkdtemp( + path.join(os.tmpdir(), 'test-create-amplify') + ); + }); + + afterEach(async () => { + await fs.rm(tempDir, { recursive: true }); + }); + + void it('if amplify path already exists', async () => { + const amplifyDirPath = path.join(tempDir, 'amplify'); + await fs.mkdir(amplifyDirPath, { recursive: true }); + + const result = await execa( + packageManagerExecutable, + ['create', 'amplify', '--yes'], + { + cwd: tempDir, + stdio: 'pipe', + reject: false, + } + ); + assert.equal(result.exitCode, 1); + assert.ok( + result.stderr + .toLocaleString() + .includes( + 'If you are trying to run an Amplify (Gen 2) command inside an Amplify (Gen 1) project we recommend creating the project in another directory' + ) + ); + }); + }); } ); From 69aa2d428034ae9e47016bd813054d6b83f47ade Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=E2=98=94?= Date: Mon, 4 Dec 2023 14:55:47 -0800 Subject: [PATCH 28/38] chore: enable all initialStatues --- 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 9b32ff097e..c1475df24c 100644 --- a/packages/integration-tests/src/test-e2e/create_amplify.test.ts +++ b/packages/integration-tests/src/test-e2e/create_amplify.test.ts @@ -134,7 +134,7 @@ void describe( const initialStates = ['empty', 'module', 'commonjs'] as const; - initialStates.slice(0, 1).forEach((initialState) => { + initialStates.forEach((initialState) => { void describe('installs expected packages and scaffolds expected files', () => { let tempDir: string; beforeEach(async () => { From 81d285d06fb7bf39e1f224cbea82ca49804486f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=E2=98=94?= Date: Mon, 4 Dec 2023 19:05:52 -0800 Subject: [PATCH 29/38] test: change concurrencyLevel for yarn and yarn stable --- .../src/test-e2e/create_amplify.test.ts | 508 +++++++++--------- 1 file changed, 245 insertions(+), 263 deletions(-) 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 c1475df24c..7b71a728b7 100644 --- a/packages/integration-tests/src/test-e2e/create_amplify.test.ts +++ b/packages/integration-tests/src/test-e2e/create_amplify.test.ts @@ -10,6 +10,10 @@ import { testConcurrencyLevel } from './test_concurrency.js'; type PackageManagerExecutable = 'npm' | 'yarn' | 'yarn-stable' | 'pnpm'; +const concurrency = process.env.PACKAGE_MANAGER_EXECUTABLE?.startsWith('yarn') + ? 1 + : testConcurrencyLevel; + const packageManagerSetup = async ( packageManagerExecutable: PackageManagerExecutable, dir?: string @@ -75,310 +79,288 @@ const packageManagerSetup = async ( } }; -void describe( - 'create-amplify script', - { concurrency: testConcurrencyLevel }, - () => { - const { PACKAGE_MANAGER_EXECUTABLE = 'npm' } = process.env; - const packageManagerExecutable = - PACKAGE_MANAGER_EXECUTABLE === 'yarn-stable' - ? 'yarn' - : PACKAGE_MANAGER_EXECUTABLE; - - before(async () => { - // start a local npm proxy and publish the current codebase to the proxy - await execa('npm', ['run', 'clean:npm-proxy'], { stdio: 'inherit' }); - await execa('npm', ['run', 'vend'], { stdio: 'inherit' }); - - // install package manager - if (PACKAGE_MANAGER_EXECUTABLE === 'yarn') { - await execa('npm', ['install', '-g', 'yarn'], { stdio: 'inherit' }); - } else if (PACKAGE_MANAGER_EXECUTABLE === 'pnpm') { - await execa('npm', ['install', '-g', PACKAGE_MANAGER_EXECUTABLE], { - stdio: 'inherit', - }); - } +void describe('create-amplify script', { concurrency }, () => { + const { PACKAGE_MANAGER_EXECUTABLE = 'npm' } = process.env; + const packageManagerExecutable = + PACKAGE_MANAGER_EXECUTABLE === 'yarn-stable' + ? 'yarn' + : PACKAGE_MANAGER_EXECUTABLE; + + before(async () => { + // start a local npm proxy and publish the current codebase to the proxy + await execa('npm', ['run', 'clean:npm-proxy'], { stdio: 'inherit' }); + await execa('npm', ['run', 'vend'], { stdio: 'inherit' }); + + // install package manager + if (PACKAGE_MANAGER_EXECUTABLE === 'yarn') { + await execa('npm', ['install', '-g', 'yarn'], { stdio: 'inherit' }); + } else if (PACKAGE_MANAGER_EXECUTABLE === 'pnpm') { + await execa('npm', ['install', '-g', PACKAGE_MANAGER_EXECUTABLE], { + stdio: 'inherit', + }); + } - // nuke the npx cache to ensure we are installing packages from the npm proxy - if (PACKAGE_MANAGER_EXECUTABLE !== 'yarn-stable') { - await packageManagerSetup( - PACKAGE_MANAGER_EXECUTABLE as PackageManagerExecutable - ); + // nuke the npx cache to ensure we are installing packages from the npm proxy + if (PACKAGE_MANAGER_EXECUTABLE !== 'yarn-stable') { + await packageManagerSetup( + PACKAGE_MANAGER_EXECUTABLE as PackageManagerExecutable + ); + } + + // Force 'create-amplify' installation in npx cache by executing help command + // before tests run. Otherwise, installing 'create-amplify' concurrently + // may lead to race conditions and corrupted npx cache. + await execa( + packageManagerExecutable, + [ + 'create', + 'amplify', + ...(PACKAGE_MANAGER_EXECUTABLE === 'yarn-stable' + ? [] + : ['--yes', '--']), + '--help', + ], + { + // Command must run outside of 'amplify-backend' workspace. + cwd: os.homedir(), + stdio: 'inherit', } + ); + }); - // Force 'create-amplify' installation in npx cache by executing help command - // before tests run. Otherwise, installing 'create-amplify' concurrently - // may lead to race conditions and corrupted npx cache. - await execa( - packageManagerExecutable, - [ - 'create', - 'amplify', - ...(PACKAGE_MANAGER_EXECUTABLE === 'yarn-stable' - ? [] - : ['--yes', '--']), - '--help', - ], - { - // Command must run outside of 'amplify-backend' workspace. - cwd: os.homedir(), - stdio: 'inherit', - } - ); - }); + after(async () => { + // stop the npm proxy + await execa('npm', ['run', 'stop:npm-proxy'], { stdio: 'inherit' }); + }); - after(async () => { - // stop the npm proxy - await execa('npm', ['run', 'stop:npm-proxy'], { stdio: 'inherit' }); - }); + const initialStates = ['empty', 'module', 'commonjs'] as const; - const initialStates = ['empty', 'module', 'commonjs'] as const; + initialStates.forEach((initialState) => { + void describe('installs expected packages and scaffolds expected files', () => { + let tempDir: string; + beforeEach(async () => { + tempDir = await fs.mkdtemp( + path.join(os.tmpdir(), 'test-create-amplify') + ); - initialStates.forEach((initialState) => { - void describe('installs expected packages and scaffolds expected files', () => { - let tempDir: string; - beforeEach(async () => { - tempDir = await fs.mkdtemp( - path.join(os.tmpdir(), 'test-create-amplify') + if (PACKAGE_MANAGER_EXECUTABLE === 'yarn-stable') { + await packageManagerSetup( + PACKAGE_MANAGER_EXECUTABLE as PackageManagerExecutable, + tempDir ); + } + }); - if (PACKAGE_MANAGER_EXECUTABLE === 'yarn-stable') { - await packageManagerSetup( - PACKAGE_MANAGER_EXECUTABLE as PackageManagerExecutable, - tempDir - ); - } - }); + afterEach(async () => { + await fs.rm(tempDir, { recursive: true }); + }); - afterEach(async () => { - await fs.rm(tempDir, { recursive: true }); + void it(`starting from ${initialState} project`, async () => { + if (initialState != 'empty') { + await fs.writeFile( + path.join(tempDir, 'package.json'), + JSON.stringify( + { + name: 'test_name', + version: '0.0.1', + type: initialState, + }, + null, + 2 + ) + ); + } + + await execa(packageManagerExecutable, ['create', 'amplify', '--yes'], { + cwd: tempDir, + stdio: 'inherit', }); + const packageJsonPath = path.resolve(tempDir, 'package.json'); + const packageJsonObject = JSON.parse( + await fs.readFile(packageJsonPath, 'utf-8') + ); - void it(`starting from ${initialState} project`, async () => { - if (initialState != 'empty') { - await fs.writeFile( - path.join(tempDir, 'package.json'), - JSON.stringify( - { - name: 'test_name', - version: '0.0.1', - type: initialState, - }, - null, - 2 - ) - ); - } + assert.deepStrictEqual( + Object.keys(packageJsonObject.devDependencies).sort(), + ['@aws-amplify/backend', '@aws-amplify/backend-cli', 'typescript'] + ); - await execa( - packageManagerExecutable, - ['create', 'amplify', '--yes'], - { - cwd: tempDir, - stdio: 'inherit', - } - ); - const packageJsonPath = path.resolve(tempDir, 'package.json'); - const packageJsonObject = JSON.parse( - await fs.readFile(packageJsonPath, 'utf-8') - ); + assert.deepStrictEqual( + Object.keys(packageJsonObject.dependencies).sort(), + ['aws-amplify'] + ); - assert.deepStrictEqual( - Object.keys(packageJsonObject.devDependencies).sort(), - ['@aws-amplify/backend', '@aws-amplify/backend-cli', 'typescript'] - ); + const gitIgnorePath = path.resolve(tempDir, '.gitignore'); + const gitIgnoreContent = (await fs.readFile(gitIgnorePath, 'utf-8')) + .split(os.EOL) + .filter((s) => s.trim()); + const expectedGitIgnoreContent = [ + '# amplify', + '.amplify', + 'amplifyconfiguration*', + 'node_modules', + ]; + + expectedGitIgnoreContent.forEach((line) => { + assert.ok(gitIgnoreContent.includes(line)); + }); - assert.deepStrictEqual( - Object.keys(packageJsonObject.dependencies).sort(), - ['aws-amplify'] - ); + const amplifyPathPrefix = path.join(tempDir, 'amplify'); - const gitIgnorePath = path.resolve(tempDir, '.gitignore'); - const gitIgnoreContent = (await fs.readFile(gitIgnorePath, 'utf-8')) - .split(os.EOL) - .filter((s) => s.trim()); - const expectedGitIgnoreContent = [ - '# amplify', - '.amplify', - 'amplifyconfiguration*', - 'node_modules', - ]; - - expectedGitIgnoreContent.forEach((line) => { - assert.ok(gitIgnoreContent.includes(line)); - }); + // Read tsconfig.json content, remove all comments, and make assertions + const tsConfigPath = path.resolve(amplifyPathPrefix, 'tsconfig.json'); + const tsConfigContent = ( + await fs.readFile(tsConfigPath, 'utf-8') + ).replace(/\/\*[\s\S]*?\*\/|([^:]|^)\/\/.*$/gm, ''); + const tsConfigObject = JSON.parse(tsConfigContent); - const amplifyPathPrefix = path.join(tempDir, 'amplify'); + assert.equal(tsConfigObject.compilerOptions.module, 'node16'); + assert.equal(tsConfigObject.compilerOptions.resolveJsonModule, true); - // Read tsconfig.json content, remove all comments, and make assertions - const tsConfigPath = path.resolve(amplifyPathPrefix, 'tsconfig.json'); - const tsConfigContent = ( - await fs.readFile(tsConfigPath, 'utf-8') - ).replace(/\/\*[\s\S]*?\*\/|([^:]|^)\/\/.*$/gm, ''); - const tsConfigObject = JSON.parse(tsConfigContent); + const pathPrefix = path.join(tempDir, 'amplify'); - assert.equal(tsConfigObject.compilerOptions.module, 'node16'); - assert.equal(tsConfigObject.compilerOptions.resolveJsonModule, true); + const files = await glob(path.join(amplifyPathPrefix, '**', '*'), { + // eslint-disable-next-line spellcheck/spell-checker + nodir: true, + windowsPathsNoEscape: true, + ignore: ['**/node_modules/**', '**/yarn.lock'], + }); - const pathPrefix = path.join(tempDir, 'amplify'); + const expectedAmplifyFiles = [ + path.join('auth', 'resource.ts'), + 'backend.ts', + path.join('data', 'resource.ts'), + 'package.json', + 'tsconfig.json', + ]; + + assert.deepStrictEqual( + files.sort(), + expectedAmplifyFiles.map((suffix) => path.join(pathPrefix, suffix)) + ); - const files = await glob(path.join(amplifyPathPrefix, '**', '*'), { - // eslint-disable-next-line spellcheck/spell-checker - nodir: true, - windowsPathsNoEscape: true, - ignore: ['**/node_modules/**', '**/yarn.lock'], + if (PACKAGE_MANAGER_EXECUTABLE === 'yarn-stable') { + await execa('yarn', ['config', 'set', 'nodeLinker', 'node-modules'], { + cwd: `${tempDir}/amplify`, + stdio: 'inherit', }); - const expectedAmplifyFiles = [ - path.join('auth', 'resource.ts'), - 'backend.ts', - path.join('data', 'resource.ts'), - 'package.json', - 'tsconfig.json', - ]; - - assert.deepStrictEqual( - files.sort(), - expectedAmplifyFiles.map((suffix) => path.join(pathPrefix, suffix)) + await fs.appendFile( + path.join(tempDir, '.yarnrc.yml'), + `pnpIgnorePatterns:\n - ./nm-packages/**` ); + await execa('yarn', ['install'], { + cwd: tempDir, + stdin: 'inherit', + }); + await execa('yarn', ['add', '@aws-amplify/backend'], { + cwd: `${tempDir}/amplify`, + stdio: 'inherit', + }); + } + + // assert that project compiles successfully + await execa( + packageManagerExecutable === 'npm' ? 'npx' : packageManagerExecutable, + [ + 'tsc', + '--noEmit', + '--skipLibCheck', + // pointing the project arg to the amplify backend directory will use the tsconfig present in that directory + '--project', + amplifyPathPrefix, + ], + { + cwd: tempDir, + stdio: 'inherit', + } + ); + if (PACKAGE_MANAGER_EXECUTABLE.startsWith('yarn')) { + await execa('yarn', ['add', 'aws-cdk', 'aws-cdk-lib', 'constructs'], { + cwd: tempDir, + stdio: 'inherit', + }); if (PACKAGE_MANAGER_EXECUTABLE === 'yarn-stable') { await execa( 'yarn', - ['config', 'set', 'nodeLinker', 'node-modules'], + [ + 'add', + '-D', + 'tsx', + 'graphql', + 'pluralize', + 'zod', + '@aws-amplify/platform-core', + ], { - cwd: `${tempDir}/amplify`, + cwd: tempDir, stdio: 'inherit', } ); - await fs.appendFile( - path.join(tempDir, '.yarnrc.yml'), - `pnpIgnorePatterns:\n - ./nm-packages/**` - ); - await execa('yarn', ['install'], { + await execa('node', ['--version'], { cwd: tempDir, - stdin: 'inherit', - }); - await execa('yarn', ['add', '@aws-amplify/backend'], { - cwd: `${tempDir}/amplify`, - stdio: 'inherit', }); } + } - // assert that project compiles successfully - await execa( - packageManagerExecutable === 'npm' - ? 'npx' - : packageManagerExecutable, - [ - 'tsc', - '--noEmit', - '--skipLibCheck', - // pointing the project arg to the amplify backend directory will use the tsconfig present in that directory - '--project', - amplifyPathPrefix, - ], - { - cwd: tempDir, - stdio: 'inherit', - } - ); - - if (PACKAGE_MANAGER_EXECUTABLE.startsWith('yarn')) { - await execa( - 'yarn', - ['add', 'aws-cdk', 'aws-cdk-lib', 'constructs'], - { - cwd: tempDir, - stdio: 'inherit', - } - ); - if (PACKAGE_MANAGER_EXECUTABLE === 'yarn-stable') { - await execa( - 'yarn', - [ - 'add', - '-D', - 'tsx', - 'graphql', - 'pluralize', - 'zod', - '@aws-amplify/platform-core', - ], - { - cwd: tempDir, - stdio: 'inherit', - } - ); - - await execa('node', ['--version'], { - cwd: tempDir, - }); - } + // assert that project synthesizes successfully + await execa( + packageManagerExecutable === 'npm' ? 'npx' : packageManagerExecutable, + [ + 'cdk', + 'synth', + '--context', + `amplify-backend-namespace=123`, + '--context', + `amplify-backend-name=sandboxName`, + '--context', + `amplify-backend-type=sandbox`, + '--app', + "'npx tsx amplify/backend.ts'", + '--quiet', + ], + { + cwd: tempDir, + stdio: 'inherit', } - - // assert that project synthesizes successfully - await execa( - packageManagerExecutable === 'npm' - ? 'npx' - : packageManagerExecutable, - [ - 'cdk', - 'synth', - '--context', - `amplify-backend-namespace=123`, - '--context', - `amplify-backend-name=sandboxName`, - '--context', - `amplify-backend-type=sandbox`, - '--app', - "'npx tsx amplify/backend.ts'", - '--quiet', - ], - { - cwd: tempDir, - stdio: 'inherit', - } - ); - }); + ); }); }); + }); - void describe('fails fast', () => { - let tempDir: string; - beforeEach(async () => { - tempDir = await fs.mkdtemp( - path.join(os.tmpdir(), 'test-create-amplify') - ); - }); + void describe('fails fast', () => { + let tempDir: string; + beforeEach(async () => { + tempDir = await fs.mkdtemp(path.join(os.tmpdir(), 'test-create-amplify')); + }); - afterEach(async () => { - await fs.rm(tempDir, { recursive: true }); - }); + afterEach(async () => { + await fs.rm(tempDir, { recursive: true }); + }); - void it('if amplify path already exists', async () => { - const amplifyDirPath = path.join(tempDir, 'amplify'); - await fs.mkdir(amplifyDirPath, { recursive: true }); + void it('if amplify path already exists', async () => { + const amplifyDirPath = path.join(tempDir, 'amplify'); + await fs.mkdir(amplifyDirPath, { recursive: true }); - const result = await execa( - packageManagerExecutable, - ['create', 'amplify', '--yes'], - { - cwd: tempDir, - stdio: 'pipe', - reject: false, - } - ); - assert.equal(result.exitCode, 1); - assert.ok( - result.stderr - .toLocaleString() - .includes( - 'If you are trying to run an Amplify (Gen 2) command inside an Amplify (Gen 1) project we recommend creating the project in another directory' - ) - ); - }); + const result = await execa( + packageManagerExecutable, + ['create', 'amplify', '--yes'], + { + cwd: tempDir, + stdio: 'pipe', + reject: false, + } + ); + assert.equal(result.exitCode, 1); + assert.ok( + result.stderr + .toLocaleString() + .includes( + 'If you are trying to run an Amplify (Gen 2) command inside an Amplify (Gen 1) project we recommend creating the project in another directory' + ) + ); }); - } -); + }); +}); From f45b6c89e154d19232cf42821b9f313839fcccb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=E2=98=94?= Date: Mon, 4 Dec 2023 19:55:41 -0800 Subject: [PATCH 30/38] add yarn-stable to test fails fast --- .../integration-tests/src/test-e2e/create_amplify.test.ts | 7 +++++++ 1 file changed, 7 insertions(+) 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 7b71a728b7..57261fb319 100644 --- a/packages/integration-tests/src/test-e2e/create_amplify.test.ts +++ b/packages/integration-tests/src/test-e2e/create_amplify.test.ts @@ -334,6 +334,13 @@ void describe('create-amplify script', { concurrency }, () => { let tempDir: string; beforeEach(async () => { tempDir = await fs.mkdtemp(path.join(os.tmpdir(), 'test-create-amplify')); + + if (PACKAGE_MANAGER_EXECUTABLE === 'yarn-stable') { + await packageManagerSetup( + PACKAGE_MANAGER_EXECUTABLE as PackageManagerExecutable, + tempDir + ); + } }); afterEach(async () => { From 45090b2ef4b9fca2ff69ea084f6f6ff61a6938bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=E2=98=94?= Date: Mon, 4 Dec 2023 20:52:55 -0800 Subject: [PATCH 31/38] chore: update changeset --- .changeset/itchy-pigs-switch.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .changeset/itchy-pigs-switch.md diff --git a/.changeset/itchy-pigs-switch.md b/.changeset/itchy-pigs-switch.md new file mode 100644 index 0000000000..a845151cc8 --- /dev/null +++ b/.changeset/itchy-pigs-switch.md @@ -0,0 +1,2 @@ +--- +--- From ac452fb7513339749d070d5a5fc41facf4154f38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=E2=98=94?= Date: Mon, 4 Dec 2023 21:06:17 -0800 Subject: [PATCH 32/38] chore: change workflow trigger --- .github/workflows/poc-e2e-flow-test.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/poc-e2e-flow-test.yml b/.github/workflows/poc-e2e-flow-test.yml index 047c8bb295..4cbc307bbd 100644 --- a/.github/workflows/poc-e2e-flow-test.yml +++ b/.github/workflows/poc-e2e-flow-test.yml @@ -5,7 +5,10 @@ name: 'poc-e2e-flow-test' on: # TODO: need to change the trigger push: branches: - - poc/pms-create-amplify + - poc/package-manager-support + pull_request: + branches: + - poc/package-manager-support jobs: install: From 0d83dd0598ea03abfc9d9ab48c61b7bfc4d9c43c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=E2=98=94?= Date: Tue, 5 Dec 2023 11:19:52 -0800 Subject: [PATCH 33/38] chore: yarn not install typescript in root folder --- packages/create-amplify/src/amplify_project_creator.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/create-amplify/src/amplify_project_creator.ts b/packages/create-amplify/src/amplify_project_creator.ts index fbbe3545b1..a37c40f996 100644 --- a/packages/create-amplify/src/amplify_project_creator.ts +++ b/packages/create-amplify/src/amplify_project_creator.ts @@ -14,7 +14,9 @@ export class AmplifyProjectCreator { private readonly defaultDevPackages = [ '@aws-amplify/backend', '@aws-amplify/backend-cli', - 'typescript@^5.0.0', // TODO: remove this line for yarn since it's installed in amplify/ + ...(process.env.PACKAGE_MANAGER_EXECUTABLE?.startsWith('yarn') + ? [] + : ['typescript@^5.0.0']), // For yarn, we install typescript at generateInitialProjectFiles(); ]; private readonly defaultProdPackages = ['aws-amplify']; From 5829bd3d5a8f0b79916a4c61ba575ff77bfc17dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=E2=98=94?= Date: Tue, 5 Dec 2023 11:34:00 -0800 Subject: [PATCH 34/38] chore: update package.lock --- package-lock.json | 104 +++++++++++++++++++++++----------------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0bad5a5a2a..d60bdadce9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20521,12 +20521,12 @@ }, "packages/auth-construct": { "name": "@aws-amplify/auth-construct-alpha", - "version": "0.4.2", + "version": "0.4.3", "license": "Apache-2.0", "dependencies": { "@aws-amplify/backend-output-schemas": "^0.4.0", "@aws-amplify/backend-output-storage": "^0.2.6", - "@aws-amplify/plugin-types": "^0.4.2" + "@aws-amplify/plugin-types": "^0.5.0" }, "peerDependencies": { "aws-cdk-lib": "^2.110.1", @@ -20535,19 +20535,19 @@ }, "packages/backend": { "name": "@aws-amplify/backend", - "version": "0.5.5", + "version": "0.6.0", "license": "Apache-2.0", "dependencies": { - "@aws-amplify/backend-auth": "^0.3.5", - "@aws-amplify/backend-data": "^0.8.2", - "@aws-amplify/backend-function": "^0.2.5", + "@aws-amplify/backend-auth": "^0.3.6", + "@aws-amplify/backend-data": "^0.8.3", + "@aws-amplify/backend-function": "^0.3.0", "@aws-amplify/backend-output-schemas": "^0.4.0", "@aws-amplify/backend-output-storage": "^0.2.6", - "@aws-amplify/backend-secret": "^0.3.1", - "@aws-amplify/backend-storage": "^0.3.1", + "@aws-amplify/backend-secret": "^0.3.2", + "@aws-amplify/backend-storage": "^0.3.2", "@aws-amplify/data-schema": "^0.12.9", - "@aws-amplify/platform-core": "^0.3.1", - "@aws-amplify/plugin-types": "^0.4.2", + "@aws-amplify/platform-core": "^0.3.2", + "@aws-amplify/plugin-types": "^0.5.0", "@aws-sdk/client-amplify": "^3.440.0" }, "devDependencies": { @@ -20561,16 +20561,16 @@ }, "packages/backend-auth": { "name": "@aws-amplify/backend-auth", - "version": "0.3.5", + "version": "0.3.6", "license": "Apache-2.0", "dependencies": { - "@aws-amplify/auth-construct-alpha": "^0.4.2", + "@aws-amplify/auth-construct-alpha": "^0.4.3", "@aws-amplify/backend-output-storage": "0.2.6", - "@aws-amplify/plugin-types": "^0.4.2" + "@aws-amplify/plugin-types": "^0.5.0" }, "devDependencies": { "@aws-amplify/backend-platform-test-stubs": "^0.3.1", - "@aws-amplify/platform-core": "^0.3.1" + "@aws-amplify/platform-core": "^0.3.2" }, "peerDependencies": { "aws-cdk-lib": "^2.110.1", @@ -20579,19 +20579,19 @@ }, "packages/backend-data": { "name": "@aws-amplify/backend-data", - "version": "0.8.2", + "version": "0.8.3", "license": "Apache-2.0", "dependencies": { "@aws-amplify/backend-output-schemas": "^0.4.0", "@aws-amplify/backend-output-storage": "0.2.6", "@aws-amplify/data-construct": "^1.4.1", "@aws-amplify/data-schema-types": "^0.6.6", - "@aws-amplify/plugin-types": "^0.4.2" + "@aws-amplify/plugin-types": "^0.5.0" }, "devDependencies": { "@aws-amplify/backend-platform-test-stubs": "^0.3.1", "@aws-amplify/data-schema": "^0.12.9", - "@aws-amplify/platform-core": "^0.3.1" + "@aws-amplify/platform-core": "^0.3.2" }, "peerDependencies": { "aws-cdk-lib": "^2.110.1", @@ -20600,11 +20600,11 @@ }, "packages/backend-deployer": { "name": "@aws-amplify/backend-deployer", - "version": "0.3.4", + "version": "0.4.0", "license": "Apache-2.0", "dependencies": { - "@aws-amplify/platform-core": "^0.3.1", - "@aws-amplify/plugin-types": "^0.4.2", + "@aws-amplify/platform-core": "^0.3.2", + "@aws-amplify/plugin-types": "^0.5.0", "execa": "^7.2.0", "tsx": "^3.12.6" }, @@ -20615,16 +20615,16 @@ }, "packages/backend-function": { "name": "@aws-amplify/backend-function", - "version": "0.2.5", + "version": "0.3.0", "license": "Apache-2.0", "dependencies": { "@aws-amplify/backend-output-storage": "0.2.6", - "@aws-amplify/plugin-types": "^0.4.2", + "@aws-amplify/plugin-types": "^0.5.0", "execa": "^7.1.1" }, "devDependencies": { "@aws-amplify/backend-platform-test-stubs": "^0.3.1", - "@aws-amplify/platform-core": "^0.3.1", + "@aws-amplify/platform-core": "^0.3.2", "uuid": "^9.0.1" }, "peerDependencies": { @@ -20650,7 +20650,7 @@ "version": "0.4.0", "license": "Apache-2.0", "devDependencies": { - "@aws-amplify/plugin-types": "0.4.2" + "@aws-amplify/plugin-types": "0.5.0" }, "peerDependencies": { "zod": "^3.21.4" @@ -20679,11 +20679,11 @@ }, "packages/backend-secret": { "name": "@aws-amplify/backend-secret", - "version": "0.3.1", + "version": "0.3.2", "license": "Apache-2.0", "dependencies": { - "@aws-amplify/platform-core": "^0.3.0", - "@aws-amplify/plugin-types": "^0.4.0", + "@aws-amplify/platform-core": "^0.3.2", + "@aws-amplify/plugin-types": "^0.5.0", "@aws-sdk/client-ssm": "^3.398.0" }, "devDependencies": { @@ -20692,16 +20692,16 @@ }, "packages/backend-storage": { "name": "@aws-amplify/backend-storage", - "version": "0.3.1", + "version": "0.3.2", "license": "Apache-2.0", "dependencies": { "@aws-amplify/backend-output-storage": "^0.2.6", - "@aws-amplify/plugin-types": "^0.4.2", + "@aws-amplify/plugin-types": "^0.5.0", "@aws-amplify/storage-construct-alpha": "^0.2.3" }, "devDependencies": { "@aws-amplify/backend-platform-test-stubs": "^0.3.1", - "@aws-amplify/platform-core": "^0.3.1" + "@aws-amplify/platform-core": "^0.3.2" }, "peerDependencies": { "aws-cdk-lib": "^2.110.1", @@ -20710,18 +20710,18 @@ }, "packages/cli": { "name": "@aws-amplify/backend-cli", - "version": "0.9.1", + "version": "0.9.2", "license": "Apache-2.0", "dependencies": { "@aws-amplify/backend-output-schemas": "^0.4.0", - "@aws-amplify/backend-secret": "^0.3.1", + "@aws-amplify/backend-secret": "^0.3.2", "@aws-amplify/cli-core": "^0.2.0", "@aws-amplify/client-config": "^0.4.2", - "@aws-amplify/deployed-backend-client": "^0.3.3", + "@aws-amplify/deployed-backend-client": "^0.3.4", "@aws-amplify/form-generator": "^0.6.0", "@aws-amplify/model-generator": "^0.2.3", - "@aws-amplify/platform-core": "^0.3.0", - "@aws-amplify/sandbox": "^0.3.5", + "@aws-amplify/platform-core": "^0.3.2", + "@aws-amplify/sandbox": "^0.3.7", "@aws-sdk/credential-provider-ini": "^3.360.0", "@aws-sdk/credential-providers": "^3.360.0", "@aws-sdk/region-config-resolver": "^3.433.0", @@ -20884,11 +20884,11 @@ } }, "packages/create-amplify": { - "version": "0.3.8", + "version": "0.3.9", "license": "Apache-2.0", "dependencies": { "@aws-amplify/cli-core": "^0.2.0", - "@aws-amplify/platform-core": "0.3.1", + "@aws-amplify/platform-core": "0.3.2", "execa": "^7.2.0", "yargs": "^17.7.2" }, @@ -21011,11 +21011,11 @@ }, "packages/deployed-backend-client": { "name": "@aws-amplify/deployed-backend-client", - "version": "0.3.3", + "version": "0.3.4", "license": "Apache-2.0", "dependencies": { "@aws-amplify/backend-output-schemas": "^0.4.0", - "@aws-amplify/platform-core": "^0.3.0", + "@aws-amplify/platform-core": "^0.3.2", "@aws-sdk/client-amplify": "^3.329.0", "@aws-sdk/client-cloudformation": "^3.329.0", "@aws-sdk/client-s3": "^3.329.0", @@ -21057,14 +21057,14 @@ }, "packages/integration-tests": { "name": "@aws-amplify/integration-tests", - "version": "0.3.7", + "version": "0.3.8", "license": "Apache-2.0", "devDependencies": { - "@aws-amplify/backend": "^0.5.5", - "@aws-amplify/backend-secret": "^0.3.1", + "@aws-amplify/backend": "^0.6.0", + "@aws-amplify/backend-secret": "^0.3.2", "@aws-amplify/client-config": "^0.4.0", "@aws-amplify/data-schema": "^0.12.9", - "@aws-amplify/platform-core": "^0.3.1", + "@aws-amplify/platform-core": "^0.3.2", "@aws-sdk/client-amplify": "^3.440.0", "@aws-sdk/client-cloudformation": "^3.421.0", "@aws-sdk/client-lambda": "^3.460.0", @@ -21542,10 +21542,10 @@ }, "packages/platform-core": { "name": "@aws-amplify/platform-core", - "version": "0.3.1", + "version": "0.3.2", "license": "Apache-2.0", "dependencies": { - "@aws-amplify/plugin-types": "^0.4.2", + "@aws-amplify/plugin-types": "^0.5.0", "@aws-sdk/client-sts": "3.445.0", "is-ci": "^3.0.1", "uuid": "9.0.1", @@ -21974,7 +21974,7 @@ }, "packages/plugin-types": { "name": "@aws-amplify/plugin-types", - "version": "0.4.2", + "version": "0.5.0", "license": "Apache-2.0", "peerDependencies": { "aws-cdk-lib": "^2.110.1", @@ -21983,15 +21983,15 @@ }, "packages/sandbox": { "name": "@aws-amplify/sandbox", - "version": "0.3.6", + "version": "0.3.7", "license": "Apache-2.0", "dependencies": { - "@aws-amplify/backend-deployer": "0.3.4", - "@aws-amplify/backend-secret": "^0.3.1", + "@aws-amplify/backend-deployer": "0.4.0", + "@aws-amplify/backend-secret": "^0.3.2", "@aws-amplify/cli-core": "^0.2.0", "@aws-amplify/client-config": "0.4.2", - "@aws-amplify/deployed-backend-client": "^0.3.3", - "@aws-amplify/platform-core": "^0.3.1", + "@aws-amplify/deployed-backend-client": "^0.3.4", + "@aws-amplify/platform-core": "^0.3.2", "@aws-sdk/client-cloudformation": "^3.421.0", "@aws-sdk/credential-providers": "^3.382.0", "@aws-sdk/types": "^3.378.0", @@ -22046,7 +22046,7 @@ "@aws-amplify/backend-output-storage": "^0.2.6" }, "devDependencies": { - "@aws-amplify/plugin-types": "^0.4.2" + "@aws-amplify/plugin-types": "^0.5.0" }, "peerDependencies": { "aws-cdk-lib": "^2.110.1", From ddf9e6ceedaba3ebf9c8f2232cecaf285e4d5335 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=E2=98=94?= Date: Tue, 5 Dec 2023 12:02:19 -0800 Subject: [PATCH 35/38] Revert "chore: yarn not install typescript in root folder" This reverts commit 0d83dd0598ea03abfc9d9ab48c61b7bfc4d9c43c. --- packages/create-amplify/src/amplify_project_creator.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/create-amplify/src/amplify_project_creator.ts b/packages/create-amplify/src/amplify_project_creator.ts index a37c40f996..fbbe3545b1 100644 --- a/packages/create-amplify/src/amplify_project_creator.ts +++ b/packages/create-amplify/src/amplify_project_creator.ts @@ -14,9 +14,7 @@ export class AmplifyProjectCreator { private readonly defaultDevPackages = [ '@aws-amplify/backend', '@aws-amplify/backend-cli', - ...(process.env.PACKAGE_MANAGER_EXECUTABLE?.startsWith('yarn') - ? [] - : ['typescript@^5.0.0']), // For yarn, we install typescript at generateInitialProjectFiles(); + 'typescript@^5.0.0', // TODO: remove this line for yarn since it's installed in amplify/ ]; private readonly defaultProdPackages = ['aws-amplify']; From e88dbee36fdfe230d1ca885f02f8783206ce4ef2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=E2=98=94?= Date: Tue, 5 Dec 2023 12:04:09 -0800 Subject: [PATCH 36/38] chore: remove comment --- 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 fbbe3545b1..6f2e005ae2 100644 --- a/packages/create-amplify/src/amplify_project_creator.ts +++ b/packages/create-amplify/src/amplify_project_creator.ts @@ -14,7 +14,7 @@ export class AmplifyProjectCreator { private readonly defaultDevPackages = [ '@aws-amplify/backend', '@aws-amplify/backend-cli', - 'typescript@^5.0.0', // TODO: remove this line for yarn since it's installed in amplify/ + 'typescript@^5.0.0', ]; private readonly defaultProdPackages = ['aws-amplify']; From 338457d15aad776a5459adbd01cb48a855bf7d9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=E2=98=94?= Date: Tue, 5 Dec 2023 15:30:32 -0800 Subject: [PATCH 37/38] chore: fix typo --- .github/workflows/poc-e2e-flow-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/poc-e2e-flow-test.yml b/.github/workflows/poc-e2e-flow-test.yml index 4cbc307bbd..86840c52b3 100644 --- a/.github/workflows/poc-e2e-flow-test.yml +++ b/.github/workflows/poc-e2e-flow-test.yml @@ -43,7 +43,7 @@ jobs: pkg-manager: [npm, yarn, yarn-stable, pnpm] node-version: [20] env: - ACKAGE_MANAGER_EXECUTABLE: ${{ matrix.pkg-manager }} # TODO: remove PACKAGE_MANAGER_EXECUTABLE once CLI is able to getPackageManager(). + PACKAGE_MANAGER_EXECUTABLE: ${{ matrix.pkg-manager }} # TODO: remove PACKAGE_MANAGER_EXECUTABLE once CLI is able to getPackageManager(). runs-on: ${{ matrix.os }} timeout-minutes: 60 needs: From f98ddb965516f9612a25fc1885b2fffd1261e6e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=E2=98=94?= Date: Tue, 5 Dec 2023 15:42:57 -0800 Subject: [PATCH 38/38] chore: rename yarn-classic and yarn modern --- .github/workflows/poc-e2e-flow-test.yml | 2 +- .../src/initial_project_file_generator.ts | 10 ++-- .../src/npm_package_manager_controller.ts | 8 ++-- .../src/npm_project_initializer.ts | 2 +- .../src/test-e2e/create_amplify.test.ts | 47 ++++++++----------- 5 files changed, 33 insertions(+), 36 deletions(-) diff --git a/.github/workflows/poc-e2e-flow-test.yml b/.github/workflows/poc-e2e-flow-test.yml index 86840c52b3..41ee16f2f7 100644 --- a/.github/workflows/poc-e2e-flow-test.yml +++ b/.github/workflows/poc-e2e-flow-test.yml @@ -40,7 +40,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest, windows-latest] - pkg-manager: [npm, yarn, yarn-stable, pnpm] + pkg-manager: [npm, yarn-classic, yarn-modern, pnpm] node-version: [20] env: PACKAGE_MANAGER_EXECUTABLE: ${{ matrix.pkg-manager }} # TODO: remove PACKAGE_MANAGER_EXECUTABLE once CLI is able to getPackageManager(). diff --git a/packages/create-amplify/src/initial_project_file_generator.ts b/packages/create-amplify/src/initial_project_file_generator.ts index a39f2bed3c..834ba52291 100644 --- a/packages/create-amplify/src/initial_project_file_generator.ts +++ b/packages/create-amplify/src/initial_project_file_generator.ts @@ -20,7 +20,7 @@ export class InitialProjectFileGenerator { private readonly executableName = !process.env.PACKAGE_MANAGER_EXECUTABLE ? 'npm' - : process.env.PACKAGE_MANAGER_EXECUTABLE === 'yarn-stable' + : process.env.PACKAGE_MANAGER_EXECUTABLE.startsWith('yarn') ? 'yarn' : process.env.PACKAGE_MANAGER_EXECUTABLE; // TODO: replace `process.env.PACKAGE_MANAGER_EXECUTABLE` with `getPackageManagerName()` once the test infra is ready. @@ -42,7 +42,7 @@ export class InitialProjectFileGenerator { JSON.stringify(packageJsonContent, null, 2) ); - if (process.env.PACKAGE_MANAGER_EXECUTABLE === 'yarn-stable') { + if (process.env.PACKAGE_MANAGER_EXECUTABLE === 'yarn-modern') { fs.writeFile(path.resolve(targetDir, 'yarn.lock'), '', (err) => { if (err) { console.error(`Error creating ${targetDir}/${targetDir}`, err); @@ -80,7 +80,11 @@ export class InitialProjectFileGenerator { await this.executeWithDebugLogger( targetDir, - this.executableName === 'npm' ? 'npx' : this.executableName, + this.executableName === 'npm' + ? 'npx' + : this.executableName.startsWith('yarn') + ? 'yarn' + : this.executableName, tscArgs, execa ); diff --git a/packages/create-amplify/src/npm_package_manager_controller.ts b/packages/create-amplify/src/npm_package_manager_controller.ts index 546c581de4..a7013ec788 100644 --- a/packages/create-amplify/src/npm_package_manager_controller.ts +++ b/packages/create-amplify/src/npm_package_manager_controller.ts @@ -18,7 +18,7 @@ export class NpmPackageManagerController implements PackageManagerController { ) {} private readonly executableName = !process.env.PACKAGE_MANAGER_EXECUTABLE ? 'npm' - : process.env.PACKAGE_MANAGER_EXECUTABLE === 'yarn-stable' + : process.env.PACKAGE_MANAGER_EXECUTABLE.startsWith('yarn') ? 'yarn' : process.env.PACKAGE_MANAGER_EXECUTABLE; // TODO: replace `process.env.PACKAGE_MANAGER_EXECUTABLE` with `getPackageManagerName()` once the test infra is ready. @@ -29,9 +29,9 @@ export class NpmPackageManagerController implements PackageManagerController { packageNames: string[], type: DependencyType ): Promise => { - const args = [this.executableName === 'yarn' ? 'add' : 'install'].concat( - ...packageNames - ); + const args = [ + this.executableName.startsWith('yarn') ? 'add' : 'install', + ].concat(...packageNames); if (type === 'dev') { args.push('-D'); } diff --git a/packages/create-amplify/src/npm_project_initializer.ts b/packages/create-amplify/src/npm_project_initializer.ts index 861ee9e53b..072e0c9068 100644 --- a/packages/create-amplify/src/npm_project_initializer.ts +++ b/packages/create-amplify/src/npm_project_initializer.ts @@ -19,7 +19,7 @@ export class NpmProjectInitializer { private readonly executableName = !process.env.PACKAGE_MANAGER_EXECUTABLE ? 'npm' - : process.env.PACKAGE_MANAGER_EXECUTABLE === 'yarn-stable' + : process.env.PACKAGE_MANAGER_EXECUTABLE.startsWith('yarn') ? 'yarn' : process.env.PACKAGE_MANAGER_EXECUTABLE; // TODO: replace `process.env.PACKAGE_MANAGER_EXECUTABLE` with `getPackageManagerName()` once the test infra is ready. 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 57261fb319..7e113e50e7 100644 --- a/packages/integration-tests/src/test-e2e/create_amplify.test.ts +++ b/packages/integration-tests/src/test-e2e/create_amplify.test.ts @@ -8,7 +8,7 @@ import assert from 'assert'; import { glob } from 'glob'; import { testConcurrencyLevel } from './test_concurrency.js'; -type PackageManagerExecutable = 'npm' | 'yarn' | 'yarn-stable' | 'pnpm'; +type PackageManagerExecutable = 'npm' | 'yarn-classic' | 'yarn-modern' | 'pnpm'; const concurrency = process.env.PACKAGE_MANAGER_EXECUTABLE?.startsWith('yarn') ? 1 @@ -32,7 +32,7 @@ const packageManagerSetup = async ( await fs.rm(npxCacheLocation, { recursive: true }); } } else if (packageManagerExecutable.startsWith('yarn')) { - if (packageManagerExecutable === 'yarn-stable') { + if (packageManagerExecutable === 'yarn-modern') { await execa('corepack', ['enable'], execaOptions); await execa('yarn', ['init', '-2'], execaOptions); @@ -48,23 +48,13 @@ const packageManagerSetup = async ( ); } else { await execa( - packageManagerExecutable, + 'yarn', ['config', 'set', 'registry', 'http://localhost:4873'], execaOptions ); - await execa( - packageManagerExecutable, - ['config', 'get', 'registry'], - execaOptions - ); + await execa('yarn', ['config', 'get', 'registry'], execaOptions); } - await execa( - packageManagerExecutable === 'yarn-stable' - ? 'yarn' - : packageManagerExecutable, - ['cache', 'clean'], - execaOptions - ); + await execa('yarn', ['cache', 'clean'], execaOptions); } else if (packageManagerExecutable === 'pnpm') { await execa(packageManagerExecutable, ['--version']); await execa(packageManagerExecutable, [ @@ -81,10 +71,9 @@ const packageManagerSetup = async ( void describe('create-amplify script', { concurrency }, () => { const { PACKAGE_MANAGER_EXECUTABLE = 'npm' } = process.env; - const packageManagerExecutable = - PACKAGE_MANAGER_EXECUTABLE === 'yarn-stable' - ? 'yarn' - : PACKAGE_MANAGER_EXECUTABLE; + const packageManagerExecutable = PACKAGE_MANAGER_EXECUTABLE.startsWith('yarn') + ? 'yarn' + : PACKAGE_MANAGER_EXECUTABLE; before(async () => { // start a local npm proxy and publish the current codebase to the proxy @@ -92,7 +81,7 @@ void describe('create-amplify script', { concurrency }, () => { await execa('npm', ['run', 'vend'], { stdio: 'inherit' }); // install package manager - if (PACKAGE_MANAGER_EXECUTABLE === 'yarn') { + if (PACKAGE_MANAGER_EXECUTABLE === 'yarn-classic') { await execa('npm', ['install', '-g', 'yarn'], { stdio: 'inherit' }); } else if (PACKAGE_MANAGER_EXECUTABLE === 'pnpm') { await execa('npm', ['install', '-g', PACKAGE_MANAGER_EXECUTABLE], { @@ -101,7 +90,7 @@ void describe('create-amplify script', { concurrency }, () => { } // nuke the npx cache to ensure we are installing packages from the npm proxy - if (PACKAGE_MANAGER_EXECUTABLE !== 'yarn-stable') { + if (PACKAGE_MANAGER_EXECUTABLE !== 'yarn-modern') { await packageManagerSetup( PACKAGE_MANAGER_EXECUTABLE as PackageManagerExecutable ); @@ -115,7 +104,7 @@ void describe('create-amplify script', { concurrency }, () => { [ 'create', 'amplify', - ...(PACKAGE_MANAGER_EXECUTABLE === 'yarn-stable' + ...(PACKAGE_MANAGER_EXECUTABLE === 'yarn-modern' ? [] : ['--yes', '--']), '--help', @@ -143,7 +132,7 @@ void describe('create-amplify script', { concurrency }, () => { path.join(os.tmpdir(), 'test-create-amplify') ); - if (PACKAGE_MANAGER_EXECUTABLE === 'yarn-stable') { + if (PACKAGE_MANAGER_EXECUTABLE === 'yarn-modern') { await packageManagerSetup( PACKAGE_MANAGER_EXECUTABLE as PackageManagerExecutable, tempDir @@ -239,7 +228,7 @@ void describe('create-amplify script', { concurrency }, () => { expectedAmplifyFiles.map((suffix) => path.join(pathPrefix, suffix)) ); - if (PACKAGE_MANAGER_EXECUTABLE === 'yarn-stable') { + if (PACKAGE_MANAGER_EXECUTABLE === 'yarn-modern') { await execa('yarn', ['config', 'set', 'nodeLinker', 'node-modules'], { cwd: `${tempDir}/amplify`, stdio: 'inherit', @@ -261,7 +250,11 @@ void describe('create-amplify script', { concurrency }, () => { // assert that project compiles successfully await execa( - packageManagerExecutable === 'npm' ? 'npx' : packageManagerExecutable, + packageManagerExecutable === 'npm' + ? 'npx' + : packageManagerExecutable.startsWith('yarn') + ? 'yarn' + : packageManagerExecutable, [ 'tsc', '--noEmit', @@ -281,7 +274,7 @@ void describe('create-amplify script', { concurrency }, () => { cwd: tempDir, stdio: 'inherit', }); - if (PACKAGE_MANAGER_EXECUTABLE === 'yarn-stable') { + if (PACKAGE_MANAGER_EXECUTABLE === 'yarn-modern') { await execa( 'yarn', [ @@ -335,7 +328,7 @@ void describe('create-amplify script', { concurrency }, () => { beforeEach(async () => { tempDir = await fs.mkdtemp(path.join(os.tmpdir(), 'test-create-amplify')); - if (PACKAGE_MANAGER_EXECUTABLE === 'yarn-stable') { + if (PACKAGE_MANAGER_EXECUTABLE === 'yarn-modern') { await packageManagerSetup( PACKAGE_MANAGER_EXECUTABLE as PackageManagerExecutable, tempDir