don't ask for install option

scaffold-eth · Jul 12, 2024 · 6f69aa1 · 6f69aa1
1 parent af45c2e
commit 6f69aa1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 21 deletions.
diff --git a/src/main.ts b/src/main.ts
@@ -40,7 +40,7 @@ export async function createProject(options: Options) {
         task: () => installPackages(targetDirectory),
         skip: () => {
           if (!options.install) {
-            return "Manually skipped";
+            return "Manually skipped, since `--skip-install` flag was passed";
           }
           return false;
         },
@@ -50,7 +50,7 @@ export async function createProject(options: Options) {
         task: () => prettierFormat(targetDirectory),
         skip: () => {
           if (!options.install) {
-            return "`yarn install` was skipped";
+            return "Can't use source prettier, since `yarn install` was skipped";
           }
           return false;
         },

diff --git a/src/types.ts b/src/types.ts
@@ -9,7 +9,7 @@ export type ExternalExtension = {
 
 type BaseOptions = {
   project: string | null;
-  install: boolean | null;
+  install: boolean;
   dev: boolean;
   externalExtension: ExternalExtension | ExternalExtensionNameDev | null;
   solidityFramework: SolidityFramework | "none" | null;

diff --git a/src/utils/parse-arguments-into-options.ts b/src/utils/parse-arguments-into-options.ts
@@ -54,9 +54,6 @@ const validateExternalExtension = async (
 export async function parseArgumentsIntoOptions(rawArgs: Args): Promise<RawOptions> {
   const args = arg(
     {
-      "--install": Boolean,
-      "-i": "--install",
-
       "--skip-install": Boolean,
       "--skip": "--skip-install",
 
@@ -76,15 +73,8 @@ export async function parseArgumentsIntoOptions(rawArgs: Args): Promise<RawOptio
     },
   );
 
-  const install = args["--install"] ?? null;
   const skipInstall = args["--skip-install"] ?? null;
 
-  if (install && skipInstall) {
-    throw new Error('Please select only one of the options: "--install" or "--skip-install".');
-  }
-
-  const hasInstallRelatedFlag = install || skipInstall;
-
   const dev = args["--dev"] ?? false; // info: use false avoid asking user
 
   const help = args["--help"] ?? false;
@@ -112,7 +102,7 @@ export async function parseArgumentsIntoOptions(rawArgs: Args): Promise<RawOptio
 
   return {
     project,
-    install: hasInstallRelatedFlag ? install || !skipInstall : null,
+    install: !skipInstall,
     dev,
     externalExtension: extension,
     help,

diff --git a/src/utils/prompt-for-missing-options.ts b/src/utils/prompt-for-missing-options.ts
@@ -34,19 +34,13 @@ export async function promptForMissingOptions(options: RawOptions): Promise<Opti
       choices: [SOLIDITY_FRAMEWORKS.HARDHAT, SOLIDITY_FRAMEWORKS.FOUNDRY, nullExtensionChoice],
       default: SOLIDITY_FRAMEWORKS.HARDHAT,
     },
-    {
-      type: "confirm",
-      name: "install",
-      message: "Install packages?",
-      default: defaultOptions.install,
-    },
   ];
 
   const answers = await inquirer.prompt(questions, cliAnswers);
 
   const mergedOptions: Options = {
     project: options.project ?? answers.project,
-    install: options.install ?? answers.install,
+    install: options.install,
     dev: options.dev ?? defaultOptions.dev,
     solidityFramework: options.solidityFramework ?? answers.solidityFramework,
     externalExtension: options.externalExtension,