uview-plus 3.8.55 → 3.8.106

package/libs/i18n/locales/{de.json → de.js}

@@ -1,4 +1,4 @@
-{
+export default {
     "up.common.cancel": "Abbrechen",
     "up.common.confirm": "Bestätigen",
     "up.common.start": "Start",

package/libs/i18n/locales/{en.json → en.js}

@@ -1,4 +1,4 @@
-{
+export default {
     "up.common.cancel": "Cancel",
     "up.common.confirm": "Confirm",
     "up.common.start": "Start",
@@ -83,4 +83,4 @@
     "up.goodsSku.amount": "Items",
     "up.goodsSku.choosed": "Selected",
     "up.goodsSku.buyAmount": "Quantity"
-}
+}

package/libs/i18n/locales/{es.json → es.js}

@@ -1,4 +1,4 @@
-{
+export default {
     "up.common.cancel": "Cancelar",
     "up.common.confirm": "Confirmar",
     "up.common.start": "Iniciar",

package/libs/i18n/locales/{fr.json → fr.js}

@@ -1,4 +1,4 @@
-{
+export default {
     "up.common.cancel": "Annuler",
     "up.common.confirm": "Confirmer",
     "up.common.start": "Démarrer",
@@ -83,4 +83,4 @@
     "up.goodsSku.amount": "Pièces",
     "up.goodsSku.choosed": "Sélectionné",
     "up.goodsSku.buyAmount": "Quantité"
-}
+}

package/libs/i18n/locales/{ja.json → ja.js}

@@ -1,4 +1,4 @@
-{
+export default {
     "up.common.cancel": "キャンセル",
     "up.common.confirm": "確認",
     "up.common.start": "開始",

package/libs/i18n/locales/{ko.json → ko.js}

@@ -1,4 +1,4 @@
-{
+export default {
     "up.common.cancel": "취소",
     "up.common.confirm": "확인",
     "up.common.start": "시작",

package/libs/i18n/locales/{ru.json → ru.js}

@@ -1,4 +1,4 @@
-{
+export default {
     "up.common.cancel": "Отмена",
     "up.common.confirm": "Подтвердить",
     "up.common.start": "Начало",

package/libs/i18n/locales/{th.json → th.js}

@@ -1,4 +1,4 @@
-{
+export default {
     "up.common.cancel": "ยกเลิก",
     "up.common.confirm": "ยืนยัน",
     "up.common.start": "เริ่มต้น",

package/libs/i18n/locales/{zh-Hans.json → zh-Hans.js}

@@ -1,4 +1,4 @@
-{
+export default {
     "up.common.cancel": "取消",
     "up.common.confirm": "确定",
     "up.common.start": "开始",

package/libs/i18n/locales/{zh-Hant.json → zh-Hant.js}

@@ -1,4 +1,4 @@
-{
+export default {
     "up.common.cancel": "取消",
     "up.common.confirm": "確定",
     "up.common.start": "開始",

package/libs/mixin/mixin.js

@@ -1,5 +1,5 @@
 import { defineMixin } from '../vue'
-import { deepMerge, $parent, sleep } from '../function/index'
+import { deepMerge, $parent, upGetRect } from '../function/index'
 import test from '../function/test'
 import route from '../util/route'
 import {
@@ -12,13 +12,6 @@ import {
     getThemeVarsForStyle,
     syncThemeRuntimeFromStorage
 } from '../theme/runtime'
-// #ifdef APP-NVUE
-// 由于weex为阿里的KPI业绩考核的产物，所以不支持百分比单位，这里需要通过dom查询组件的宽度
-const dom = (typeof uni !== 'undefined' && uni && typeof uni.requireNativePlugin === 'function')
-    ? uni.requireNativePlugin('dom')
-    : null
-// #endif
-
 export const mixin = defineMixin({
     // 定义每个组件都可能需要用到的外部样式以及类名
     props: {
@@ -49,7 +42,7 @@ export const mixin = defineMixin({
         }
     },
     onLoad() {
-        // getRect挂载到$u上，因为这方法需要使用in(this)，所以无法把它独立成一个单独的文件导出
+        // 保留 uni.$u.getRect 兼容入口
         this.upBindGetRect()
         this.upInitThemeVersion()
         if (this.upIsPageScope()) {
@@ -74,7 +67,7 @@ export const mixin = defineMixin({
         if (typeof uni !== 'undefined' && typeof uni.$on === 'function') {
             this.__uThemeChangeHandler = (payload = {}) => {
                 this.upSyncThemeVersion(payload)
-                this.chacheU = null
+                this.upClearUCache()
                 if (typeof this.$forceUpdate === 'function') {
                     this.$forceUpdate()
                 }
@@ -89,6 +82,10 @@ export const mixin = defineMixin({
         $u() {
             this.upThemeVersion
             // #ifndef APP-NVUE
+            const instance = this.$
+            if (instance?.__upUCache) {
+                return instance.__upUCache
+            }
             // 在非nvue端，移除props，http，mixin等对象，避免在小程序setData时数据过大影响性能
             let mergeU = deepMerge(uni.$u, {
                 props: undefined,
@@ -96,10 +93,11 @@ export const mixin = defineMixin({
                 mixin: undefined
             })
 			// 缓存结果避免每次计算
-			if (!this.chacheU) {
-				this.chacheU = mergeU
+			if (instance) {
+				instance.__upUCache = mergeU
+				return instance.__upUCache
 			}
-			return this.chacheU
+			return mergeU
             // #endif
             // #ifdef APP-NVUE
             return uni.$u
@@ -156,6 +154,11 @@ export const mixin = defineMixin({
         }
     },
     methods: {
+        upClearUCache() {
+            if (this.$) {
+                this.$.__upUCache = null
+            }
+        },
         upBindGetRect() {
             const upU = this.$u || (typeof uni !== 'undefined' ? uni.$u : null)
             if (upU) {
@@ -213,47 +216,8 @@ export const mixin = defineMixin({
         navTo(url = '', linkType = 'navigateTo') {
             route({ type: this.linkType, url })
         },
-        // 查询节点信息
-        // 目前此方法在支付宝小程序中无法获取组件跟接点的尺寸，为支付宝的bug(2020-07-21)
-        // 解决办法为在组件根部再套一个没有任何作用的view元素
-        $uGetRect(selector, all) {
-            return new Promise((resolve) => {
-                // #ifndef APP-NVUE
-                uni.createSelectorQuery()
-                    .in(this)[all ? 'selectAll' : 'select'](selector)
-                    .boundingClientRect((rect) => {
-                        if (all && Array.isArray(rect) && rect.length) {
-                            resolve(rect)
-                        }
-                        if (!all && rect) {
-                            resolve(rect)
-                        }
-                    })
-                    .exec()
-                // #endif
-                
-                // #ifdef APP-NVUE
-                sleep(30).then(() => {
-                    let selectorNvue = selector.substring(1) // 去掉开头的#或者.
-                    let selectorRef = this.$refs[selectorNvue]
-                    if (!selectorRef) {
-                        // console.log('不存在元素，请检查是否设置了ref属性' + selectorNvue + '。')
-                        resolve({
-                            with: 0,
-                            height: 0,
-                            left: 0,
-                            right: 0,
-                            top: 0,
-                            bottom: 0
-                        }) 
-                    }
-                    dom.getComponentRect(selectorRef, res => {
-                        // console.log(res)
-                        resolve(res.size)
-                    })
-                })
-                // #endif
-            })
+        $uGetRect(selector, all = false) {
+            return upGetRect(selector, all, this)
         },
         getParentData(parentName = '') {
             // 避免在created中去定义parent变量

package/libs/root/index.js

@@ -1,7 +1,7 @@
 import { dirname, relative, resolve } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import process from 'node:process'
-import { existsSync, mkdirSync, statSync, writeFileSync } from 'node:fs'
+import { copyFileSync, existsSync, mkdirSync, readFileSync, statSync, writeFileSync } from 'node:fs'
 
 import { createFilter, normalizePath } from 'vite'
 
@@ -10,6 +10,12 @@ import { rebuildUpApp, registerUpApp } from './root.js'
 import { loadPagesJson, normalizePlatformPath, toArray } from './utils.js'
 
 const rootLibPath = normalizePath(dirname(fileURLToPath(import.meta.url)))
+const appStaticIconFontRelativePath = 'static/app-plus/uview-plus/upicon.ttf'
+const appStaticIconFontFlag = 'const useAppStaticIconFont = false;'
+const appStaticIconFontEnabledFlag = 'const useAppStaticIconFont = true;'
+const appRemoteIconFontCondition = /\/\*\s*#ifdef\s+APP\s+\|\|\s+(MP-QQ\s+\|\|\s+MP-TOUTIAO\s+\|\|\s+MP-BAIDU\s+\|\|\s+MP-KUAISHOU\s+\|\|\s+MP-XHS)\s*\*\//
+const appCompiledRemoteIconFontFace = /[ \t]*(?:\/\/[^\n]*\n[ \t]*)?@font-face\s*\{[^{}]*font-family:\s*['"]?uicon-iconfont['"]?;?[^{}]*at\.alicdn\.com\/t\/font_2225171[^{}]*\}\s*/
+const appCompiledRemoteIconFontFaceGlobal = /[ \t]*(?:\/\/[^\n]*\n[ \t]*)?@font-face\s*\{[^{}]*font-family:\s*['"]?uicon-iconfont['"]?;?[^{}]*at\.alicdn\.com\/t\/font_2225171[^{}]*\}\s*/g
 
 export default function UniUpRoot(options = {}) {
   const rootOptions = {
@@ -53,7 +59,10 @@ export default function UniUpRoot(options = {}) {
   const rootPath = normalizePath(projectInfo.rootPath)
   const appUpPath = normalizePath(resolve(rootPath, `${rootFileName}.vue`))
   const rootToastHostPath = normalizePath(resolve(rootLibPath, 'root-toast-host.vue'))
-  const nvueRootPath = normalizePath(resolve(rootPath, 'uni_modules/uview-plus/libs/root/nvue-root.vue'))
+  const iconFontSourcePath = normalizePath(resolve(rootLibPath, '../../components/u-icon/upicon.ttf'))
+  const appStaticIconFontPath = normalizePath(resolve(rootPath, appStaticIconFontRelativePath))
+  const uIconUtilPath = normalizePath(resolve(rootPath, 'uni_modules/uview-plus/components/u-icon/util.js'))
+  const uIconVuePath = normalizePath(resolve(rootPath, 'uni_modules/uview-plus/components/u-icon/u-icon.vue'))
   const themeRuntimePath = normalizePath(resolve(rootPath, 'uni_modules/uview-plus/libs/theme/runtime.js'))
   const pagesPath = normalizePath(resolve(rootPath, 'pages.json'))
   const excludedPaths = toArray(rootOptions.excludePages)
@@ -90,6 +99,51 @@ export default function UniUpRoot(options = {}) {
     writeFileSync(appUpPath, defaultRootSfc, 'utf-8')
   }
 
+  const shouldCopyFile = (sourcePath, targetPath) => {
+    if (!existsSync(targetPath)) return true
+    if (statSync(sourcePath).size !== statSync(targetPath).size) return true
+    return !readFileSync(sourcePath).equals(readFileSync(targetPath))
+  }
+
+  const ensureAppStaticIconFont = () => {
+    if (process.env.UNI_PLATFORM !== 'app') return
+    if (!existsSync(iconFontSourcePath)) {
+      throw new Error(`uview-plus built-in icon font is missing: ${iconFontSourcePath}`)
+    }
+
+    mkdirSync(dirname(appStaticIconFontPath), { recursive: true })
+    if (shouldCopyFile(iconFontSourcePath, appStaticIconFontPath)) {
+      copyFileSync(iconFontSourcePath, appStaticIconFontPath)
+    }
+  }
+
+  const removeAppCompiledRemoteIconFontFace = (code) => code.replace(appCompiledRemoteIconFontFaceGlobal, '')
+
+  const transformAppStaticIconFont = (code, cleanId) => {
+    if (process.env.UNI_PLATFORM !== 'app') return null
+    if (cleanId === uIconUtilPath && code.includes(appStaticIconFontFlag)) {
+      return code.replace(appStaticIconFontFlag, appStaticIconFontEnabledFlag)
+    }
+    if (cleanId === uIconVuePath && appRemoteIconFontCondition.test(code)) {
+      return code.replace(appRemoteIconFontCondition, '/* #ifdef $1 */')
+    }
+    if (cleanId === uIconVuePath && appCompiledRemoteIconFontFace.test(code)) {
+      return removeAppCompiledRemoteIconFontFace(code)
+    }
+    return null
+  }
+
+  const removeAppRemoteIconFontFaceFromCssAssets = (bundle) => {
+    if (process.env.UNI_PLATFORM !== 'app') return
+    Object.values(bundle).forEach((asset) => {
+      if (asset.type !== 'asset') return
+      if (!asset.fileName.endsWith('.css')) return
+      if (typeof asset.source !== 'string') return
+      if (!appCompiledRemoteIconFontFace.test(asset.source)) return
+      asset.source = removeAppCompiledRemoteIconFontFace(asset.source)
+    })
+  }
+
   const refreshPagesJson = () => {
     if (!existsSync(pagesPath)) return
     const mtimeMs = statSync(pagesPath).mtimeMs
@@ -101,10 +155,16 @@ export default function UniUpRoot(options = {}) {
   return {
     name: 'vite-plugin-uni-up-root',
     enforce: 'pre',
-    configResolved({ plugins }) {
+    configResolved(config) {
+      const { plugins } = config
       hasPlatformPlugin = plugins.some(v => v.name === 'vite-plugin-uni-platform')
+      if (plugins.some(v => v.name === 'uni:app-nvue')) {
+        config.build.rollupOptions = config.build.rollupOptions || {}
+        config.build.rollupOptions.treeshake = false
+      }
     },
     buildStart() {
+      ensureAppStaticIconFont()
       ensureRootFile()
       refreshPagesJson()
     },
@@ -113,6 +173,14 @@ export default function UniUpRoot(options = {}) {
       const isSfcBlock = id.includes('?')
       const cleanId = normalizePath(id.split('?')[0])
 
+      const iconFontCode = transformAppStaticIconFont(code, cleanId)
+      if (iconFontCode) {
+        return {
+          code: iconFontCode,
+          map: null,
+        }
+      }
+
       const filterMain = createFilter(mainFiles)
       if (filterMain(cleanId)) {
         ms = await registerUpApp(code, rootFileName, getRelativeImportPath(cleanId, rootToastHostPath))
@@ -120,7 +188,9 @@ export default function UniUpRoot(options = {}) {
 
       const filterUpRoot = createFilter(appUpPath)
       if (filterUpRoot(cleanId)) {
-        ms = await rebuildUpApp(code, rootOptions.enabledVirtualHost)
+        ms = await rebuildUpApp(code, rootOptions.enabledVirtualHost, {
+          rootToastHostImportPath: getRelativeImportPath(cleanId, rootToastHostPath)
+        })
       }
 
       refreshPagesJson()
@@ -130,7 +200,7 @@ export default function UniUpRoot(options = {}) {
         if (cleanId.endsWith('.nvue')) {
           ms = await transformNvuePage(
             code,
-            getRelativeImportPath(cleanId, nvueRootPath),
+            getRelativeImportPath(cleanId, appUpPath),
             getRelativeImportPath(cleanId, themeRuntimePath),
             rootOptions.enabledGlobalRef
           )
@@ -147,5 +217,8 @@ export default function UniUpRoot(options = {}) {
       }
       return null
     },
+    generateBundle(_, bundle) {
+      removeAppRemoteIconFontFaceFromCssAssets(bundle)
+    },
   }
 }

package/libs/root/page.js

@@ -53,11 +53,11 @@ export async function transformPage(code, enabledGlobalRef = false) {
 }
 
 function ensureOptionsComponent(ms, scriptContent) {
-  if (scriptContent.includes('UpNvueRoot')) return
+  if (scriptContent.includes('AppUpRoot')) return
 
   const componentsMatch = scriptContent.match(/components\s*:\s*\{/)
   if (componentsMatch) {
-    ms.appendLeft(componentsMatch.index + componentsMatch[0].length, ' UpNvueRoot,')
+    ms.appendLeft(componentsMatch.index + componentsMatch[0].length, ' AppUpRoot,')
     return
   }
 
@@ -65,7 +65,7 @@ function ensureOptionsComponent(ms, scriptContent) {
   if (exportDefaultMatch) {
     ms.appendLeft(
       exportDefaultMatch.index + exportDefaultMatch[0].length,
-      '\n  components: { UpNvueRoot },'
+      '\n  components: { AppUpRoot },'
     )
   }
 }
@@ -89,7 +89,7 @@ function ensureOptionsThemeMixin(ms, scriptContent) {
 }
 
 function getScriptSetupImports(componentImportPath, runtimeImportPath) {
-  return `import UpNvueRoot from '${componentImportPath}'
+  return `import AppUpRoot from '${componentImportPath}'
 import { computed as __upComputed, onBeforeUnmount as __upOnBeforeUnmount, onMounted as __upOnMounted, ref as __upRef } from 'vue'
 import { onShow as __upOnShow } from '@dcloudio/uni-app'
 import {
@@ -161,7 +161,7 @@ const upThemeNavBgColor = __upComputed(() => {
 }
 
 function getOptionsImports(componentImportPath, runtimeImportPath) {
-  return `import UpNvueRoot from '${componentImportPath}'
+  return `import AppUpRoot from '${componentImportPath}'
 import {
   applyNativeThemeUI as __upApplyNativeThemeUI,
   applyNativeThemeUIDeferred as __upApplyNativeThemeUIDeferred,
@@ -251,7 +251,7 @@ export async function transformNvuePage(
   const sfc = await parseSFC(code)
   const ms = new MagicString(code)
 
-  wrapTemplate(ms, sfc, 'UpNvueRoot', getPageRootRefSource(sfc, enabledGlobalRef), true)
+  wrapTemplate(ms, sfc, 'AppUpRoot', getPageRootRefSource(sfc, enabledGlobalRef), true)
 
   if (sfc.scriptSetup) {
     ms.appendLeft(sfc.scriptSetup.loc.start.offset, getScriptSetupImports(componentImportPath, runtimeImportPath))
@@ -261,7 +261,7 @@ export async function transformNvuePage(
     ensureOptionsThemeMixin(ms, sfc.script.content)
   } else {
     ms.append(
-      `\n<script>\n${getOptionsImports(componentImportPath, runtimeImportPath)}export default {\n  components: { UpNvueRoot },\n  mixins: [__upNvueThemeMixin]\n}\n</script>\n`
+      `\n<script>\n${getOptionsImports(componentImportPath, runtimeImportPath)}export default {\n  components: { AppUpRoot },\n  mixins: [__upNvueThemeMixin]\n}\n</script>\n`
     )
   }
 

package/libs/root/root.js

@@ -2,6 +2,28 @@ import { MagicString } from 'vue/compiler-sfc'
 
 import { parseSFC } from './utils.js'
 
+function ensureRootToastHostComponent(ms, scriptContent) {
+  const componentsMatch = scriptContent.match(/components\s*:\s*\{([\s\S]*?)\}/)
+  if (componentsMatch && /\bUpRootToastHost\b/.test(componentsMatch[1])) return
+
+  if (componentsMatch) {
+    ms.appendLeft(componentsMatch.index + componentsMatch[0].length, ' UpRootToastHost,')
+    return
+  }
+
+  const exportDefaultMatch = scriptContent.match(/export\s+default\s+(?:defineComponent\s*\()?\s*\{/)
+  if (exportDefaultMatch) {
+    ms.appendLeft(
+      exportDefaultMatch.index + exportDefaultMatch[0].length,
+      '\n  components: { UpRootToastHost },'
+    )
+  }
+}
+
+function getRootToastHostImport(importPath) {
+  return `import UpRootToastHost from '${importPath}'\n`
+}
+
 export async function registerUpApp(
   code,
   fileName = 'App.up',
@@ -21,17 +43,57 @@ import UpRootToastHost from "${rootToastHostPath}";`
   return ms
 }
 
-export async function rebuildUpApp(code, enabledVirtualHost = false) {
+export async function rebuildUpApp(
+  code,
+  enabledVirtualHost = false,
+  { rootToastHostImportPath = '' } = {}
+) {
   const ms = new MagicString(code)
   const rootTagNameRE = /<(UpRootView|up-root-view)(?:\s*\/>|><\/\1>)/
-  ms.replace(rootTagNameRE, '<slot />\n    <ku-root-toast-host />')
+  const hasRootView = rootTagNameRE.test(code)
+  if (hasRootView) {
+    const rootToastHostTag = rootToastHostImportPath
+      ? '<UpRootToastHost />'
+      : '<ku-root-toast-host />'
+    ms.replace(rootTagNameRE, `<slot />\n    ${rootToastHostTag}`)
+  }
+
+  const shouldInjectRootToastHost = hasRootView && rootToastHostImportPath
+  const sfc = enabledVirtualHost || shouldInjectRootToastHost
+    ? await parseSFC(code)
+    : null
+
+  if (shouldInjectRootToastHost) {
+    const importCode = getRootToastHostImport(rootToastHostImportPath)
+
+    if (sfc.scriptSetup) {
+      if (!/\bimport\s+UpRootToastHost\b/.test(sfc.scriptSetup.content)) {
+        ms.appendLeft(sfc.scriptSetup.loc.start.offset, importCode)
+      }
+    } else if (sfc.script) {
+      if (!/\bimport\s+UpRootToastHost\b/.test(sfc.script.content)) {
+        ms.appendLeft(sfc.script.loc.start.offset, importCode)
+      }
+      ensureRootToastHostComponent(ms, sfc.script.content)
+    }
+  }
 
   if (enabledVirtualHost) {
-    const sfc = await parseSFC(code)
     if (sfc.script) {
       return ms
     }
     const langType = sfc.scriptSetup?.lang
+    if (!sfc.scriptSetup && shouldInjectRootToastHost) {
+      ms.append(`<script ${langType ? `lang="${langType}"` : ''}>
+    ${getRootToastHostImport(rootToastHostImportPath)}export default {
+      components: { UpRootToastHost },
+      options: {
+        virtualHost: true,
+      }
+    }
+</script>`)
+      return ms
+    }
     ms.append(`<script ${langType ? `lang="${langType}"` : ''}>
     export default {
       options: {
@@ -40,5 +102,13 @@ export async function rebuildUpApp(code, enabledVirtualHost = false) {
     }\n</script>`)
   }
 
+  if (!sfc?.script && !sfc?.scriptSetup && shouldInjectRootToastHost) {
+    ms.append(`<script>
+    ${getRootToastHostImport(rootToastHostImportPath)}export default {
+      components: { UpRootToastHost },
+    }
+</script>`)
+  }
+
   return ms
 }