Revert "chore: remove ensureInitialized"

This reverts commit 96483ce.
aws-amplify · Dec 18, 2023 · 7c59c80 · 7c59c80
1 parent 96483ce
commit 7c59c80
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 1 deletion.
diff --git a/packages/create-amplify/src/amplify_project_creator.ts b/packages/create-amplify/src/amplify_project_creator.ts
@@ -34,7 +34,7 @@ export class AmplifyProjectCreator {
     logger.debug(`Validating current state of target directory...`);
     await this.projectRootValidator.validate();
 
-    await this.packageManagerController.initializeAmplifyFolder();
+    await this.packageManagerController.ensureInitialized();
 
     await logger.indicateProgress(
       `Installing required dependencies`,

diff --git a/packages/create-amplify/src/package-manager-controller/npm_package_manager_controller.ts b/packages/create-amplify/src/package-manager-controller/npm_package_manager_controller.ts
@@ -50,6 +50,12 @@ export class NpmPackageManagerController implements PackageManagerController {
     );
   };
 
+  ensureInitialized = async () => {
+    await this.packageManagerControllerFactory.initializeProject(
+      this.packageManagerProps
+    );
+  };
+
   getWelcomeMessage = () => {
     const cdCommand =
       process.cwd() === this.projectRoot

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
@@ -19,6 +19,7 @@ export abstract class PackageManagerController {
     packageNames: string[],
     type: DependencyType
   ) => Promise<void>;
+  abstract ensureInitialized: () => Promise<void>;
   abstract getWelcomeMessage: () => string;
   abstract generateInitialProjectFiles: () => Promise<void>;
   abstract initializeAmplifyFolder: () => Promise<void>;

diff --git a/packages/create-amplify/src/package-manager-controller/pnpm_package_manager_controller.ts b/packages/create-amplify/src/package-manager-controller/pnpm_package_manager_controller.ts
@@ -51,6 +51,12 @@ export class PnpmPackageManagerController implements PackageManagerController {
     );
   };
 
+  ensureInitialized = async () => {
+    await this.packageManagerControllerFactory.initializeProject(
+      this.packageManagerProps
+    );
+  };
+
   getWelcomeMessage = () => {
     const cdCommand =
       process.cwd() === this.projectRoot

diff --git a/.../create-amplify/src/package-manager-controller/yarn_classic_package_manager_controller.ts b/.../create-amplify/src/package-manager-controller/yarn_classic_package_manager_controller.ts
@@ -53,6 +53,12 @@ export class YarnClassicPackageManagerController
     );
   };
 
+  ensureInitialized = async () => {
+    await this.packageManagerControllerFactory.initializeProject(
+      this.packageManagerProps
+    );
+  };
+
   getWelcomeMessage = () => {
     const cdCommand =
       process.cwd() === this.projectRoot

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
@@ -54,6 +54,12 @@ export class YarnModernPackageManagerController
     );
   };
 
+  ensureInitialized = async () => {
+    await this.packageManagerControllerFactory.initializeProject(
+      this.packageManagerProps
+    );
+  };
+
   getWelcomeMessage = () => {
     const cdCommand =
       process.cwd() === this.projectRoot