@dcloudio/vue-cli-plugin-uni 2.0.2-4070520250711001 → 2.0.2-4080420251103001

package/lib/chain-webpack.js

@@ -172,12 +172,12 @@ module.exports = function chainWebpack (platformOptions, vueOptions, api) {
       'process.env.UNI_COMPILER_VERSION': JSON.stringify(process.env.UNI_COMPILER_VERSION),
       'process.env.UNI_APP_VERSION_NAME': JSON.stringify(process.env.UNI_APP_VERSION_NAME),
       'process.env.UNI_APP_VERSION_CODE': JSON.stringify(process.env.UNI_APP_VERSION_CODE),
-      __UNI_SOCKET_HOSTS__: JSON.stringify(process.env.UNI_SOCKET_HOSTS || ''),
-      __UNI_SOCKET_PORT__: JSON.stringify(process.env.UNI_SOCKET_PORT || ''),
-      __UNI_SOCKET_ID__: JSON.stringify(process.env.UNI_SOCKET_ID || ''),
-      __UNI_CONSOLE_KEEP_ORIGINAL__: JSON.stringify(
+      'process.env.UNI_SOCKET_HOSTS': JSON.stringify(process.env.UNI_SOCKET_HOSTS || ''),
+      'process.env.UNI_SOCKET_PORT': JSON.stringify(process.env.UNI_SOCKET_PORT || ''),
+      'process.env.UNI_SOCKET_ID': JSON.stringify(process.env.UNI_SOCKET_ID || ''),
+      'process.env.UNI_CONSOLE_KEEP_ORIGINAL': JSON.stringify(
         !(process.env.UNI_PLATFORM === 'mp-harmony' ||
-        process.env.UNI_PLATFORM === 'app-harmony')
+          process.env.UNI_PLATFORM === 'app-harmony')
       )
     }
     if (process.env.UNI_USING_VUE3) {

package/lib/configure-webpack.js

@@ -368,7 +368,8 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt
         }),
       vuex: require.resolve('@dcloudio/vue-cli-plugin-uni/packages/vuex3'),
       '@vue/composition-api': require.resolve('@dcloudio/vue-cli-plugin-uni/packages/@vue/composition-api'),
