wip(x-ios): 调整部分dom2判断条件

fxy060608 · fxy060608 · commit 1ebada6b76f7 · 2026-01-29T14:58:56.000+08:00
diff --git a/packages/uni-app-uts/src/plugins/dom2/css.ts b/packages/uni-app-uts/src/plugins/dom2/css.ts
@@ -34,9 +34,7 @@ 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 isDom2Harmony =
-    process.env.UNI_APP_X_DOM2 === 'true' &&
-    process.env.UNI_UTS_PLATFORM === 'app-harmony'
+  const isDom2 = process.env.UNI_APP_X_DOM2 === 'true'
   return {
     name,
     // 需要提前，因为unocss会在configResolved读取vite:css-post插件
@@ -72,7 +70,7 @@ export function uniAppCssPrePlugin(): Plugin {
             platform: process.env.UNI_UTS_PLATFORM,
             helper: requireUniHelpers(),
           })
-          if (isDom2Harmony && fontFaces) {
+          if (isDom2 && fontFaces) {
             const id = CSS_FILE_ID_MAP.get(filename)
             if (id) {
               const cloneFontFaces = fontFaces.reduce(
@@ -121,7 +119,7 @@ export function uniAppCssPrePlugin(): Plugin {
         name: 'uni:app-uvue-css-inline-post',
         apply: 'build',
         generateBundle(_, bundle) {
-          if (isDom2Harmony) {
+          if (isDom2) {
             Object.entries(bundle).forEach(([file, asset]) => {
               // 不支持多style标签
               if (asset.type === 'chunk') {
@@ -154,7 +152,7 @@ export function uniAppCssPrePlugin(): Plugin {
       // 重要：必须放到 unplugin-auto-import、uni:sd 前
       const index = plugins.findIndex((p) => p.name === 'unplugin-auto-import')
       plugins.splice(index, 0, uvueCssPostPlugin)
-      if (isDom2Harmony) {
+      if (isDom2) {
         plugins.splice(index + 1, 0, uvueCssInlinePostPlugin)
       }
     },
diff --git a/packages/uni-app-uts/src/plugins/harmony/index.ts b/packages/uni-app-uts/src/plugins/harmony/index.ts
@@ -29,11 +29,9 @@ import { replaceExtApiPagePaths } from '../js/extApiPages'
 import { uniAppCssPlugin, uniAppCssPrePlugin } from '../dom2/css'
 
 export function init() {
-  const isDom2Harmony =
-    process.env.UNI_APP_X_DOM2 === 'true' &&
-    process.env.UNI_UTS_PLATFORM === 'app-harmony'
+  const isDom2 = process.env.UNI_APP_X_DOM2 === 'true'
   return [
-    ...(isDom2Harmony ? [uniAppCssPrePlugin()] : []),
+    ...(isDom2 ? [uniAppCssPrePlugin()] : []),
     ...(isNormalCompileTarget()
       ? [uniWorkersPlugin(), uniDecryptUniModulesPlugin()]
       : []),
@@ -60,13 +58,13 @@ export function init() {
         ]),
     uniUTSUVueJavaScriptPlugin(),
     resolveUTSCompiler().uts2js({
-      dom2: isDom2Harmony,
+      dom2: isDom2,
       platform: 'app-harmony',
       inputDir: process.env.UNI_INPUT_DIR,
       version: process.env.UNI_COMPILER_VERSION,
       cacheRoot: path.resolve(process.env.UNI_APP_X_CACHE_DIR, '.uts2js/cache'),
       sourceMap: enableSourceMap(),
-      sharedDataLibName: isDom2Harmony ? 'libentry.so' : undefined,
+      sharedDataLibName: isDom2 ? 'libentry.so' : undefined,
       modules: {
         vueCompilerDom,
         uniCliShared,
@@ -78,11 +76,11 @@ export function init() {
         },
       },
     }),
-    ...(isDom2Harmony ? [uniSharedDataPlugin()] : []),
+    ...(isDom2 ? [uniSharedDataPlugin()] : []),
     ...(process.env.UNI_COMPILE_EXT_API_TYPE === 'pages'
       ? [replaceExtApiPagePaths()]
       : []),
-    ...(isDom2Harmony ? [uniAppCssPlugin()] : []),
+    ...(isDom2 ? [uniAppCssPlugin()] : []),
     ...(isNormalCompileTarget() ? [uniStatsPlugin()] : []),
   ]
 }
diff --git a/packages/uni-app-uts/src/plugins/js/pagesJson.ts b/packages/uni-app-uts/src/plugins/js/pagesJson.ts
@@ -26,9 +26,7 @@ export function uniAppPagesPlugin(): Plugin {
     PAGES_JSON_UTS
   )
 
-  const isDom2Harmony =
-    process.env.UNI_APP_X_DOM2 === 'true' &&
-    process.env.UNI_UTS_PLATFORM === 'app-harmony'
+  const isDom2 = process.env.UNI_APP_X_DOM2 === 'true'
 
   let allPagePaths: string[] = []
   let isFirst = true
@@ -83,7 +81,7 @@ export function uniAppPagesPlugin(): Plugin {
         const pagesJson = normalizeUniAppXAppPagesJson(code)
 
         // vapor 暂不支持 tabBar
-        if (isDom2Harmony) {
+        if (isDom2) {
           if (pagesJson.tabBar) {
             hasTabBar = true
             delete pagesJson.tabBar
diff --git a/packages/uni-app-uts/src/plugins/js/plugin.ts b/packages/uni-app-uts/src/plugins/js/plugin.ts
@@ -86,9 +86,7 @@ export function createUniAppJsEnginePlugin(
         }
       : {}
 
-    const isDom2Harmony =
-      process.env.UNI_APP_X_DOM2 === 'true' &&
-      process.env.UNI_UTS_PLATFORM === 'app-harmony'
+    const isDom2 = process.env.UNI_APP_X_DOM2 === 'true'
     return {
       name: 'uni:app-uts',
       apply: 'build',
@@ -172,13 +170,13 @@ export function createUniAppJsEnginePlugin(
       },
       configResolved(config) {
         configResolved(config)
-        if (!isDom2Harmony) {
+        if (!isDom2) {
           initUniAppJsEngineDom1CssPlugin(config)
         }
         insertBeforePlugin(uniAppJsPlugin(config), 'uni:app-main', config)
         // 如果开启了 vapor 模式，则禁用 vue 的 devtools，让 @vitejs/plugin-vue 不管是开发还是发行，均生成发行代码
         // 理论上非 vapor 也应该禁用，但为了不引发其他问题，暂时只禁用 vapor 模式
-        if (isDom2Harmony) {
+        if (isDom2) {
           const plugin = config.plugins.find((p) => p.name === 'vite:vue')
           if (plugin?.api?.options) {
             plugin.api.options.devToolsEnabled = false
diff --git a/packages/uni-app-uts/src/plugins/utils.ts b/packages/uni-app-uts/src/plugins/utils.ts
@@ -35,12 +35,9 @@ const isXHarmony =
 export function createUniOptions(
   platform: 'app-android' | 'app-ios' | 'app-harmony'
 ): UniVitePlugin['uni'] {
-  const isDom2Harmony =
-    process.env.UNI_APP_X_DOM2 === 'true' && platform === 'app-harmony'
+  const isDom2 = process.env.UNI_APP_X_DOM2 === 'true'
   return {
-    compiler: isDom2Harmony
-      ? 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
@@ -75,7 +72,7 @@ export function createUniOptions(
       platform === 'app-ios' || platform === 'app-harmony'
         ? {
             isNativeTag(tag) {
-              if (isDom2Harmony) {
+              if (isDom2) {
                 return isDom2AppNativeTag(tag)
               }
               return (
diff --git a/packages/uni-cli-shared/src/vite/plugins/vitejs/plugins/css.ts b/packages/uni-cli-shared/src/vite/plugins/vitejs/plugins/css.ts
@@ -386,8 +386,7 @@ 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'
+  const isDom2 = process.env.UNI_APP_X_DOM2 === 'true'
   return {
     name: 'vite:css-post',
     buildStart() {
@@ -407,7 +406,7 @@ export function cssPostPlugin(
         code:
           modulesCode ||
           (isJsCode
-            ? isDom2Harmony
+            ? isDom2
               ? `export default ${JS_STYLE_PLACEHOLDER_STR}`
               : 'export default {}'
             : ''),
@@ -418,7 +417,7 @@ export function cssPostPlugin(
       }
     },
     async renderChunk(_code, chunk, _opts) {
-      if (isDom2Harmony) {
+      if (isDom2) {
         // 通过 generateBundle 实现
         return null
       }
diff --git a/packages/vite-plugin-uni/src/plugins/copy.ts b/packages/vite-plugin-uni/src/plugins/copy.ts
@@ -22,10 +22,8 @@ export function uniCopyPlugin({
 }: Pick<VitePluginUniResolvedOptions, 'outputDir' | 'copyOptions'>): Plugin {
   const staticDir = PUBLIC_DIR + '/**/*'
   const uniModulesStaticDir = 'uni_modules/*/' + PUBLIC_DIR + '/**/*'
-  const isDom2Harmony =
-    process.env.UNI_APP_X_DOM2 === 'true' &&
-    process.env.UNI_PLATFORM === 'app-harmony'
-  const uniModulesCppDir = isDom2Harmony ? 'uni_modules/*/cppsdk/**/*' : ''
+  const isDom2 = process.env.UNI_APP_X_DOM2 === 'true'
+  const uniModulesCppDir = isDom2 ? 'uni_modules/*/cppsdk/**/*' : ''
   const assets = [staticDir, uniModulesStaticDir]
   const cppAssets: string[] = []
   if (uniModulesCppDir) {
diff --git a/packages/vite-plugin-uni/src/vue/options.ts b/packages/vite-plugin-uni/src/vue/options.ts
@@ -96,12 +96,10 @@ export function initPluginVueOptions(
   const compilerOptions =
     templateOptions.compilerOptions || (templateOptions.compilerOptions = {})
 
-  const isDom2Harmony =
-    process.env.UNI_APP_X_DOM2 === 'true' &&
-    process.env.UNI_PLATFORM === 'app-harmony'
+  const isDom2 = process.env.UNI_APP_X_DOM2 === 'true'
 
   ;(compilerOptions as any).isX = process.env.UNI_APP_X === 'true'
-  ;(compilerOptions as any).dom2 = isDom2Harmony
+  ;(compilerOptions as any).dom2 = isDom2
 
   // 默认就移除comments节点
   compilerOptions.comments = false
@@ -224,7 +222,7 @@ export function initPluginVueOptions(
     compilerOptions.nodeTransforms.push(
       ...getBaseNodeTransforms(
         options.base,
-        isDom2Harmony ? createResolveStaticAsset(options.inputDir) : undefined
+        isDom2 ? createResolveStaticAsset(options.inputDir) : undefined
       )
     )
   }
@@ -308,7 +306,7 @@ export function initPluginVueOptions(
     if (!vueOptions.script.babelParserPlugins.includes('decorators')) {
       vueOptions.script.babelParserPlugins.push('decorators')
     }
-    if (isDom2Harmony) {
+    if (isDom2) {
       const appVue = resolveAppVue(process.env.UNI_INPUT_DIR)
       function isAppVue(id: string) {
         return normalizePath(id) === appVue
