fix: e2e tests

.changeset/itchy-pigs-switch.md

@@ -0,0 +1,2 @@
+---
+---

.github/workflows/poc-e2e-flow-test.yml

@@ -5,7 +5,7 @@ name: 'poc-e2e-flow-test'
 on: # TODO: need to change the trigger
   push:
     branches:
-      - poc/e2e-create-amplify
+      - poc/pms-create-amplify
 
 jobs:
   install:
@@ -37,18 +37,8 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        pkg-manager: [npm, yarn, pnpm]
+        pkg-manager: [npm, yarn, yarn-stable, pnpm]
         node-version: [20]
-        include:
-          - os: ubuntu-latest
-            pkg-manager: yarn-stable
-            node-version: 19 # TODO: use Node 20 once https://github.com/yarnpkg/berry/pull/5961 is released
-          - os: macos-latest
-            pkg-manager: yarn-stable
-            node-version: 19 # TODO: use Node 20 once https://github.com/yarnpkg/berry/pull/5961 is released
-          - os: windows-latest
-            pkg-manager: yarn-stable
-            node-version: 19 # TODO: use Node 20 once https://github.com/yarnpkg/berry/pull/5961 is released
     env:
       ACKAGE_MANAGER_EXECUTABLE: ${{ matrix.pkg-manager }} # TODO: remove PACKAGE_MANAGER_EXECUTABLE once CLI is able to getPackageManager().
     runs-on: ${{ matrix.os }}

packages/create-amplify/src/amplify_project_creator.ts

@@ -14,7 +14,7 @@ export class AmplifyProjectCreator {
   private readonly defaultDevPackages = [
     '@aws-amplify/backend',
     '@aws-amplify/backend-cli',
-    'typescript@^5.0.0',
+    'typescript@^5.0.0', // TODO: remove this line for yarn since it's installed in amplify/
   ];
 
   private readonly defaultProdPackages = ['aws-amplify'];

packages/create-amplify/src/initial_project_file_generator.ts

@@ -1,4 +1,5 @@
 import path from 'path';
+import fs from 'fs';
 import _fs from 'fs/promises';
 import { executeWithDebugLogger as _executeWithDebugLogger } from './execute_with_logger.js';
 import { execa } from 'execa';
@@ -17,6 +18,12 @@ export class InitialProjectFileGenerator {
     private readonly executeWithDebugLogger = _executeWithDebugLogger
   ) {}
 
+  private readonly executableName = !process.env.PACKAGE_MANAGER_EXECUTABLE
+    ? 'npm'
+    : process.env.PACKAGE_MANAGER_EXECUTABLE === 'yarn-stable'
+    ? 'yarn'
+    : process.env.PACKAGE_MANAGER_EXECUTABLE; // TODO: replace `process.env.PACKAGE_MANAGER_EXECUTABLE` with `getPackageManagerName()` once the test infra is ready.
+
   /**
    * Copies the template directory to an amplify folder within the projectRoot
    */
@@ -35,6 +42,16 @@ export class InitialProjectFileGenerator {
       JSON.stringify(packageJsonContent, null, 2)
     );
 
+    if (process.env.PACKAGE_MANAGER_EXECUTABLE === 'yarn-stable') {
+      fs.writeFile(path.resolve(targetDir, 'yarn.lock'), '', (err) => {
+        if (err) {
+          console.error(`Error creating ${targetDir}/${targetDir}`, err);
+        } else {
+          console.log(`${targetDir}/yarn.lock created successfully.`);
+        }
+      });
+    }
+
     await this.initializeTsConfig(targetDir);
   };
 
@@ -52,6 +69,20 @@ export class InitialProjectFileGenerator {
       'es2022',
     ];
 
-    await this.executeWithDebugLogger(targetDir, 'npx', tscArgs, execa);
+    if (this.executableName.startsWith('yarn')) {
+      await this.executeWithDebugLogger(
+        targetDir,
+        'yarn',
+        ['add', 'typescript@^5'],
+        execa
+      );
+    }
+
+    await this.executeWithDebugLogger(
+      targetDir,
+      this.executableName === 'npm' ? 'npx' : this.executableName,
+      tscArgs,
+      execa
+    );
   };
 }

packages/create-amplify/src/npm_project_initializer.ts

@@ -17,8 +17,11 @@ export class NpmProjectInitializer {
     private readonly execa = _execa
   ) {}
 
-  private readonly executableName =
-    process.env.PACKAGE_MANAGER_EXECUTABLE || 'npm'; // TODO: replace `process.env.PACKAGE_MANAGER_EXECUTABLE` with `getPackageManagerName()` once the test infra is ready.
+  private readonly executableName = !process.env.PACKAGE_MANAGER_EXECUTABLE
+    ? 'npm'
+    : process.env.PACKAGE_MANAGER_EXECUTABLE === 'yarn-stable'
+    ? 'yarn'
+    : process.env.PACKAGE_MANAGER_EXECUTABLE; // TODO: replace `process.env.PACKAGE_MANAGER_EXECUTABLE` with `getPackageManagerName()` once the test infra is ready.
 
   /**
    * If package.json already exists, this is a noop. Otherwise, `npm init` is executed to create a package.json file