fix(package-manager): pnpm tsc not found (#1016)

* fix(package-manager): pnpm and e2e test

* update changeset

* fix e2e test to detect binary

* use beta version

* delete .bin folder

* fix yarn test

* remove yarn modern redundant packages

* remove yarn more redundant packages

* fix unit tests

* try fixing npx which amplify

* remove npx which amplify

* Update packages/integration-tests/src/package_manager_sanity_checks.test.ts

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

* treat yarn amplify@beta

* Revert "treat yarn amplify@beta"

This reverts commit 52dc1f7.

* treat yarn amplify@beta again

* fix yarn modern

* fix yarn modern unit test

* fix lint error

* fix unit test

* change after test install

* remove corepack install

* fix yarn modern unit test

* fix yarn classic global create-amplify

* change comments

* use npm run install

---------

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

Author: 0618

.changeset/brave-pets-clean.md

@@ -0,0 +1,5 @@
+---
+'@aws-amplify/cli-core': patch
+---
+
+fix pnpm Command "tsc" not found

.eslint_dictionary.json

@@ -20,6 +20,7 @@
   "codegen",
   "cognito",
   "commonjs",
+  "corepack",
   "ctor",
   "darwin",
   "datastore",

package-lock.json

@@ -112,7 +112,8 @@ Get started by running \`${this.binaryRunner} amplify sandbox\`.`;
       targetDir,
       this.binaryRunner,
       tscArgs,
-      this.execa
+      this.execa,
+      { preferLocal: true, localDir: targetDir }
     );
   }
 

packages/cli-core/src/package-manager-controller/package_manager_controller_base.ts

@@ -138,7 +138,7 @@ void describe('YarnClassicPackageManagerController', () => {
           existsSyncMock
         );
       await yarnClassicPackageManagerController.initializeTsConfig('./amplify');
-      assert.equal(executeWithDebugLoggerMock.mock.callCount(), 2);
+      assert.equal(executeWithDebugLoggerMock.mock.callCount(), 1);
     });
   });
 });

packages/cli-core/src/package-manager-controller/yarn_classic_package_manager_controller.test.ts

@@ -33,21 +33,4 @@ export class YarnClassicPackageManagerController extends PackageManagerControlle
       existsSync
     );
   }
-
-  initializeTsConfig = async (targetDir: string) => {
-    await this.addTypescript(targetDir);
-    await super.initializeTsConfig(targetDir);
-  };
-
-  /**
-   * addTypescript - initializes a tsconfig.json file in the project root
-   */
-  private addTypescript = async (targetDir: string) => {
-    await this.executeWithDebugLogger(
-      targetDir,
-      'yarn',
-      ['add', 'typescript@^5'],
-      this.execa
-    );
-  };
 }

packages/cli-core/src/package-manager-controller/yarn_classic_package_manager_controller.ts

@@ -40,27 +40,15 @@ void describe('YarnModernPackageManagerController', () => {
         ['testPackage1', 'testPackage2'],
         'dev'
       );
-      assert.equal(executeWithDebugLoggerMock.mock.callCount(), 2);
-      assert.deepEqual(executeWithDebugLoggerMock.mock.calls[0].arguments, [
-        '/testProjectRoot',
-        'yarn',
-        ['add', '-D', 'tsx', 'esbuild'],
-        execaMock,
-      ]);
+      assert.equal(executeWithDebugLoggerMock.mock.callCount(), 1);
     });
 
     void it('runs yarn add with the correct arguments for prod dependencies', async () => {
       await yarnModernPackageManagerController.installDependencies(
         ['testPackage1', 'testPackage2'],
         'prod'
       );
-      assert.equal(executeWithDebugLoggerMock.mock.callCount(), 2);
-      assert.deepEqual(executeWithDebugLoggerMock.mock.calls[0].arguments, [
-        '/testProjectRoot',
-        'yarn',
-        ['add', '-D', 'tsx', 'esbuild'],
-        execaMock,
-      ]);
+      assert.equal(executeWithDebugLoggerMock.mock.callCount(), 1);
     });
   });
 

