Skip to content

Commit f91a0d0

Browse files
author
Kelly Selden
committed
extract isDefaultBlueprint for future change
1 parent 7b3e871 commit f91a0d0

4 files changed

Lines changed: 33 additions & 5 deletions

File tree

src/get-project-options.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
const path = require('path');
44
const fs = require('fs-extra');
5+
const isDefaultBlueprint = require('./is-default-blueprint');
56

67
function getProjectType(checkForDep, keywords) {
78
let isAddon = keywords && keywords.indexOf('ember-addon') !== -1;
@@ -30,7 +31,7 @@ module.exports = async function getProjectOptions({
3031
dependencies,
3132
devDependencies
3233
}, blueprint) {
33-
if (blueprint && blueprint.name !== 'ember-cli') {
34+
if (blueprint && !isDefaultBlueprint(blueprint)) {
3435
return ['blueprint'];
3536
}
3637

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ const fs = require('fs-extra');
55
const run = require('./run');
66
const utils = require('./utils');
77
const loadSafeBlueprint = require('./load-safe-blueprint');
8+
const isDefaultBlueprint = require('./is-default-blueprint');
89

910
const nodeModulesIgnore = `
1011
@@ -16,7 +17,7 @@ module.exports = function getStartAndEndCommands({
1617
startBlueprint,
1718
endBlueprint
1819
}) {
19-
let isCustomBlueprint = endBlueprint.name !== 'ember-cli';
20+
let isCustomBlueprint = !isDefaultBlueprint(endBlueprint);
2021

2122
let startRange;
2223
let endRange;
@@ -49,7 +50,7 @@ module.exports = function getStartAndEndCommands({
4950
};
5051

5152
function getArgs(projectName, blueprint) {
52-
let isCustomBlueprint = blueprint.name !== 'ember-cli';
53+
let isCustomBlueprint = !isDefaultBlueprint(blueprint);
5354

5455
let _blueprint;
5556
if (isCustomBlueprint) {
@@ -99,7 +100,7 @@ function createProjectFromCache({
99100
cwd
100101
});
101102

102-
let isCustomBlueprint = options.blueprint.name !== 'ember-cli';
103+
let isCustomBlueprint = !isDefaultBlueprint(options.blueprint);
103104

104105
if (isCustomBlueprint) {
105106
await postCreateCustomBlueprint({
@@ -130,7 +131,7 @@ function createProjectFromRemote({
130131
if (options.blueprint) {
131132
let command = getArgs(options.projectName, options.blueprint).join(' ');
132133

133-
let isCustomBlueprint = options.blueprint.name !== 'ember-cli';
134+
let isCustomBlueprint = !isDefaultBlueprint(options.blueprint);
134135

135136
if (isCustomBlueprint) {
136137
await utils.npx(`ember-cli ${command}`, { cwd });

src/is-default-blueprint.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
'use strict';
2+
3+
function isDefaultBlueprint(blueprint) {
4+
return blueprint.name === 'ember-cli';
5+
}
6+
7+
module.exports = isDefaultBlueprint;
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
'use strict';
2+
3+
const { describe, it } = require('../helpers/mocha');
4+
const { expect } = require('../helpers/chai');
5+
const isDefaultBlueprint = require('../../src/is-default-blueprint');
6+
7+
describe(isDefaultBlueprint, function() {
8+
it('detects default blueprint', function() {
9+
expect(isDefaultBlueprint({
10+
name: 'ember-cli'
11+
})).to.be.true;
12+
});
13+
14+
it('detects custom blueprint', function() {
15+
expect(isDefaultBlueprint({
16+
name: 'custom-blueprint'
17+
})).to.be.false;
18+
});
19+
});

0 commit comments

Comments
 (0)