testing yarn berry on ci

Author: Ashwin Kumar

.github/actions/node-and-build/action.yml

@@ -7,6 +7,13 @@ inputs:
 runs:
   using: 'composite'
   steps:
+    - name: Setup yarn berry
+      shell: bash
+      run: |
+        npm install -g corepack
+        corepack enable
+        corepack prepare [email protected] --activate
+        yarn -v
     - name: Setup Node.js 20
       uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
       with:
@@ -36,11 +43,11 @@ runs:
       run: yarn
       shell: bash
       working-directory: ./amplify-js
-    - name: Bootstrap
-      if: inputs.is-prebuild != 'true' || steps.cache-build-artifacts.outputs.cache-hit != 'true'
-      run: yarn bootstrap
-      shell: bash
-      working-directory: ./amplify-js
+    # - name: Bootstrap
+    #   if: inputs.is-prebuild != 'true' || steps.cache-build-artifacts.outputs.cache-hit != 'true'
+    #   run: yarn bootstrap
+    #   shell: bash
+    #   working-directory: ./amplify-js
     - name: Build packages
       if: steps.cache-build-artifacts.outputs.cache-hit != 'true'
       run: yarn build

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

@@ -60,30 +60,26 @@ jobs:
           # Use -X theirs to automatically resolve conflicts in favor of main
           git merge origin/main --no-edit -X theirs --allow-unrelated-histories
           echo "MERGE COMPLETE"
-          git push origin pre-prod/main
+          git push origin pre-prod/main-test
           
-          # Now create a new branch from the updated pre-prod/main
+          # Now create a new branch from the updated pre-prod/main-test
           git checkout -b $TEMP_BRANCH_NAME
 
-      - name: Setup yarn berry and Update API references
-        working-directory: ./docs
-        run: |
-          npm install -g corepack
-          corepack enable
-          yarn -v
+    #   - name: Setup yarn berry and Update API references
+    #     working-directory: ./docs
+    #     run: |
+    #       # Update API references
+    #       yarn && yarn clean-references -- -p amplify-js
+    #       git add .
+    #       git commit --allow-empty -m "chore: Update amplify-js API references"
 
-          # Update API references
-          yarn && yarn clean-references -- -p amplify-js
-          git add .
-          git commit --allow-empty -m "chore: Update amplify-js API references"
-
-      - name: Create a docs PR to merge api references back into the docs site
-        working-directory: ./docs
-        env:
-          TEMP_BRANCH_NAME: ${{ needs.docs-update-prep.outputs.branch_name }}
-          GITHUB_TOKEN: ${{ secrets.GH_TOKEN_AMPLIFY_JS_WRITE }}
-        run: |
-          git push origin $TEMP_BRANCH_NAME
+    #   - name: Create a docs PR to merge api references back into the docs site
+    #     working-directory: ./docs
+    #     env:
+    #       TEMP_BRANCH_NAME: ${{ needs.docs-update-prep.outputs.branch_name }}
+    #       GITHUB_TOKEN: ${{ secrets.GH_TOKEN_AMPLIFY_JS_WRITE }}
+    #     run: |
+    #       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.'
+    #       # 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.'

.github/workflows/callable-get-package-list.yml

@@ -25,7 +25,9 @@ jobs:
           SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2
       - name: Install
         if: steps.cache-package-list.outputs.cache-hit != 'true'
-        run: yarn
+        run: |
+          yarn -v
+          yarn
         shell: bash
       # Need the repo checked out in order to read the file
       - name: Dump Package List

.github/workflows/push-integ-test.yml

@@ -8,7 +8,7 @@ concurrency:
 on:
   push:
     branches:
-      - replace-with-your-branch
+      - ashwin-ci-test
 
 jobs:
   e2e:

.gitignore

@@ -19,6 +19,7 @@ package-lock.json
 packages/*/.watchmanconfig
 dual-publish-tmp
 docs/reference.json
+install-state.gz
 
 ### Version file - core build artifact
 packages/core/src/Platform/version.ts

.yarnrc.yml

@@ -0,0 +1 @@
+nodeLinker: node-modules

package.json

@@ -135,15 +135,13 @@
 	"resolutions": {
 		"@types/babel__traverse": "7.20.0",
 		"path-scurry": "1.10.0",
-		"**/glob/minipass": "6.0.2",
 		"nx": "16.7.0",
 		"xml2js": "0.5.0",
-		"tar": "6.2.1",
-		"**/cross-spawn": "7.0.5"
+		"tar": "6.2.1"
 	},
 	"overrides": {
 		"tar": "6.2.1",
 		"cross-spawn": "7.0.5"
 	},
-	"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
+	"packageManager": "yarn@4.9.0"
 }

packages/api-rest/package.json

@@ -1,6 +1,5 @@
 {
 	"name": "@aws-amplify/api-rest",
-	"private": false,
 	"version": "4.1.4",
 	"description": "Api-rest category of aws-amplify",
 	"main": "./dist/cjs/index.js",

packages/storage/package.json

@@ -14,8 +14,8 @@
 		"./dist/esm/providers/s3/utils/client/runtime/base64/index.native.mjs": "./dist/esm/providers/s3/utils/client/runtime/base64/index.browser.mjs",
 		"./dist/esm/providers/s3/utils/client/runtime/s3TransferHandler/fetch.mjs": "./dist/esm/providers/s3/utils/client/runtime/s3TransferHandler/xhr.mjs",
 		"./dist/esm/providers/s3/utils/client/runtime/xmlParser/pureJs.mjs": "./dist/esm/providers/s3/utils/client/runtime/xmlParser/dom.mjs",
-		"fast-xml-parser": false,
-		"buffer": false
+		"buffer": false,
+		"fast-xml-parser": false
 	},
 	"sideEffects": false,
 	"publishConfig": {