packages/cli-core/src/package-manager-controller/yarn_modern_package_manager_controller.test.ts

@@ -36,14 +36,6 @@ export class YarnModernPackageManagerController extends PackageManagerController
     );
   }
 
-  installDependencies: (
-    packageNames: string[],
-    type: 'dev' | 'prod'
-  ) => Promise<void> = async (packageNames, type) => {
-    await this.addDependencies(this.cwd);
-    await super.installDependencies(packageNames, type);
-  };
-
   initializeTsConfig = async (targetDir: string) => {
     await this.addLockFile(targetDir);
     await this.addTypescript(targetDir);
@@ -79,13 +71,4 @@ export class YarnModernPackageManagerController extends PackageManagerController
       this.execa
     );
   };
-
-  private addDependencies = async (targetDir: string) => {
-    await this.executeWithDebugLogger(
-      targetDir,
-      'yarn',
-      ['add', '-D', 'tsx', 'esbuild'],
-      this.execa
-    );
-  };
 }

packages/cli-core/src/package-manager-controller/yarn_modern_package_manager_controller.ts

@@ -22,6 +22,8 @@ export class AmplifyProjectCreator {
     'aws-cdk-lib@^2',
     'constructs@^10.0.0',
     'typescript@^5.0.0',
+    'tsx',
+    'esbuild',
   ];
 
   private readonly defaultProdPackages = ['aws-amplify'];

packages/create-amplify/src/amplify_project_creator.ts

@@ -1,4 +1,4 @@
-import { execa } from 'execa';
+import { execa, execaCommand } from 'execa';
 import * as fsp from 'fs/promises';
 import * as path from 'path';
 import * as os from 'os';
@@ -34,10 +34,22 @@ void describe('getting started happy path', async () => {
     // start a local npm proxy and publish the current codebase to the proxy
     await execa('npm', ['run', 'clean:npm-proxy'], { stdio: 'inherit' });
     await execa('npm', ['run', 'vend'], { stdio: 'inherit' });
+    /**
+     * delete .bin folder in the repo because
+     * 1) e2e tests should not depend on them
+     * 2) execa would have package managers to use them if it can not find the binary in the test project
+     */
+    await execaCommand(`rm -rf ${process.cwd()}/node_modules/.bin`);
   });
 
   after(async () => {
+    // TODO: remove the condition once GA https://github.com/aws-amplify/amplify-backend/issues/1013
+    // create-amplify has been installed globally, we need to remove it before running `setup:local`
+    if (packageManager === 'yarn-classic') {
+      await execa('yarn', ['global', 'remove', 'create-amplify']);
+    }
     // stop the npm proxy
+    await execa('npm', ['install'], { stdio: 'inherit' }); // add tsx back since we removed all the binaries
     await execa('npm', ['run', 'stop:npm-proxy'], { stdio: 'inherit' });
   });
 
@@ -67,11 +79,22 @@ void describe('getting started happy path', async () => {
   });
 
   void it('creates new project and deploy them without an error', async () => {
-    await runPackageManager(
-      packageManager,
-      ['create', 'amplify', '--yes'],
-      tempDir
-    ).run();
+    // TODO: remove the condition once GA https://github.com/aws-amplify/amplify-backend/issues/1013
+    if (packageManager === 'yarn-classic') {
+      await execa('yarn', ['global', 'add', 'create-amplify@beta']);
+      process.env.npm_config_user_agent = 'yarn/1.22.21';
+      await runPackageManager(
+        packageManager,
+        ['create', 'amplify', '--yes'],
+        tempDir
+      ).run();
+    } else {
+      await runPackageManager(
+        packageManager,
+        ['create', 'amplify@beta', '--yes'], // TODO: remove "@beta" once GA https://github.com/aws-amplify/amplify-backend/issues/1013
+        tempDir
+      ).run();
+    }
 
     const pathPrefix = path.join(tempDir, 'amplify');