@dcloudio/vue-cli-plugin-uni 2.0.1-alpha-33720220111001 → 2.0.1-alpha-33820220118002

package/commands/build.js

@@ -34,7 +34,7 @@ module.exports = (api, options) => {
       '--auto-host': 'specify automator host',
       '--auto-port': 'specify automator port',
       '--subpackage': 'specify subpackage',
-      '--plugin': 'specify plugin',
+      '--plugin': 'specify mp plugin',
       '--manifest': 'build manifest.json'
     }
   }, async (args) => {
@@ -244,17 +244,19 @@ function analysisPluginDir () {
   const pluginJson = parseJson(fs.readFileSync(pluginJsonPath, 'utf-8'), true)
 
   // main 入口文件是否存在
-  process.env.UNI_MP_PLUGIN_MAIN = pluginJson.main
-  const UNI_MP_PLUGIN_MAIN = process.env.UNI_MP_PLUGIN_MAIN
-  const mainFilePath = path.resolve(process.env.UNI_INPUT_DIR, UNI_MP_PLUGIN_MAIN)
-
-  if (UNI_MP_PLUGIN_MAIN && !fs.pathExistsSync(mainFilePath)) {
-    console.log()
-    console.error(uniI18n.__('pluginUni.entryDileNoExistsCheckAfterRetry', {
-      0: UNI_MP_PLUGIN_MAIN
-    }))
-    console.log()
-    process.exit(0)
+  if (pluginJson.main) {
+    process.env.UNI_MP_PLUGIN_MAIN = pluginJson.main
+    const UNI_MP_PLUGIN_MAIN = process.env.UNI_MP_PLUGIN_MAIN
+    const mainFilePath = path.resolve(process.env.UNI_INPUT_DIR, UNI_MP_PLUGIN_MAIN)
+
+    if (UNI_MP_PLUGIN_MAIN && !fs.pathExistsSync(mainFilePath)) {
+      console.log()
+      console.error(uniI18n.__('pluginUni.entryDileNoExistsCheckAfterRetry', {
+        0: UNI_MP_PLUGIN_MAIN
+      }))
+      console.log()
+      process.exit(0)
+    }
   }
 }
 

package/lib/env.js

@@ -352,9 +352,7 @@ if (process.env.UNI_USING_NATIVE || process.env.UNI_USING_V3_NATIVE) {
     if (process.env.UNI_PLATFORM === 'app-plus') {
       const pagesPkg = require('@dcloudio/webpack-uni-pages-loader/package.json')
       if (pagesPkg) {
-        const v3Tips = `（v3）${uniI18n.__('see')}：https://ask.dcloud.net.cn/article/36599。`
-        info = uniI18n.__('compilerVersion') + '：' + pagesPkg['uni-app'].compilerVersion + (process.env.UNI_USING_V3
-          ? v3Tips : '')
+        info = uniI18n.__('compilerVersion') + '：' + pagesPkg['uni-app'].compilerVersion
       }
       if (process.env.UNI_USING_V3) {
         console.log(info)

package/lib/mp/index.js

@@ -178,11 +178,12 @@ module.exports = {
 
     {
       const globalEnv = process.env.UNI_PLATFORM === 'mp-alipay' ? 'my' : 'wx';
-      [].concat(process.env.UNI_MP_PLUGIN ? process.env.UNI_MP_PLUGIN_MAIN : JSON.parse(process.env
-        .UNI_MP_PLUGIN_EXPORT))
-        .forEach(fileName => addToUniEntry(fileName))
-      beforeCode +=
-        `${globalEnv}.__webpack_require_${(process.env.UNI_MP_PLUGIN || 'UNI_MP_PLUGIN').replace(/-/g, '_')}__ = __webpack_require__;`
+      [].concat(
+        process.env.UNI_MP_PLUGIN
+          ? process.env.UNI_MP_PLUGIN_MAIN
+          : JSON.parse(process.env.UNI_MP_PLUGIN_EXPORT)
+      ).forEach(fileName => addToUniEntry(fileName))
+      beforeCode += `${globalEnv}.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;`
     }
 
     const alias = { // 仅 mp-weixin
@@ -319,4 +320,4 @@ module.exports = {
     webpackConfig.plugins.delete('preload')
     webpackConfig.plugins.delete('prefetch')
   }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/vue-cli-plugin-uni",
-  "version": "2.0.1-alpha-33720220111001",
+  "version": "2.0.1-alpha-33820220118002",
   "description": "uni-app plugin for vue-cli 3",
   "main": "index.js",
   "repository": {
@@ -17,7 +17,7 @@
   "author": "fxy060608",
   "license": "Apache-2.0",
   "dependencies": {
-    "@dcloudio/uni-stat": "^2.0.1-alpha-33720220111001",
+    "@dcloudio/uni-stat": "^2.0.1-alpha-33820220118002",
     "buffer-json": "^2.0.0",
     "clone-deep": "^4.0.1",
     "copy-webpack-plugin": "^5.1.1",
@@ -39,5 +39,5 @@
     "wrap-loader": "^0.2.0",
     "xregexp": "4.0.0"
   },
-  "gitHead": "ae20a1e0c511d81be43382a256733a6e9a8102a2"
+  "gitHead": "c109a58cdc4ecf3b49bf256fbec6d570c3c110e1"
 }

package/packages/mp-vue/dist/mp.runtime.esm.js

@@ -5827,9 +5827,10 @@ function internalMixin(Vue) {
 
   Vue.prototype.$emit = function(event) {
     if (this.$scope && event) {
-      (this.$scope['_triggerEvent'] || this.$scope['triggerEvent'])(event, {
-        __args__: toArray(arguments, 1)
-      });
+      (this.$scope['_triggerEvent'] || this.$scope['triggerEvent'])
+        .call(this.$scope, event, {
+          __args__: toArray(arguments, 1)
+        })
     }
     return oldEmit.apply(this, arguments)
   };
@@ -5893,7 +5894,7 @@ function internalMixin(Vue) {
     if (!target) {
       target = this;
     }
-    // 解决动态属性添加
+    // 解决动态属性添加
     Vue.set(target, key, value)
   };
 
@@ -5901,7 +5902,7 @@ function internalMixin(Vue) {
     if (!target) {
       target = this;
     }
-    // 解决动态属性添加
+    // 解决动态属性添加
     Vue.set(target, key, value)
   };