@dcloudio/uni-cli-shared 3.0.0-5000720260410001 → 3.0.0-5010520260709001

package/dist/vite/plugins/inject.js

@@ -12,6 +12,7 @@ const shared_1 = require("@vue/shared");
 const magic_string_1 = __importDefault(require("magic-string"));
 const utils_1 = require("../utils");
 const uts_1 = require("../../uts");
+const x_1 = require("../../x");
 const debugInject = (0, debug_1.default)('uni:inject');
 // const debugInjectTry = debug('uni:inject-try')
 function uniViteInjectPlugin(name, options) {
@@ -39,12 +40,15 @@ function uniViteInjectPlugin(name, options) {
         normalizeModulesMap(namespaceModulesMap);
     }
     const firstpass = new RegExp(`(?:${Array.from(modulesMap.keys()).map(escape).join('|')})`, 'g');
-    const sourceMap = options.sourceMap !== false;
+    let sourceMap = options.sourceMap !== false;
     const callback = options.callback;
     return {
         name,
         // 确保在 commonjs 之后，否则会混合 es6 module 与 cjs 的代码，导致 commonjs 失效
         enforce: options.enforce ?? 'post',
+        configResolved(config) {
+            sourceMap = options.sourceMap !== false && (0, utils_1.withSourcemap)(config);
+        },
         transform(code, id) {
             if (!filter(id))
                 return null;
@@ -128,7 +132,7 @@ function uniViteInjectPlugin(name, options) {
             }
             (0, estree_walker_1.walk)(ast, {
                 enter(node, parent) {
-                    if (sourceMap) {
+                    if (sourceMap && (0, x_1.shouldUseHighResolutionSourceMap)()) {
                         magicString.addSourcemapLocation(node.start);
                         magicString.addSourcemapLocation(node.end);
                     }
@@ -170,7 +174,11 @@ function uniViteInjectPlugin(name, options) {
             magicString.prepend(`${importBlock}\n\n`);
             return {
                 code: magicString.toString(),
-                map: sourceMap ? magicString.generateMap({ hires: true }) : null,
+                map: sourceMap
+                    ? magicString.generateMap({
+                        hires: (0, x_1.shouldUseHighResolutionSourceMap)(),
+                    })
+                    : null,
             };
         },
     };

package/dist/vite/plugins/json.js

@@ -9,86 +9,19 @@ const json_1 = require("../../json");
 const preprocess_1 = require("../../preprocess");
 const utils_1 = require("../utils");
 function uniJsonPlugin() {
-    const UTS_CAST_ARRAY_MARKER = '/*__UTS_CAST_UTSJSON_ARRAY__*/';
-    const UTS_CAST_OBJECT_MARKER = '/*__UTS_CAST_UTSJSON_OBJECT__*/';
-    const IS_UNI_X_ANDROID = process.env.UNI_APP_X === 'true' &&
-        process.env.UNI_UTS_PLATFORM === 'app-android';
     return {
         name: 'uni:json',
         enforce: 'pre',
-        generateBundle(options, bundle) {
-            if (IS_UNI_X_ANDROID) {
-                for (const [fileName, file] of Object.entries(bundle)) {
-                    if (fileName.endsWith('.json.ts')) {
-                        if (file.type === 'asset' && file.source) {
-                            const source = file.source.toString();
-                            if (source.includes(UTS_CAST_ARRAY_MARKER) ||
-                                source.includes(UTS_CAST_OBJECT_MARKER)) {
-                                file.source = source
-                                    .replace(new RegExp(UTS_CAST_ARRAY_MARKER.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), 'g'), ' as UTSJSONObject[]')
-                                    .replace(new RegExp(UTS_CAST_OBJECT_MARKER.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), 'g'), ' as UTSJSONObject');
-                            }
-                        }
-                    }
-                }
-            }
-        },
         transform(code, id) {
             // 如果已经被其他插件处理过了，就不再处理，比如 commonjs 插件，ICAPRegistrar.json?commonjs-external
             if (id.startsWith('\0')) {
                 return;
             }
-            const { filename } = (0, utils_1.parseVueRequest)(id);
-            if (path_1.default.extname(filename) !== '.json') {
+            if (path_1.default.extname((0, utils_1.parseVueRequest)(id).filename) !== '.json') {
                 return;
             }
-            let codeObj = (0, json_1.parseJson)((0, preprocess_1.preJson)(code, id), false, id);
-            let codeJson = '';
-            if (IS_UNI_X_ANDROID) {
-                if (Array.isArray(codeObj)) {
-                    codeJson +=
-                        'export default JSON.parseArray(`' +
-                            JSON.stringify(codeObj, null, 2) +
-                            '`)' +
-                            UTS_CAST_ARRAY_MARKER +
-                            ';\n';
-                }
-                else {
-                    codeJson +=
-                        'let __jsonObj = JSON.parseObject(`' +
-                            JSON.stringify(codeObj, null, 2) +
-                            '`);\n';
-                    for (const key in codeObj) {
-                        if (!Object.hasOwn(codeObj, key))
-                            continue;
-                        const element = codeObj[key];
-                        if (Array.isArray(element)) {
-                            codeJson += `export const ${key} = __jsonObj?.getArray("${key}")${UTS_CAST_ARRAY_MARKER};\n`;
-                        }
-                        else if (typeof element === 'object' && element !== null) {
-                            codeJson += `export const ${key} = __jsonObj?.get("${key}")${UTS_CAST_OBJECT_MARKER};\n`;
-                        }
-                        else if (typeof element === 'string') {
-                            codeJson += `export const ${key} = __jsonObj?.getString("${key}") ?? '';\n`;
-                        }
-                        else if (typeof element === 'number') {
-                            codeJson += `export const ${key} = __jsonObj?.getNumber("${key}") ?? 0;\n`;
-                        }
-                        else if (typeof element === 'boolean') {
-                            codeJson += `export const ${key} = __jsonObj?.getBoolean("${key}") ?? false;\n`;
-                        }
-                        else {
-                            codeJson += `export const ${key} = __jsonObj?.get("${key}")${UTS_CAST_OBJECT_MARKER};\n`;
-                        }
-                    }
-                    codeJson += `export default __jsonObj;`;
-                }
-            }
-            else {
-                codeJson = JSON.stringify(codeObj, null, 2);
-            }
             return {
-                code: codeJson,
+                code: JSON.stringify((0, json_1.parseJson)((0, preprocess_1.preJson)(code, id), false, id), null, 2),
                 map: {
                     mappings: '',
                 },

package/dist/vite/plugins/jsonJs.js

@@ -7,16 +7,19 @@ exports.defineUniManifestJsonPlugin = exports.defineUniPagesJsonPlugin = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const constants_1 = require("../../constants");
+const subpackage_1 = require("../../json/mp/subpackage");
 const utils_1 = require("../../utils");
 exports.defineUniPagesJsonPlugin = createDefineJsonJsPlugin('pages.json');
 exports.defineUniManifestJsonPlugin = createDefineJsonJsPlugin('manifest.json');
 function createDefineJsonJsPlugin(name) {
     const JSON_JS = constants_1.JSON_JS_MAP[name];
+    // pages-json-js 仅允许独立分包 root query；manifest-json-js 仍保持 app 级。
+    const allowedQuery = name === 'pages.json' ? subpackage_1.MP_INDEPENDENT_ROOT_QUERY : '';
     return function (createVitePlugin) {
         const opts = {
             resolvedConfig: {},
             filter(id) {
-                return id.endsWith(JSON_JS);
+                return !!parseJsonJsRequest(id, JSON_JS, allowedQuery);
             },
         };
         const plugin = createVitePlugin(opts);
@@ -30,8 +33,9 @@ function createDefineJsonJsPlugin(name) {
             if (res) {
                 return res;
             }
-            if (id.endsWith(JSON_JS)) {
-                return jsonJsPath;
+            const jsonJsRequest = parseJsonJsRequest(id, JSON_JS, allowedQuery);
+            if (jsonJsRequest) {
+                return jsonJsPath + jsonJsRequest.query;
             }
         };
         plugin.configResolved = function (config) {
@@ -53,3 +57,37 @@ function createDefineJsonJsPlugin(name) {
         return plugin;
     };
 }
+function parseJsonJsRequest(id, jsonJs, allowedQuery) {
+    const queryIndex = id.indexOf('?');
+    const query = queryIndex === -1 ? '' : id.slice(queryIndex + 1);
+    if (query && !isAllowedJsonJsQuery(query, allowedQuery)) {
+        return;
+    }
+    if (queryIndex !== -1 && !query) {
+        return;
+    }
+    const filename = queryIndex === -1 ? id : id.slice(0, queryIndex);
+    if (!filename.endsWith(jsonJs)) {
+        return;
+    }
+    return {
+        filename,
+        query: queryIndex === -1 ? '' : id.slice(queryIndex),
+    };
+}
+function isAllowedJsonJsQuery(query, allowedQuery) {
+    if (!allowedQuery) {
+        return false;
+    }
+    const items = query.split('&');
+    if (items.length !== 1) {
+        return false;
+    }
+    const item = items[0];
+    const equalIndex = item.indexOf('=');
+    if (equalIndex === -1) {
+        return false;
+    }
+    return (item.slice(0, equalIndex) === allowedQuery &&
+        item.slice(equalIndex + 1).length > 0);
+}

package/dist/vite/plugins/pre.js

@@ -8,6 +8,7 @@ const path_1 = __importDefault(require("path"));
 const debug_1 = __importDefault(require("debug"));
 const pluginutils_1 = require("@rollup/pluginutils");
 const constants_1 = require("../../constants");
+const dom2_1 = require("../../dom2");
 const preprocess_1 = require("../../preprocess");
 const utils_1 = require("../utils");
 const debugPreJs = (0, debug_1.default)('uni:pre-js');
@@ -41,6 +42,7 @@ function uniPrePlugin(config, options) {
             if (!hasEndif) {
                 return;
             }
+            (0, dom2_1.warnDom2RootScrollView)(code, filename, !!query.vue);
             // 因为完整的 vue 会先条件编译，而 vue&type=template 等会再次条件编译，如果走error模式会报两次错误，且第二次错误没有正确的位置映射
             const unbalanced = query.vue ? 'skip' : 'error';
             if (isHtml) {

package/dist/vite/plugins/sfc.js

@@ -9,6 +9,7 @@ const magic_string_1 = __importDefault(require("magic-string"));
 const vue_1 = require("../../vue");
 const utils_1 = require("../utils");
 const preprocess_1 = require("../../preprocess");
+const x_1 = require("../../x");
 const SRC_IMPORT_RE = /<(template|script|style)[^>]*src\s*=\s*["']([^"']+)["'][^>]*>/;
 const SRC_IMPORT_VUE_RE = /<(template|script|style)[^>]*src\s*=\s*["'](.*\.uvue|.*\.vue)["'][^>]*>/;
 function isSrcImport(code) {
@@ -120,7 +121,9 @@ function uniViteSfcSrcImportPlugin({ onlyVue } = { onlyVue: true }) {
             }
             return {
                 code: s.toString(),
-                map: sourceMap ? s.generateMap({ hires: true }) : null,
+                map: sourceMap
+                    ? s.generateMap({ hires: (0, x_1.shouldUseHighResolutionSourceMap)() })
+                    : null,
             };
         },
     };

package/dist/vite/plugins/stats.d.ts

@@ -1,2 +1,6 @@
 import type { Plugin } from 'vite';
-export declare function uniStatsPlugin(): Plugin;
+interface UniStatsPluginOptions {
+    manifestOnly?: boolean;
+}
+export declare function uniStatsPlugin(options?: UniStatsPluginOptions): Plugin;
+export {};

package/dist/vite/plugins/stats.js

@@ -9,11 +9,64 @@ const utils_1 = require("../../utils");
 const json_1 = require("../../json");
 const messages_1 = require("../../messages");
 const emittedHashMap = new WeakMap();
-function uniStatsPlugin() {
+function normalizeVaporRenderTarget(target) {
+    if (typeof target !== 'string') {
+        return;
+    }
+    if (target.includes('bytecode')) {
+        return 'bytecode';
+    }
+    if (target.includes('nativecode')) {
+        return 'nativecode';
+    }
+}
+function formatVaporRenderTarget(target) {
+    return messages_1.M[`view.render.compiler.target.${target}`];
+}
+function getManifestVaporRenderTarget(manifest) {
+    return normalizeVaporRenderTarget(manifest['uni-app-x']?.['vapor-render-target']);
+}
+function appendChangedFile(changedFiles, seenFiles, filename) {
+    if (seenFiles.has(filename)) {
+        return;
+    }
+    seenFiles.add(filename);
+    changedFiles.push(filename);
+}
+function appendImporterFiles(changedFiles, seenFiles, bundle) {
+    const importerMap = new Map();
+    Object.keys(bundle).forEach((filename) => {
+        const outputFile = bundle[filename];
+        if (outputFile.type !== 'chunk') {
+            return;
+        }
+        const imports = outputFile.imports.concat(outputFile.dynamicImports);
+        imports.forEach((file) => {
+            const importers = importerMap.get(file);
+            if (importers) {
+                importers.push(filename);
+            }
+            else {
+                importerMap.set(file, [filename]);
+            }
+        });
+    });
+    for (let i = 0; i < changedFiles.length; i++) {
+        const importers = importerMap.get(changedFiles[i]);
+        if (!importers) {
+            continue;
+        }
+        importers.forEach((filename) => {
+            appendChangedFile(changedFiles, seenFiles, filename);
+        });
+    }
+}
+function uniStatsPlugin(options = {}) {
     let resolvedConfig;
     let isManifestChanged = false;
-    const shouldTrackManifestChange = process.env.UNI_APP_X === 'true' &&
+    const shouldTrackManifestChange = process.env.UNI_PLATFORM === 'app' ||
         process.env.UNI_PLATFORM === 'app-harmony';
+    const shouldAppendImporterFiles = process.env.UNI_PLATFORM === 'app-harmony';
     let isVapor = shouldTrackManifestChange && process.env.UNI_APP_X_DOM2 === 'true';
     return {
         name: 'uni:app-stats',
@@ -28,21 +81,36 @@ function uniStatsPlugin() {
                 try {
                     const manifest = (0, json_1.parseJson)(fs_extra_1.default.readFileSync(id, 'utf-8'), true, 'manifest.json');
                     const uniAppX = manifest['uni-app-x'] || {};
+                    const vaporRenderTarget = getManifestVaporRenderTarget(manifest);
+                    const runtimeVaporRenderTarget = normalizeVaporRenderTarget(process.env.UNI_APP_X_VAPOR_RENDER_TARGET);
+                    if (vaporRenderTarget &&
+                        runtimeVaporRenderTarget &&
+                        vaporRenderTarget !== runtimeVaporRenderTarget) {
+                        console.warn(messages_1.M['dev.watching.vapor.render.target']
+                            .replace('{manifestTarget}', formatVaporRenderTarget(vaporRenderTarget))
+                            .replace('{runtimeTarget}', formatVaporRenderTarget(runtimeVaporRenderTarget)));
+                    }
                     if (uniAppX.vapor !== isVapor) {
                         isVapor = uniAppX.vapor === true;
                         console.warn(messages_1.M['dev.watching.restart.vapor']);
+                        // 主动退出，避免后续会打印正在编译中等日志
+                        process.exit(0);
                     }
                 }
                 catch (e) { }
             }
         },
         writeBundle(_, bundle) {
+            if (options.manifestOnly) {
+                return;
+            }
             if (resolvedConfig.isProduction) {
                 // 仅dev生效
                 return;
             }
             const emittedHash = emittedHashMap.get(resolvedConfig);
             const changedFiles = [];
+            const seenFiles = new Set();
             Object.keys(bundle).forEach((filename) => {
                 // 不处理sourcemap
                 if (filename.endsWith('.map')) {
@@ -58,9 +126,12 @@ function uniStatsPlugin() {
                 }
                 if (emittedHash.get(filename) !== outputFileHash) {
                     emittedHash.set(filename, outputFileHash);
-                    changedFiles.push(filename);
+                    appendChangedFile(changedFiles, seenFiles, filename);
                 }
             });
+            if (shouldAppendImporterFiles) {
+                appendImporterFiles(changedFiles, seenFiles, bundle);
+            }
             if (isManifestChanged) {
                 isManifestChanged = false;
                 changedFiles.unshift('manifest.json');

package/dist/vite/plugins/uts/uni_modules.d.ts

@@ -12,7 +12,7 @@ interface UniUTSPluginOptions {
 export declare function getCurrentCompiledUTSPlugins(): Set<string>;
 export declare function getCurrentCompiledUTSProviders(): Set<string>;
 export declare function uniUTSAppUniModulesPlugin(options?: UniUTSPluginOptions): Plugin;
-export declare function buildUniExtApis(): Promise<void>;
+export declare function buildUniExtApis(providerOnly?: boolean): Promise<void>;
 export declare function buildNonTreeShakingUniModules(): Promise<void>;
 export declare function resolveExtApiProvider(pkg: Record<string, any>): {
     name?: string | undefined;

package/dist/vite/plugins/uts/uni_modules.js

@@ -12,6 +12,7 @@ const uts_1 = require("../../../uts");
 const utils_1 = require("../../utils");
 const uni_modules_1 = require("../../../uni_modules");
 const uni_modules_cloud_1 = require("../../../uni_modules.cloud");
+const x_1 = require("../../../x");
 const utils_2 = require("../../../utils");
 const json_1 = require("../../../json");
 const fs_1 = require("../../../fs");
@@ -19,6 +20,7 @@ const context_1 = require("../../../preprocess/context");
 const hbx_1 = require("../../../hbx");
 const console_1 = require("../../../logs/console");
 const workers_1 = require("../../../workers");
+const dom2_1 = require("../../../dom2");
 /* eslint-disable no-restricted-globals */
 const { preprocess } = require('../../../../lib/preprocess');
 function rewriteUniModulesConsoleExpr(fileName, content) {
@@ -160,7 +162,7 @@ function getCurrentCompiledUTSProviders() {
     return utsProviders;
 }
 exports.getCurrentCompiledUTSProviders = getCurrentCompiledUTSProviders;
-let uniExtApiCompiler = async () => { };
+let uniExtApiCompiler = async (providerOnly = false) => { };
 let nonTreeShakingUniModulesCompiler = async () => { };
 function emptyCacheDir(platform) {
     const uvueOutputDir = (0, uts_1.uvueOutDir)(platform);
@@ -242,7 +244,10 @@ function uniUTSAppUniModulesPlugin(options = {}) {
     const uniXKotlinCompiler = process.env.UNI_APP_X_TSC === 'true' &&
         (process.env.UNI_UTS_PLATFORM === 'app-android' ||
             process.env.UNI_UTS_PLATFORM === 'app')
-        ? createUniXKotlinCompilerOnce({ resolveWorkers })
+        ? createUniXKotlinCompilerOnce({
+            resolveWorkers,
+            sourceFileCallback: (0, dom2_1.initSourceFileCallback)(),
+        })
         : null;
     const uniXSwiftCompiler = process.env.UNI_APP_X_TSC === 'true' &&
         (process.env.UNI_UTS_PLATFORM === 'app-ios' ||
@@ -418,16 +423,20 @@ function uniUTSAppUniModulesPlugin(options = {}) {
                     return filterAutoImports(autoImports, (0, uts_1.parseSwiftModuleWithPluginId)(pluginId, true));
                 });
             },
+            iosPreprocessor: createAppIosUniModulesSyncFilePreprocessorOnce(!!options.x),
+            androidPreprocessor: createAppAndroidUniModulesSyncFilePreprocessorOnce(!!options.x),
+            // harmonyPreprocessor: createAppHarmonyUniModulesSyncFilePreprocessorOnce(!!options.x),
         });
     };
-    uniExtApiCompiler = async () => {
+    uniExtApiCompiler = async (providerOnly = false) => {
         // 此方法为兜底方法，确保uni_modules中的所有插件都会编译，目前仅用于编译provider
         // 获取 provider 扩展(编译所有uni)
         const plugins = (0, uni_modules_1.getUniExtApiPlugins)().filter((provider) => !utsPlugins.has(provider.plugin));
+        const providers = (0, uni_modules_1.getUniExtApiProviders)();
         for (const plugin of plugins) {
             const pluginDir = path_1.default.resolve(inputDir, 'uni_modules', plugin.plugin);
             // 如果是 app-js 环境
-            if (process.env.UNI_APP_X_UVUE_SCRIPT_ENGINE === 'js') {
+            if ((0, x_1.isUniAppXJsEngine)()) {
                 if (fs_extra_1.default.existsSync(path_1.default.resolve(pluginDir, 'utssdk', 'app-js', 'index.uts'))) {
                     continue;
                 }
@@ -440,14 +449,18 @@ function uniUTSAppUniModulesPlugin(options = {}) {
                     continue;
                 }
             }
+            const isProvider = providers.some((p) => p.plugin === plugin.plugin);
             utsProviders.add(plugin.plugin);
-            const result = await compilePlugin(pluginDir);
-            if (result) {
-                // 时机不对，不能addWatch
-                // result.deps.forEach((dep) => {
-                //   this.addWatchFile(dep)
-                // })
+            if ((providerOnly && isProvider) || !providerOnly) {
+                await compilePlugin(pluginDir);
             }
+            // const result = await compilePlugin(pluginDir)
+            // if (result) {
+            //   // 时机不对，不能addWatch
+            //   // result.deps.forEach((dep) => {
+            //   //   this.addWatchFile(dep)
+            //   // })
+            // }
         }
     };
     nonTreeShakingUniModulesCompiler = async () => {
@@ -570,8 +583,8 @@ function uniUTSAppUniModulesPlugin(options = {}) {
     };
 }
 exports.uniUTSAppUniModulesPlugin = uniUTSAppUniModulesPlugin;
-async function buildUniExtApis() {
-    await uniExtApiCompiler();
+async function buildUniExtApis(providerOnly = false) {
+    await uniExtApiCompiler(providerOnly);
 }
 exports.buildUniExtApis = buildUniExtApis;
 async function buildNonTreeShakingUniModules() {
@@ -610,8 +623,13 @@ function uniDecryptUniModulesPlugin() {
                     appname: manifest.name,
                     platform: process.env.UNI_UTS_PLATFORM,
                     'uni-app-x': isX,
+                    vapor: process.env.UNI_APP_X_DOM2 === 'true',
                     env,
                 };
+                if (options.vapor) {
+                    options.vaporRenderTarget =
+                        process.env.UNI_APP_X_VAPOR_RENDER_TARGET || 'bytecode';
+                }
                 // 鸿蒙平台需要拆分两次云编译
                 if (process.env.UNI_UTS_PLATFORM === 'app-harmony') {
                     const harmonyEnv = {

package/dist/vite/plugins/vitejs/plugins/asset.js

@@ -37,8 +37,10 @@ const shared_1 = require("@vue/shared");
 const utils_1 = require("../utils");
 const utils_2 = require("../../../../vite/utils/utils");
 const utils_3 = require("../../../../utils");
+const x_1 = require("../../../../x");
 const static_1 = require("./static");
 exports.assetUrlRE = /__VITE_ASSET__([a-z\d]{8})__(?:\$_(.*?)__)?/g;
+const assetUrlMarker = '__VITE_ASSET__';
 const rawRE = /(\?|&)raw(?:&|$)/;
 const urlRE = /(\?|&)url(?:&|$)/;
 exports.chunkToEmittedAssetsMap = new WeakMap();
@@ -106,6 +108,10 @@ function assetPlugin(config, options) {
             let match;
             let s;
             exports.assetUrlRE.lastIndex = 0;
+            // 部分 chunk 不包含资源占位符，先用低成本字符串查找跳过正则扫描。
+            if (code.indexOf(assetUrlMarker) === -1) {
+                return null;
+            }
             // Urls added with JS using e.g.
             // imgElement.src = "__VITE_ASSET__5aa0ddc0__" are using quotes
             // Urls added in CSS that is imported in JS end up like
@@ -124,7 +130,9 @@ function assetPlugin(config, options) {
             if (s) {
                 return {
                     code: s.toString(),
-                    map: (0, utils_2.withSourcemap)(config) ? s.generateMap({ hires: true }) : null,
+                    map: (0, utils_2.withSourcemap)(config)
+                        ? s.generateMap({ hires: shouldUseAssetHighResolutionSourceMap() })
+                        : null,
                 };
             }
             else {
@@ -134,6 +142,11 @@ function assetPlugin(config, options) {
     };
 }
 exports.assetPlugin = assetPlugin;
+function shouldUseAssetHighResolutionSourceMap() {
+    // Android dom2 的 app-service 后续会与 esbuild map 合并，低精度 asset map
+    // 可能导致原始 .uvue 映射丢失或断点偏移。
+    return (0, x_1.isUniAppXAndroid)() || (0, x_1.shouldUseHighResolutionSourceMap)();
+}
 function parseAssets(config, code) {
     let match;
     let s;

package/dist/vite/plugins/vitejs/plugins/css.d.ts

@@ -47,9 +47,9 @@ export declare function cssPostPlugin(config: ResolvedConfig, { platform, isJsCo
     isJsCode?: boolean;
     preserveModules?: boolean;
     chunkCssFilename: (id: string) => string | void;
-    chunkCssCode: (filename: string, cssCode: string) => Promise<string> | string;
+    chunkCssCode: (filename: string, cssCode: string) => Promise<string | Uint8Array> | string;
     includeComponentCss?: boolean;
-    emitFile?: (filename: string, cssCode: string) => void;
+    emitFile?: (filename: string, cssCode: string | Uint8Array) => void;
 }): Plugin;
 export declare function formatPostcssSourceMap(rawMap: ExistingRawSourceMap, file: string): ExistingRawSourceMap;
 export type CssUrlReplacer = (url: string, importer?: string, source?: PostCSS.Source) => string | Promise<string>;

package/dist/vite/plugins/vitejs/plugins/css.js

@@ -42,7 +42,9 @@ const shared_1 = require("@vue/shared");
 const preprocess_1 = require("../../../../preprocess");
 const uniapp_1 = require("../../../../postcss/plugins/uniapp");
 const cleanString_1 = require("../cleanString");
+const x_1 = require("../../../../x");
 const constants_1 = require("../../../../constants");
+const fontFamily_1 = require("../../../../dom2/fontFamily");
 const utils_2 = require("../../../utils/utils");
 const compiler_core_1 = require("@vue/compiler-core");
 const utils_3 = require("../../../../utils");
@@ -222,8 +224,17 @@ function findCssModuleIds(moduleId, includeComponentCss = true, cssModuleIds, se
 function cssPostPlugin(config, { platform, isJsCode, preserveModules, chunkCssFilename, chunkCssCode, includeComponentCss, emitFile, }) {
     // styles initialization in buildStart causes a styling loss in watch
     const styles = new Map();
+    // 只缓存 cssCode 的 hash，不缓存完整 css，避免用空间换时间。
+    const cssChunkCodeHashCache = new Map();
     let cssChunks;
-    const isDom2Harmony = process.env.UNI_APP_X_DOM2 === 'true' && platform === 'app-harmony';
+    const isDom2 = process.env.UNI_APP_X_DOM2 === 'true';
+    const isDom2App = isDom2 && platform.startsWith('app');
+    // 仅限定鸿蒙 DOM2 开发模式，避免影响其它平台和生产构建。
+    const enableCssIncremental = process.env.NODE_ENV === 'development' &&
+        process.env.UNI_UTS_PLATFORM === 'app-harmony' &&
+        isDom2App &&
+        !!isJsCode &&
+        !!emitFile;
     return {
         name: 'vite:css-post',
         buildStart() {
@@ -240,8 +251,8 @@ function cssPostPlugin(config, { platform, isJsCode, preserveModules, chunkCssFi
             return {
                 code: modulesCode ||
                     (isJsCode
-                        ? isDom2Harmony
-                            ? `export default ${constants_1.JS_STYLE_PLACEHOLDER_STR}`
+                        ? isDom2App
+                            ? `export default ${(0, fontFamily_1.createJsStylePlaceholder)(id)}`
                             : 'export default {}'
                         : ''),
                 map: { mappings: '' },
@@ -251,7 +262,7 @@ function cssPostPlugin(config, { platform, isJsCode, preserveModules, chunkCssFi
             };
         },
         async renderChunk(_code, chunk, _opts) {
-            if (isDom2Harmony) {
+            if (isDom2) {
                 // 通过 generateBundle 实现
                 return null;
             }
@@ -337,6 +348,9 @@ function cssPostPlugin(config, { platform, isJsCode, preserveModules, chunkCssFi
                 });
             }
             if (!cssChunks.size) {
+                if (enableCssIncremental) {
+                    cssChunkCodeHashCache.clear();
+                }
                 return;
             }
             // resolve asset URL placeholders to their built file URLs and perform
@@ -365,14 +379,29 @@ function cssPostPlugin(config, { platform, isJsCode, preserveModules, chunkCssFi
                     .map((id) => styles.get(id) || '')
                     .join('\n');
             };
+            const currentCssFilenames = enableCssIncremental
+                ? new Set(cssChunks.keys())
+                : undefined;
             for (const filename of cssChunks.keys()) {
                 const cssCode = genCssCode(filename);
+                const cssCodeHash = enableCssIncremental ? (0, utils_3.hash)(cssCode) : '';
+                const hasFontFace = enableCssIncremental && /@font-face\b/i.test(cssCode);
+                // 鸿蒙 DOM2 开发模式下，未变化的样式无需重复 parseCss 和写入原生侧。
+                // @font-face 会在 chunkCssCode 中写入字体缓存，必须保留原有副作用。
+                if (enableCssIncremental &&
+                    !hasFontFace &&
+                    cssChunkCodeHashCache.get(filename) === cssCodeHash) {
+                    continue;
+                }
                 let source = await processChunkCSS(cssCode, {
                     filename: filename,
                     inlined: false,
                     minify: true,
                 });
-                if (source.trim()) {
+                if (typeof source === 'string') {
+                    source = source.trim();
+                }
+                if (source) {
                     emitFile
                         ? emitFile(filename, source)
                         : this.emitFile({
@@ -381,6 +410,16 @@ function cssPostPlugin(config, { platform, isJsCode, preserveModules, chunkCssFi
                             source,
                         });
                 }
+                if (enableCssIncremental) {
+                    cssChunkCodeHashCache.set(filename, cssCodeHash);
+                }
+            }
+            if (currentCssFilenames) {
+                cssChunkCodeHashCache.forEach((_, filename) => {
+                    if (!currentCssFilenames.has(filename)) {
+                        cssChunkCodeHashCache.delete(filename);
+                    }
+                });
             }
         },
     };
@@ -1170,7 +1209,7 @@ async function getSource(source, filename, additionalData, enableSourcemap, sep
     const ms = new magic_string_1.default(source);
     ms.appendLeft(0, sep);
     ms.appendLeft(0, additionalData);
-    const map = ms.generateMap({ hires: true });
+    const map = ms.generateMap({ hires: (0, x_1.shouldUseHighResolutionSourceMap)() });
     map.file = filename;
     map.sources = [filename];
     return {