From 82c59c7364b81f8900584132185e72b80abf92d9 Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Thu, 10 Aug 2023 18:12:49 +0100 Subject: [PATCH 1/2] Revert "add code to support node 8" This reverts commit 13e645c9339d5cef44b1d2ad2187be9144441854. --- src/get-start-and-end-commands.js | 7 ++----- test/unit/get-start-and-end-commands-test.js | 6 +++--- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/get-start-and-end-commands.js b/src/get-start-and-end-commands.js index 1f0344ac7..596b06e88 100644 --- a/src/get-start-and-end-commands.js +++ b/src/get-start-and-end-commands.js @@ -19,9 +19,6 @@ const nodeModulesIgnore = ` /node_modules/ `; -// remove when node 8 is dropped -const lastNode8Version = '3.16'; - module.exports = function getStartAndEndCommands({ packageJson: { name: projectName }, baseBlueprint, @@ -50,7 +47,7 @@ module.exports = function getStartAndEndCommands({ // first version that supports blueprints with versions // `-b foo@1.2.3` // https://github.com/ember-cli/ember-cli/pull/8571 - startRange = endRange = `>=3.11.0-beta.1 <${lastNode8Version}`; + startRange = endRange = '>=3.11.0-beta.1'; } return { @@ -175,7 +172,7 @@ function runEmberRemotely({ let isGlimmer = blueprint.packageName === glimmerPackageName && blueprint.name === glimmerPackageName; if (isCustomBlueprint || isGlimmer) { - args = [`ember-cli@${lastNode8Version}`, ...args]; + args = ['ember-cli', ...args]; // args = ['-p', 'github:ember-cli/ember-cli#cfb9780', 'ember', 'new', projectName, `-dir=${directoryName}, '-sg', -sn', '-b', `${blueprint.packageName}@${blueprint.version}`]; } else { args = ['-p', `ember-cli@${blueprint.version}`, 'ember', ...args]; diff --git a/test/unit/get-start-and-end-commands-test.js b/test/unit/get-start-and-end-commands-test.js index ab1da4ec5..efd2745d1 100644 --- a/test/unit/get-start-and-end-commands-test.js +++ b/test/unit/get-start-and-end-commands-test.js @@ -254,7 +254,7 @@ describe(_getStartAndEndCommands, function() { name: blueprint, version: startVersion }, - packageRange: '>=3.11.0-beta.1 <3.16' + packageRange: '>=3.11.0-beta.1' }, endOptions: { baseBlueprint: { @@ -265,7 +265,7 @@ describe(_getStartAndEndCommands, function() { name: blueprint, version: endVersion }, - packageRange: '>=3.11.0-beta.1 <3.16' + packageRange: '>=3.11.0-beta.1' } }); }); @@ -335,7 +335,7 @@ describe(_getStartAndEndCommands, function() { expect(npxStub.args).to.deep.equal([[ [ - `${packageName}@3.16`, + packageName, 'new', projectName, '-sg', From 8fa222d107b59cba2407290bdebe49f091b90160 Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Thu, 10 Aug 2023 21:17:35 +0100 Subject: [PATCH 2/2] use ember-cli@latest --- src/get-start-and-end-commands.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/get-start-and-end-commands.js b/src/get-start-and-end-commands.js index 596b06e88..4bd9fad7b 100644 --- a/src/get-start-and-end-commands.js +++ b/src/get-start-and-end-commands.js @@ -172,7 +172,7 @@ function runEmberRemotely({ let isGlimmer = blueprint.packageName === glimmerPackageName && blueprint.name === glimmerPackageName; if (isCustomBlueprint || isGlimmer) { - args = ['ember-cli', ...args]; + args = ['ember-cli@latest', ...args]; // args = ['-p', 'github:ember-cli/ember-cli#cfb9780', 'ember', 'new', projectName, `-dir=${directoryName}, '-sg', -sn', '-b', `${blueprint.packageName}@${blueprint.version}`]; } else { args = ['-p', `ember-cli@${blueprint.version}`, 'ember', ...args];