Merge pull request #1240 from mansona/fix-remote-blueprints

Fix custom blueprints
ember-cli · Aug 30, 2023 · 87c3902 · 87c3902
2 parents 257f5d7 + 05ebc8a
commit 87c3902
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 41 deletions.
diff --git a/src/get-start-and-end-commands.js b/src/get-start-and-end-commands.js
@@ -109,7 +109,7 @@ function getArgs({
     args.push(`-dir=${directoryName}`);
   }
 
-  args.push('-sg');
+  args.push('--skip-git');
 
   let _blueprint;
   if (blueprint.path) {
@@ -130,8 +130,7 @@ function getArgs({
 
   return [
     ...args,
-    '-sn',
-    '-sb',
+    '--skip-npm',
     '-b',
     _blueprint,
     ...blueprint.options
@@ -175,7 +174,7 @@ function runEmberRemotely({
   let isGlimmer = blueprint.packageName === glimmerPackageName && blueprint.name === glimmerPackageName;
 
   if (isCustomBlueprint || isGlimmer) {
-    args = [`ember-cli@${lastNode8Version}`, ...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];

diff --git a/test/unit/get-start-and-end-commands-test.js b/test/unit/get-start-and-end-commands-test.js
@@ -121,9 +121,8 @@ describe(_getStartAndEndCommands, function() {
         path.normalize(`${packageRoot}/bin/ember`),
         'new',
         projectName,
-        '-sg',
-        '-sn',
-        '-sb',
+        '--skip-git',
+        '--skip-npm',
         '-b',
         'app'
       ],
@@ -152,9 +151,8 @@ describe(_getStartAndEndCommands, function() {
         commandName,
         'new',
         projectName,
-        '-sg',
-        '-sn',
-        '-sb',
+        '--skip-git',
+        '--skip-npm',
         '-b',
         'app'
       ],
@@ -296,9 +294,8 @@ describe(_getStartAndEndCommands, function() {
           path.normalize(`${packageRoot}/bin/ember`),
           'new',
           projectName,
-          '-sg',
-          '-sn',
-          '-sb',
+          '--skip-git',
+          '--skip-npm',
           '-b',
           blueprintPath
         ],
@@ -335,12 +332,11 @@ describe(_getStartAndEndCommands, function() {
 
       expect(npxStub.args).to.deep.equal([[
         [
-          `${packageName}@3.16`,
+          `${packageName}@latest`,
           'new',
           projectName,
-          '-sg',
-          '-sn',
-          '-sb',
+          '--skip-git',
+          '--skip-npm',
           '-b',
           blueprintPath
         ],
@@ -385,9 +381,8 @@ describe(_getStartAndEndCommands, function() {
             path.normalize(`${packageRoot}/bin/ember`),
             'new',
             projectName,
-            '-sg',
-            '-sn',
-            '-sb',
+            '--skip-git',
+            '--skip-npm',
             '-b',
             baseBlueprint.name,
             ...baseBlueprint.options
@@ -441,9 +436,8 @@ describe(_getStartAndEndCommands, function() {
             commandName,
             'new',
             projectName,
-            '-sg',
-            '-sn',
-            '-sb',
+            '--skip-git',
+            '--skip-npm',
             '-b',
             baseBlueprint.name,
             ...baseBlueprint.options
@@ -498,9 +492,8 @@ describe(_getStartAndEndCommands, function() {
           commandName,
           'new',
           'my-project',
-          '-sg',
-          '-sn',
-          '-sb',
+          '--skip-git',
+          '--skip-npm',
           '-b',
           baseBlueprint.name,
           ...baseBlueprint.options
@@ -610,9 +603,8 @@ describe(_getStartAndEndCommands, function() {
       expect(args).to.deep.equal([
         'new',
         projectName,
-        '-sg',
-        '-sn',
-        '-sb',
+        '--skip-git',
+        '--skip-npm',
         '-b',
         'app'
       ]);
@@ -628,9 +620,8 @@ describe(_getStartAndEndCommands, function() {
       expect(args).to.deep.equal([
         'new',
         projectName,
-        '-sg',
-        '-sn',
-        '-sb',
+        '--skip-git',
+        '--skip-npm',
         '-b',
         'addon',
         '--no-welcome'
@@ -649,9 +640,8 @@ describe(_getStartAndEndCommands, function() {
         'new',
         `@my-scope/${projectName}`,
         `-dir=${projectName}`,
-        '-sg',
-        '-sn',
-        '-sb',
+        '--skip-git',
+        '--skip-npm',
         '-b',
         'app'
       ]);
@@ -669,9 +659,8 @@ describe(_getStartAndEndCommands, function() {
       expect(args).to.deep.equal([
         'new',
         projectName,
-        '-sg',
-        '-sn',
-        '-sb',
+        '--skip-git',
+        '--skip-npm',
         '-b',
         '/path/to/my-blueprint'
       ]);
@@ -693,9 +682,8 @@ describe(_getStartAndEndCommands, function() {
       expect(args).to.deep.equal([
         'new',
         projectName,
-        '-sg',
-        '-sn',
-        '-sb',
+        '--skip-git',
+        '--skip-npm',
         '-b',
         'app',
         '--my-option-1',