Merge remote-tracking branch 'upstream/main' into feat/package-manager-controller-bun

Ponjimon · Ponjimon · commit eaf75cd2e912 · 2025-09-30T16:09:22.000Z
diff --git a/.changeset/angry-rivers-enter.md b/.changeset/angry-rivers-enter.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/.changeset/cold-clouds-wish.md b/.changeset/cold-clouds-wish.md
@@ -0,0 +1,5 @@
+---
+'@aws-amplify/integration-tests': patch
+---
+
+Disable self-signup for UserPool
diff --git a/.changeset/dependabot-0ac643d54fd010c0e4b359006a48066c228d18d1.md b/.changeset/dependabot-0ac643d54fd010c0e4b359006a48066c228d18d1.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/.changeset/dependabot-37b86d353a9484c8aae9c871b02772f06a1dbec5.md b/.changeset/dependabot-37b86d353a9484c8aae9c871b02772f06a1dbec5.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/.changeset/dependabot-4c02668e914ca562196cd2771aa7098a12e2580c.md b/.changeset/dependabot-4c02668e914ca562196cd2771aa7098a12e2580c.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/.changeset/dependabot-7e57f82e9efb80ff062ca31ef9981269435e8cb5.md b/.changeset/dependabot-7e57f82e9efb80ff062ca31ef9981269435e8cb5.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/.changeset/dependabot-a7e1133b14918a75a499da041e8026376022108f.md b/.changeset/dependabot-a7e1133b14918a75a499da041e8026376022108f.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/.changeset/dependabot-create-amplify-37b86d353a9484c8aae9c871b02772f06a1dbec5.md b/.changeset/dependabot-create-amplify-37b86d353a9484c8aae9c871b02772f06a1dbec5.md
@@ -0,0 +1,5 @@
+---
+'create-amplify': patch
+---
+
+bump create amplify dependencies
diff --git a/.changeset/dependabot-e589128fc38f146b0a1f95ecf140c597346f4bf4.md b/.changeset/dependabot-e589128fc38f146b0a1f95ecf140c597346f4bf4.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/.changeset/dependabot-ed41783f7e310a193bae2bc805398f9a30b717b4.md b/.changeset/dependabot-ed41783f7e310a193bae2bc805398f9a30b717b4.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/.changeset/little-houses-think.md b/.changeset/little-houses-think.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/.changeset/poor-terms-mix.md b/.changeset/poor-terms-mix.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/.changeset/silent-peas-vanish.md b/.changeset/silent-peas-vanish.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/.changeset/social-memes-dream.md b/.changeset/social-memes-dream.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/.changeset/tough-candles-show.md b/.changeset/tough-candles-show.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/.github/workflows/canary_checks.yml b/.github/workflows/canary_checks.yml
@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # version 4.1.4
       - uses: ./.github/actions/setup_node
         with:
-          node-version: 18
+          node-version: lts/*
       - name: Install and build without lock file
         shell: bash
         run: |
diff --git a/.github/workflows/e2e_resource_cleanup.yml b/.github/workflows/e2e_resource_cleanup.yml
@@ -36,4 +36,9 @@ jobs:
           role-to-assume: arn:aws:iam::${{ matrix.testAccount }}:role/e2e-resource-cleanup
           aws-region: ${{ matrix.region }}
       - name: Run E2E resource cleanup
-        run: npm run e2e:cleanup-resources
+        uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # version 3.0.2
+        with:
+          max_attempts: 3
+          retry_wait_seconds: 60 # wait a minute before retrying
+          timeout_minutes: 15 # these don't typically take long
+          command: npm run e2e:cleanup-resources
diff --git a/.github/workflows/health_checks.yml b/.github/workflows/health_checks.yml
@@ -485,8 +485,7 @@ jobs:
           node_version: ${{ matrix.node-version }}
           cdk-lib-version: ${{ needs.resolve_inputs.outputs.cdk_lib_version }}
           link_cli: true
-          run: |
-            npm run test:dir ${{ matrix.testPaths }}
+          run: npm run test:dir ${{ matrix.testPaths }}
   e2e_generate_sandbox_tests_matrix:
     if: needs.do_include_e2e.outputs.run_e2e == 'true'
     runs-on: ubuntu-latest
@@ -653,8 +652,7 @@ jobs:
           node_version: ${{ matrix.node-version }}
           cdk-lib-version: ${{ needs.resolve_inputs.outputs.cdk_lib_version }}
           shell: bash
-          run: |
-            PACKAGE_MANAGER=${{matrix.pkg-manager}} npm run test:dir packages/integration-tests/src/package_manager_sanity_checks.test.ts
+          run: PACKAGE_MANAGER=${{matrix.pkg-manager}} npm run test:dir packages/integration-tests/src/package_manager_sanity_checks.test.ts
   lint:
     runs-on: ubuntu-latest
     needs:
@@ -793,7 +791,7 @@ jobs:
           node-version: 18
           cdk-lib-version: ${{ needs.resolve_inputs.outputs.cdk_lib_version }}
       - name: Validate that PR has changeset
-        run: npx changeset status --since origin/"$BASE_REF"
+        run: npx --package @changesets/cli -- changeset status --since origin/"$BASE_REF"
         env:
           BASE_REF: ${{ github.event.pull_request.base.ref }}
       - name: Validate changeset is not missing packages
@@ -802,7 +800,7 @@ jobs:
           BASE_SHA: ${{ github.event.pull_request.base.sha }}
       # - name: Validate that changeset has necessary dependency updates
       #   run: |
-      #     npx changeset version
+      #     npx --package @changesets/cli -- changeset version
       #     npm update
       #     npm run check:dependencies
   check_package_versions:
@@ -821,7 +819,7 @@ jobs:
         with:
           node-version: 18
           cdk-lib-version: ${{ needs.resolve_inputs.outputs.cdk_lib_version }}
-      - run: npx changeset version
+      - run: npx --verbose --package @changesets/cli -- changeset version
       - run: npm run check:package-versions
 
   update_package_versions:
diff --git a/.husky/pre-push b/.husky/pre-push
@@ -1,2 +1,2 @@
-npx changeset status --since main
+npx --package @changesets/cli -- changeset status --since main
 npm run check:api
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -56,7 +56,7 @@ npm run setup:local
 npm run test
 ```
 
-`npm run setup:local` will run `npm install`, then build all packages in the project. It also links the ampx and create-amplify bin files into the project node_modules folder.
+`npm run setup:local` will run `npm ci`, then build all packages in the project. It also links the ampx and create-amplify bin files into the project node_modules folder.
 
 `npm run test` will run all the unit tests in the project
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
diff --git a/packages/create-amplify/src/default_packages.json b/packages/create-amplify/src/default_packages.json
diff --git a/packages/integration-tests/src/test-projects/access-testing-project/amplify/backend.ts b/packages/integration-tests/src/test-projects/access-testing-project/amplify/backend.ts
diff --git a/packages/platform-core/src/telemetry/telemetry_payload_exporter.test.ts b/packages/platform-core/src/telemetry/telemetry_payload_exporter.test.ts
diff --git a/scripts/check_changeset_completeness.ts b/scripts/check_changeset_completeness.ts
diff --git a/scripts/components/dependabot_version_update_handler.test.ts b/scripts/components/dependabot_version_update_handler.test.ts
diff --git a/scripts/components/package_lock_validator.ts b/scripts/components/package_lock_validator.ts
diff --git a/scripts/components/release_lifecycle.test.ts b/scripts/components/release_lifecycle.test.ts

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'@aws-amplify/integration-tests': patch
 +---
++
 +Disable self-signup for UserPool