saves config path for later

Author: Kelly Selden

src/bootstrap.js

@@ -10,10 +10,16 @@ const saveBlueprint = require('./save-blueprint');
 const loadSafeBlueprint = require('./load-safe-blueprint');
 const loadDefaultBlueprint = require('./load-default-blueprint');
 const { glimmerPackageName } = require('./constants');
+const getBlueprintFilePath = require('./get-blueprint-file-path');
 
 module.exports = async function bootstrap() {
   let cwd = process.cwd();
 
+  // A custom config location in package.json may be reset/init away,
+  // so we can no longer look it up on the fly after the run.
+  // We must rely on a lookup before the run.
+  let emberCliUpdateJsonPath = await getBlueprintFilePath(cwd);
+
   let packageJson = require(path.join(cwd, 'package'));
 
   let projectOptions = await getProjectOptions(packageJson);
@@ -38,7 +44,7 @@ module.exports = async function bootstrap() {
   }
 
   await saveBlueprint({
-    cwd,
+    emberCliUpdateJsonPath,
     blueprint
   });
 };

src/index.js

@@ -22,6 +22,7 @@ const isDefaultBlueprint = require('./is-default-blueprint');
 const findBlueprint = require('./find-blueprint');
 const getBaseBlueprint = require('./get-base-blueprint');
 const chooseBlueprintUpdates = require('./choose-blueprint-updates');
