Skip to content

Move people from the built-in default to @ember-tooling/classic-build-app-blueprint #1279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
pichfl wants to merge 1 commit into from
Closed

Move people from the built-in default to @ember-tooling/classic-build-app-blueprint #1279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,7 @@ module.exports.defaultAddonBlueprintName = 'addon';
module.exports.glimmerPackageName = '@glimmer/blueprint';

module.exports.defaultTo = '*';

module.exports.EMBER_LEGACY_BLUEPRINT_VERSION = '6.7.0';
module.exports.CLASSIC_BUILD_APP_BLUEPRINT =
'@ember-tooling/classic-build-app-blueprint';
21 changes: 20 additions & 1 deletion src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,15 @@ const getBaseBlueprint = require('./get-base-blueprint');
const chooseBlueprintUpdates = require('./choose-blueprint-updates');
const getBlueprintFilePath = require('./get-blueprint-file-path');
const resolvePackage = require('./resolve-package');
const { defaultTo } = require('./constants');
const {
defaultTo,
defaultAppBlueprintName,
defaultPackageName,
EMBER_LEGACY_BLUEPRINT_VERSION,
CLASSIC_BUILD_APP_BLUEPRINT
} = require('./constants');
const normalizeBlueprintArgs = require('./normalize-blueprint-args');
const semver = require('semver');

/**
* If `version` attribute exists in the `blueprint` object and URL is empty, skip. Otherwise resolve the details of
Expand Down Expand Up @@ -211,6 +218,18 @@ module.exports = async function emberCliUpdate({
let versions = await getVersions(packageName);
let getTagVersion = _getTagVersion(versions, packageName);
endBlueprint.version = await getTagVersion(to);

if (
endBlueprint.isBaseBlueprint &&
packageName === defaultPackageName &&
endBlueprint.name === defaultAppBlueprintName &&
semver.gte(to, EMBER_LEGACY_BLUEPRINT_VERSION)
) {
endBlueprint.name = CLASSIC_BUILD_APP_BLUEPRINT;
endBlueprint.packageName = CLASSIC_BUILD_APP_BLUEPRINT;

await _resolvePackage(endBlueprint, packageUrl, to);
}
}

let customDiffOptions = getStartAndEndCommands({
Expand Down
20 changes: 20 additions & 0 deletions src/save-blueprint.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

const utils = require('./utils');
const findBlueprint = require('./find-blueprint');
const {
defaultPackageName,
defaultAppBlueprintName,
EMBER_LEGACY_BLUEPRINT_VERSION,
CLASSIC_BUILD_APP_BLUEPRINT
} = require('./constants');
const semver = require('semver');

function addBlueprint(emberCliUpdateJson, blueprint) {
emberCliUpdateJson.blueprints.push(blueprint);
Expand Down Expand Up @@ -67,6 +74,19 @@ async function saveBlueprint({ emberCliUpdateJsonPath, blueprint }) {
savedBlueprint.version = version;
}

if (
savedBlueprint.isBaseBlueprint &&
packageName === defaultPackageName &&
name === defaultAppBlueprintName &&
semver.gte(version, EMBER_LEGACY_BLUEPRINT_VERSION)
) {
savedBlueprint.name = CLASSIC_BUILD_APP_BLUEPRINT;
delete savedBlueprint.packageName;
delete savedBlueprint.location;
delete savedBlueprint.codemodsSource;
delete savedBlueprint.outputRepo;
}

await utils.saveBlueprintFile(emberCliUpdateJsonPath, emberCliUpdateJson);
}

Expand Down