@dcloudio/uni-cli-shared 3.0.0-alpha-1000920260626810 → 3.0.0-alpha-5020120260710001

package/dist/dom2/index.d.ts

@@ -1,3 +1,4 @@
 export * from './sharedData';
 export * from './vue';
 export * from './fontFamily';
+export * from './rootScrollView';

package/dist/dom2/index.js

@@ -17,3 +17,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./sharedData"), exports);
 __exportStar(require("./vue"), exports);
 __exportStar(require("./fontFamily"), exports);
+__exportStar(require("./rootScrollView"), exports);

package/dist/dom2/rootScrollView.d.ts

@@ -0,0 +1,47 @@
+export interface VueCodePosition {
+    line: number;
+    column: number;
+}
+export interface VueCodeEditRange {
+    start: VueCodePosition;
+    end: VueCodePosition;
+    /**
+     * 调用方替换时建议只移除非换行字符，用于尽量保持错误定位和调试行号不变。
+     */
+    preserveLineBreaks: true;
+    /**
+     * 开始范围包含首个子节点前的缩进，调用方需要保留这段缩进，避免改变子节点格式。
+     */
+    preserveEndIndent?: true;
+}
+export type VueCodeEditRangesResult = Record<string, VueCodeEditRange[]>;
+/**
+ * 批量定位由 `#ifdef APP` 包裹的根 scroll-view 需要移除的范围。
+ * 只返回需要修改的行列号，不修改文件，也不返回修改后的文件内容。
+ */
+export declare function resolveAppRootScrollViewEditRanges(vueFiles: string[], inputDir: string): VueCodeEditRangesResult;
+/**
+ * 蒸汽模式下，页面根节点会自动补一个 scroll-view。
+ * 这里仅用正则做精确匹配：命中范围宁可保守，也不能误报。
+ */
+export declare function hasAppRootScrollViewWrappedByIfdef(code: string): boolean;
+/**
+ * 仅在 dom2 页面整文件预处理时定位需要提示优化建议的根 scroll-view 节点。
+ */
+export declare function resolveDom2RootScrollViewWarnLocation(code: string, filename: string, isVueSubRequest: boolean): {
+    loc: import("@vue/compiler-core").SourceLocation | {
+        start: {
+            line: number;
+            column: number;
+            offset: number;
+        };
+        end: {
+            line: number;
+            column: number;
+            offset: number;
+        };
+    };
+    source: string;
+} | undefined;
+export declare function warnDom2RootScrollView(code: string, filename: string, isVueSubRequest: boolean): void;
+export declare function resolveAppRootScrollViewEditRangesByCode(code: string, filename: string): VueCodeEditRange[];

package/dist/dom2/rootScrollView.js