-      '@dcloudio/uni-console': require.resolve('@dcloudio/vue-cli-plugin-uni/packages/uni-console/dist/index.esm.js')
+      '@dcloudio/uni-console': require.resolve('@dcloudio/vue-cli-plugin-uni/packages/uni-console/dist/' + (
+        process.env.UNI_PLATFORM.startsWith('mp-') ? 'mp' : 'index') + '.esm.js')
     }
 
     if (process.env.UNI_PLATFORM.startsWith('mp')) {

package/lib/env.js

@@ -97,10 +97,6 @@ process.env.VUE_APP_NAME = manifestJsonObj.name
 
 process.env.UNI_USING_V3_SCOPED = true
 
-// 导出到小程序插件
-process.env.UNI_MP_PLUGIN_EXPORT = JSON.stringify(Object.keys(platformOptions.plugins || {}).map(pluginName =>
-  platformOptions.plugins[pluginName].export))
-
 const isH5 = !process.env.UNI_SUB_PLATFORM && process.env.UNI_PLATFORM === 'h5'
 const isProduction = process.env.NODE_ENV === 'production'
 
@@ -302,6 +298,37 @@ process.UNI_STAT_CONFIG = {
   appid: manifestJsonObj.appid
 }
 
+// 导出到小程序插件
+const mpPluginExports = Object.keys(platformOptions.plugins || {}).map(
+  pluginName => platformOptions.plugins[pluginName].export
+)
+// 小程序分包导出到插件
+if (process.env.UNI_PLATFORM.indexOf('mp-') > -1 && Array.isArray(pagesJsonObj.subPackages)) {
+  pagesJsonObj.subPackages.forEach(subPackage => {
+    if (subPackage && subPackage.plugins) {
+      Object.keys(subPackage.plugins).forEach(pluginName => {
+        const plugin = subPackage.plugins[pluginName]
+        if (plugin.export) {
+          const pluginExportFileRelative = path.join(subPackage.root, plugin.export)
+          const pluginExportFile = path.resolve(process.env.UNI_INPUT_DIR, pluginExportFileRelative)
+          if (!fs.existsSync(pluginExportFile)) {
+            console.log()
+            console.error(
+              uniI18n.__('pluginUni.entryDileNoExistsCheckAfterRetry', {
+                0: pluginExportFile
+              })
+            )
+            console.log()
+            process.exit(0)
+          }
+          mpPluginExports.push(pluginExportFileRelative)
+        }
+      })
+    }
+  })
+}
+process.env.UNI_MP_PLUGIN_EXPORT = JSON.stringify(mpPluginExports)
+
 // 默认启用 自定义组件模式
 // if (isInHBuilderXAlpha) {
 let usingComponentsAbsent = false

package/lib/format-text.js

@@ -1,3 +1,5 @@
+const { condense } = require('./util')
+
 var validDivisionCharRE = /[\w).+\-_$\]]/
 
 function parseFilters (exp) {
@@ -74,7 +76,7 @@ function parseFilters (exp) {
           break // }
       }
       if (c === 0x2f) { // /
-        var j = i - 1
+        var j = i - 1
         /* eslint-disable no-void */
         var p = (void 0)
         // find first non-whitespace prev char
@@ -164,7 +166,8 @@ module.exports = {
     if (children && children.length) {
       children.forEach(childEl => {
         if (childEl.text) {
-          const text = childEl.text.trim()
+          // fix: 和 vue3 一致压缩空白行为，防止去除   等空白符
+          const text = condense(childEl.text)
           if (childEl.type === 2) {
             try {
               const {
@@ -185,4 +188,4 @@ module.exports = {
     }
     return ''
   }
-}
+}

package/lib/h5/index.js

@@ -18,8 +18,10 @@ const {
 const modifyVueLoader = require('../vue-loader')
 
 const WebpackHtmlAppendPlugin = require('../../packages/webpack-html-append-plugin')
-
 const WebpackUniAppPlugin = require('../../packages/webpack-uni-app-loader/plugin/index')
+const WebpackHtmlInjectAliYunPlugin = require('../../packages/webpack-html-inject-aliyun-plugin/index')
+
+const { AliYunCloudAuthWebSDK } = require('../util')
 
 function resolve (dir) {
   return path.resolve(__dirname, '../../', dir)
@@ -51,7 +53,8 @@ function getProvides () {
 
 const plugins = [
   new WebpackUniAppPlugin(),
-  new webpack.ProvidePlugin(getProvides())
+  new webpack.ProvidePlugin(getProvides()),
+  new WebpackHtmlInjectAliYunPlugin(AliYunCloudAuthWebSDK)
 ]
 
 if (process.env.NODE_ENV !== 'production') {

package/lib/mp/index.js

@@ -201,15 +201,17 @@ 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 += `
-// @ts-ignore
-${globalEnv}.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;`
+      const globalEnv = process.env.UNI_PLATFORM === 'mp-alipay' ? 'my' : 'wx'
+      if (process.env.UNI_MP_PLUGIN) {
+        addToUniEntry(process.env.UNI_MP_PLUGIN_MAIN)
+      } else if (process.env.UNI_MP_PLUGIN_EXPORT) {
+        let exportFiles = JSON.parse(process.env.UNI_MP_PLUGIN_EXPORT)
+        if (typeof exportFiles === 'string') {
+          exportFiles = [exportFiles]
+        }
+        exportFiles.forEach(fileName => addToUniEntry(fileName))
+      }
+      beforeCode += `\n// @ts-ignore\n${globalEnv}.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;`
     }
 
     const alias = { // 仅 mp-weixin

package/lib/util.js

@@ -5,6 +5,9 @@ const {
   pathToGlob
 } = require('@dcloudio/uni-cli-shared/lib/util')
 
+function isWhitespace (c) {
+  return c === 32 /** SPACE */ || c === 10 /** NewLine */ || c === 9 /** Tab */ || c === 12 /** FormFeed */ || c === 13 /** CarriageReturn */
+}
 let partialIdentifier = false
 module.exports = {
   getPartialIdentifier () {
@@ -115,5 +118,62 @@ module.exports = {
         )
       }
     }
-  }
+  },
+  /**
+   * 压缩字符串空白字符
+   * - 连续空白合并为单个空格
+   * - 根据 trimSide 控制只处理左侧或右侧空白
+   *
+   * @param {string} str - 待处理字符串
+   * @param {'left'|'right'|'both'|'none'} trimSide - 压缩的方向
+   * @returns {string} 处理后的字符串
+   */
+  condense (str, trimSide = 'both') {
+    const len = str.length
+    let ret = ''
+    let prevCharIsWhitespace = false
+
+    let firstNonWhitespace = 0
+    while (firstNonWhitespace < len && isWhitespace(str.charCodeAt(firstNonWhitespace))) {
+      firstNonWhitespace++
+    }
+
+    let lastNonWhitespace = len - 1
+    while (lastNonWhitespace >= 0 && isWhitespace(str.charCodeAt(lastNonWhitespace))) {
+      lastNonWhitespace--
+    }
+
+    for (let i = 0; i < len; i++) {
+      const code = str.charCodeAt(i)
+
+      if (isWhitespace(code)) {
+        let shouldCondense = false
+
+        if (trimSide === 'both') {
+          shouldCondense = true
+        } else if (trimSide === 'left') {
+          if (i <= firstNonWhitespace) shouldCondense = true
+        } else if (trimSide === 'right') {
+          if (i >= lastNonWhitespace) shouldCondense = true
+        } else {
+          shouldCondense = false // none
+        }
+
+        if (shouldCondense) {
+          if (!prevCharIsWhitespace) {
+            ret += ' '
+            prevCharIsWhitespace = true
+          }
+        } else {
+          ret += str[i]
+        }
+      } else {
+        ret += str[i]
+        prevCharIsWhitespace = false
+      }
+    }
+
+    return ret
+  },
+  AliYunCloudAuthWebSDK: 'https://cn-shanghai-aliyun-cloudauth.oss-cn-shanghai.aliyuncs.com/web_sdk_js/jsvm_all.js'
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/vue-cli-plugin-uni",
-  "version": "2.0.2-4070520250711001",
+  "version": "2.0.2-4080420251103001",
   "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.2-4070520250711001",
+    "@dcloudio/uni-stat": "^2.0.2-4080420251103001",
     "buffer-json": "^2.0.0",
     "clone-deep": "^4.0.1",
     "cross-env": "^5.2.0",
@@ -41,5 +41,5 @@
     "copy-webpack-plugin": ">=5",
     "postcss": ">=7"
   },
-  "gitHead": "1cfce22ea63bfcf84c9f9f26df4a5c144286c756"
+  "gitHead": "45cefdc25bd7f68367e86074eb16962b0cb8221d"
 }