@mpxjs/mpx-cli-service 2.0.7 → 2.1.0

package/bin/mpx-cli-service.js

@@ -1,19 +1,29 @@
 #!/usr/bin/env node
-
 const { semver, error } = require('@vue/cli-shared-utils')
 const requiredVersion = require('../package.json').engines.node
 const filterPluginsByPlatform = require('../utils/filterPlugins')
+const { LogUpdate } = require('@mpxjs/vue-cli-plugin-mpx/utils/reporter')
+const Service = require('../lib/Service')
+const {
+  getTargets,
+  setTargetProcessEnv,
+  runServiceCommand,
+  removeArgv,
+  rawTarget
+} = require('@mpxjs/cli-shared-utils')
 
-if (!semver.satisfies(process.version, requiredVersion, { includePrerelease: true })) {
+if (
+  !semver.satisfies(process.version, requiredVersion, {
+    includePrerelease: true
+  })
+) {
   error(
     `You are using Node ${process.version}, but mpx-cli-service ` +
-    `requires Node ${requiredVersion}.\nPlease upgrade your Node version.`
+      `requires Node ${requiredVersion}.\nPlease upgrade your Node version.`
   )
   process.exit(1)
 }
 
-const Service = require('../lib/Service')
-const { parseTarget } = require('@mpxjs/vue-cli-plugin-mpx/utils')
 const service = new Service(process.env.VUE_CLI_CONTEXT || process.cwd())
 const rawArgv = process.argv.slice(2)
 const args = require('minimist')(rawArgv, {
@@ -32,31 +42,61 @@ const args = require('minimist')(rawArgv, {
     'verbose'
   ]
 })
-const command = args._[0]
-process.env.MPX_CLI_MODE = command.split(':')[1] || 'mp'
-
-const { env } = parseTarget(args.target)
-
-const setPluginsToSkip = service.setPluginsToSkip.bind(service)
-service.setPluginsToSkip = function (args) {
-  setPluginsToSkip(args, rawArgv)
-  let plugins = filterPluginsByPlatform(process.env.MPX_CLI_MODE)
-  // 小程序模式下，将 @vue/cli-service 内置的 base 及 app 配置过滤掉
-  if (process.env.MPX_CLI_MODE === 'mp') {
-    plugins = plugins.concat([
-      'built-in:config/base',
-      'built-in:config/app',
-      'built-in:config/css'
-    ])
+const targets = getTargets(args)
+if (targets.length === 1) {
+  const command = args._[0]
+  const target = targets[0]
+  setTargetProcessEnv(target)
+  const setPluginsToSkip = service.setPluginsToSkip.bind(service)
+  service.setPluginsToSkip = function (args) {
+    setPluginsToSkip(args, rawArgv)
+    let plugins = filterPluginsByPlatform(process.env.MPX_CLI_MODE)
+    // 小程序模式下，将 @vue/cli-service 内置的 base 及 app 配置过滤掉
+    if (process.env.MPX_CLI_MODE !== 'web') {
+      plugins = plugins.concat([
+        'built-in:config/base',
+        'built-in:config/app',
+        'built-in:config/css'
+      ])
+    }
+    plugins.forEach((plugin) => {
+      this.pluginsToSkip.add(plugin)
+    })
   }
-
-  plugins.forEach(plugin => {
-    this.pluginsToSkip.add(plugin)
+  if (target.env) args.mode = target.env
+  service.run(command, args, rawArgv).catch((err) => {
+    error(err)
+    process.exit(1)
+  })
+} else {
+  const chunks = []
+  let doneNum = 0
+  const num = 0
+  const logUpdate = new LogUpdate()
+  targets.forEach((target, index) => {
+    const ls = runServiceCommand(
+      [...removeArgv(rawArgv, 'targets'), '--targets', rawTarget(target)],
+      {
+        env: {
+          ...process.env,
+          FORCE_COLOR: true,
+          NODE_ENV: undefined
+        },
+        stdio: 'inherit'
+      }
+    )
+    // 子进程输出内容
+    ls.on('message', (data) => {
+      if (data.status === 'done') {
+        doneNum++
+        if (doneNum === num) {
+          doneNum = 0
+          logUpdate.done()
+        }
+      } else {
+        chunks[index] = data.message
+        logUpdate.render(chunks.join('\n\n'))
+      }
+    })
   })
 }
-
-// 优先wx:production 然后是 --mode=production
-service.run(command, { ...args, mode: env || args.mode }, rawArgv).catch((err) => {
-  error(err)
-  process.exit(1)
-})

package/lib/Service.js

@@ -1,5 +1,9 @@
 const Service = require('@vue/cli-service')
 
+const { getServerBundle } = require('@mpxjs/cli-shared-utils')
+
 process.env.CI = 't'
 
 module.exports = Service
+
+module.exports.getServerBundle = getServerBundle

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@mpxjs/mpx-cli-service",
-  "version": "2.0.7",
+  "version": "2.1.0",
   "description": "local service for mpx-cli project",
   "main": "lib/Service.js",
   "bin": {
     "mpx-cli-service": "bin/mpx-cli-service.js"
   },
   "dependencies": {
+    "@mpxjs/cli-shared-utils": "^2.0.7",
     "@vue/cli-service": "^5.0.0",
     "@vue/cli-shared-utils": "^5.0.4",
     "minimist": "^1.2.5"