Merge branch 'dev' of github.com:dcloudio/uni-app into dev

packages/vue-cli-plugin-uni/bin/uniapp-cli.js

-#!/usr/bin/env node
-
-const yargsParser = require('yargs-parser')
-const argv = yargsParser(process.argv.slice(2))
-const action = argv._[0]
-if (action === 'custom') {
-  require('../lib/commands/custom')(argv)
-} else if (action === 'invoke') {
-  require('../lib/commands/invoke')(argv)
-} else {
-  process.exit(0)
+#!/usr/bin/env node
+
+const yargsParser = require('yargs-parser')
+const argv = yargsParser(process.argv.slice(2))
+const action = argv._[0]
+if (action === 'custom') {
+  require('../lib/commands/custom')(argv)
+} else if (action === 'invoke') {
+  require('../lib/commands/invoke')(argv)
+} else {
+  process.exit(0)
 }

packages/vue-cli-plugin-uni/lib/options.js

@@ -27,8 +27,10 @@ module.exports = function initOptions (options) {
   options.transpileDependencies.push(genTranspileDepRegex(path.resolve(process.env.UNI_INPUT_DIR, 'node_modules')))
   options.transpileDependencies.push('@dcloudio/uni-' + process.env.UNI_PLATFORM)
   options.transpileDependencies.push('@dcloudio/uni-stat')
-  // mp runtime
-  options.transpileDependencies.push('@dcloudio/uni-mp-weixin/dist/mp.js')
+
+  if (process.env.UNI_PLATFORM !== 'mp-weixin') { // mp runtime
+    options.transpileDependencies.push('@dcloudio/uni-mp-weixin')
+  }
 
   if (process.env.UNI_PLATFORM === 'h5') { // h5 dev 用到了这两个，需要 babel
     options.transpileDependencies.push('ansi-regex')