Merge branch 'main' into temp/release-merge-1745264853

Author: HuiSF

.github/CODEOWNERS

@@ -1,12 +1,12 @@
 * @aws-amplify/amplify-js
-/packages/api @aws-amplify/amplify-js @aws-amplify/amplify-data
-/packages/api-graphql @aws-amplify/amplify-data
-/packages/api-rest @aws-amplify/amplify-js @aws-amplify/amplify-data
-/packages/core @aws-amplify/amplify-js @aws-amplify/amplify-data
-/packages/datastore @aws-amplify/amplify-data
-/packages/datastore-storage-adapter @aws-amplify/amplify-data
+/packages/api @aws-amplify/amplify-js
+/packages/api-graphql @aws-amplify/amplify-js
+/packages/api-rest @aws-amplify/amplify-js
+/packages/core @aws-amplify/amplify-js
+/packages/datastore @aws-amplify/amplify-js
+/packages/datastore-storage-adapter @aws-amplify/amplify-js
 /packages/geo @aws-amplify/amplify-js @aws-amplify/amplify-ui
-/packages/pubsub @aws-amplify/amplify-js @aws-amplify/amplify-data
+/packages/pubsub @aws-amplify/amplify-js
 /packages/aws-amplify/package.json @aws-amplify/amplify-js-admins
 /packages/storage/src/storageBrowser @aws-amplify/amplify-js @aws-amplify/amplify-ui
 /packages/storage/storage-browser @aws-amplify/amplify-js @aws-amplify/amplify-ui

.github/PULL_REQUEST_TEMPLATE.md

@@ -12,7 +12,7 @@ the requirements below.
 
 #### Issue #, if available
 <!-- Also, please reference any associated PRs for documentation updates. -->
-
+<!-- For external contributions, provide the github issue the PR is addressing. If no github issue exists for the related changes, open a new issue in https://github.com/aws-amplify/amplify-js/issues. -->
 
 
 #### Description of how you validated changes

.github/workflows/callable-docs-update.yml

@@ -48,6 +48,22 @@ jobs:
         run: |
           yarn run docs:references
 
+      - name: Prepare docs temp branch
+        working-directory: ./docs
+        env:
+          TEMP_BRANCH_NAME: ${{ needs.docs-update-prep.outputs.branch_name }}
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN_AMPLIFY_JS_WRITE }}
+        run: |
+          # First sync pre-prod/main with main using the "theirs" strategy to resolve conflicts
+          git fetch origin main pre-prod/main
+          git checkout pre-prod/main
+          # Use -X theirs to automatically resolve conflicts in favor of main
+          git merge origin/main --no-edit -X theirs
+          git push origin pre-prod/main
+          
+          # Now create a new branch from the updated pre-prod/main
+          git checkout -b $TEMP_BRANCH_NAME
+
       - name: Update API references in the docs site
         working-directory: ./docs
         run: |
@@ -61,6 +77,7 @@ jobs:
           TEMP_BRANCH_NAME: ${{ needs.docs-update-prep.outputs.branch_name }}
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN_AMPLIFY_JS_WRITE }}
         run: |
-          git checkout -b $TEMP_BRANCH_NAME
           git push origin $TEMP_BRANCH_NAME
+          
+          # Create PR from the temp branch to pre-prod/main
           gh pr create -B pre-prod/main -H $TEMP_BRANCH_NAME --title 'chore: amplify-js api references update' --body 'Merge the api references changes from the most recent release.'