feat(mp): vue3

packages/uni-cli-shared/lib/preprocess.js

@@ -27,7 +27,14 @@ module.exports = function initPreprocess (name, platforms, userDefines = {}) {
       defaultContext[normalize(name)] = false
     })
 
-  defaultContext.VUE2 = true
+  if (process.env.UNI_USING_VUE3) {
+    defaultContext.VUE3 = true
+  } else {
+    defaultContext.VUE2 = true
+  }
+  // nvue 只支持vue2
+  nvueContext.VUE2 = true
+  nvueContext.VUE3 = false
 
   vueContext[normalize(name)] = true
 

packages/vue-cli-plugin-uni/index.js

@@ -87,5 +87,5 @@ const args = require('minimist')(process.argv.slice(2))
 
 module.exports.defaultModes = {
   'uni-serve': args.mode || 'development',
-  'uni-build':  args.mode || process.env.NODE_ENV
+  'uni-build': args.mode || process.env.NODE_ENV
 }

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

@@ -16,11 +16,20 @@ if (process.env.UNI_INPUT_DIR && process.env.UNI_INPUT_DIR.indexOf('./') === 0)
   process.env.UNI_INPUT_DIR = path.resolve(process.cwd(), process.env.UNI_INPUT_DIR)
 }
 process.env.UNI_INPUT_DIR = process.env.UNI_INPUT_DIR || path.resolve(process.cwd(), defaultInputDir)
+
+const manifestJsonObj = require('@dcloudio/uni-cli-shared/lib/manifest').getManifestJson()
+
+// 小程序 vue3 标记
+if (process.env.UNI_PLATFORM.indexOf('mp-') === 0) {
+  if (manifestJsonObj.vueVersion === '3' || manifestJsonObj.vueVersion === 3) {
+    process.env.UNI_USING_VUE3 = true
+    process.env.UNI_USING_VUE3_OPTIONS_API = true
+  }
+}
 
 // 初始化全局插件对象
-global.uniPlugin = require('@dcloudio/uni-cli-shared/lib/plugin').init()
+global.uniPlugin = require('@dcloudio/uni-cli-shared/lib/plugin').init()
 
-const manifestJsonObj = require('@dcloudio/uni-cli-shared/lib/manifest').getManifestJson()
 const platformOptions = manifestJsonObj[process.env.UNI_SUB_PLATFORM || process.env.UNI_PLATFORM] || {}
 // 插件校验环境
 global.uniPlugin.validate.forEach(validate => {
@@ -263,7 +272,8 @@ if (platformOptions.usingComponents === true) {
 
 // 兼容历史配置 betterScopedSlots
 const modes = ['legacy', 'auto', 'augmented']
-const scopedSlotsCompiler = !platformOptions.scopedSlotsCompiler && platformOptions.betterScopedSlots ? modes[2] : platformOptions.scopedSlotsCompiler
+const scopedSlotsCompiler = !platformOptions.scopedSlotsCompiler && platformOptions.betterScopedSlots ? modes[2]
+  : platformOptions.scopedSlotsCompiler
 process.env.SCOPED_SLOTS_COMPILER = modes.includes(scopedSlotsCompiler) ? scopedSlotsCompiler : modes[1]
 // 快手小程序抽象组件编译报错，如未指定 legacy 固定为 augmented 模式
 if (process.env.UNI_PLATFORM === 'mp-kuaishou' && process.env.SCOPED_SLOTS_COMPILER !== modes[0]) {
@@ -465,4 +475,4 @@ runByHBuilderX && console.log('正在编译中...')
 
 module.exports = {
   manifestPlatformOptions: platformOptions
-}
+}

packages/vue-cli-plugin-uni/lib/mp/index.js

@@ -128,7 +128,8 @@ class PreprocessAssetsPlugin {
 
 function initSubpackageConfig (webpackConfig, vueOptions) {
   if (process.env.UNI_OUTPUT_DEFAULT_DIR === process.env.UNI_OUTPUT_DIR) { // 未自定义output
-    process.env.UNI_OUTPUT_DIR = path.resolve(process.env.UNI_OUTPUT_DIR, (process.env.UNI_SUBPACKGE || process.env.UNI_MP_PLUGIN))
+    process.env.UNI_OUTPUT_DIR = path.resolve(process.env.UNI_OUTPUT_DIR, (process.env.UNI_SUBPACKGE || process.env
+      .UNI_MP_PLUGIN))
   }
   vueOptions.outputDir = process.env.UNI_OUTPUT_DIR
   webpackConfig.output.path(process.env.UNI_OUTPUT_DIR)
@@ -175,7 +176,8 @@ module.exports = {
 
       const UNI_MP_PLUGIN_MAIN = process.env.UNI_MP_PLUGIN_MAIN
       if (UNI_MP_PLUGIN_MAIN) {
-        process.UNI_ENTRY[UNI_MP_PLUGIN_MAIN.split('.')[0]] = path.resolve(process.env.UNI_INPUT_DIR, UNI_MP_PLUGIN_MAIN)
+        process.UNI_ENTRY[UNI_MP_PLUGIN_MAIN.split('.')[0]] = path.resolve(process.env.UNI_INPUT_DIR,
+          UNI_MP_PLUGIN_MAIN)
       }
     }
 
@@ -295,4 +297,4 @@ module.exports = {
     webpackConfig.plugins.delete('preload')
     webpackConfig.plugins.delete('prefetch')
   }
-}
+}

packages/webpack-uni-mp-loader/lib/main-new.js

@@ -77,6 +77,10 @@ createPage(Page)
       type: jsPreprocessOptions.type
     })
 
+    if (process.env.UNI_USING_VUE3) {
+      content = content + ';createApp().app.mount(\'#app\');'
+    }
+
     const resourcePath = 'app'
 
     const {

src/platforms/app-plus/service/publish-handler.js

-export function publishHandler (eventType, args, pageIds) {
+export function publishHandler(eventType, args, pageIds) {
   args = JSON.stringify(args)
   if (process.env.NODE_ENV !== 'production') {
     console.log(`UNIAPP[publishHandler]:[${+new Date()}]`, eventType, args, pageIds)
@@ -8,6 +8,9 @@ export function publishHandler (eventType, args, pageIds) {
   }
   const evalJSCode =
     `typeof UniViewJSBridge !== 'undefined' && UniViewJSBridge.subscribeHandler("${eventType}",${args},__PAGE_ID__)`
+  if (process.env.NODE_ENV !== 'production') {
+    console.log(`UNIAPP[publishHandler]:[${+new Date()}]`, 'length', evalJSCode.length)
+  }
   pageIds.forEach(id => {
     const webview = plus.webview.getWebviewById(String(id))
     webview && webview.evalJS(evalJSCode.replace('__PAGE_ID__', id))