chore(dom2): 调整部分 dom2 判断

Author: fxy060608

packages/uni-app-uts/src/plugins/dom2/css.ts

@@ -34,6 +34,8 @@ export function uniAppCssPrePlugin(): Plugin {
   const mainPath = resolveMainPathOnce(process.env.UNI_INPUT_DIR)
   const appUVuePath = resolveAppVue(process.env.UNI_INPUT_DIR)
   const { parseCss } = require('@dcloudio/compiler-vapor-dom2')
+  const isDom2 = process.env.UNI_APP_X_DOM2 === 'true'
+  const isDom2Harmony = isDom2 && process.env.UNI_UTS_PLATFORM === 'app-harmony'
   return {
     name,
     // 需要提前，因为unocss会在configResolved读取vite:css-post插件
@@ -69,9 +71,6 @@ export function uniAppCssPrePlugin(): Plugin {
             platform: process.env.UNI_UTS_PLATFORM,
             helper: requireUniHelpers(),
           })
-          const isDom2Harmony =
-            process.env.UNI_APP_X_DOM2 === 'true' &&
-            process.env.UNI_UTS_PLATFORM === 'app-harmony'
           if (isDom2Harmony && fontFaces) {
             const id = CSS_FILE_ID_MAP.get(filename)
             if (id) {
@@ -121,10 +120,6 @@ export function uniAppCssPrePlugin(): Plugin {
         name: 'uni:app-uvue-css-inline-post',
         apply: 'build',
         generateBundle(_, bundle) {
-          // 暂时保留此条件容错
-          const isDom2Harmony =
-            process.env.UNI_APP_X_DOM2 === 'true' &&
-            process.env.UNI_UTS_PLATFORM === 'app-harmony'
           if (isDom2Harmony) {
             Object.entries(bundle).forEach(([file, asset]) => {
               // 不支持多style标签
@@ -158,9 +153,6 @@ export function uniAppCssPrePlugin(): Plugin {
       // 重要：必须放到 unplugin-auto-import、uni:sd 前
       const index = plugins.findIndex((p) => p.name === 'unplugin-auto-import')
       plugins.splice(index, 0, uvueCssPostPlugin)
-      const isDom2Harmony =
-        process.env.UNI_APP_X_DOM2 === 'true' &&
-        process.env.UNI_UTS_PLATFORM === 'app-harmony'
       if (isDom2Harmony) {
         plugins.splice(index + 1, 0, uvueCssInlinePostPlugin)
       }

packages/uni-app-uts/src/plugins/harmony/index.ts

@@ -76,11 +76,11 @@ export function init() {
         },
       },
     }),
-    ...(process.env.UNI_APP_X_DOM2 === 'true' ? [uniSharedDataPlugin()] : []),
+    ...(isDom2 ? [uniSharedDataPlugin()] : []),
     ...(process.env.UNI_COMPILE_EXT_API_TYPE === 'pages'
       ? [replaceExtApiPagePaths()]
       : []),
-    ...(process.env.UNI_APP_X_DOM2 === 'true' ? [uniAppCssPlugin()] : []),
+    ...(isDom2 ? [uniAppCssPlugin()] : []),
     ...(isNormalCompileTarget() ? [uniStatsPlugin()] : []),
   ]
 }

packages/uni-app-uts/src/plugins/js/plugin.ts

@@ -86,6 +86,7 @@ export function createUniAppJsEnginePlugin(
         }
       : {}
 
+    const isDom2 = process.env.UNI_APP_X_DOM2 === 'true'
     return {
       name: 'uni:app-uts',
       apply: 'build',
@@ -166,16 +167,13 @@ export function createUniAppJsEnginePlugin(
       },
       configResolved(config) {
         configResolved(config)
-        if (process.env.UNI_APP_X_DOM2 !== 'true') {
+        if (!isDom2) {
           initUniAppJsEngineDom1CssPlugin(config)
         }
         insertBeforePlugin(uniAppJsPlugin(config), 'uni:app-main', config)
         // 如果开启了 vapor 模式，则禁用 vue 的 devtools，让 @vitejs/plugin-vue 不管是开发还是发行，均生成发行代码
         // 理论上非 vapor 也应该禁用，但为了不引发其他问题，暂时只禁用 vapor 模式
-        if (
-          process.env.UNI_VUE_VAPOR === 'true' ||
-          process.env.UNI_APP_X_DOM2 === 'true'
-        ) {
+        if (isDom2 || process.env.UNI_VUE_VAPOR === 'true') {
           const plugin = config.plugins.find((p) => p.name === 'vite:vue')
           if (plugin?.api?.options) {
             plugin.api.options.devToolsEnabled = false

packages/uni-app-uts/src/plugins/utils.ts

@@ -35,11 +35,9 @@ const isXHarmony =
 export function createUniOptions(
   platform: 'app-android' | 'app-ios' | 'app-harmony'
 ): UniVitePlugin['uni'] {
+  const isDom2 = process.env.UNI_APP_X_DOM2 === 'true'
   return {
-    compiler:
-      process.env.UNI_APP_X_DOM2 === 'true'
-        ? require('@dcloudio/compiler-vapor-dom2')
-        : undefined,
+    compiler: isDom2 ? require('@dcloudio/compiler-vapor-dom2') : undefined,
     copyOptions() {
       const inputDir = process.env.UNI_INPUT_DIR
       const outputDir = process.env.UNI_OUTPUT_DIR
@@ -74,7 +72,7 @@ export function createUniOptions(
       platform === 'app-ios' || platform === 'app-harmony'
         ? {
             isNativeTag(tag) {
-              if (process.env.UNI_APP_X_DOM2 === 'true') {
+              if (isDom2) {
                 return isDom2AppNativeTag(tag)
               }
               return (

packages/uni-cli-shared/src/vite/plugins/vitejs/plugins/css.ts

@@ -386,6 +386,8 @@ export function cssPostPlugin(
   // styles initialization in buildStart causes a styling loss in watch
   const styles: Map<string, string> = new Map<string, string>()
   let cssChunks: Map<string, string[]>
+  const isDom2Harmony =
+    process.env.UNI_APP_X_DOM2 === 'true' && platform === 'app-harmony'
   return {
     name: 'vite:css-post',
     buildStart() {
@@ -401,9 +403,6 @@ export function cssPostPlugin(
 
       // build CSS handling ----------------------------------------------------
       styles.set(id, css)
-      const isDom2Harmony =
-        process.env.UNI_APP_X_DOM2 === 'true' &&
-        process.env.UNI_UTS_PLATFORM === 'app-harmony'
       return {
         code:
           modulesCode ||
@@ -419,7 +418,7 @@ export function cssPostPlugin(
       }
     },
     async renderChunk(_code, chunk, _opts) {
-      if (platform === 'app-harmony' && process.env.UNI_APP_X_DOM2 === 'true') {
+      if (isDom2Harmony) {
         // 通过 generateBundle 实现
         return null
       }