chore: refactor getPackageManagerController yarn-modern

aws-amplify · Dec 18, 2023 · 28da8a9 · 28da8a9
1 parent 24e17eb
commit 28da8a9
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 14 deletions.
diff --git a/packages/create-amplify/src/package-manager-controller/package_manager_controller_factory.ts b/packages/create-amplify/src/package-manager-controller/package_manager_controller_factory.ts
@@ -188,10 +188,13 @@ export class PackageManagerControllerFactory {
   /**
    * Copies the template directory to an amplify folder within the projectRoot
    */
-  generateInitialProjectFiles = async (packageManagerProps: {
-    name: string;
-    binaryRunner: string;
-  }): Promise<void> => {
+  generateInitialProjectFiles = async (
+    packageManagerProps: {
+      name: string;
+      binaryRunner: string;
+    },
+    operate?: (param: string) => Promise<void>
+  ): Promise<void> => {
     const targetDir = path.resolve(this.projectRoot, 'amplify');
     await this.fsp.mkdir(targetDir, { recursive: true });
     await this.fsp.cp(
@@ -206,15 +209,10 @@ export class PackageManagerControllerFactory {
       JSON.stringify(packageJsonContent, null, 2)
     );
 
-    if (packageManagerProps.name === 'yarn-modern') {
-      try {
-        await this.fsp.writeFile(path.resolve(targetDir, 'yarn.lock'), '');
-        console.log(`${targetDir}/yarn.lock created successfully.`);
-      } catch (error) {
-        console.error(`Error creating ${targetDir}/${targetDir}`, error);
-      }
-    }
-
     await this.initializeTsConfig(targetDir, packageManagerProps);
+
+    if (operate) {
+      await operate(targetDir);
+    }
   };
 }
diff --git a/...s/create-amplify/src/package-manager-controller/yarn_modern_package_manager_controller.ts b/...s/create-amplify/src/package-manager-controller/yarn_modern_package_manager_controller.ts
@@ -1,4 +1,6 @@
 import { execa as _execa } from 'execa';
+import fsp from 'fs/promises';
+import * as path from 'path';
 import { executeWithDebugLogger } from '../execute_with_logger.js';
 import {
   DependencyType,
@@ -12,6 +14,7 @@ import {
 export class YarnModernPackageManagerController
   implements PackageManagerController
 {
+  private readonly fsp = fsp;
   private readonly execa = _execa;
   private readonly packageManagerProps = {
     name: 'yarn-modern',
@@ -29,6 +32,18 @@ export class YarnModernPackageManagerController
     private readonly packageManagerControllerFactory: PackageManagerControllerFactory
   ) {}
 
+  /**
+   * createLockFile
+   */
+  private async createLockFile(targetDir: string) {
+    try {
+      await this.fsp.writeFile(path.resolve(targetDir, 'yarn.lock'), '');
+      console.log(`${targetDir}/yarn.lock created successfully.`);
+    } catch (error) {
+      console.error(`Error creating ${targetDir}/${targetDir}`, error);
+    }
+  }
+
   /**
    * Installs the given package names as devDependencies
    */
@@ -59,7 +74,8 @@ export class YarnModernPackageManagerController
 
   generateInitialProjectFiles = async () => {
     await this.packageManagerControllerFactory.generateInitialProjectFiles(
-      this.packageManagerProps
+      this.packageManagerProps,
+      this.createLockFile
     );
   };