@mpxjs/cli 3.0.0-beta.1 → 3.1.0-beta.1

package/bin/mpx.js

@@ -8,48 +8,112 @@ const builtInPreset = require('../lib/preset')
 const inquirer = require('inquirer')
 const prompts = require('../lib/prompts')
 const plugins = require('../lib/plugins')
+const loadRemotePreset = require('@vue/cli/lib/util/loadRemotePreset')
+const loadLocalPreset = require('@vue/cli/lib/util/loadLocalPreset')
+const {
+  chalk,
+  exit,
+  error,
+  log
+} = require('@vue/cli-shared-utils')
+const merge = require('lodash.merge')
 
 const args = process.argv.slice(2)
-const { p, preset, i, inlinePreset } = minimist(args)
+const parsedArgs = minimist(args)
 
-// 只有当使用 create 命令且没有提供 preset 的情况下才走 prompt 逻辑
-if (args[0] === 'create' && !p && !preset && !i && !inlinePreset) {
-  const name = args[1]
-  inquirer.prompt(prompts).then(answers => {
-    if (answers.needTs) {
-      Object.assign(builtInPreset.plugins, plugins.tsSupport)
-    }
-    if (answers.cloudFunc) {
-      Object.assign(builtInPreset.plugins, plugins.cloudFunc)
+async function resolvePreset(args = {}) {
+  const { p, preset, i, inlinePreset, c, clone } = args
+  let res = {}
+  let cliPreset = {}
+  if (p || preset) {
+    // mpx create foo --preset bar
+    cliPreset = p || preset
+    if (cliPreset.endsWith('.json') || /^\./.test(cliPreset) || path.isAbsolute(cliPreset)) {
+      res = await loadLocalPreset(path.resolve(cliPreset))
+    } else if (cliPreset.includes('/')) {
+      try {
+        log(`Fetching remote preset ${chalk.cyan(cliPreset)}...`)
+        res = await loadRemotePreset(cliPreset, c || clone)
+      } catch (e) {
+        error(`Failed fetching remote preset ${chalk.cyan(cliPreset)}:`)
+        throw e
+      }
     }
-    if (answers.isPlugin) {
-      Object.assign(builtInPreset.plugins, plugins.isPlugin)
+  } else if (i || inlinePreset) {
+    // mpx create foo --inlinePreset {...}
+    cliPreset = i || inlinePreset
+    try {
+      res = JSON.parse(cliPreset)
+    } catch (e) {
+      error(`CLI inline preset is not valid JSON: ${cliPreset}`);
+      exit(1)
     }
-    if (answers.transWeb) {
-      Object.assign(builtInPreset.plugins, plugins.transWeb)
-    }
-    // TODO: 添加其他 prompt 插件配置
-
-    // 各插件共享 answers 配置
-    Object.keys(builtInPreset.plugins).forEach(function(key) {
-      let plugin = builtInPreset.plugins[key]
-      plugin = Object.assign(plugin, {
-        ...answers,
-        name
+  }
+  return res
+}
+
+async function resolvePrompts(name, builtInPreset) {
+  return new Promise(function(resolve) {
+    inquirer.prompt(prompts).then(answers => {
+      if (answers.needTs) {
+        Object.assign(builtInPreset.plugins, plugins.tsSupport)
+      }
+      if (answers.cloudFunc) {
+        Object.assign(builtInPreset.plugins, plugins.cloudFunc)
+      }
+      if (answers.isPlugin) {
+        Object.assign(builtInPreset.plugins, plugins.isPlugin)
+      }
+      if (answers.transWeb) {
+        Object.assign(builtInPreset.plugins, plugins.transWeb)
+      }
+      // TODO: 添加其他 prompt 插件配置
+
+      // 各插件共享 answers 配置
+      Object.keys(builtInPreset.plugins).forEach(function(key) {
+        let plugin = builtInPreset.plugins[key]
+        plugin = Object.assign(plugin, {
+          ...answers,
+          name
+        })
       })
+
+      resolve(builtInPreset)
     })
+  })
+}
 
-    // 添加 inlinePreset
-    args.splice(1, 0, '-i', JSON.stringify(builtInPreset))
-    // 去掉 @vue/cli 创建项目成功后的提示
-    args.push('--skipGetStarted')
-    doVueCli()
+function regenCmd() {
+  const cmd = [...parsedArgs._, '--skipGetStarted']
+  const ignoreKey = ['_', 'p', 'preset', 'i', 'inlinePreset']
+  Object.keys(parsedArgs).map((key = '') => {
+    if (key && !ignoreKey.includes(key)) {
+      cmd.push(key.length > 1 ? `--${key}` : `-${key}`)
+      cmd.push(parsedArgs[key])
+    }
   })
+  return cmd
+}
+
+async function hookForCreateCli() {
+  const name = args[1]
+  let cmd = regenCmd()
+  const mpxBuiltInPreset = await resolvePrompts(name, builtInPreset)
+  const cliPreset = await resolvePreset(parsedArgs)
+  const mergedPreset = merge(mpxBuiltInPreset, cliPreset)
+
+  cmd.push('-i', JSON.stringify(mergedPreset))
+  doVueCli(cmd)
+}
+
+// hook for create cli
+if (args[0] === 'create') {
+  hookForCreateCli()
 } else {
-  doVueCli()
+  doVueCli(args)
 }
 
-function doVueCli() {
+function doVueCli(args) {
   execa(
     'node',
     [

package/lib/plugins.js

@@ -1,4 +1,4 @@
-const prefix = 'vue-cli-plugin-mpx'
+const prefix = '@mpxjs/vue-cli-plugin-mpx'
 
 const plugins = {
   tsSupport: {

package/lib/preset.js

@@ -1,9 +1,9 @@
 module.exports = {
   cssPreprocessor: 'stylus',
   plugins: {
-    'mpx-cli-service': {},
-    'vue-cli-plugin-mpx': {},
-    'vue-cli-plugin-mpx-mp': {},
-    'vue-cli-plugin-mpx-eslint': {}
+    '@mpxjs/mpx-cli-service': {},
+    '@mpxjs/vue-cli-plugin-mpx': {},
+    '@mpxjs/vue-cli-plugin-mpx-mp': {},
+    '@mpxjs/vue-cli-plugin-mpx-eslint': {}
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/cli",
-  "version": "3.0.0-beta.1",
+  "version": "3.1.0-beta.1",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -8,13 +8,18 @@
   },
   "keywords": [],
   "author": "",
-  "license": "ISC",
+  "license": "Apache",
   "dependencies": {
-    "@vue/cli": "^4.5.8",
+    "@vue/cli": "^5.0.0-rc.2",
     "execa": "^4.1.0",
+    "lodash.merge": "^4.6.2",
     "shelljs": "^0.8.4"
   },
   "engines": {
     "node": ">=8.9"
+  },
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org",
+    "access": "public"
   }
 }