Merge branch 'main' into feat/pre-signed-upload-url

Author: osama-rizk

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

@@ -30,7 +30,7 @@ runs:
           ${{ runner.os }}-build-artifacts-
       env:
         SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2
-    # TODO We should be able to skip yarn / bootstrap if we cache enough things. Leaving because skipping causes issues.
+    # TODO We should be able to skip yarn install if we cache enough things. Leaving because skipping causes issues.
     - name: Install
       if: inputs.is-prebuild != 'true' || steps.cache-build-artifacts.outputs.cache-hit != 'true'
       shell: bash
@@ -42,11 +42,6 @@ runs:
           echo "Attempt $i failed."
           sleep 5
         done
-    - 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-canary-e2e-tests.yml

@@ -69,10 +69,6 @@ jobs:
         run: yarn
         shell: bash
         working-directory: ./amplify-js
-      - name: Bootstrap
-        run: yarn bootstrap
-        shell: bash
-        working-directory: ./amplify-js
       - name: Build packages
         run: yarn build
         shell: bash

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

@@ -34,7 +34,13 @@ jobs:
       - name: Dump Package List
         if: steps.cache-package-list.outputs.cache-hit != 'true'
         run: |
-          yarn lerna ll | egrep -v "lerna|Done|yarn" | jq -R -s -c 'split("\n")[:-1] | map({name: split(" ")[0], path: split(" ")[-1]})' > package-list.json
+          # Get all workspaces and filter out private packages (examples and scripts)
+          # This matches Lerna's behavior with "command.run.private: false"
+          yarn workspaces info --json 2>&1 | sed -n '/^{/,/^}/p' | jq -c '
+            to_entries | 
+            map({name: .key, path: .value.location}) | 
+            map(select(.path | (contains("/example") or startswith("scripts/")) | not))
+          ' > package-list.json
       - name: Get Package List
         id: get_package_list
         run: |

.github/workflows/callable-native-unit-tests.yml

@@ -25,12 +25,12 @@ jobs:
         env:
           TEST_PACKAGE: ${{ matrix.package.name }}
         run: |
-          npx lerna exec --scope $TEST_PACKAGE yarn prepare:ios
-          npx lerna exec --scope $TEST_PACKAGE yarn test:ios
+          yarn workspace $TEST_PACKAGE prepare:ios
+          yarn workspace $TEST_PACKAGE test:ios
       - name: Run Android Tests
         working-directory: ./amplify-js
         env:
           TEST_PACKAGE: ${{ matrix.package.name }}
         run: |
-          npx lerna exec --scope $TEST_PACKAGE yarn prepare:android
-          npx lerna exec --scope $TEST_PACKAGE yarn test:android
+          yarn workspace $TEST_PACKAGE prepare:android
+          yarn workspace $TEST_PACKAGE test:android

.github/workflows/callable-unit-tests.yml

@@ -24,7 +24,7 @@ jobs:
         working-directory: ./amplify-js
         env:
           TEST_PACKAGE: ${{ matrix.package.name }}
-        run: npx lerna exec --scope $TEST_PACKAGE yarn test
+        run: yarn workspace $TEST_PACKAGE test
   # disable temporarily
   #   - name: Check coverage report existence
   #     id: check-report

.gitignore

@@ -1,6 +1,5 @@
 build
 Config
-lerna-debug.log
 node_modules
 packages/*/node_modules/**
 packages/**/lib/
@@ -75,6 +74,9 @@ coverage-ts/
 **/.rollup.cache
 **/buildMeta
 
+# Turborepo
+.turbo
+
 # ruby
 vendor/
 Gemfile.lock

.turborc

@@ -0,0 +1,3 @@
+{
+  "telemetry": false
+}

CONTRIBUTING.md

@@ -53,17 +53,13 @@ This section should get you running with **Amplify JS** and get you familiar wit
 
 The recommended version of Node JS to work with this project is [`18.18.0`](https://nodejs.org/en/blog/release/v18.18.0/) with Yarn version [`1.22.x`](https://github.com/yarnpkg/yarn/blob/master/CHANGELOG.md).
 
-> Note: newer versions of Yarn (2+) remove support for lerna's `--mutex` flag
-> so be sure to use Yarn v1.22.x
-
 Start by [forking](https://help.github.com/en/github/getting-started-with-github/fork-a-repo) the main branch of [amplify-js](https://github.com/aws-amplify/amplify-js).
 
 ```
 git clone git@github.com:[username]/amplify-js.git
 cd amplify-js
 
 yarn
-yarn bootstrap
 yarn build
 ```
 
@@ -139,7 +135,7 @@ Allowed patterns are stored in `.git/config` and apply only to your local reposi
 
 ## Architecture of the codebase
 
-Amplify JS is a monorepo built with `Yarn` and `Lerna`. All the categories of Amplify live within the `packages` directory in the root. Each category inside packages has its own `src/` and `package.json`.
+Amplify JS is a monorepo built with `Yarn` and `Turborepo`. All the categories of Amplify live within the `packages` directory in the root. Each category inside packages has its own `src/` and `package.json`.
 
 [**Packages inside Amplify JS Monorepo**](https://github.com/aws-amplify/amplify-js/tree/main/packages)
 
@@ -170,15 +166,15 @@ yarn run test --scope @aws-amplify/auth
 #### Test in a local sample app
 
 **Yarn Linking**
-The best way to develop locally and test is to link the individual package you’re working on and run lerna in watch mode.
+The best way to develop locally and test is to link the individual package you’re working on and run it in watch mode.
 
 Note: to test using the react-native framework you will need to use [Verdaccio](#verdaccio)
 
 Run watch mode while editing (auth for example):
 
 ```
-npx lerna exec --scope @aws-amplify/auth yarn link
-npx lerna exec --scope @aws-amplify/auth yarn build:watch
+yarn workspace @aws-amplify/auth link
+yarn workspace @aws-amplify/auth build:watch
 ```
 
 Or run the whole library in watch mode if you are working on multiple packages
@@ -280,7 +276,7 @@ _[Skip step 1 to 3 if you have already done this]_
 
 1. Fork [`aws-amplify/amplify-js`](https://github.com/aws-amplify/amplify-js)
 2. Clone your fork locally: `git clone git@github.com:YOUR_GITHUB_USERNAME/amplify-js.git`
-3. Run `yarn && yarn bootstrap` in the repository root
+3. Run `yarn` in the repository root
 4. Within your fork, create a new branch based on the issue (e.g. Issue #123) you're addressing - `git checkout -b "group-token/short-token-[branch-name]"` or `git checkout -b "short-token/[branch-name]"`
    - Use grouping tokens at the beginning of the branch names. For e.g, if you are working on changes specific to `amplify-ui-components`, then you could start the branch name as `ui-components/...`
    - short token

lerna.json

@@ -40,8 +40,10 @@
 		"**/rollup.config.mjs",
 		"rollup",
 		".husky",
+		".turbo",
 		"eslint.config.mjs",
-		"packages/core/metadata"
+		"packages/core/metadata",
+		"packages/react-native/example/.bundle/config"
 	],
 	"ignoreFile": ".gitignore",
 	"license": "license_header.txt",