support new boilerplate-update

Author: Kelly Selden

bin/commands/default.js

@@ -23,7 +23,7 @@ module.exports.handler = async function handler(argv) {
   let blueprintOptions = argv._.slice(0);
 
   try {
-    let message = await emberCliUpdate({
+    let result = await emberCliUpdate({
       blueprint,
       blueprintOptions,
       from,
@@ -36,12 +36,27 @@ module.exports.handler = async function handler(argv) {
       compareOnly,
       statsOnly,
       listCodemods,
-      createCustomDiff,
-      wasRunAsExecutable: true
+      createCustomDiff
     });
+
+    let ps = result.resolveConflictsProcess;
+    if (ps) {
+      process.stdin.pipe(ps.stdin);
+      ps.stdout.pipe(process.stdout);
+      ps.stderr.pipe(process.stderr);
+    }
+
+    let message = await result.promise;
     if (message) {
       console.log(message);
     }
+
+    // since we are piping, not inheriting, the child process
+    // doesn't have the power to close its parent
+    if (ps) {
+      // eslint-disable-next-line no-process-exit
+      process.exit();
+    }
   } catch (err) {
     console.error(err);
   }

bin/commands/init.js

@@ -22,17 +22,32 @@ module.exports.handler = async function handler(argv) {
   let blueprintOptions = argv._.slice(1);
 
   try {
-    let message = await init({
+    let result = await init({
       blueprint,
       to,
       resolveConflicts,
       reset,
-      blueprintOptions,
-      wasRunAsExecutable: true
+      blueprintOptions
     });
+
+    let ps = result.resolveConflictsProcess;
+    if (ps) {
+      process.stdin.pipe(ps.stdin);
+      ps.stdout.pipe(process.stdout);
+      ps.stderr.pipe(process.stderr);
+    }
+
+    let message = await result.promise;
     if (message) {
       console.log(message);
     }
+
+    // since we are piping, not inheriting, the child process
+    // doesn't have the power to close its parent
+    if (ps) {
+      // eslint-disable-next-line no-process-exit
+      process.exit();
+    }
   } catch (err) {
     console.error(err);
   }

src/command.js

@@ -83,7 +83,15 @@ module.exports = {
   ],
 
   async run(options) {
-    options.wasRunAsExecutable = true;
-    await emberCliUpdate(options);
+    let result = await emberCliUpdate(options);
+
+    let ps = result.resolveConflictsProcess;
+    if (ps) {
+      process.stdin.pipe(ps.stdin);
+      ps.stdout.pipe(process.stdout);
+      ps.stderr.pipe(process.stderr);
+    }
+
+    await result.promise;
   }
 };

src/index.js

@@ -63,8 +63,7 @@ module.exports = async function emberCliUpdate({
   compareOnly,
   statsOnly,
   listCodemods,
-  createCustomDiff,
-  wasRunAsExecutable
+  createCustomDiff
 }) {
   let cwd = process.cwd();
 
@@ -170,7 +169,10 @@ module.exports = async function emberCliUpdate({
 
   let endBlueprint;
 
-  let result = await (await boilerplateUpdate({
+  let {
+    promise,
+    resolveConflictsProcess
+  } = await boilerplateUpdate({
     projectOptions: ({ packageJson }) => getProjectOptions(packageJson, blueprint),
     mergeOptions: async function mergeOptions({
       packageJson,
@@ -250,23 +252,29 @@ module.exports = async function emberCliUpdate({
     codemodsUrl,
     codemodsJson,
     createCustomDiff,
-    ignoredFiles: [await getBlueprintRelativeFilePath(cwd)],
-    wasRunAsExecutable
-  })).promise;
-
-  if (_blueprint || isPersistedBlueprint) {
-    await saveBlueprint({
-      emberCliUpdateJsonPath,
-      blueprint: endBlueprint
-    });
+    ignoredFiles: [await getBlueprintRelativeFilePath(cwd)]
+  });
 
-    if (!reset) {
-      await stageBlueprintFile({
-        cwd,
-        emberCliUpdateJsonPath
-      });
-    }
-  }
+  return {
+    promise: (async() => {
+      let result = await promise;
+
+      if (_blueprint || isPersistedBlueprint) {
+        await saveBlueprint({
+          emberCliUpdateJsonPath,
+          blueprint: endBlueprint
+        });
+
+        if (!reset) {
+          await stageBlueprintFile({
+            cwd,
+            emberCliUpdateJsonPath
+          });
+        }
+      }
 
-  return result;
+      return result;
+    })(),
+    resolveConflictsProcess
+  };
 };

src/init.js

@@ -23,8 +23,7 @@ module.exports = async function init({
   to = toDefault,
   resolveConflicts,
   reset,
-  blueprintOptions = [],
-  wasRunAsExecutable
+  blueprintOptions = []
 }) {
   let cwd = process.cwd();
 
@@ -100,7 +99,10 @@ module.exports = async function init({
     init = true;
   }
 
-  let result = await (await boilerplateUpdate({
+  let {
+    promise,
+    resolveConflictsProcess
+  } = await boilerplateUpdate({
     endVersion: blueprint.version,
     resolveConflicts,
     reset,
@@ -113,21 +115,27 @@ module.exports = async function init({
       baseBlueprint,
       endBlueprint: blueprint
     }),
-    ignoredFiles: [await getBlueprintRelativeFilePath(cwd)],
-    wasRunAsExecutable
-  })).promise;
-
-  await saveBlueprint({
-    emberCliUpdateJsonPath,
-    blueprint
+    ignoredFiles: [await getBlueprintRelativeFilePath(cwd)]
   });
 
-  if (!(reset || init)) {
-    await stageBlueprintFile({
-      cwd,
-      emberCliUpdateJsonPath
-    });
-  }
-
-  return result;
+  return {
+    promise: (async() => {
+      let result = await promise;
+
+      await saveBlueprint({
+        emberCliUpdateJsonPath,
+        blueprint
+      });
+
+      if (!(reset || init)) {
+        await stageBlueprintFile({
+          cwd,
+          emberCliUpdateJsonPath
+        });
+      }
+
+      return result;
+    })(),
+    resolveConflictsProcess
+  };
 };

test/integration/index-test.js

@@ -65,7 +65,7 @@ describe(function() {
     process.chdir(tmpPath);
 
     let promise = (async() => {
-      let result = await emberCliUpdate({
+      let result = await (await emberCliUpdate({
         blueprint,
         from,
         to,
@@ -76,7 +76,7 @@ describe(function() {
         codemodsJson,
         listCodemods,
         createCustomDiff
-      });
+      })).promise;
 
       await afterMerge();
 

test/integration/init-test.js

@@ -48,7 +48,7 @@ describe(init, function() {
 
     process.chdir(tmpPath);
 
-    let promise = init({
+    let { promise } = await init({
       blueprint,
       to,
       blueprintOptions