Skip to content

Commit 6f72333

Browse files
committed
Reduce logical complexity
1 parent 0528d9e commit 6f72333

1 file changed

Lines changed: 7 additions & 10 deletions

File tree

src/index.js

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,6 @@ module.exports = async function emberCliUpdate({
184184
packageUrl = parsedPackage.url;
185185
}
186186

187-
let isCustomBlueprint = !isDefaultBlueprint(blueprint);
188-
189187
let baseBlueprint = await getBaseBlueprint({
190188
cwd,
191189
blueprints,
@@ -214,25 +212,24 @@ module.exports = async function emberCliUpdate({
214212
let startBlueprint = { ...blueprint };
215213
/** @type {Blueprint} */
216214
let endBlueprint = { ...blueprint };
215+
delete endBlueprint.version;
217216

218217
let { promise, resolveConflictsProcess } = await boilerplateUpdate({
219218
cwd,
220219
projectOptions: ({ packageJson }) =>
221220
getProjectOptions(packageJson, blueprint),
222221
mergeOptions: async function mergeOptions({ packageJson, projectOptions }) {
223-
delete endBlueprint.version;
222+
if (isDefaultBlueprint(blueprint)) {
223+
let packageName = getPackageName(projectOptions);
224+
let versions = await getVersions(packageName);
225+
let getTagVersion = _getTagVersion(versions, packageName);
224226

225-
if (isCustomBlueprint) {
227+
endBlueprint.version = await getTagVersion(to);
228+
} else {
226229
await Promise.all([
227230
_resolvePackage(startBlueprint, packageUrl, startBlueprint.version),
228231
_resolvePackage(endBlueprint, packageUrl, to)
229232
]);
230-
} else {
231-
startBlueprint = { ...blueprint };
232-
let packageName = getPackageName(projectOptions);
233-
let versions = await getVersions(packageName);
234-
let getTagVersion = _getTagVersion(versions, packageName);
235-
endBlueprint.version = await getTagVersion(to);
236233
}
237234

238235
let customDiffOptions = getStartAndEndCommands({

0 commit comments

Comments
 (0)