feat: allow saving multiple presets

Author: yyx990803

__mocks__/inquirer.js

@@ -28,6 +28,8 @@ exports.prompt = prompts => {
     const a = pendingAssertions[i - skipped]
     if (!a) {
       console.error(`no matching assertion for prompt:`, prompt)
+      console.log(prompts)
+      console.log(pendingAssertions)
     }
 
     if (a.message) {

packages/@vue/cli-plugin-pwa/__tests__/pwaPlugin.spec.js

@@ -3,15 +3,15 @@ jest.setTimeout(30000)
 const path = require('path')
 const portfinder = require('portfinder')
 const { createServer } = require('http-server')
-const { defaults } = require('@vue/cli/lib/options')
+const { defaultPreset } = require('@vue/cli/lib/options')
 const create = require('@vue/cli-test-utils/createTestProject')
 const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
 
 let server, browser
 test('pwa', async () => {
   // it's ok to mutate here since jest loads each test in a separate vm
-  defaults.plugins['@vue/cli-plugin-pwa'] = {}
-  const project = await create('pwa-build', defaults)
+  defaultPreset.plugins['@vue/cli-plugin-pwa'] = {}
+  const project = await create('pwa-build', defaultPreset)
   expect(project.has('src/registerServiceWorker.js')).toBe(true)
 
   const { stdout } = await project.run('vue-cli-service build')

packages/@vue/cli-service/__tests__/build.spec.js

@@ -3,13 +3,13 @@ jest.setTimeout(30000)
 const path = require('path')
 const portfinder = require('portfinder')
 const { createServer } = require('http-server')
-const { defaults } = require('@vue/cli/lib/options')
+const { defaultPreset } = require('@vue/cli/lib/options')
 const create = require('@vue/cli-test-utils/createTestProject')
 const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
 
 let server, browser, page
 test('build', async () => {
-  const project = await create('e2e-build', defaults)
+  const project = await create('e2e-build', defaultPreset)
 
   // test public copy
   project.write('public/foo.js', '1')

packages/@vue/cli-service/__tests__/buildDLL.spec.js

@@ -3,13 +3,13 @@ jest.setTimeout(30000)
 const path = require('path')
 const portfinder = require('portfinder')
 const { createServer } = require('http-server')
-const { defaults } = require('@vue/cli/lib/options')
+const { defaultPreset } = require('@vue/cli/lib/options')
 const create = require('@vue/cli-test-utils/createTestProject')
 const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
 
 let server, browser, page
 test('build with DLL', async () => {
-  const project = await create('e2e-build-dll', Object.assign({}, defaults, {
+  const project = await create('e2e-build-dll', Object.assign({}, defaultPreset, {
     router: true,
     vuex: true
   }))

packages/@vue/cli-service/__tests__/serve.spec.js

@@ -1,13 +1,13 @@
 jest.setTimeout(30000)
 
-const { defaults } = require('@vue/cli/lib/options')
+const { defaultPreset } = require('@vue/cli/lib/options')
 const create = require('@vue/cli-test-utils/createTestProject')
 const serve = require('@vue/cli-test-utils/serveWithPuppeteer')
 
 const sleep = n => new Promise(resolve => setTimeout(resolve, n))
 
 test('serve', async () => {
-  const project = await create('e2e-serve', defaults)
+  const project = await create('e2e-serve', defaultPreset)
 
   await serve(
     () => project.run('vue-cli-service serve'),
@@ -26,7 +26,7 @@ test('serve', async () => {
 })
 
 test('serve with router', async () => {
-  const project = await create('e2e-serve-router', Object.assign({}, defaults, {
+  const project = await create('e2e-serve-router', Object.assign({}, defaultPreset, {
     router: true
   }))
 

packages/@vue/cli-shared-utils/lib/_silence.js

@@ -1,4 +1,4 @@
-module.exports = function silence (exports) {
+module.exports = function silence (logName, exports) {
   const logs = {}
   Object.keys(exports).forEach(key => {
     if (key !== 'error') {
@@ -8,5 +8,5 @@ module.exports = function silence (exports) {
       }
     }
   })
-  exports.logs = logs
+  exports[logName] = logs
 }

packages/@vue/cli-shared-utils/lib/logger.js

@@ -45,5 +45,5 @@ exports.clearConsole = title => {
 
 // silent all logs except errors during tests and keep record
 if (process.env.VUE_CLI_TEST) {
-  require('./_silence')(exports)
+  require('./_silence')('logs', exports)
 }

packages/@vue/cli-shared-utils/lib/spinner.js

@@ -45,5 +45,5 @@ exports.resumeSpinner = () => {
 
 // silent all logs except errors during tests and keep record
 if (process.env.VUE_CLI_TEST) {
-  require('./_silence')(exports)
+  require('./_silence')('spinner', exports)
 }

packages/@vue/cli-shared-utils/lib/validate.js

@@ -4,11 +4,15 @@ const { error } = require('./logger')
 // proxy to joi for option validation
 exports.createSchema = fn => fn(joi)
 
-exports.validate = (obj, schema, options = {}) => {
+exports.validate = (obj, schema, options = {}, noExit) => {
   joi.validate(obj, schema, options, err => {
     if (err) {
       error(`vue-cli options validation failed:\n` + err.message)
-      process.exit(1)
+      if (!noExit) {
+        process.exit(1)
+      } else {
+        throw err
+      }
     }
   })
 }

packages/@vue/cli-test-utils/assertPromptModule.js

@@ -1,6 +1,7 @@
 // using this requires mocking fs & inquirer
 
 const Creator = require('@vue/cli/lib/Creator')
+const { loadOptions } = require('@vue/cli/lib/options')
 const { expectPrompts } = require('inquirer') // from mock
 
 module.exports = async function assertPromptModule (
@@ -13,7 +14,7 @@ module.exports = async function assertPromptModule (
   if (opts.plguinsOnly) {
     expectedPrompts.unshift(
       {
-        message: 'project creation mode',
+        message: 'Please pick a preset',
         choose: 1
       }
     )
@@ -23,23 +24,24 @@ module.exports = async function assertPromptModule (
         choose: 1 // package.json
       },
       {
-        message: 'package manager',
-        choose: 0 // yarn
-      },
-      {
-        message: 'Save the preferences',
+        message: 'Save this as a preset',
         confirm: false
       }
     )
+    if (!loadOptions().packageManager) {
+      expectedPrompts.push({
+        message: 'package manager',
+        choose: 0 // yarn
+      })
+    }
   }
 
   expectPrompts(expectedPrompts)
   const creator = new Creator('test', '/', [].concat(module))
-  const options = await creator.promptAndResolveOptions()
+  const preset = await creator.promptAndResolvePreset()
 
   if (opts.plguinsOnly) {
-    delete options.packageManager
-    delete options.useConfigFiles
+    delete preset.useConfigFiles
   }
-  expect(options).toEqual(expectedOptions)
+  expect(preset).toEqual(expectedOptions)
 }