+const getBlueprintFilePath = require('./get-blueprint-file-path');
 
 const {
   'to': { default: toDefault },
@@ -47,7 +48,12 @@ module.exports = async function emberCliUpdate({
 }) {
   let cwd = process.cwd();
 
-  let emberCliUpdateJson = await loadSafeBlueprintFile(cwd);
+  // A custom config location in package.json may be reset/init away,
+  // so we can no longer look it up on the fly after the run.
+  // We must rely on a lookup before the run.
+  let emberCliUpdateJsonPath = await getBlueprintFilePath(cwd);
+
+  let emberCliUpdateJson = await loadSafeBlueprintFile(emberCliUpdateJsonPath);
 
   let blueprint;
   let packageUrl;
@@ -248,35 +254,41 @@ All blueprints are up-to-date!`;
   })).promise;
 
   if (_blueprint) {
-    let emberCliUpdateJson = await loadBlueprintFile(cwd);
+    let emberCliUpdateJson = await loadBlueprintFile(emberCliUpdateJsonPath);
 
     // If you don't have a state file, save the default blueprint,
     // even if you are currently working on a custom blueprint.
     if (!emberCliUpdateJson || !isCustomBlueprint) {
       await saveBlueprint({
-        cwd,
+        emberCliUpdateJsonPath,
         blueprint: defaultBlueprint
       });
     }
 
     if (isCustomBlueprint) {
       await saveBlueprint({
-        cwd,
+        emberCliUpdateJsonPath,
         blueprint: endBlueprint
       });
     }
 
     if (!reset) {
-      await stageBlueprintFile(cwd);
+      await stageBlueprintFile({
+        cwd,
+        emberCliUpdateJsonPath
+      });
     }
   } else if (isPersistedBlueprint) {
     await saveBlueprint({
-      cwd,
+      emberCliUpdateJsonPath,
       blueprint: endBlueprint
     });
 
     if (!reset) {
-      await stageBlueprintFile(cwd);
+      await stageBlueprintFile({
+        cwd,
+        emberCliUpdateJsonPath
+      });
     }
   }
 

src/init.js

@@ -16,6 +16,7 @@ const findBlueprint = require('./find-blueprint');
 const getBaseBlueprint = require('./get-base-blueprint');
 const getVersions = require('boilerplate-update/src/get-versions');
 const _getTagVersion = require('./get-tag-version');
+const getBlueprintFilePath = require('./get-blueprint-file-path');
 
 module.exports = async function init({
   blueprint: _blueprint,
@@ -27,6 +28,11 @@ module.exports = async function init({
 }) {
   let cwd = process.cwd();
 
+  // A custom config location in package.json may be reset/init away,
+  // so we can no longer look it up on the fly after the run.
+  // We must rely on a lookup before the run.
+  let emberCliUpdateJsonPath = await getBlueprintFilePath(cwd);
+
   let packageName;
   let name;
   let location;
@@ -60,7 +66,7 @@ module.exports = async function init({
     version = await getTagVersion(to);
   }
 
-  let emberCliUpdateJson = await loadSafeBlueprintFile(cwd);
+  let emberCliUpdateJson = await loadSafeBlueprintFile(emberCliUpdateJsonPath);
 
   let blueprint;
 
@@ -110,17 +116,20 @@ module.exports = async function init({
     wasRunAsExecutable
   })).promise;
 
-  if (!await loadBlueprintFile(cwd)) {
+  if (!await loadBlueprintFile(emberCliUpdateJsonPath)) {
     await bootstrap();
   }
 
   await saveBlueprint({
-    cwd,
+    emberCliUpdateJsonPath,
     blueprint
   });
 
   if (!reset) {
-    await stageBlueprintFile(cwd);
+    await stageBlueprintFile({
+      cwd,
+      emberCliUpdateJsonPath
+    });
   }
 
   return result;

src/install.js

@@ -9,6 +9,7 @@ const bootstrap = require('./bootstrap');
 const emberInstallAddon = require('./ember-install-addon');
 const getVersions = require('boilerplate-update/src/get-versions');
 const _getTagVersion = require('./get-tag-version');
+const getBlueprintFilePath = require('./get-blueprint-file-path');
 
 const toDefault = require('./args').to.default;
 
@@ -17,6 +18,11 @@ module.exports = async function install({
 }) {
   let cwd = process.cwd();
 
+  // A custom config location in package.json may be reset/init away,
+  // so we can no longer look it up on the fly after the run.
+  // We must rely on a lookup before the run.
+  let emberCliUpdateJsonPath = await getBlueprintFilePath(cwd);
+
   let parsedPackage = await parseBlueprintPackage({
     cwd,
     blueprint: addon
@@ -58,12 +64,12 @@ module.exports = async function install({
     version
   });
 
-  if (!await loadBlueprintFile(cwd)) {
+  if (!await loadBlueprintFile(emberCliUpdateJsonPath)) {
     await bootstrap();
   }
 
   await saveBlueprint({
-    cwd,
+    emberCliUpdateJsonPath,
     blueprint
   });
 };

src/load-blueprint-file.js

@@ -1,11 +1,11 @@
 'use strict';
 
 const fs = require('fs-extra');
-const getBlueprintFilePath = require('./get-blueprint-file-path');
 
-async function loadBlueprintFile(cwd) {
+async function loadBlueprintFile(emberCliUpdateJsonPath) {
   try {
-    return await fs.readJson(await getBlueprintFilePath(cwd));
+    let emberCliUpdateJson = await fs.readJson(emberCliUpdateJsonPath);
+    return emberCliUpdateJson;
   } catch (err) {}
 }
 

src/load-safe-blueprint-file.js

@@ -2,8 +2,8 @@
 
 const loadBlueprintFile = require('./load-blueprint-file');
 
-async function loadSafeBlueprintFile(cwd) {
-  let emberCliUpdateJson = await loadBlueprintFile(cwd);
+async function loadSafeBlueprintFile(emberCliUpdateJsonPath) {
+  let emberCliUpdateJson = await loadBlueprintFile(emberCliUpdateJsonPath);
 
   if (!emberCliUpdateJson) {
     emberCliUpdateJson = {};

src/save-blueprint-file.js

@@ -2,9 +2,8 @@
 
 const fs = require('fs-extra');
 const path = require('path');
-const getBlueprintFilePath = require('./get-blueprint-file-path');
 
-async function saveBlueprintFile(cwd, emberCliUpdateJson) {
+async function saveBlueprintFile(emberCliUpdateJsonPath, emberCliUpdateJson) {
   emberCliUpdateJson.packages = emberCliUpdateJson.blueprints.reduce((packages, blueprint) => {
     let _package = packages.find(p => p.name === blueprint.packageName);
 
@@ -30,8 +29,6 @@ async function saveBlueprintFile(cwd, emberCliUpdateJson) {
 
   delete emberCliUpdateJson.blueprints;
 
-  let emberCliUpdateJsonPath = await getBlueprintFilePath(cwd);
-
   await fs.ensureDir(path.dirname(emberCliUpdateJsonPath));
 
   await fs.writeJson(emberCliUpdateJsonPath, emberCliUpdateJson, {

src/save-blueprint.js

@@ -8,11 +8,11 @@ function addBlueprint(emberCliUpdateJson, blueprint) {
 }
 
 async function saveBlueprint({
-  cwd,
+  emberCliUpdateJsonPath,
   blueprint
 }) {
   if (!(blueprint && blueprint.version)) {
-    blueprint = await utils.loadDefaultBlueprintFromDisk(cwd);
+    blueprint = await utils.loadDefaultBlueprintFromDisk(emberCliUpdateJsonPath);
   }
 
   let {
@@ -25,7 +25,7 @@ async function saveBlueprint({
     isBaseBlueprint
   } = blueprint;
 
-  let emberCliUpdateJson = await utils.loadSafeBlueprintFile(cwd);
+  let emberCliUpdateJson = await utils.loadSafeBlueprintFile(emberCliUpdateJsonPath);
 
   let savedBlueprint = findBlueprint(emberCliUpdateJson, packageName, name);
 
@@ -58,7 +58,7 @@ async function saveBlueprint({
     savedBlueprint.version = version;
   }
 
-  await utils.saveBlueprintFile(cwd, emberCliUpdateJson);
+  await utils.saveBlueprintFile(emberCliUpdateJsonPath, emberCliUpdateJson);
 }
 
 module.exports = saveBlueprint;

src/save.js

@@ -6,6 +6,7 @@ const loadSafeBlueprint = require('./load-safe-blueprint');
 const saveBlueprint = require('./save-blueprint');
 const loadBlueprintFile = require('./load-blueprint-file');
 const bootstrap = require('./bootstrap');
+const getBlueprintFilePath = require('./get-blueprint-file-path');
 
 module.exports = async function save({
   blueprint: _blueprint,
@@ -18,6 +19,11 @@ module.exports = async function save({
 
   let cwd = process.cwd();
 
+  // A custom config location in package.json may be reset/init away,
+  // so we can no longer look it up on the fly after the run.
+  // We must rely on a lookup before the run.
+  let emberCliUpdateJsonPath = await getBlueprintFilePath(cwd);
+
   let parsedPackage = await parseBlueprintPackage({
     cwd,
     blueprint: _blueprint
@@ -33,12 +39,12 @@ module.exports = async function save({
     options: blueprintOptions
   });
 
-  if (!await loadBlueprintFile(cwd)) {
+  if (!await loadBlueprintFile(emberCliUpdateJsonPath)) {
     await bootstrap();
   }
 
   await saveBlueprint({
-    cwd,
+    emberCliUpdateJsonPath,
     blueprint
   });
 };

src/stage-blueprint-file.js

@@ -1,12 +1,15 @@
 'use strict';
 
-const { getBlueprintRelativeFilePath } = require('./get-blueprint-file-path');
+const path = require('path');
 const run = require('./run');
 
-async function stageBlueprintFile(cwd) {
-  let emberCliUpdateJsonPath = await getBlueprintRelativeFilePath(cwd);
+async function stageBlueprintFile({
+  cwd,
+  emberCliUpdateJsonPath
+}) {
+  let relative = path.relative(cwd, emberCliUpdateJsonPath);
 
-  await run(`git add ${emberCliUpdateJsonPath}`);
+  await run(`git add ${relative}`);
 }
 
 module.exports = stageBlueprintFile;