use collect-unknown-options for initializing blueprints with options

Author: Kelly Selden

bin/commands/default.js

@@ -20,7 +20,7 @@ module.exports.handler = async function handler(argv) {
   let statsOnly = argv['stats-only'];
   let listCodemods = argv['list-codemods'];
   let createCustomDiff = argv['create-custom-diff'];
-  let blueprintOptions = argv['--'] || [];
+  let blueprintOptions = argv._.slice(0);
 
   try {
     let message = await emberCliUpdate({

bin/commands/init.js

@@ -14,14 +14,12 @@ module.exports.builder = {
   reset: args['reset']
 };
 
-module.exports.blueprintOptionsDefault = [];
-
 module.exports.handler = async function handler(argv) {
   let blueprint = argv['blueprint'];
   let to = argv['to'];
   let resolveConflicts = argv['resolve-conflicts'];
   let reset = argv['reset'];
-  let blueprintOptions = argv['--'] || module.exports.blueprintOptionsDefault;
+  let blueprintOptions = argv._.slice(1);
 
   try {
     let message = await init({

bin/commands/save.js

@@ -15,7 +15,7 @@ module.exports.builder = {
 module.exports.handler = async function handler(argv) {
   let blueprint = argv['blueprint'];
   let from = argv['from'];
-  let blueprintOptions = argv['--'] || [];
+  let blueprintOptions = argv._.slice(1);
 
   try {
     await save({

bin/ember-cli-update.js

@@ -4,7 +4,8 @@
 require('yargs')
   .commandDir('commands')
   .parserConfiguration({
-    'populate--': true
+    'populate--': true,
+    'collect-unknown-options': true
   })
   .argv;
 

src/init.js

@@ -17,16 +17,13 @@ const resolvePackage = require('./resolve-package');
 const {
   'to': { default: toDefault }
 } = require('./args');
-const {
-  blueprintOptionsDefault
-} = require('../bin/commands/init');
 
 module.exports = async function init({
   blueprint: _blueprint,
   to = toDefault,
   resolveConflicts,
   reset,
-  blueprintOptions = blueprintOptionsDefault,
+  blueprintOptions = [],
   wasRunAsExecutable
 }) {
   let cwd = process.cwd();

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

@@ -92,7 +92,7 @@ describe(function() {
     if (from) {
       args.push(`--from=${from}`);
     }
-    args = [...args, '--', ...blueprintOptions];
+    args = [...args, ...blueprintOptions];
 
     return processBin({
       binFile: 'ember-cli-update',
@@ -587,7 +587,6 @@ describe(function() {
         'save',
         `-b=${location}`,
         `--from=${partial}`,
-        '--',
         ...options
       ],
       cwd: tmpPath,
@@ -640,7 +639,6 @@ describe(function() {
         `-b=${location}`,
         `--from=${from}`,
         `--to=${to}`,
-        '--',
         ...options
       ],
       cwd: tmpPath,