only pre-download blueprint when it's not on npm

Author: Kelly Selden

src/ember-install-addon.js

@@ -36,24 +36,47 @@ async function getEmberCliVersion({
 
 async function emberInstallAddon({
   cwd,
-  addonName,
-  blueprintPackageName,
+  addonNameOverride,
+  packageName,
+  version,
+  blueprintPath,
   stdin
 }) {
-  let emberCliVersion = await getEmberCliVersion({ cwd });
+  let addon;
 
-  let install = ember(['i', addonName], { cwd, stdin });
+  if (addonNameOverride) {
+    addon = addonNameOverride;
+    if (version && !blueprintPath) {
+      addon += `@${version}`;
+    }
+  }
 
-  let generate;
+  if (!addon) {
+    addon = blueprintPath;
+  }
+
+  if (!addon) {
+    addon = `${packageName}@${version}`;
+  }
 
-  let isBuggyEmberCliVersion = semver.satisfies(emberCliVersion, buggyEmberCliRange);
+  let install = ember(['i', addon], { cwd, stdin });
 
-  if (!isBuggyEmberCliVersion) {
+  let generate;
+
+  if (!blueprintPath) {
     generate = install;
   } else {
-    await install;
+    let emberCliVersion = await getEmberCliVersion({ cwd });
+
+    let isBuggyEmberCliVersion = semver.satisfies(emberCliVersion, buggyEmberCliRange);
+
+    if (!isBuggyEmberCliVersion) {
+      generate = install;
+    } else {
+      await install;
 
-    generate = ember(['g', blueprintPackageName], { cwd, stdin });
+      generate = ember(['g', packageName], { cwd, stdin });
+    }
   }
 
   return {

src/get-base-blueprint.js

@@ -22,16 +22,18 @@ async function getBaseBlueprint({
       baseBlueprint = loadSafeBlueprint(baseBlueprint);
       let isCustomBlueprint = !isDefaultBlueprint(baseBlueprint);
       if (isCustomBlueprint) {
-        let url;
         if (baseBlueprint.location) {
           let parsedPackage = await parseBlueprintPackage({
             cwd,
             blueprint: baseBlueprint
           });
-          url = parsedPackage.url;
+          let downloadedPackage = await downloadPackage(
+            baseBlueprint.packageName,
+            parsedPackage.url,
+            baseBlueprint.version
+          );
+          baseBlueprint.path = downloadedPackage.path;
         }
-        let downloadedPackage = await downloadPackage(baseBlueprint.packageName, url, baseBlueprint.version);
-        baseBlueprint.path = downloadedPackage.path;
       }
     } else {
       defaultBlueprint = await loadDefaultBlueprintFromDisk(cwd);

src/get-start-and-end-commands.js

@@ -9,6 +9,7 @@ const isDefaultBlueprint = require('./is-default-blueprint');
 const emberInstallAddon = require('./ember-install-addon');
 const overwriteBlueprintFiles = require('./overwrite-blueprint-files');
 const debug = require('debug')('ember-cli-update');
+const npm = require('boilerplate-update/src/npm');
 
 const nodeModulesIgnore = `
 
@@ -37,7 +38,10 @@ module.exports = function getStartAndEndCommands({
   } else if (!endBlueprint.isBaseBlueprint && isDefaultBlueprint(baseBlueprint)) {
     startRange = endRange = baseBlueprint.version;
   } else {
-    startRange = endRange = '';
+    // first version that supports blueprints with versions
+    // `-b [email protected]`
+    // https://github.com/ember-cli/ember-cli/pull/8571
+    startRange = endRange = '>=3.11.0-beta.1';
   }
 
   return {
@@ -63,13 +67,18 @@ module.exports = function getStartAndEndCommands({
   };
 };
 
-function isDefaultAddonBlueprint(blueprint) {
+async function isDefaultAddonBlueprint(blueprint) {
   let isCustomBlueprint = !isDefaultBlueprint(blueprint);
 
   let isDefaultAddonBlueprint;
 
   if (isCustomBlueprint) {
-    let { keywords } = utils.require(path.join(blueprint.path, 'package'));
+    let keywords;
+    if (blueprint.path) {
+      keywords = utils.require(path.join(blueprint.path, 'package')).keywords;
+    } else {
+      keywords = await npm.json(`v ${blueprint.packageName} keywords`);
+    }
 
     isDefaultAddonBlueprint = !(keywords && keywords.includes('ember-blueprint'));
   }
@@ -88,14 +97,16 @@ function getArgs(projectName, blueprint) {
     args.push('init');
   }
 
-  let isCustomBlueprint = !isDefaultBlueprint(blueprint);
-
   let _blueprint;
-  if (isCustomBlueprint) {
+  if (blueprint.path) {
+    // Only use path when necessary, because `npm install <folder>`
+    // symlinks instead of actually installing, so any peerDeps won't
+    // work. Example https://github.com/salsify/ember-cli-dependency-lint/blob/v1.0.3/lib/commands/dependency-lint.js#L5
     _blueprint = blueprint.path;
-  } else {
-    // Can we use the above path all the time, even if it is default?
+  } else if (isDefaultBlueprint(blueprint)) {
     _blueprint = blueprint.name;
+  } else {
+    _blueprint = `${blueprint.packageName}@${blueprint.version}`;
   }
 
   return [
@@ -186,7 +197,7 @@ function createProject(runEmber) {
       }
 
       if (options.blueprint) {
-        if (isDefaultAddonBlueprint(options.blueprint)) {
+        if (await isDefaultAddonBlueprint(options.blueprint)) {
           await module.exports.installAddonBlueprint({
             cwd,
             projectName: options.projectName,
@@ -227,8 +238,9 @@ module.exports.installAddonBlueprint = async function installAddonBlueprint({
 
   let { ps } = await emberInstallAddon({
     cwd: projectRoot,
-    addonName: blueprint.path,
-    blueprintPackageName: blueprint.packageName,
+    packageName: blueprint.packageName,
+    version: blueprint.version,
+    blueprintPath: blueprint.path,
     stdin: 'pipe'
   });
 

src/index.js

@@ -172,21 +172,27 @@ All blueprints are up-to-date!`;
       endBlueprint = { ...blueprint };
 
       if (isCustomBlueprint) {
-        let [
-          startDownloadedPackage,
-          endDownloadedPackage
-        ] = await Promise.all([
-          startBlueprint ? downloadPackage(startBlueprint.packageName, packageUrl, startBlueprint.version) : null,
-          downloadPackage(endBlueprint.packageName, packageUrl, to)
-        ]);
-
-        if (startBlueprint) {
-          startBlueprint.path = startDownloadedPackage.path;
-          startBlueprint.version = startDownloadedPackage.version;
+        if (packageUrl) {
+          let [
+            startDownloadedPackage,
+            endDownloadedPackage
+          ] = await Promise.all([
+            startBlueprint ? downloadPackage(startBlueprint.packageName, packageUrl, startBlueprint.version) : null,
+            downloadPackage(endBlueprint.packageName, packageUrl, to)
+          ]);
+
+          if (startBlueprint) {
+            startBlueprint.path = startDownloadedPackage.path;
+            startBlueprint.version = startDownloadedPackage.version;
+          }
+
+          endBlueprint.path = endDownloadedPackage.path;
+          endBlueprint.version = endDownloadedPackage.version;
+        } else {
+          let versions = await getVersions(endBlueprint.packageName);
+          let getTagVersion = _getTagVersion(versions, endBlueprint.packageName);
+          endBlueprint.version = await getTagVersion(to);
         }
-
-        endBlueprint.path = endDownloadedPackage.path;
-        endBlueprint.version = endDownloadedPackage.version;
       } else {
         let packageName = getPackageName(projectOptions);
         let packageVersion = getPackageVersion(packageJson, packageName);

src/init.js

@@ -14,6 +14,8 @@ const loadBlueprintFile = require('./load-blueprint-file');
 const bootstrap = require('./bootstrap');
 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');
 
 module.exports = async function init({
   blueprint: _blueprint,
@@ -35,6 +37,7 @@ module.exports = async function init({
       blueprint: _blueprint
     });
     packageName = parsedPackage.name;
+    name = parsedPackage.name;
     location = parsedPackage.location;
     url = parsedPackage.url;
   } else {
@@ -43,13 +46,18 @@ module.exports = async function init({
     name = defaultBlueprint.name;
   }
 
-  let downloadedPackage = await downloadPackage(packageName, url, to);
-  packageName = downloadedPackage.name;
-
-  // could be "app" or "addon" already
-  // don't want to overwrite with "ember-cli"
-  if (!name) {
+  let version;
+  let path;
+  if (url) {
+    let downloadedPackage = await downloadPackage(packageName, url, to);
+    packageName = downloadedPackage.name;
     name = downloadedPackage.name;
+    version = downloadedPackage.version;
+    path = downloadedPackage.path;
+  } else {
+    let versions = await getVersions(packageName);
+    let getTagVersion = _getTagVersion(versions, packageName);
+    version = await getTagVersion(to);
   }
 
   let emberCliUpdateJson = await loadSafeBlueprintFile(cwd);
@@ -70,8 +78,8 @@ module.exports = async function init({
 
   blueprint = loadSafeBlueprint(blueprint);
 
-  blueprint.version = downloadedPackage.version;
-  blueprint.path = downloadedPackage.path;
+  blueprint.version = version;
+  blueprint.path = path;
 
   let {
     baseBlueprint

src/install.js

@@ -7,6 +7,8 @@ const saveBlueprint = require('./save-blueprint');
 const loadBlueprintFile = require('./load-blueprint-file');
 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 toDefault = require('./args').to.default;
 
@@ -20,26 +22,40 @@ module.exports = async function install({
     blueprint: addon
   });
 
-  let downloadedPackage = await downloadPackage(parsedPackage.name, parsedPackage.url, toDefault);
+  let packageName;
+  let version;
+  let path;
+  if (parsedPackage.location) {
+    let downloadedPackage = await downloadPackage(null, parsedPackage.url, toDefault);
+    packageName = downloadedPackage.name;
+    version = downloadedPackage.version;
+    path = downloadedPackage.path;
+  } else {
+    packageName = addon;
+    let versions = await getVersions(packageName);
+    let getTagVersion = _getTagVersion(versions, packageName);
+    version = await getTagVersion(toDefault);
+  }
 
   // We are double installing it, via the above and the below.
-  // The above is needed to resolve the real package name,
-  // and the below is needed to allow NPM/yarn to resolve the
-  // package.json version for us.
+  // The above is needed to resolve the real package name
+  // if location is specified, and the below is needed to allow
+  // NPM/yarn to resolve the package.json version for us.
   // This may be able to be combined somehow...
   let { ps } = await emberInstallAddon({
     cwd,
-    addonName: addon,
-    blueprintPackageName: downloadedPackage.name
+    addonNameOverride: addon,
+    packageName,
+    blueprintPath: path
   });
 
   await ps;
 
   let blueprint = loadSafeBlueprint({
-    packageName: downloadedPackage.name,
-    name: downloadedPackage.name,
+    packageName,
+    name: packageName,
     location: parsedPackage.location,
-    version: downloadedPackage.version
+    version
   });
 
   if (!await loadBlueprintFile(cwd)) {

test/unit/get-start-and-end-commands-test.js

@@ -351,7 +351,7 @@ describe(_getStartAndEndCommands, function() {
             name: blueprint,
             version: startVersion
           },
-          packageRange: ''
+          packageRange: '>=3.11.0-beta.1'
         },
         endOptions: {
           baseBlueprint: {
@@ -362,7 +362,7 @@ describe(_getStartAndEndCommands, function() {
             name: blueprint,
             version: endVersion
           },
-          packageRange: ''
+          packageRange: '>=3.11.0-beta.1'
         }
       });
     });