feat: package manager support (#960)

* feat: create amplify skip prompts for `--yes` option (#507)

* feat: add env ci support

* test: update unit tests

* feat: create amplify --yes option

* chore: remove un-used code

* feat: support Panage Manager env var

* chore: add comments

* chore: remove env.CI

* chore: update changeset

* chore: rename PACKAGE_MANAGER_EXECUTABLE

* fix: tests

* fix npm -> npx

* feat: init e2e test workflow for Package Manager Support (#533)

* test: init e2e flow test

* fix GH hash

* use dynamic pkg manager

* setup nodejs with npm

* setup more pkg managers

* install pkg managers

* fix yarn1 and change step name

* fix yarn1

* fix yarn1

* split yarn1 into 2 steps

* fix yarn1

* fix yarn1 win

* exclude bun on windows

* yarn1 windows

* setup yarn3

* yarn3

* yarn3 yarnPath

* yarn use 3rd party action

* try yarn3

* set yarn 3.6.x

* set yarn berry

* set yarn stable and pass --yes

* feat: add env ci support

* test: update unit tests

* feat: create amplify --yes option

* chore: remove un-used code

* feat: support Panage Manager env var

* chore: add comments

* chore: remove env.CI

* chore: update changeset

* chore: rename PACKAGE_MANAGER_EXECUTABLE

* fix: tests

* use Env Var PACKAGE_MANAGER_EXECUTABLE

* fix npm -> npx, remove bun

* fix npm -> npx

* change -- --yes

* chore: update package.lock

* chore: remove @Alpha

* fix: clean up yarn

* fix: change yarn1 to yarn

* chore: rename yarn step

* chore: use env

* fix: yarn-stable env var

* add comments

* chore: update sample app with new imports (#541)

* feat: use "use client"; directive in generated react components (#540)

* fix: flatten prop types auth (#534)

* fix: flatten auth login with types

* chore: update snapshots

* chore: update api

* chore: add changeset

* chore: add TODO

---------

Co-authored-by: Amplifiyer <[email protected]>
Co-authored-by: Spencer Stolworthy <[email protected]>
Co-authored-by: awsluja <[email protected]>

* fix: pnpm init and env var (#563)

* fix: npm_project_initializer to use env var

* fix: pnpm init

* chore: update package.lock

* chore: update package.lock

* test: use GH workflow for e2e test of create amplify (#636)

* feat: setup GH workflow for create amplify

* chore: changeset

* fix: add pkg type for modern yarn

* fix npm install

* feat: test Node v20 and Node v19

* feat: test Node v20 and yarn-stable with Node 19

* feat: exclude yarn-stable

* feat: include node 20 and exclude node 19

* feat: use node 20 for others, use node 19 for yarn-stable

* chore: add TODO to use Node 20

* fix: e2e tests (#771)

* chore: change branch to poc/pms-create-amplify

* fix: gitIgnore test

* fix: refactor e2e for pms

* chore: update package.lock

* chore: update package.lock

* temp: refactor

* temp: run 1 test

* temp: fix npx

* temp: install packages for yarn

* temp: update initial_project_file_generator

* temp: install ts for yarn

* temp: ignore node_modules and yarn.lock

* temp: create yarn.lock for yarn stable

* temp: fix yarn-stable init

* temp: fix --help

* fix: assert for gitignore

* chore: change yarn stable install

* fix: not install yarn stable globally

* add @yarnpkg/sdks base

* yarn stable use node-modules

* remove emoji

* remove @yarnpkg/sdks

* yarn stable use node 18.18

* yarn stable use node 20

* chore: re-enable all tests

* Revert "chore: re-enable all tests"

This reverts commit f7a167b.

* chore: uncomment test

* chore: enable all initialStatues

* test: change concurrencyLevel for yarn and yarn stable

* add yarn-stable to test fails fast

* chore: update changeset

* chore: change workflow trigger

* chore: yarn not install typescript in root folder

* chore: update package.lock

* Revert "chore: yarn not install typescript in root folder"

This reverts commit 0d83dd0.

* chore: remove comment

* chore: fix typo

* chore: rename yarn-classic and yarn modern

* fix(create_amplify.test): after merge main

* fix the concurrency for yarn classic and modern, and fix expect

* feat: package manager support create amplify (#793)

* chore: update package.lock

* init

* feat: dynamically get package manager

* chore: change workflow trigger

* chore: change workflow trigger

* chore: rename npm functions

* chore: update output log

* fix: pnpm cache clear command

* chore: refactor packageManager

* fix: remove pnpm store

* chore: create package_manager file

* chore: change workflow trigger

* chore: refactor PackageManager Controller and Initializer

* fix: update types

* chore: refactor to use factory

* chore: remove try catch from the controllers

* chore: change type

* chore: use abstract class

* fix tests

* fix: PackageManagerBase

* chore: refactor PackageManagerControllerFactory

* chore: refactor packageJsonExists

* chore: cleanup code

* fix: projectJsonExists

* remove package_manager file

* chore: refactor package_manager props into package manager controllers

* chore: rename packageManagerControllerFactory

* chore: make projectRoot, userAgent, getPackageManagerName private

* chore: refactor ensureInitialized

* chore: refactor PackageManagerController to extend PackageManagerControllerFactory

* Revert "chore: refactor PackageManagerController to extend PackageManagerControllerFactory"

This reverts commit 7ddc64f.

* chore: refactor to inject PackageManagerControllerFactory to xPackageManagerController

* chore: move initialProjectFileGenerator to packageManagerController

* fix: initializeAMplifyFolder

* fix: generateInitialProjectFiles

* fix: template path

* chore: refactor getPackageManagerController yarn-modern

* chore: create getWelcomeMessage

* Revert "chore: refactor getPackageManagerController yarn-modern"

This reverts commit 28da8a9.

* chore: refactor generateInitialProjectFiles for yarn-modern

* chore: cleanup code

* chore: remove PackageManagerControllerFactory index

* chore: remove ensureInitialized

* Revert "chore: remove ensureInitialized"

This reverts commit 96483ce.

* Revert "Revert "chore: remove ensureInitialized""

This reverts commit 7c59c80.

* temp: add initializeProject to PackageManagerController

* temp: revert InitialProjectFileGenerator

* fix: InitialProjectFileGenerator

* test: restore initial_project_file_generator

* move installDependencies and getWelcomeMessage to PackageManagerController

* add addLockFile

* add JSDocs and resolve some review comments

* fix: create_amplify.test

* chore: add addTypescript

* chore: refactor generateInitialProjectFiles

* Update packages/create-amplify/src/package-manager-controller/package_manager_controller_factory.ts

Co-authored-by: Edward Foyle <[email protected]>

* chore: refactor generateInitialProjectFiles again

* chore: refactor welcomeMessage

* test: add package_manager_controller_factory

* test: fix test types

* chore: comments update

* chore: handle process.env.npm_config_user_agent undefined

* chore: move addLockFile and addTypescript into initializeTsConfig

* test: refactor packageManagerControllerFactory

* fix: yarn initializeTsConfig

* fix: yarn modern initializeTsConfig

* fix: amplify_project_creator test

* chore: refactor contructor

* chore: update package.lock

* fix: pnpm init, remove --debug, etc

* test: add test for NpmPackageManagerController

* fix build error

* chore: refactor NpmPackageManagerController

* test: add test for xPackageManagerController

* chore: convert fs to fsp

* fix yarn modern

---------

Co-authored-by: Edward Foyle <[email protected]>

* chore: update package-lock

* test: add deploy test (#901)

* chore: add e2e_flow.test

* add deploy test but don't work

* comment out deploy test

* fix: e2e test assert

* chore: update package.lock

* add deploy test

* use before and after

* change amplifyCli to execa

* change test trigger

* Revert "change amplifyCli to execa"

This reverts commit 9f85439.

* setupProfile

* Revert "Revert "change amplifyCli to execa""

This reverts commit 4950b7d.

* remove fail test and initialStates

* install @aws-amplify/backend-deployer

* chore: update changeset

* chore: set nodeLinker in test project

* fix execaOptions syntax error

* fix: npx in cdk deployer

* chore: update changeset

* fix: yarn modern build

* chore: update package-lock

* chore: remove some asserts

* chore: remove synth

* install packages to fix yarn

* remove create-amplify  help

* simplify before and after

* remove one packageManagerSetup

* refactor packageManagerSetup

* fix yarn-

* move yarn add to setupPackageManager

* fix type error

* Revert "fix type error" and "move yarn add to setupPackageManager"

This reverts commit d88ef61.

* try fix pnpm for windows by adding @AWS-SDK+credential-providers

* remove the pnpm patch

* add nodir to dictionary

* move setupPackageManager to a new file

* rename PACKAGE_MANAGER_EXECUTABLE to PACKAGE_MANAGER

* refactor packageManagerSetup to use switch

* refactor packageManagerSetup to initializeX

* use beforeEach and afterEach

* add TODO comment

* temp

* simplify yarn-modern treatments

* misc changes

* add TODO comments

* exclude pnpm on windows

* Revert "exclude pnpm on windows"

This reverts commit dd7b423.

* exclude pnpm on windows

* resolve review comments

* fix syntax error

* address review comments

* move this.packageManager logic to ctor

* fix yarn-modern

* add packageManagerCli and packageManagerExecutable

* fix yarn

* address review comments

* rename package_manager_sanity_check

* update workflow yml

* chore: update package-lock

* move npm proxy to before and after

* change comments

* feat(backend-deploy): use packageManagerController (#947)

* fix logger

* fix logLevel

* change workflow trigger to include poc/pms-cli-core

* move package_manager_controller to cli-core

* chore: update changeset

* move npm_config_user_agent to getPackageManagerName and add runWithPackageManager

* fix build error

* modify executeWithDebugLogger

* add getPackageManagerCommandArgs

* refactor cdk_deployer to use package manager

* install cli-core

* fix execaChildProcess type

* use PackageManagerControllerFactory in cdkDeployer

* fix amplify/amplify path

* chore: update API.md

* clean up package-manager-controller export

* update API.md

* add type PackageManagerController

* use PackageManagerController type from plugin-types

* rename PackageManagerControllerBase and use plugin-types

* change workflow trigger to exclude poc/pms-cli-core

* refactor BackendDeployerFactory to take PackageManagerController

* clean up getPackageManagerCommandArgs

* add projectRoot and rename packageManagerControllerBase file

* set projectRoot default value

* rename execute_with_debugger_logger

* use execa Options

* Revert "use execa Options"

This reverts commit 30cd61e.

* rename executeChildProcessWithPackageManager to executeCommand

* make BackendDeployerFactory param mandatory

* make BackendDeployerFactory param mandatory

* remove DependencyType

* remove @aws-amplify/platform-core from cli-core

* remove some default projectRoot

* remove all default projectRoot

* inject printer to factory

* update package-lock

* fix cli-core version in backend-deployer

* move @aws-amplify/cli-core to devDep

* add getCommand

* change execa option type

* change projectRoot to private

* rename projectRoot to cwd

* change ./ to cwd

* remove @aws-amplify/cli-core from backend-deployer

* patch dependencies_validator for execa

* fix getCommand, cdk_deployer.test, amplify_project_creator.test

* fix initial_project_file_generator.test

* fix executeWithDebugLogger test

* fix YarnModernPackageManagerController test

* fix packageManagerControllerFactory test

* fix lint error

* Update packages/cli-core/src/package-manager-controller/package_manager_controller_factory.ts

Co-authored-by: Kamil Sobol <[email protected]>

* remove never used packageManagerExecutable

* update changeset

* feat: add Package Manager test to health_checks (#968)

* add package-manager-tests to health-checks

* remove poc-e2e-flow-test

* add run_package_manager_tests_tests condition

* fix run_package_manager_tests_tests condition

* remove amplify-backend_windows-latest_8-core

* use re-usable action for run-e2e

* Revert "remove amplify-backend_windows-latest_8-core"

This reverts commit 547834a.

* Revert "use re-usable action for run-e2e"

This reverts commit 3159e01.

* revert re-usable action

* Update .changeset/new-timers-warn.md

Co-authored-by: Kamil Sobol <[email protected]>

* clean up commented code

* use amplify-backend_windows-latest_8-core

* Update .changeset/new-timers-warn.md

Co-authored-by: Edward Foyle <[email protected]>

* remove inaccurate JSdoc

* remove integration-tests from changeset

---------

Co-authored-by: Amplifiyer <[email protected]>
Co-authored-by: Spencer Stolworthy <[email protected]>
Co-authored-by: awsluja <[email protected]>
Co-authored-by: Edward Foyle <[email protected]>
Co-authored-by: Kamil Sobol <[email protected]>

Author: 6 people

.changeset/new-timers-warn.md

@@ -0,0 +1,10 @@
+---
+'@aws-amplify/backend-deployer': minor
+'create-amplify': minor
+'@aws-amplify/plugin-types': minor
+'@aws-amplify/cli-core': minor
+'@aws-amplify/sandbox': minor
+'@aws-amplify/backend-cli': minor
+---
+
+Support yarn 1, yarn 2+ and pnpm package managers

.eslint_dictionary.json

@@ -32,6 +32,7 @@
   "ecma",
   "enum",
   "enums",
+  "esbuild",
   "esnext",
   "execa",
   "facebook",
@@ -74,6 +75,7 @@
   "namespace",
   "nodejs",
   "nodenext",
+  "nodir",
   "npmrc",
   "npx",
   "nullability",
@@ -85,6 +87,7 @@
   "passthrough",
   "pathname",
   "pipelined",
+  "pnpm",
   "posix",
   "readdir",
   "readline",

.github/workflows/health_checks.yml

@@ -164,6 +164,53 @@ jobs:
           aws-region: us-west-2
       - name: Run E2E tests
         run: npm run e2e
+  run_package_manager_e2e_tests:
+    if: needs.do_include_e2e.outputs.run_e2e == 'true'
+    strategy:
+      # will finish running other test matrices even if one fails
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, amplify-backend_windows-latest_8-core]
+        pkg-manager: [npm, yarn-classic, yarn-modern, pnpm]
+        node-version: [20]
+        exclude:
+          - os: amplify-backend_windows-latest_8-core
+            pkg-manager: pnpm
+    env:
+      PACKAGE_MANAGER: ${{ matrix.pkg-manager }}
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 25
+    needs:
+      - build
+      - do_include_e2e
+    permissions:
+      # these permissions are required for the configure-aws-credentials action to get a JWT from GitHub
+      id-token: write
+      contents: read
+    steps:
+      - name: Checkout aws-amplify/amplify-cli repo
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - name: Setup Node.js
+        uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # version 3.8.1
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: Restore Build Cache
+        uses: ./.github/actions/restore_build_cache
+      - name: Configure test tooling credentials
+        uses: ./.github/actions/setup_profile
+        with:
+          role-to-assume: ${{ secrets.E2E_TOOLING_ROLE_ARN }}
+          aws-region: us-west-2
+          profile-name: e2e-tooling
+      - name: Configure test execution credentials
+        uses: aws-actions/configure-aws-credentials@04b98b3f9e85f563fb061be8751a0352327246b0 # version 3.0.1
+        with:
+          role-to-assume: ${{ secrets.E2E_RUNNER_ROLE_ARN }}
+          aws-region: us-west-2
+      - name: Run E2E flow tests with ${{ matrix.pkg-manager }}
+        shell: bash
+        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:

.gitignore

@@ -19,3 +19,5 @@ verdaccio-logs.txt
 cdk.out/
 e2e-tests
 concurrent_workspace_script_cache.json
+
+testDir

.prettierignore

@@ -12,3 +12,4 @@ expected-cdk-out
 concurrent_workspace_script_cache.json
 scripts/components/api-changes-validator/test-resources/working-directory
 test-projects
+testDir

package-lock.json

@@ -5,6 +5,7 @@
 ```ts
 
 import { BackendIdentifier } from '@aws-amplify/plugin-types';
+import { PackageManagerController } from '@aws-amplify/plugin-types';
 
 // @public
 export type BackendDeployer = {
@@ -14,7 +15,8 @@ export type BackendDeployer = {
 
 // @public
 export class BackendDeployerFactory {
-    static getInstance: () => BackendDeployer;
+    constructor(packageManagerController: PackageManagerController);
+    getInstance(): BackendDeployer;
 }
 
 // @public (undocumented)