@@ -0,0 +1,283 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveAppRootScrollViewEditRangesByCode = exports.warnDom2RootScrollView = exports.resolveDom2RootScrollViewWarnLocation = exports.hasAppRootScrollViewWrappedByIfdef = exports.resolveAppRootScrollViewEditRanges = void 0;
+const fs_extra_1 = require("fs-extra");
+const path_1 = require("path");
+const compiler_sfc_1 = require("@vue/compiler-sfc");
+const json_1 = require("../json");
+const logs_1 = require("../logs");
+const messages_1 = require("../messages");
+const utils_1 = require("../utils");
+const utils_2 = require("../vite/plugins/vitejs/utils");
+const { preprocess: preprocessHtml } = require('../../lib/preprocess');
+const TEMPLATE_BLOCK_RE = /<template\b[^>]*>([\s\S]*?)<\/template>/i;
+const ROOT_SCROLL_VIEW_ATTR_RE = /^\s+style\s*=\s*(["'])\s*flex\s*:\s*1\s*;?\s*\1\s*$/;
+const APP_ROOT_SCROLL_VIEW_RE = /^\s*<!--\s*#ifdef APP\s*-->\s*<scroll-view([^>]*)>[\s\S]*<\/scroll-view>\s*<!--\s*#endif\s*-->\s*$/;
+const SPLIT_APP_ROOT_SCROLL_VIEW_RE = /^\s*<!--\s*#ifdef APP\s*-->\s*<scroll-view([^>]*)>\s*<!--\s*#endif\s*-->[\s\S]*<!--\s*#ifdef APP\s*-->\s*<\/scroll-view>\s*<!--\s*#endif\s*-->\s*$/;
+/**
+ * 批量定位由 `#ifdef APP` 包裹的根 scroll-view 需要移除的范围。
+ * 只返回需要修改的行列号，不修改文件，也不返回修改后的文件内容。
+ */
+function resolveAppRootScrollViewEditRanges(vueFiles, inputDir) {
+    const result = {};
+    vueFiles.forEach((file) => {
+        const filename = resolveVueFilename(inputDir, file);
+        if (!(0, fs_extra_1.existsSync)(filename)) {
+            return;
+        }
+        const content = (0, fs_extra_1.readFileSync)(filename, 'utf8');
+        const ranges = resolveAppRootScrollViewEditRangesByCode(content, filename);
+        if (ranges.length) {
+            result[file] = ranges;
+        }
+    });
+    return result;
+}
+exports.resolveAppRootScrollViewEditRanges = resolveAppRootScrollViewEditRanges;
+/**
+ * 蒸汽模式下，页面根节点会自动补一个 scroll-view。
+ * 这里仅用正则做精确匹配：命中范围宁可保守，也不能误报。
+ */
+function hasAppRootScrollViewWrappedByIfdef(code) {
+    const templateContent = getTemplateContent(code);
+    if (!templateContent) {
+        return false;
+    }
+    return (matchesAppRootScrollViewTemplate(templateContent, APP_ROOT_SCROLL_VIEW_RE) ||
+        matchesAppRootScrollViewTemplate(templateContent, SPLIT_APP_ROOT_SCROLL_VIEW_RE));
+}
+exports.hasAppRootScrollViewWrappedByIfdef = hasAppRootScrollViewWrappedByIfdef;
+/**
+ * 仅在 dom2 页面整文件预处理时定位需要提示优化建议的根 scroll-view 节点。
+ */
+function resolveDom2RootScrollViewWarnLocation(code, filename, isVueSubRequest) {
+    if (process.env.UNI_PLATFORM !== 'app' ||
+        process.env.UNI_APP_X_DOM2 !== 'true' ||
+        isVueSubRequest ||
+        !(0, json_1.parseUniXPageOptions)(filename) ||
+        !code.includes('scroll-view') ||
+        !code.includes('#ifdef APP')) {
+        return;
+    }
+    if (!hasAppRootScrollViewWrappedByIfdef(code)) {
+        return;
+    }
+    return resolveAppRootScrollViewNodeLocByCode(code, filename);
+}
+exports.resolveDom2RootScrollViewWarnLocation = resolveDom2RootScrollViewWarnLocation;
+function warnDom2RootScrollView(code, filename, isVueSubRequest) {
+    const location = resolveDom2RootScrollViewWarnLocation(code, filename, isVueSubRequest);
+    if (!location) {
+        return;
+    }
+    (0, logs_1.onCompileLog)('warn', {
+        message: messages_1.M['dom2.root.scroll.view'],
+        name: 'Warn',
+        loc: location.loc,
+    }, createWarnCodeFrameSource(location), (0, utils_1.normalizePath)((0, path_1.relative)(process.env.UNI_INPUT_DIR, filename)));
+}
+exports.warnDom2RootScrollView = warnDom2RootScrollView;
+function resolveVueFilename(inputDir, file) {
+    if ((0, path_1.isAbsolute)(file)) {
+        const root = (0, path_1.parse)(file).root;
+        // HBuilderX/uni-app 里页面路径可能写成 `/pages/a/b.uvue`，
+        // 这种是项目内绝对路径，不是磁盘绝对路径，需要仍然基于 inputDir 解析。
+        if (root === '/' || root === '\\') {
+            return (0, path_1.resolve)(inputDir, removeLeadingRootSlash(file));
+        }
+        return file;
+    }
+    return (0, path_1.resolve)(inputDir, file);
+}
+function removeLeadingRootSlash(file) {
+    let index = 0;
+    while (file.charAt(index) === '/' || file.charAt(index) === '\\') {
+        index++;
+    }
+    return file.slice(index);
+}
+function getTemplateContent(code) {
+    return code.match(TEMPLATE_BLOCK_RE)?.[1];
+}
+function matchesAppRootScrollViewTemplate(template, regex) {
+    const match = template.match(regex);
+    return !!match && ROOT_SCROLL_VIEW_ATTR_RE.test(match[1]);
+}
+function resolveAppRootScrollViewNodeLocByCode(code, filename) {
+    const template = parseSfcTemplate(code, filename);
+    if (!template) {
+        return;
+    }
+    const children = template.ast.children;
+    if (children.length !== 3) {
+        return;
+    }
+    const [, scrollViewNode] = children;
+    if (!isRootScrollView(scrollViewNode)) {
+        return;
+    }
+    return {
+        loc: createStartTagLoc(code, scrollViewNode),
+        source: resolveStartTagSource(scrollViewNode),
+    };
+}
+function createStartTagLoc(code, node) {
+    const source = node.loc.source || '';
+    const endOffsetInSource = source.indexOf('>');
+    if (endOffsetInSource === -1) {
+        return {
+            start: node.loc.start,
+            end: node.loc.end,
+        };
+    }
+    return (0, utils_2.offsetToStartAndEnd)(code, node.loc.start.offset, node.loc.start.offset + endOffsetInSource + 1);
+}
+function resolveStartTagSource(node) {
+    const source = node.loc.source || '';
+    const endOffsetInSource = source.indexOf('>');
+    if (endOffsetInSource === -1) {
+        return source;
+    }
+    return source.slice(0, endOffsetInSource + 1);
+}
+function createWarnCodeFrameSource(location) {
+    return `${'\n'.repeat(Math.max(location.loc.start.line - 1, 0))}${location.source}`;
+}
+function resolveAppRootScrollViewEditRangesByCode(code, filename) {
+    const template = parseSfcTemplate(code, filename);
+    if (!template) {
+        return [];
+    }
+    const children = template.ast.children;
+    if (children.length !== 3) {
+        return [];
+    }
+    const [ifdefNode, scrollViewNode, endifNode] = children;
+    if (!isAppIfdefComment(ifdefNode) ||
+        !isRootScrollView(scrollViewNode) ||
+        !isEndifComment(endifNode)) {
+        return [];
+    }
+    // 使用项目既有的条件编译实现先跑一遍，再交给 Vue 编译器确认 APP 分支根节点。
+    if (!isPreprocessedRootScrollView(template.content, filename)) {
+        return [];
+    }
+    return createRootScrollViewEditRanges(ifdefNode, scrollViewNode, endifNode);
+}
+exports.resolveAppRootScrollViewEditRangesByCode = resolveAppRootScrollViewEditRangesByCode;
+function parseSfcTemplate(code, filename) {
+    const { descriptor, errors } = (0, compiler_sfc_1.parse)(code, {
+        filename,
+        sourceMap: false,
+    });
+    if (errors.length || !descriptor.template?.ast) {
+        return;
+    }
+    return {
+        content: descriptor.template.content,
+        ast: descriptor.template.ast,
+    };
+}
+function isPreprocessedRootScrollView(content, filename) {
+    try {
+        const preprocessed = preprocessHtml(content, createAppPreContext(), {
+            type: 'html',
+        });
+        const template = parseSfcTemplate(`<template>${preprocessed}</template>`, filename);
+        const root = template?.ast.children[0];
+        return (!!root && template.ast.children.length === 1 && root.tag === 'scroll-view');
+    }
+    catch (e) {
+        return false;
+    }
+}
+function createAppPreContext() {
+    // 这里只声明本函数需要的 APP/UVue 上下文，避免改动全局条件编译上下文。
+    return {
+        APP: true,
+        APP_UVUE: true,
+        UNI_APP_X: true,
+        VUE3: true,
+        VUE3_VAPOR: true,
+    };
+}
+function isAppIfdefComment(node) {
+    return (node.type === 3 /* NodeTypes.COMMENT */ && node.content?.trim() === '#ifdef APP');
+}
+function isEndifComment(node) {
+    return node.type === 3 /* NodeTypes.COMMENT */ && node.content?.trim() === '#endif';
+}
+function isRootScrollView(node) {
+    return (node.type === 1 /* NodeTypes.ELEMENT */ &&
+        node.tag === 'scroll-view' &&
+        hasOnlyFlexStyle(node));
+}
+function hasOnlyFlexStyle(node) {
+    if (!node.props || node.props.length !== 1) {
+        return false;
+    }
+    const style = node.props[0];
+    return (style.type === 6 /* NodeTypes.ATTRIBUTE */ &&
+        style.name === 'style' &&
+        !!style.value &&
+        normalizeFlexStyle(style.value.content) === 'flex:1');
+}
+function normalizeFlexStyle(style) {
+    let normalized = '';
+    for (let i = 0; i < style.length; i++) {
+        const char = style.charAt(i);
+        if (char !== ' ' && char !== '\t' && char !== '\n' && char !== '\r') {
+            normalized += char;
+        }
+    }
+    if (normalized.endsWith(';')) {
+        return normalized.slice(0, -1);
+    }
+    return normalized;
+}
+function createRootScrollViewEditRanges(ifdefNode, scrollViewNode, endifNode) {
+    const children = scrollViewNode.children || [];
+    if (!children.length) {
+        return [createEditRange(ifdefNode, endifNode)];
+    }
+    const firstChild = children[0];
+    const lastChild = children[children.length - 1];
+    // 兼容如下写法：条件编译分别包裹 scroll-view 的开始标签和结束标签。
+    // <!-- #ifdef APP -->
+    // <scroll-view style="flex:1">
+    // <!-- #endif -->
+    //   ...
+    // <!-- #ifdef APP -->
+    // </scroll-view>
+    // <!-- #endif -->
+    if (isEndifComment(firstChild) && isAppIfdefComment(lastChild)) {
+        return [
+            createEditRangeByLoc(ifdefNode.loc.start, firstChild.loc.end),
+            createEditRangeByLoc(lastChild.loc.start, endifNode.loc.end),
+        ];
+    }
+    return [
+        createEditRangeByLoc(ifdefNode.loc.start, firstChild.loc.start, true),
+        createEditRangeByLoc(lastChild.loc.end, endifNode.loc.end),
+    ];
+}
+function createEditRange(startNode, endNode) {
+    return createEditRangeByLoc(startNode.loc.start, endNode.loc.end);
+}
+function createEditRangeByLoc(start, end, preserveEndIndent = false) {
+    const range = {
+        start: toPosition(start),
+        end: toPosition(end),
+        preserveLineBreaks: true,
+    };
+    if (preserveEndIndent) {
+        range.preserveEndIndent = true;
+    }
+    return range;
+}
+function toPosition(loc) {
+    return {
+        line: loc.line,
+        column: loc.column,
+    };
+}

package/dist/dom2/vue.d.ts

@@ -9,7 +9,6 @@ export declare function initVueTemplateCompilerExtraOptions(descriptor: SFCDescr
     enableRootScrollViewTransform: boolean;
     rootScrollView: import("src/json/uni-x").UniXPageOptions | undefined;
     scriptCppBlocks: any;
-    disableStaticStyle: boolean;
     onVueTemplateCompileLog(type: 'warn' | 'error', error: CompilerError): void;
     r: any;
     className: any;

package/dist/dom2/vue.js

@@ -13,32 +13,19 @@ function initVueTemplateCompilerExtraOptions(descriptor) {
     const relativeFilename = (0, utils_1.normalizePath)(path_1.default.relative(process.env.UNI_INPUT_DIR, filename));
     const rootScrollView = (0, json_1.parseUniXPageOptions)(filename);
     const componentType = rootScrollView || (0, json_1.isUniPageFile)(filename) ? 'page' : 'component';
-    const isDevX = process.env.UNI_HX_VERSION_DEV === 'true' &&
-        process.env.UNI_APP_X === 'true';
     const isDynamic = process.env.UNI_APP_X_DOM2_DYNAMIC === 'true';
-    let disableStaticStyle = false;
-    if (isDevX &&
-        // 动态渲染时，仍旧使用静态样式，避免性能问题。
-        !isDynamic &&
-        process.env.NODE_ENV === 'development') {
-        if (process.env.UNI_UTS_PLATFORM === 'app-harmony') {
-            // 开发版本、开发模式下，非鸿蒙release模式打包
-            disableStaticStyle = process.env.UNI_APP_HARMONY_RUN_MODE !== 'release';
-        }
-    }
     const helper = (0, utils_1.requireUniHelpers)();
     return {
         root: (0, utils_1.normalizePath)(process.env.UNI_INPUT_DIR),
         platform: process.env.UNI_UTS_PLATFORM,
         componentType,
-        filename: filename,
+        filename,
         relativeFilename,
         helper,
         enableRootScrollViewTransform: true,
         // 仅页面透传 rootScrollView，避免非页面组件误触发 ROOT 自动包裹逻辑。
         rootScrollView: componentType === 'page' ? rootScrollView : undefined,
         scriptCppBlocks: descriptor.scriptCppBlocks,
-        disableStaticStyle,
         onVueTemplateCompileLog(type, error) {
             return (0, vue_1.onVueTemplateCompileLog)(type, error, descriptor.source, relativeFilename);
         },

package/dist/hbx/alias.js

@@ -5,11 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatInstallHBuilderXPluginTips = exports.moduleAliasFormatter = exports.installHBuilderXPlugin = exports.initModuleAlias = void 0;
 // 注意：该文件尽可能少依赖其他文件，否则可能会导致还没有alias的时候，就加载了目标模块
-const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const module_alias_1 = __importDefault(require("module-alias"));
 const utils_1 = require("./utils");
-const jsonc_parser_1 = require("jsonc-parser");
 const hbxPlugins = {
     typescript: 'compile-typescript/node_modules/typescript',
     less: 'compile-less/node_modules/less',
@@ -17,32 +15,32 @@ const hbxPlugins = {
     stylus: 'compile-stylus/node_modules/stylus',
     pug: 'compile-pug-cli/node_modules/pug',
 };
+function isWebOrMpPlatform(platform) {
+    return platform === 'h5' || platform === 'web' || platform?.startsWith('mp-');
+}
 function initModuleAlias() {
     const libDir = path_1.default.resolve(__dirname, '../../lib');
     const compilerSfcPath = path_1.default.resolve(libDir, '@vue/compiler-sfc');
     const serverRendererPath = require.resolve('@vue/server-renderer');
+    if (process.env.UNI_OUTPUT_DIR) {
+        const baseOutDir = path_1.default.basename(process.env.UNI_OUTPUT_DIR);
+        process.env.UNI_APP_X_CACHE_DIR =
+            process.env.UNI_APP_X_CACHE_DIR ||
+                path_1.default.resolve(process.env.UNI_OUTPUT_DIR, '../cache/.' + baseOutDir);
+    }
     // 对路径进行兼容
     if (!process.env.UNI_APP_X_DOM2_CPP_DIR &&
         process.env.UNI_APP_HARMONY_DOM2_CPP_DIR) {
         process.env.UNI_APP_X_DOM2_CPP_DIR =
             process.env.UNI_APP_HARMONY_DOM2_CPP_DIR;
     }
-    // TODO 等待正式对外推出后，删除这个兼容逻辑
-    if (process.env.UNI_APP_PLATFORM === 'ios' ||
-        process.env.UNI_APP_PLATFORM === 'android') {
-        if (process.env.UNI_INPUT_DIR) {
-            const manifestJsonFilename = path_1.default.resolve(process.env.UNI_INPUT_DIR, 'manifest.json');
-            if (fs_1.default.existsSync(manifestJsonFilename)) {
-                const manifestJsonStr = fs_1.default.readFileSync(manifestJsonFilename, 'utf-8');
-                const manifestJson = (0, jsonc_parser_1.parse)(manifestJsonStr);
-                if (manifestJson?.['uni-app-x']?.vapor === true) {
-                    const vaporFilename = path_1.default.resolve(process.env.UNI_INPUT_DIR, '.vapor');
-                    if (fs_1.default.existsSync(vaporFilename)) {
-                        process.env.UNI_APP_X_DOM2 = 'true';
-                    }
-                }
-            }
-        }
+    // alias 初始化可能早于 CLI 环境初始化，这里仅依据外部预置的平台环境变量判断。
+    // 如果是 web 和小程序，目前强制非蒸汽。
+    const utsPlatform = process.env.UNI_UTS_PLATFORM;
+    const uniPlatform = process.env.UNI_PLATFORM;
+    if (isWebOrMpPlatform(utsPlatform) || isWebOrMpPlatform(uniPlatform)) {
+        delete process.env.UNI_APP_X_DOM2;
+        delete process.env.UNI_APP_X_DOM2_DYNAMIC;
     }
     if (process.env.UNI_APP_X_DOM2 === 'true') {
         if (process.env.UNI_OUTPUT_DIR &&
@@ -78,27 +76,8 @@ function initModuleAlias() {
         if (process.env.UNI_APP_PLATFORM ||
             process.env.UNI_PLATFORM === 'app-harmony') {
             if (!process.env.UNI_APP_X_VAPOR_RENDER_TARGET) {
-                // ios 和 harmony 平台默认使用 bytecode 目标，存在 .native 文件时使用 native 目标；其他平台如果存在 .dynamic 文件则使用 bytecode 目标，否则使用 native 目标
-                if (process.env.UNI_APP_PLATFORM === 'ios' ||
-                    process.env.UNI_APP_PLATFORM === 'harmony' ||
-                    process.env.UNI_PLATFORM === 'app-harmony') {
-                    if (process.env.UNI_INPUT_DIR &&
-                        fs_1.default.existsSync(path_1.default.resolve(process.env.UNI_INPUT_DIR, '.native'))) {
-                        process.env.UNI_APP_X_VAPOR_RENDER_TARGET = 'nativecode';
-                    }
-                    else {
-                        process.env.UNI_APP_X_VAPOR_RENDER_TARGET = 'bytecode';
-                    }
-                }
-                else {
-                    if (process.env.UNI_INPUT_DIR &&
-                        fs_1.default.existsSync(path_1.default.resolve(process.env.UNI_INPUT_DIR, '.dynamic'))) {
-                        process.env.UNI_APP_X_VAPOR_RENDER_TARGET = 'bytecode';
-                    }
-                    else {
-                        process.env.UNI_APP_X_VAPOR_RENDER_TARGET = 'nativecode';
-                    }
-                }
+                // 默认 app 平台使用 bytecode 目标
+                process.env.UNI_APP_X_VAPOR_RENDER_TARGET = 'bytecode';
             }
             if (process.env.UNI_APP_X_VAPOR_RENDER_TARGET?.includes('bytecode')) {
                 process.env.UNI_APP_X_DOM2_DYNAMIC = 'true';

package/dist/hbx/index.d.ts

@@ -1,5 +1,5 @@
 export { formatAtFilename, createErrorWithBlockFlag } from './log';
 export * from './env';
 export { initModuleAlias, installHBuilderXPlugin, formatInstallHBuilderXPluginTips, } from './alias';
-export declare function uniHBuilderXConsolePlugin(method?: string): import("vite/dist/node").Plugin<any>;
+export declare function uniHBuilderXConsolePlugin(method?: string): import("vite").Plugin<any>;
 export declare function isEnableConsole(): boolean;

package/dist/i18n.js

@@ -47,51 +47,36 @@ function isUniAppLocaleFile(filepath) {
     return localeJsonRE.test(path_1.default.basename(filepath));
 }
 exports.isUniAppLocaleFile = isUniAppLocaleFile;
-const localeJsonCache = new Map();
 function parseLocaleJson(filepath) {
-    const { mtimeMs, size } = fs_1.default.statSync(filepath);
-    const cached = localeJsonCache.get(filepath);
-    if (cached && cached.mtimeMs === mtimeMs && cached.size === size) {
-        return cached.json;
-    }
     let jsonObj = (0, json_1.parseJson)(fs_1.default.readFileSync(filepath, 'utf8'), false, filepath);
     if (isUniAppLocaleFile(filepath)) {
         jsonObj = jsonObj.common || {};
     }
-    localeJsonCache.set(filepath, { mtimeMs, size, json: jsonObj });
     return jsonObj;
 }
-const localeFilesCache = new Map();
 function getLocaleFiles(cwd) {
-    let mtimeMs;
-    try {
-        mtimeMs = fs_1.default.statSync(cwd).mtimeMs;
-    }
-    catch {
-        return [];
-    }
-    const cached = localeFilesCache.get(cwd);
-    if (cached && cached.mtimeMs === mtimeMs) {
-        return cached.files;
-    }
-    const files = (0, fast_glob_1.sync)('*.json', { cwd, absolute: true });
-    localeFilesCache.set(cwd, { mtimeMs, files });
-    return files;
+    return (0, fast_glob_1.sync)('*.json', { cwd, absolute: true });
 }
 exports.getLocaleFiles = getLocaleFiles;
 function initLocales(dir, withMessages = true) {
-    return getLocaleFiles(dir).reduce((res, filepath) => {
-        const filename = path_1.default.basename(filepath);
-        try {
-            const locale = filename.replace(/(uni-app.)?(.*).json/, '$2');
-            if (withMessages) {
-                (0, shared_1.extend)(res[locale] || (res[locale] = {}), parseLocaleJson(filepath));
-            }
-            else {
-                res[locale] = {};
+    if (!fs_1.default.existsSync(dir)) {
+        return {};
+    }
+    return fs_1.default.readdirSync(dir).reduce((res, filename) => {
+        if (path_1.default.extname(filename) === '.json') {
+            try {
+                const locale = path_1.default
+                    .basename(filename)
+                    .replace(/(uni-app.)?(.*).json/, '$2');
+                if (withMessages) {
+                    (0, shared_1.extend)(res[locale] || (res[locale] = {}), parseLocaleJson(path_1.default.join(dir, filename)));
+                }
+                else {
+                    res[locale] = {};
+                }
             }
+            catch (e) { }
         }
-        catch { }
         return res;
     }, {});
 }

package/dist/index.d.ts

@@ -26,7 +26,7 @@ export * from './platform';
 export * from './utsUtils';
 export * from './workers';
 export { parseUniExtApi, parseUniExtApis, parseInjects, Define, DefineOptions, Defines, getUniExtApiProviderRegisters, formatExtApiProviderName, } from './uni_modules';
-export { getUniModulesEncryptType, parseUniModulesArtifacts, resolveEncryptUniModule, } from './uni_modules.cloud';
+export { copyEncryptUniModulesDom2Bytes, getUniModulesEncryptType, parseUniModulesArtifacts, resolveEncryptUniModule, } from './uni_modules.cloud';
 import type { EncryptPackageJson } from './uni_modules.cloud';
 export type EncryptArtifacts = EncryptPackageJson['uni_modules']['artifacts'];
 export { M } from './messages';

package/dist/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkUpdate = exports.M = exports.resolveEncryptUniModule = exports.parseUniModulesArtifacts = exports.getUniModulesEncryptType = exports.formatExtApiProviderName = exports.getUniExtApiProviderRegisters = exports.parseInjects = exports.parseUniExtApis = exports.parseUniExtApi = void 0;
+exports.checkUpdate = exports.M = exports.resolveEncryptUniModule = exports.parseUniModulesArtifacts = exports.getUniModulesEncryptType = exports.copyEncryptUniModulesDom2Bytes = exports.formatExtApiProviderName = exports.getUniExtApiProviderRegisters = exports.parseInjects = exports.parseUniExtApis = exports.parseUniExtApi = void 0;
 __exportStar(require("./fs"), exports);
 __exportStar(require("./mp"), exports);
 __exportStar(require("./url"), exports);
@@ -49,6 +49,7 @@ Object.defineProperty(exports, "parseInjects", { enumerable: true, get: function
 Object.defineProperty(exports, "getUniExtApiProviderRegisters", { enumerable: true, get: function () { return uni_modules_1.getUniExtApiProviderRegisters; } });
 Object.defineProperty(exports, "formatExtApiProviderName", { enumerable: true, get: function () { return uni_modules_1.formatExtApiProviderName; } });
 var uni_modules_cloud_1 = require("./uni_modules.cloud");
+Object.defineProperty(exports, "copyEncryptUniModulesDom2Bytes", { enumerable: true, get: function () { return uni_modules_cloud_1.copyEncryptUniModulesDom2Bytes; } });
 Object.defineProperty(exports, "getUniModulesEncryptType", { enumerable: true, get: function () { return uni_modules_cloud_1.getUniModulesEncryptType; } });
 Object.defineProperty(exports, "parseUniModulesArtifacts", { enumerable: true, get: function () { return uni_modules_cloud_1.parseUniModulesArtifacts; } });
 Object.defineProperty(exports, "resolveEncryptUniModule", { enumerable: true, get: function () { return uni_modules_cloud_1.resolveEncryptUniModule; } });

package/dist/json/app/manifest/plus.js

@@ -117,7 +117,15 @@ function initUniStatistics(manifestJson) {
     if (!uniStatistics) {
         return;
     }
-    if (uniStatistics.version === 2 || uniStatistics.version === '2') {
+    /**
+     * 判断是否为私有版统计：
+     * - 新配置：type === 'private'
+     * - 旧配置兼容：version === 2
+     */
+    const isPrivateStat = uniStatistics.type === 'private' ||
+        uniStatistics.version === 2 ||
+        uniStatistics.version === '2';
+    if (isPrivateStat) {
         if (uniStatistics.uniCloud && uniStatistics.uniCloud.spaceId) {
             return;
         }

package/dist/json/app/pages/definePage.js

@@ -46,7 +46,9 @@ function defineNVuePageCode(pagesJson) {
         }
         const pagePathWithExtname = (0, utils_1.normalizePagePath)(page.path, 'app');
         if (pagePathWithExtname) {
-            importNVuePagesCode.push(`import('./${pagePathWithExtname}').then((res)=>res.default)`);
+            importNVuePagesCode.push(
+            // 使用 res.default 确保 rollup 不会摇树
+            `import('./${pagePathWithExtname}').then((res)=>{res.default})`);
         }
     });
     return importNVuePagesCode.join('\n');

package/dist/json/mp/index.d.ts

@@ -2,3 +2,5 @@ export * from './jsonFile';
 export { AppJson, ComponentJson, MiniProgramComponentsType } from './types';
 export { mergeMiniProgramAppJson, parseMiniProgramPagesJson } from './pages';
 export { parseMiniProgramProjectJson } from './project';
+export { MP_INDEPENDENT_ROOT_QUERY, MP_INDEPENDENT_MAIN_PREFIX, MP_INDEPENDENT_VIRTUAL_ROOT_QUERY, formatIndependentVirtualId, getIndependentRootByFilename, getIndependentRoots, getIndependentSubPackages, hasIndependentRoot, isAppPagesJson, isInIndependentRoot, normalizeIndependentRoot, parseIndependentMainRoot, parseIndependentRoot, parseIndependentSubPackages, parseIndependentVirtualRoot, resolveIndependentRoot, setIndependentSubPackages, stringifyIndependentRoots, withIndependentRoot, withIndependentRootIfNeeded, withoutIndependentRoot, } from './subpackage';
+export type { IndependentSubPackage } from './subpackage';

package/dist/json/mp/index.js

@@ -14,10 +14,32 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseMiniProgramProjectJson = exports.parseMiniProgramPagesJson = exports.mergeMiniProgramAppJson = void 0;
+exports.withoutIndependentRoot = exports.withIndependentRootIfNeeded = exports.withIndependentRoot = exports.stringifyIndependentRoots = exports.setIndependentSubPackages = exports.resolveIndependentRoot = exports.parseIndependentVirtualRoot = exports.parseIndependentSubPackages = exports.parseIndependentRoot = exports.parseIndependentMainRoot = exports.normalizeIndependentRoot = exports.isInIndependentRoot = exports.isAppPagesJson = exports.hasIndependentRoot = exports.getIndependentSubPackages = exports.getIndependentRoots = exports.getIndependentRootByFilename = exports.formatIndependentVirtualId = exports.MP_INDEPENDENT_VIRTUAL_ROOT_QUERY = exports.MP_INDEPENDENT_MAIN_PREFIX = exports.MP_INDEPENDENT_ROOT_QUERY = exports.parseMiniProgramProjectJson = exports.parseMiniProgramPagesJson = exports.mergeMiniProgramAppJson = void 0;
 __exportStar(require("./jsonFile"), exports);
 var pages_1 = require("./pages");
 Object.defineProperty(exports, "mergeMiniProgramAppJson", { enumerable: true, get: function () { return pages_1.mergeMiniProgramAppJson; } });
 Object.defineProperty(exports, "parseMiniProgramPagesJson", { enumerable: true, get: function () { return pages_1.parseMiniProgramPagesJson; } });
 var project_1 = require("./project");
 Object.defineProperty(exports, "parseMiniProgramProjectJson", { enumerable: true, get: function () { return project_1.parseMiniProgramProjectJson; } });
+var subpackage_1 = require("./subpackage");
+Object.defineProperty(exports, "MP_INDEPENDENT_ROOT_QUERY", { enumerable: true, get: function () { return subpackage_1.MP_INDEPENDENT_ROOT_QUERY; } });
+Object.defineProperty(exports, "MP_INDEPENDENT_MAIN_PREFIX", { enumerable: true, get: function () { return subpackage_1.MP_INDEPENDENT_MAIN_PREFIX; } });
+Object.defineProperty(exports, "MP_INDEPENDENT_VIRTUAL_ROOT_QUERY", { enumerable: true, get: function () { return subpackage_1.MP_INDEPENDENT_VIRTUAL_ROOT_QUERY; } });
+Object.defineProperty(exports, "formatIndependentVirtualId", { enumerable: true, get: function () { return subpackage_1.formatIndependentVirtualId; } });
+Object.defineProperty(exports, "getIndependentRootByFilename", { enumerable: true, get: function () { return subpackage_1.getIndependentRootByFilename; } });
+Object.defineProperty(exports, "getIndependentRoots", { enumerable: true, get: function () { return subpackage_1.getIndependentRoots; } });
+Object.defineProperty(exports, "getIndependentSubPackages", { enumerable: true, get: function () { return subpackage_1.getIndependentSubPackages; } });
+Object.defineProperty(exports, "hasIndependentRoot", { enumerable: true, get: function () { return subpackage_1.hasIndependentRoot; } });
+Object.defineProperty(exports, "isAppPagesJson", { enumerable: true, get: function () { return subpackage_1.isAppPagesJson; } });
+Object.defineProperty(exports, "isInIndependentRoot", { enumerable: true, get: function () { return subpackage_1.isInIndependentRoot; } });
+Object.defineProperty(exports, "normalizeIndependentRoot", { enumerable: true, get: function () { return subpackage_1.normalizeIndependentRoot; } });
+Object.defineProperty(exports, "parseIndependentMainRoot", { enumerable: true, get: function () { return subpackage_1.parseIndependentMainRoot; } });
+Object.defineProperty(exports, "parseIndependentRoot", { enumerable: true, get: function () { return subpackage_1.parseIndependentRoot; } });
+Object.defineProperty(exports, "parseIndependentSubPackages", { enumerable: true, get: function () { return subpackage_1.parseIndependentSubPackages; } });
+Object.defineProperty(exports, "parseIndependentVirtualRoot", { enumerable: true, get: function () { return subpackage_1.parseIndependentVirtualRoot; } });
+Object.defineProperty(exports, "resolveIndependentRoot", { enumerable: true, get: function () { return subpackage_1.resolveIndependentRoot; } });
+Object.defineProperty(exports, "setIndependentSubPackages", { enumerable: true, get: function () { return subpackage_1.setIndependentSubPackages; } });
+Object.defineProperty(exports, "stringifyIndependentRoots", { enumerable: true, get: function () { return subpackage_1.stringifyIndependentRoots; } });
+Object.defineProperty(exports, "withIndependentRoot", { enumerable: true, get: function () { return subpackage_1.withIndependentRoot; } });
+Object.defineProperty(exports, "withIndependentRootIfNeeded", { enumerable: true, get: function () { return subpackage_1.withIndependentRootIfNeeded; } });
+Object.defineProperty(exports, "withoutIndependentRoot", { enumerable: true, get: function () { return subpackage_1.withoutIndependentRoot; } });