Skip to content

Commit 70810e0

Browse files
author
Kelly Selden
committed
move defaultTo to constants
1 parent d94d3df commit 70810e0

9 files changed

Lines changed: 21 additions & 28 deletions

File tree

src/args.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
'use strict';
22

3+
const { defaultTo } = require('./constants');
4+
35
module.exports = {
46
'blueprint': {
57
alias: ['b'],
@@ -12,7 +14,7 @@ module.exports = {
1214
},
1315
'to': {
1416
type: 'string',
15-
default: '*',
17+
default: defaultTo,
1618
description: 'Update to a version that isn\'t latest ("2.14.1", "~2.15", "latest", "beta")'
1719
},
1820
'resolve-conflicts': {

src/check-for-blueprint-updates.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ const parseBlueprintPackage = require('./parse-blueprint-package');
44
const downloadPackage = require('./download-package');
55
const getVersions = require('./get-versions');
66
const getTagVersion = require('boilerplate-update/src/get-tag-version');
7-
8-
const toDefault = require('./args').to.default;
7+
const { defaultTo } = require('./constants');
98

109
async function checkForBlueprintUpdates({
1110
cwd,
@@ -19,7 +18,7 @@ async function checkForBlueprintUpdates({
1918
let versions = await getVersions(blueprint.packageName);
2019

2120
latestVersion = await getTagVersion({
22-
range: toDefault,
21+
range: defaultTo,
2322
versions,
2423
packageName: blueprint.packageName
2524
});
@@ -29,7 +28,7 @@ async function checkForBlueprintUpdates({
2928
blueprint: blueprint.location || blueprint.packageName
3029
});
3130

32-
let downloadedPackage = await downloadPackage(blueprint.packageName, parsedPackage.url, toDefault);
31+
let downloadedPackage = await downloadPackage(blueprint.packageName, parsedPackage.url, defaultTo);
3332

3433
latestVersion = downloadedPackage.version;
3534
}

src/choose-blueprint-updates.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
const checkForBlueprintUpdates = require('./check-for-blueprint-updates');
44
const inquirer = require('inquirer');
55
const loadSafeBlueprint = require('./load-safe-blueprint');
6-
7-
const toDefault = require('./args').to.default;
6+
const { defaultTo } = require('./constants');
87

98
function formatBlueprintLine({
109
blueprint,
@@ -101,7 +100,7 @@ All blueprints are up-to-date!`);
101100
}]);
102101

103102
if (answer.choice === latestVersion) {
104-
to = toDefault;
103+
to = defaultTo;
105104
} else {
106105
answer = await inquirer.prompt([{
107106
type: 'input',

src/constants.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,5 @@ module.exports.defaultAppBlueprintName = 'app';
55
module.exports.defaultAddonBlueprintName = 'addon';
66

77
module.exports.glimmerPackageName = '@glimmer/blueprint';
8+
9+
module.exports.defaultTo = '*';

src/index.js

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,7 @@ const getBaseBlueprint = require('./get-base-blueprint');
2323
const chooseBlueprintUpdates = require('./choose-blueprint-updates');
2424
const getBlueprintFilePath = require('./get-blueprint-file-path');
2525
const resolvePackage = require('./resolve-package');
26-
27-
const {
28-
'to': { default: toDefault }
29-
} = require('./args');
26+
const { defaultTo } = require('./constants');
3027

3128
async function _resolvePackage(blueprint, url, range) {
3229
if (blueprint.version && !url) {
@@ -53,7 +50,7 @@ module.exports = async function emberCliUpdate({
5350
blueprint: _blueprint,
5451
blueprintOptions,
5552
from,
56-
to = toDefault,
53+
to = defaultTo,
5754
resolveConflicts,
5855
runCodemods,
5956
codemodsSource,
@@ -86,7 +83,7 @@ module.exports = async function emberCliUpdate({
8683

8784
let packageName = parsedPackage.name;
8885
if (!packageName) {
89-
let downloadedPackage = await downloadPackage(null, packageUrl, toDefault);
86+
let downloadedPackage = await downloadPackage(null, packageUrl, defaultTo);
9087
packageName = downloadedPackage.name;
9188
}
9289

src/init.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,11 @@ const findBlueprint = require('./find-blueprint');
1313
const getBaseBlueprint = require('./get-base-blueprint');
1414
const getBlueprintFilePath = require('./get-blueprint-file-path');
1515
const resolvePackage = require('./resolve-package');
16-
17-
const {
18-
'to': { default: toDefault }
19-
} = require('./args');
16+
const { defaultTo } = require('./constants');
2017

2118
module.exports = async function init({
2219
blueprint: _blueprint,
23-
to = toDefault,
20+
to = defaultTo,
2421
resolveConflicts,
2522
codemodsSource,
2623
reset,

src/install.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ const bootstrap = require('./bootstrap');
88
const emberInstallAddon = require('./ember-install-addon');
99
const getBlueprintFilePath = require('./get-blueprint-file-path');
1010
const resolvePackage = require('./resolve-package');
11-
12-
const toDefault = require('./args').to.default;
11+
const { defaultTo } = require('./constants');
1312

1413
module.exports = async function install({
1514
addon
@@ -33,7 +32,7 @@ module.exports = async function install({
3332
} = await resolvePackage({
3433
name: addon,
3534
url: parsedPackage.url,
36-
range: toDefault
35+
range: defaultTo
3736
});
3837

3938
// We are double installing it, via the above and the below.

test/acceptance/ember-cli-update-test.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ const { initBlueprint } = require('../helpers/blueprint');
2121
const run = require('../../src/run');
2222
const loadSafeBlueprintFile = require('../../src/load-safe-blueprint-file');
2323
const overwriteBlueprintFiles = require('../../src/overwrite-blueprint-files');
24-
25-
const toDefault = require('../../src/args').to.default;
24+
const { defaultTo } = require('../../src/constants');
2625

2726
const select = ' ';
2827
const down = '\u001b[B';
@@ -502,7 +501,7 @@ describe(function() {
502501
commitMessage: 'my-app',
503502
blueprint: name,
504503
// test semver latest resolution instead of pinned
505-
to: toDefault,
504+
to: defaultTo,
506505
async beforeMerge() {
507506
await initBlueprint({
508507
fixturesPath: 'test/fixtures/blueprint/addon/legacy',

test/integration/index-test.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ const {
1818
} = require('../helpers/assertions');
1919
const { initBlueprint } = require('../helpers/blueprint');
2020
const loadSafeBlueprintFile = require('../../src/load-safe-blueprint-file');
21-
22-
const toDefault = require('../../src/args').to.default;
21+
const { defaultTo } = require('../../src/constants');
2322

2423
describe(function() {
2524
this.timeout(30 * 1000);
@@ -458,7 +457,7 @@ applicable codemods: ember-modules-codemod, ember-qunit-codemod, ember-test-help
458457
fixturesPath: 'test/fixtures/blueprint/app/npm-app/local',
459458
commitMessage: 'my-app',
460459
blueprint: name,
461-
to: toDefault,
460+
to: defaultTo,
462461
async beforeMerge() {
463462
// test local base blueprints
464463
await initBlueprint({

0 commit comments

Comments
 (0)