treat glimmer apps as default blueprints

Author: Kelly Selden

src/index.js

@@ -13,7 +13,7 @@ const parseBlueprintPackage = require('./parse-blueprint-package');
 const downloadPackage = require('./download-package');
 const loadSafeBlueprintFile = require('./load-safe-blueprint-file');
 const saveBlueprint = require('./save-blueprint');
-const loadDefaultBlueprint = require('./load-default-blueprint');
+const loadDefaultBlueprintFromDisk = require('./load-default-blueprint-from-disk');
 const loadSafeBlueprint = require('./load-safe-blueprint');
 const stageBlueprintFile = require('./stage-blueprint-file');
 const { getBlueprintRelativeFilePath } = require('./get-blueprint-file-path');
@@ -111,7 +111,7 @@ module.exports = async function emberCliUpdate({
     let { blueprints } = emberCliUpdateJson;
 
     if (!blueprints.length) {
-      blueprint = loadDefaultBlueprint();
+      blueprint = await loadDefaultBlueprintFromDisk(cwd, from);
     } else {
       let {
         areAllUpToDate,
@@ -186,15 +186,9 @@ module.exports = async function emberCliUpdate({
       }
 
       let startBlueprint;
-
-      if (!isCustomBlueprint && createCustomDiff) {
-        blueprint = loadDefaultBlueprint(projectOptions, blueprint.version);
-      }
-
       if (!reset) {
         startBlueprint = { ...blueprint };
       }
-
       endBlueprint = { ...blueprint };
       delete endBlueprint.version;
 

src/is-default-blueprint.js

@@ -3,10 +3,14 @@
 const {
   defaultPackageName,
   defaultAppBlueprintName,
-  defaultAddonBlueprintName
+  defaultAddonBlueprintName,
+  glimmerPackageName
 } = require('./constants');
 
 function isDefaultBlueprint({ packageName, name }) {
+  if (packageName === glimmerPackageName && name === glimmerPackageName) {
+    return true;
+  }
   return packageName === defaultPackageName && [
     defaultAppBlueprintName,
     defaultAddonBlueprintName

src/load-default-blueprint-from-disk.js

@@ -6,18 +6,30 @@ const getPackageVersion = require('./get-package-version');
 const getProjectVersion = require('./get-project-version');
 const loadDefaultBlueprint = require('./load-default-blueprint');
 const utils = require('./utils');
+const {
+  defaultPackageName
+} = require('./constants');
 
-async function loadDefaultBlueprintFromDisk(cwd) {
-  let packageJson = utils.require(path.join(cwd, 'package'));
+async function loadDefaultBlueprintFromDisk(cwd, version) {
+  let packageJson;
+  try {
+    packageJson = utils.require(path.join(cwd, 'package'));
+  } catch (err) {}
 
-  let projectOptions = await getProjectOptions(packageJson);
+  let projectOptions;
 
-  let packageName = 'ember-cli';
-  let packageVersion = getPackageVersion(packageJson, packageName);
+  if (packageJson) {
+    projectOptions = await getProjectOptions(packageJson);
 
-  let versions = await utils.getVersions(packageName);
+    if (!projectOptions.includes('glimmer')) {
+      let packageName = defaultPackageName;
+      let packageVersion = getPackageVersion(packageJson, packageName);
 
-  let version = getProjectVersion(packageVersion, versions, projectOptions);
+      let versions = await utils.getVersions(packageName);
+
+      version = getProjectVersion(packageVersion, versions, projectOptions);
+    }
+  }
 
   let blueprint = loadDefaultBlueprint(projectOptions, version);
 

src/load-default-blueprint.js

@@ -4,31 +4,41 @@ const loadSafeBlueprint = require('./load-safe-blueprint');
 const {
   defaultPackageName,
   defaultAppBlueprintName,
-  defaultAddonBlueprintName
+  defaultAddonBlueprintName,
+  glimmerPackageName
 } = require('./constants');
 
 function loadDefaultBlueprint(projectOptions = [], version) {
-  let name = defaultAppBlueprintName;
-  let codemodsSource = 'ember-app-codemods-manifest@1';
+  let packageName = defaultPackageName;
+  let name;
+  let codemodsSource;
   if (projectOptions.includes('addon')) {
     name = defaultAddonBlueprintName;
     codemodsSource = 'ember-addon-codemods-manifest@1';
+  } else if (projectOptions.includes('glimmer')) {
+    packageName = glimmerPackageName;
+    name = glimmerPackageName;
+  } else {
+    name = defaultAppBlueprintName;
+    codemodsSource = 'ember-app-codemods-manifest@1';
   }
 
   let options = [];
-  if (projectOptions.includes('yarn')) {
-    options.push('--yarn');
-  }
-  if (!projectOptions.includes('welcome') || projectOptions.includes('addon')) {
-    // Why do addons always have --no-welcome?
-    options.push('--no-welcome');
+  if (!projectOptions.includes('glimmer')) {
+    if (projectOptions.includes('yarn')) {
+      options.push('--yarn');
+    }
+    if (!projectOptions.includes('welcome') || projectOptions.includes('addon')) {
+      // Why do addons always have --no-welcome?
+      options.push('--no-welcome');
+    }
   }
 
   return loadSafeBlueprint({
-    packageName: defaultPackageName,
+    packageName,
     name,
     version,
-    codemodsSource,
+    ...codemodsSource ? { codemodsSource } : {},
     options,
     isBaseBlueprint: true
   });

test/fixtures/glimmer/merge/glimmer-app/config/ember-cli-update.json

@@ -0,0 +1,15 @@
+{
+  "schemaVersion": 0,
+  "packages": [
+    {
+      "name": "@glimmer/blueprint",
+      "version": "0.6.1",
+      "blueprints": [
+        {
+          "name": "@glimmer/blueprint",
+          "isBaseBlueprint": true
+        }
+      ]
+    }
+  ]
+}

test/integration/load-default-blueprint-test.js

@@ -147,4 +147,22 @@ describe(_loadDefaultBlueprint, function() {
       });
     });
   });
+
+  describe('glimmer', function() {
+    beforeEach(function() {
+      projectOptions.push('glimmer');
+    });
+
+    it('works', async function() {
+      let blueprint = loadDefaultBlueprint();
+
+      expect(blueprint).to.deep.equal({
+        packageName: '@glimmer/blueprint',
+        name: '@glimmer/blueprint',
+        version,
+        isBaseBlueprint: true,
+        options: []
+      });
+    });
+  });
 });

test/unit/is-default-blueprint-test.js

@@ -3,18 +3,38 @@
 const { describe, it } = require('../helpers/mocha');
 const { expect } = require('../helpers/chai');
 const isDefaultBlueprint = require('../../src/is-default-blueprint');
+const {
+  defaultPackageName,
+  defaultAppBlueprintName,
+  defaultAddonBlueprintName,
+  glimmerPackageName
+} = require('../../src/constants');
 
 describe(isDefaultBlueprint, function() {
-  it('detects default blueprint', function() {
+  it('detects default app blueprint', function() {
     expect(isDefaultBlueprint({
-      packageName: 'ember-cli',
-      name: 'app'
+      packageName: defaultPackageName,
+      name: defaultAppBlueprintName
+    })).to.be.true;
+  });
+
+  it('detects default addon blueprint', function() {
+    expect(isDefaultBlueprint({
+      packageName: defaultPackageName,
+      name: defaultAddonBlueprintName
+    })).to.be.true;
+  });
+
+  it('detects glimmer blueprint', function() {
+    expect(isDefaultBlueprint({
+      packageName: glimmerPackageName,
+      name: glimmerPackageName
     })).to.be.true;
   });
 
   it('detects custom blueprint', function() {
     expect(isDefaultBlueprint({
-      packageName: 'ember-cli',
+      packageName: defaultPackageName,
       name: 'custom-blueprint'
     })).to.be.false;
   });

test/unit/load-default-blueprint-from-file-test.js

@@ -20,6 +20,46 @@ describe(loadDefaultBlueprintFromDisk, function() {
     sinon.restore();
   });
 
+  it('handles missing package.json', async function() {
+    require = require.withArgs(path.normalize('/test/path/package')).throws();
+
+    let blueprint = await loadDefaultBlueprintFromDisk('/test/path', '0.0.1');
+
+    expect(require).to.be.calledOnce;
+    expect(getVersions).to.not.be.called;
+
+    expect(blueprint).to.deep.equal({
+      packageName: 'ember-cli',
+      name: 'app',
+      version: '0.0.1',
+      codemodsSource: 'ember-app-codemods-manifest@1',
+      isBaseBlueprint: true,
+      options: ['--no-welcome']
+    });
+  });
+
+  it('handles glimmer app', async function() {
+    require = require.withArgs(path.normalize('/test/path/package')).returns({
+      devDependencies: {
+        '@glimmer/blueprint': '',
+        'ember-cli': '0.0.1'
+      }
+    });
+
+    let blueprint = await loadDefaultBlueprintFromDisk('/test/path', '0.0.2');
+
+    expect(require).to.be.calledOnce;
+    expect(getVersions).to.not.be.called;
+
+    expect(blueprint).to.deep.equal({
+      packageName: '@glimmer/blueprint',
+      name: '@glimmer/blueprint',
+      version: '0.0.2',
+      isBaseBlueprint: true,
+      options: []
+    });
+  });
+
   it('works', async function() {
     require = require.withArgs(path.normalize('/test/path/package')).returns({
       devDependencies: {