Fix for ENOENT yarn install error.

tiagob · Sep 22, 2020 · 3eb59e4 · 3eb59e4
1 parent 9314214
commit 3eb59e4
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 25 deletions.
diff --git a/packages/create-full-stack/src/copyTemplate.ts b/packages/create-full-stack/src/copyTemplate.ts
@@ -379,25 +379,7 @@ export default async function copyTemplate(options: {
   if (packageTemplatePath) {
     templatePath = path.dirname(packageTemplatePath);
   } else {
-    try {
-      runYarn(projectPath, ["add", fullTemplate]);
-    } catch (error) {
-      console.error(
-        `An error occurred running \`yarn add ${fullTemplate}\`:`,
-        error.code,
-        error
-      );
-      if (error.code === "ENOENT") {
-        // Re-run yarn install if it throws an "ENOENT" error
-        // It's likely https://github.com/tiagob/create-full-stack/issues/123
-        // Unfortunately, this is a long existing issue with yarn
-        // https://github.com/yarnpkg/yarn/issues/4563
-        // https://github.com/yarnpkg/yarn/issues/2629
-        runYarn(projectPath, ["add", fullTemplate]);
-      } else {
-        throw error;
-      }
-    }
+    runYarn(projectPath, ["add", fullTemplate]);
     templatePath = path.dirname(
       require.resolve(path.join(fullTemplate, "package.json"), {
         paths: [projectPath],

diff --git a/packages/create-full-stack/src/createReactAppUtils.ts b/packages/create-full-stack/src/createReactAppUtils.ts
@@ -110,7 +110,7 @@ export function isSafeToCreateProjectIn(root: string, name: string) {
 
 export function shouldUseYarn() {
   try {
-    execSync("yarnpkg --version", { stdio: "ignore" });
+    execSync("yarn --version", { stdio: "ignore" });
     return true;
   } catch (error) {
     return false;

diff --git a/packages/create-full-stack/src/index.ts b/packages/create-full-stack/src/index.ts
@@ -78,6 +78,9 @@ try {
 }
 
 async function run() {
+  // Inquirer prompt can run into the create-full-stack installation.
+  console.log();
+
   const projectPath = path.resolve(projectName);
   const appName = path.basename(projectPath);
   checkAppName(appName);
@@ -195,10 +198,17 @@ async function run() {
     hasGithubActions,
   });
 
-  console.log(`Installing packages using yarnpkg...`);
+  console.log(`Installing packages using yarn...`);
   console.log();
   // This also, uninstalls the template
-  runYarn(projectName);
+  try {
+    runYarn(projectName);
+  } catch (error) {
+    console.warn(
+      "First install attempt failed. Likely https://github.com/yarnpkg/yarn/issues/2629. Trying again."
+    );
+    runYarn(projectName);
+  }
 
   console.log("Building common...");
   console.log();

diff --git a/packages/create-full-stack/src/utils.ts b/packages/create-full-stack/src/utils.ts
@@ -1,12 +1,11 @@
 import spawn from "cross-spawn";
 
 export function runYarn(cwd: string, args: string[] = []) {
-  const command = "yarnpkg";
+  const command = "yarn";
   const argsWithCwd = ["--cwd", cwd, ...args];
   const proc = spawn.sync(command, argsWithCwd, { stdio: "inherit" });
   if (proc.status !== 0) {
-    console.error(`\`${command} ${argsWithCwd.join(" ")}\` failed`);
-    process.exit(1);
+    throw new Error(`\`${command} ${argsWithCwd.join(" ")}\` failed`);
   }
 }