@dcloudio/uni-cli-shared 3.0.0-4080720251210001 → 3.0.0-5000420260317001

package/dist/constants.d.ts

@@ -39,3 +39,6 @@ export declare const COMMON_EXCLUDE: RegExp[];
 export declare const KNOWN_ASSET_TYPES: string[];
 export declare const DEFAULT_ASSETS_RE: RegExp;
 export declare const TEXT_STYLE: string[];
+export declare const JS_STYLE_PLACEHOLDER_MARKER = "__js_style_placeholder__";
+export declare const JS_STYLE_PLACEHOLDER_STR: string;
+export declare const JS_STYLE_PLACEHOLDER_RE: RegExp;

package/dist/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TEXT_STYLE = exports.DEFAULT_ASSETS_RE = exports.KNOWN_ASSET_TYPES = exports.COMMON_EXCLUDE = exports.X_BASE_COMPONENTS_STYLE_PATH = exports.BASE_COMPONENTS_STYLE_PATH = exports.H5_COMPONENTS_STYLE_PATH = exports.H5_FRAMEWORK_STYLE_PATH = exports.H5_API_STYLE_PATH = exports.X_PAGE_EXTNAME_APP = exports.X_PAGE_EXTNAME = exports.PAGE_EXTNAME = exports.PAGE_EXTNAME_APP = exports.BINDING_COMPONENTS = exports.APP_CONFIG_SERVICE = exports.APP_CONFIG = exports.APP_SERVICE_FILENAME = exports.ASSETS_INLINE_LIMIT = exports.JSON_JS_MAP = exports.MANIFEST_JSON_UTS = exports.MANIFEST_JSON_JS = exports.PAGES_JSON_UTS = exports.PAGES_JSON_JS = exports.uni_app_x_extensions = exports.extensions = exports.SPECIAL_CHARS = exports.EXTNAME_TS_RE = exports.EXTNAME_JS_RE = exports.EXTNAME_VUE_RE = exports.EXTNAME_VUE_TEMPLATE = exports.X_EXTNAME_VUE = exports.EXTNAME_VUE = exports.EXTNAME_TS = exports.EXTNAME_JS = exports.PUBLIC_DIR = void 0;
+exports.JS_STYLE_PLACEHOLDER_RE = exports.JS_STYLE_PLACEHOLDER_STR = exports.JS_STYLE_PLACEHOLDER_MARKER = exports.TEXT_STYLE = exports.DEFAULT_ASSETS_RE = exports.KNOWN_ASSET_TYPES = exports.COMMON_EXCLUDE = exports.X_BASE_COMPONENTS_STYLE_PATH = exports.BASE_COMPONENTS_STYLE_PATH = exports.H5_COMPONENTS_STYLE_PATH = exports.H5_FRAMEWORK_STYLE_PATH = exports.H5_API_STYLE_PATH = exports.X_PAGE_EXTNAME_APP = exports.X_PAGE_EXTNAME = exports.PAGE_EXTNAME = exports.PAGE_EXTNAME_APP = exports.BINDING_COMPONENTS = exports.APP_CONFIG_SERVICE = exports.APP_CONFIG = exports.APP_SERVICE_FILENAME = exports.ASSETS_INLINE_LIMIT = exports.JSON_JS_MAP = exports.MANIFEST_JSON_UTS = exports.MANIFEST_JSON_JS = exports.PAGES_JSON_UTS = exports.PAGES_JSON_JS = exports.uni_app_x_extensions = exports.extensions = exports.SPECIAL_CHARS = exports.EXTNAME_TS_RE = exports.EXTNAME_JS_RE = exports.EXTNAME_VUE_RE = exports.EXTNAME_VUE_TEMPLATE = exports.X_EXTNAME_VUE = exports.EXTNAME_VUE = exports.EXTNAME_TS = exports.EXTNAME_JS = exports.PUBLIC_DIR = void 0;
 exports.PUBLIC_DIR = 'static';
 exports.EXTNAME_JS = ['.js', '.ts', '.jsx', '.tsx', '.uts'];
 exports.EXTNAME_TS = ['.ts', '.tsx'];
@@ -88,3 +88,8 @@ exports.KNOWN_ASSET_TYPES = [
 ];
 exports.DEFAULT_ASSETS_RE = new RegExp(`\\.(` + exports.KNOWN_ASSET_TYPES.join('|') + `)(\\?.*)?$`);
 exports.TEXT_STYLE = ['black', 'white'];
+exports.JS_STYLE_PLACEHOLDER_MARKER = '__js_style_placeholder__';
+exports.JS_STYLE_PLACEHOLDER_STR = JSON.stringify({
+    [exports.JS_STYLE_PLACEHOLDER_MARKER]: 0,
+});
+exports.JS_STYLE_PLACEHOLDER_RE = /\{\s*"__js_style_placeholder__"\s*:\s*0\s*}/g;

package/dist/deps.js

@@ -5,7 +5,7 @@ const constants_1 = require("./constants");
 const RESIZE_SENSOR_CSS = constants_1.BASE_COMPONENTS_STYLE_PATH + 'resize-sensor.css';
 const REFRESHER_CSS = constants_1.BASE_COMPONENTS_STYLE_PATH + 'refresher.css';
 const API_DEPS_CSS = (isX) => {
-    return {
+    const deps_css = {
         showModal: [`${constants_1.H5_API_STYLE_PATH}modal.css`],
         showToast: [`${constants_1.H5_API_STYLE_PATH}toast.css`],
         showActionSheet: [`${constants_1.H5_API_STYLE_PATH}action-sheet.css`],
@@ -29,6 +29,11 @@ const API_DEPS_CSS = (isX) => {
             `${constants_1.BASE_COMPONENTS_STYLE_PATH}/scroll-view.css`,
         ],
     };
+    if (isX) {
+        // @ts-expect-error
+        deps_css.showLoading = [`${constants_1.X_BASE_COMPONENTS_STYLE_PATH}loading.css`];
+    }
+    return deps_css;
 };
 exports.API_DEPS_CSS = API_DEPS_CSS;
 const COMPONENT_DEPS_CSS = (isX) => {

package/dist/dom2/index.d.ts

@@ -0,0 +1 @@
+export * from './sharedData';

package/dist/dom2/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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 });
+__exportStar(require("./sharedData"), exports);

package/dist/dom2/sharedData.d.ts

@@ -0,0 +1,2 @@
+import type { Plugin } from 'vite';
+export declare function uniSharedDataPlugin(): Plugin;

package/dist/dom2/sharedData.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.uniSharedDataPlugin = void 0;
+const uts_1 = require("../uts");
+const pages_1 = require("../json/pages");
+const utils_1 = require("../utils");
+const asset_1 = require("../vite/plugins/vitejs/plugins/asset");
+function uniSharedDataPlugin() {
+    const { USDP } = (0, utils_1.requireUniHelpers)();
+    const compiler = require('@dcloudio/compiler-vapor-dom2');
+    return USDP({
+        compilerVaporDom2: compiler,
+        utsCompiler: (0, uts_1.resolveUTSCompiler)(),
+        isUniPageFile: pages_1.isUniPageFile,
+        getSharedDataResult: compiler.getSharedDataResult,
+        getAssetFilenameById: asset_1.getAssetFilenameById,
+    });
+}
+exports.uniSharedDataPlugin = uniSharedDataPlugin;

package/dist/easycom.js

@@ -76,13 +76,17 @@ function initEasycoms(inputDir, { dirs, platform, isX, }) {
             }
         });
     };
+    const supportCustomElements = isX && process.env.UNI_APP_X_DOM2 !== 'true';
     // ext-api 模式下，不存在 easycom 特性
     if (process.env.UNI_COMPILE_TARGET !== 'ext-api') {
         clearEasycom();
         (0, uts_1.clearUTSComponents)();
         (0, uts_1.clearUTSCustomElements)();
         initEasycom(easyComOptions);
-        initUTSEasycomCustomElements();
+        // dom2 模式下，不需要注册 customElements 组件
+        if (supportCustomElements) {
+            initUTSEasycomCustomElements();
+        }
         initUTSEasycom();
     }
     const componentExtNames = isX ? 'uvue|vue' : 'vue';
@@ -93,7 +97,9 @@ function initEasycoms(inputDir, { dirs, platform, isX, }) {
             'uni_modules/*/components/*/*.(' + componentExtNames + '|jsx|tsx)',
             'utssdk/*/**/*.(' + componentExtNames + ')',
             'uni_modules/*/utssdk/*/*.(' + componentExtNames + ')',
-            'uni_modules/*/customElements/*/*.uts',
+            ...(supportCustomElements
+                ? ['uni_modules/*/customElements/*/*.uts']
+                : []),
         ], [], {
             resolve: inputDir,
         }),
@@ -104,7 +110,9 @@ function initEasycoms(inputDir, { dirs, platform, isX, }) {
                 (0, uts_1.clearUTSComponents)();
                 (0, uts_1.clearUTSCustomElements)();
                 initEasycom(easyComOptions);
-                initUTSEasycomCustomElements();
+                if (isX) {
+                    initUTSEasycomCustomElements();
+                }
                 initUTSEasycom();
             }
         },
@@ -210,20 +218,34 @@ function initAutoScanEasycom(platform, dir, rootDir, extensions) {
     if (!fs_1.default.existsSync(dir)) {
         return easycoms;
     }
+    const isDevX = process.env.UNI_HX_VERSION_DEV === 'true' &&
+        process.env.UNI_APP_X === 'true';
     const isMp = platform.startsWith('mp-');
     const is_uni_modules = path_1.default.basename(path_1.default.resolve(dir, '../..')) === 'uni_modules';
+    const has_uts_sdk_dir = fs_1.default.existsSync(path_1.default.resolve(dir, '../utssdk'));
     const is_easycom_encrypt_uni_modules = // uni_modules模式不需要此逻辑
      process.env.UNI_COMPILE_TARGET !== 'uni_modules' &&
         is_uni_modules &&
         // 前端加密插件，不能包含utssdk目录
         fs_1.default.existsSync(path_1.default.resolve(dir, '../encrypt')) &&
-        !fs_1.default.existsSync(path_1.default.resolve(dir, '../utssdk'));
+        !has_uts_sdk_dir;
     const uni_modules_plugin_id = is_easycom_encrypt_uni_modules && path_1.default.basename(path_1.default.resolve(dir, '..'));
     fs_1.default.readdirSync(dir).forEach((name) => {
         const folder = path_1.default.resolve(dir, name);
         if (!isDir(folder)) {
             return;
         }
+        if (isDevX) {
+            if (has_uts_sdk_dir &&
+                process.env.UNI_UTS_PLATFORM &&
+                (0, uni_shared_1.isBuiltInComponent)(name)) {
+                // dev下，如果是内置组件，且存在utssdk目录，则判断utssdk下是否存在当前平台，如果不存在，则跳过
+                const utsSdkPlatformDir = path_1.default.resolve(dir, '../utssdk', process.env.UNI_UTS_PLATFORM);
+                if (!fs_1.default.existsSync(utsSdkPlatformDir)) {
+                    return;
+                }
+            }
+        }
         const importDir = (0, utils_1.normalizePath)(folder);
         const files = fs_1.default.readdirSync(folder);
         // 读取文件夹文件列表，比对文件名（fs.existsSync在大小写不敏感的系统会匹配不准确）
@@ -291,10 +313,17 @@ function createImportDeclaration(local, source, imported) {
 }
 const RESOLVE_EASYCOM_IMPORT_CODE = `import { resolveDynamicComponent as __resolveDynamicComponent } from 'vue';import { resolveEasycom } from '@dcloudio/uni-app';`;
 function genResolveEasycomCode(importDeclarations, code, name) {
+    if (process.env.UNI_APP_X_DOM2 === 'true') {
+        // dom2 模式下，为了性能，不再考虑优先级问题，如果开发者需要区别，可以手动导入为其他名称
+        return name;
+    }
     if (!importDeclarations.includes(RESOLVE_EASYCOM_IMPORT_CODE)) {
         importDeclarations.push(RESOLVE_EASYCOM_IMPORT_CODE);
     }
-    return `resolveEasycom(${code.replace('_resolveComponent', '__resolveDynamicComponent')}, ${name})`;
+    return `resolveEasycom(${code
+        .replace('_resolveComponent', '__resolveDynamicComponent')
+        // 移除 maybeSelfReference 逻辑，easycom 优先级高于自引用组件
+        .replace(', true)', ')')}, ${name})`;
 }
 exports.genResolveEasycomCode = genResolveEasycomCode;
 exports.UNI_EASYCOM_EXCLUDE = [/@dcloudio\/uni-h5/];

package/dist/env/define.d.ts

@@ -1,4 +1,7 @@
 export declare function initDefine(stringifyBoolean?: boolean): {
+    __X_STYLE_ISOLATION__: string | boolean;
+    __X_STYLE_ISOLATION_UP_ARROW__: string | boolean;
+    'process.env.UNI_APP_X_NEW_STYLE_ISOLATION': string | boolean;
     __UNI_FEATURE_VIRTUAL_HOST__: boolean;
     'process.env.NODE_ENV': string;
     'process.env.UNI_DEBUG': string | boolean;

package/dist/env/define.js

@@ -10,6 +10,9 @@ function initDefine(stringifyBoolean = false) {
     const isRunByHBuilderX = (0, env_1.runByHBuilderX)();
     const isDebug = !!manifestJson.debug;
     const isX = process.env.UNI_APP_X === 'true';
+    const isNewStyleIsolation = process.env.UNI_APP_STYLE_ISOLATION_VERSION === '2';
+    // 目前仅微信小程序支持^穿透
+    const isNewStyleIsolationUpArrow = isNewStyleIsolation && process.env.UNI_PLATFORM === 'mp-weixin';
     const isMP = process.env.UNI_PLATFORM && process.env.UNI_PLATFORM.startsWith('mp-');
     process.env['UNI_APP_ID'] = manifestJson.appid;
     let mpXDefine = isX && isMP
@@ -23,6 +26,9 @@ function initDefine(stringifyBoolean = false) {
         mpXDefine.__UNI_FEATURE_VIRTUAL_HOST__ =
             platformManifestJson.enableVirtualHost !== false;
     }
+    const styleIsolation = stringifyBoolean
+        ? JSON.stringify(isNewStyleIsolation)
+        : isNewStyleIsolation;
     return {
         ...initCustomDefine(),
         'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV),
@@ -50,6 +56,12 @@ function initDefine(stringifyBoolean = false) {
         'process.env.VUE_APP_DARK_MODE': JSON.stringify(platformManifestJson.darkmode || false),
         __UNI_PRELOAD_SHADOW_IMAGE__: JSON.stringify(process.env.UNI_PLATFORM === 'mp-weixin' ? (0, utils_1.getShadowImagePath)('grey') : ''),
         ...mpXDefine,
+        __X_STYLE_ISOLATION__: styleIsolation,
+        __X_STYLE_ISOLATION_UP_ARROW__: stringifyBoolean
+            ? JSON.stringify(isNewStyleIsolationUpArrow)
+            : isNewStyleIsolationUpArrow,
+        // 下边这个主要是为web服务，因为ssr目前只能识别process.env中的内容
+        'process.env.UNI_APP_X_NEW_STYLE_ISOLATION': styleIsolation,
     };
 }
 exports.initDefine = initDefine;

package/dist/hbx/alias.js

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatInstallHBuilderXPluginTips = exports.moduleAliasFormatter = exports.installHBuilderXPlugin = exports.initModuleAlias = void 0;
-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");
@@ -20,35 +19,34 @@ 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');
-    // TODO 临时开关启用vapor
-    if (!process.env.UNI_VUE_VAPOR &&
-        process.env.UNI_INPUT_DIR &&
+    if (process.env.UNI_APP_X_DOM2 === 'true') {
+        if (
         // 该代码执行较早，不能使用UNI_UTS_PLATFORM
-        (process.env.UNI_PLATFORM === 'app-harmony' ||
-            (process.env.UNI_PLATFORM === 'app' &&
-                process.env.UNI_APP_PLATFORM === 'ios'))) {
-        const vaporConfig = path_1.default.resolve(process.env.UNI_INPUT_DIR, '.vapor');
-        if (fs_1.default.existsSync(vaporConfig)) {
-            process.env.UNI_VUE_VAPOR = 'true';
-            if (fs_1.default.readFileSync(vaporConfig, 'utf-8').trim() === '*') {
-                process.env.UNI_VUE_VAPOR_ALL = 'true';
+        process.env.UNI_PLATFORM === 'app-harmony') {
+            if (process.env.UNI_OUTPUT_DIR) {
+                if (!process.env.UNI_APP_HARMONY_DOM2_CPP_DIR) {
+                    process.env.UNI_APP_HARMONY_DOM2_CPP_DIR = path_1.default.resolve(process.env.UNI_OUTPUT_DIR, 'cpp');
+                }
             }
         }
+        else {
+            // 目前仅支持 app-harmony 平台启用 dom2
+            delete process.env.UNI_APP_X_DOM2;
+        }
     }
-    if (process.env.UNI_VUE_VAPOR === 'true') {
+    if (process.env.UNI_APP_X_DOM2 === 'true') {
         const vuePkgs = [
             '@vue/compiler-core',
             '@vue/compiler-dom',
             '@vue/compiler-sfc',
-            '@vue/compiler-ssr',
             '@vue/compiler-vapor',
-            '@vue/server-renderer',
             '@vue/shared',
         ];
         vuePkgs.forEach((pkg) => {
-            module_alias_1.default.addAlias(pkg, path_1.default.resolve(libDir, 'vapor', '@vue', pkg.split('/').pop()));
+            module_alias_1.default.addAlias(pkg, path_1.default.resolve(libDir, 'dom2', 'app', '@vue', pkg.split('/').pop()));
         });
-        module_alias_1.default.addAlias('@vitejs/plugin-vue', path_1.default.resolve(libDir, 'vapor', '@vitejs', 'plugin-vue'));
+        module_alias_1.default.addAlias('@vitejs/plugin-vue', path_1.default.resolve(libDir, 'dom2', 'app', '@vitejs', 'plugin-vue'));
+        module_alias_1.default.addAlias('@dcloudio/compiler-vapor-dom2', path_1.default.resolve(libDir, 'dom2', 'app', '@vue', 'compiler-vapor-dom2'));
     }
     else {
         module_alias_1.default.addAliases({

package/dist/hbx/index.d.ts

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

package/dist/hbx/index.js

@@ -17,13 +17,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isEnableConsole = exports.uniHBuilderXConsolePlugin = exports.formatInstallHBuilderXPluginTips = exports.installHBuilderXPlugin = exports.initModuleAlias = exports.formatAtFilename = void 0;
+exports.isEnableConsole = exports.uniHBuilderXConsolePlugin = exports.formatInstallHBuilderXPluginTips = exports.installHBuilderXPlugin = exports.initModuleAlias = exports.createErrorWithBlockFlag = exports.formatAtFilename = void 0;
 const path_1 = __importDefault(require("path"));
 const utils_1 = require("../utils");
 const console_1 = require("../vite/plugins/console");
 const workers_1 = require("../workers");
 var log_1 = require("./log");
 Object.defineProperty(exports, "formatAtFilename", { enumerable: true, get: function () { return log_1.formatAtFilename; } });
+Object.defineProperty(exports, "createErrorWithBlockFlag", { enumerable: true, get: function () { return log_1.createErrorWithBlockFlag; } });
 __exportStar(require("./env"), exports);
 var alias_1 = require("./alias");
 Object.defineProperty(exports, "initModuleAlias", { enumerable: true, get: function () { return alias_1.initModuleAlias; } });
@@ -54,7 +55,8 @@ function uniHBuilderXConsolePlugin(method = '__f__') {
 }
 exports.uniHBuilderXConsolePlugin = uniHBuilderXConsolePlugin;
 function isEnableConsole() {
-    return !!(process.env.NODE_ENV === 'development' &&
+    return !!((process.env.NODE_ENV === 'development' ||
+        process.env.NODE_ENV === 'test') &&
         process.env.UNI_SOCKET_HOSTS &&
         process.env.UNI_SOCKET_PORT &&
         process.env.UNI_SOCKET_ID);

package/dist/hbx/log.d.ts

@@ -6,3 +6,8 @@ export declare const removeInfoFormatter: Formatter;
 export declare const removeWarnFormatter: Formatter;
 export declare const removeDuplicatePluginFormatter: Formatter;
 export declare const errorFormatter: Formatter<LogErrorOptions>;
+interface ErrorWithBlockFlag extends Error {
+    __errorBlocked: true;
+}
+export declare function createErrorWithBlockFlag(msg: string): ErrorWithBlockFlag;
+export {};

package/dist/hbx/log.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.errorFormatter = exports.removeDuplicatePluginFormatter = exports.removeWarnFormatter = exports.removeInfoFormatter = exports.h5ServeFormatter = exports.formatAtFilename = void 0;
+exports.createErrorWithBlockFlag = exports.errorFormatter = exports.removeDuplicatePluginFormatter = exports.removeWarnFormatter = exports.removeInfoFormatter = exports.h5ServeFormatter = exports.formatAtFilename = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const picocolors_1 = __importDefault(require("picocolors"));
@@ -125,7 +125,15 @@ exports.errorFormatter = {
         return buildErrorMessage(opts.error, [], false);
     },
 };
+function createErrorWithBlockFlag(msg) {
+    const error = new Error(msg);
+    error.__errorBlocked = true;
+    return error;
+}
+exports.createErrorWithBlockFlag = createErrorWithBlockFlag;
+let shouldAddErrorBlock = null;
 const VITE_ROLLUP_FAILED_TO_RESOLVE_IMPORT_RE = /\[vite\]: Rollup failed to resolve import "([^"]+)" from "([^"]+)"/;
+const CANNOT_FIND_MODULE_RE = /Cannot find module '([^']+)' from '([^']+)'/;
 function buildErrorMessage(err, args = [], includeStack = true) {
     if (err.customPrint) {
         err.customPrint();
@@ -136,6 +144,16 @@ function buildErrorMessage(err, args = [], includeStack = true) {
         err.message = `Could not resolve "${importPath}" from "${fromPath}"`;
         err.id = fromPath;
     }
+    if (CANNOT_FIND_MODULE_RE.test(err.message)) {
+        const [, modulePath, fromPath] = err.message.match(CANNOT_FIND_MODULE_RE) || [];
+        // 清理模块路径和来源路径，移除查询参数等
+        const cleanModulePath = modulePath.split('?')[0];
+        const cleanFromPath = fromPath.split('?')[0];
+        const relativeFromPath = toRelativePath(cleanFromPath);
+        // 构建更友好的错误消息
+        err.id = cleanFromPath;
+        err.message = `Cannot find module "${cleanModulePath}" from "${relativeFromPath}"`;
+    }
     // 移除 from 后面的内容
     // 主要是处理：Could not resolve "./static/logo1.png" from "../../../../../../Users/xxx/HBuilderProjects/test-x/pages/index/index.uvue?vue&type=script&lang.uts"
     if (err.id && err.message.startsWith('Could not resolve ')) {
@@ -203,6 +221,19 @@ function buildErrorMessage(err, args = [], includeStack = true) {
     if (includeStack && err.stack) {
         args.push(pad(cleanStack(err.stack)));
     }
+    if (shouldAddErrorBlock === null) {
+        shouldAddErrorBlock = // 目前仅限 x 的 app 平台
+            process.env.UNI_APP_X === 'true' &&
+                (process.env.UNI_UTS_PLATFORM === 'app-android' ||
+                    process.env.UNI_UTS_PLATFORM === 'app-ios' ||
+                    process.env.UNI_UTS_PLATFORM === 'app-harmony');
+    }
+    if (shouldAddErrorBlock) {
+        if (!err.__errorBlocked) {
+            args[0] = constants_1.SPECIAL_CHARS.ERROR_BLOCK + args[0];
+            args[args.length - 1] = args[args.length - 1] + constants_1.SPECIAL_CHARS.ERROR_BLOCK;
+        }
+    }
     return args.join('\n');
 }
 function cleanStack(stack) {
@@ -216,3 +247,15 @@ function pad(source, n = 2) {
     const lines = source.split(splitRE);
     return lines.map((l) => ` `.repeat(n) + l).join(`\n`);
 }
+function toRelativePath(filePath) {
+    if (!filePath || !process.env.UNI_INPUT_DIR) {
+        return filePath;
+    }
+    try {
+        return path_1.default.relative(process.env.UNI_INPUT_DIR, filePath);
+    }
+    catch (e) {
+        // 转换失败时返回原路径
+        return filePath;
+    }
+}

package/dist/i18n.js

@@ -18,6 +18,10 @@ function initI18nOptions(platform, inputDir, warning = false, withMessages = tru
     }
     const manifestJson = (0, json_1.parseManifestJsonOnce)(inputDir);
     let fallbackLocale = manifestJson.fallbackLocale || 'en';
+    const IS_APP_X = process.env.UNI_APP_X === 'true';
+    if (IS_APP_X) {
+        fallbackLocale = manifestJson.locale || fallbackLocale;
+    }
     const locale = resolveI18nLocale(platform, Object.keys(locales), fallbackLocale);
     if (warning) {
         if (!fallbackLocale) {

package/dist/index.d.ts

@@ -7,6 +7,7 @@ export * from './ssr';
 export * from './vue';
 export * from './uts';
 export * from './logs';
+export * from './dom2';
 export * from './i18n';
 export * from './deps';
 export * from './json';

package/dist/index.js

@@ -24,6 +24,7 @@ __exportStar(require("./ssr"), exports);
 __exportStar(require("./vue"), exports);
 __exportStar(require("./uts"), exports);
 __exportStar(require("./logs"), exports);
+__exportStar(require("./dom2"), exports);
 __exportStar(require("./i18n"), exports);
 __exportStar(require("./deps"), exports);
 __exportStar(require("./json"), exports);

package/dist/json/app/manifest/index.d.ts

@@ -3,3 +3,4 @@ export * from './env';
 export { APP_CONFUSION_FILENAME, isConfusionFile, hasConfusionFile, } from './confusion';
 export { getNVueCompiler, getNVueStyleCompiler, getNVueFlexDirection, } from './nvue';
 export { parseArguments } from './arguments';
+export { initI18n } from './i18n';

package/dist/json/app/manifest/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.parseArguments = exports.getNVueFlexDirection = exports.getNVueStyleCompiler = exports.getNVueCompiler = exports.hasConfusionFile = exports.isConfusionFile = exports.APP_CONFUSION_FILENAME = exports.normalizeAppManifestJson = void 0;
+exports.initI18n = exports.parseArguments = exports.getNVueFlexDirection = exports.getNVueStyleCompiler = exports.getNVueCompiler = exports.hasConfusionFile = exports.isConfusionFile = exports.APP_CONFUSION_FILENAME = exports.normalizeAppManifestJson = void 0;
 const shared_1 = require("@vue/shared");
 const merge_1 = require("./merge");
 const defaultManifestJson_1 = require("./defaultManifestJson");
@@ -63,3 +63,5 @@ Object.defineProperty(exports, "getNVueStyleCompiler", { enumerable: true, get:
 Object.defineProperty(exports, "getNVueFlexDirection", { enumerable: true, get: function () { return nvue_2.getNVueFlexDirection; } });
 var arguments_2 = require("./arguments");
 Object.defineProperty(exports, "parseArguments", { enumerable: true, get: function () { return arguments_2.parseArguments; } });
+var i18n_2 = require("./i18n");
+Object.defineProperty(exports, "initI18n", { enumerable: true, get: function () { return i18n_2.initI18n; } });

package/dist/json/mp/pages.js

@@ -14,12 +14,7 @@ const utils_2 = require("../../utils");
 const project_1 = require("./project");
 const manifest_1 = require("../manifest");
 const theme_1 = require("../theme");
-const utils_3 = require("../utils");
 function parseMiniProgramPagesJson(jsonStr, platform, options = { subpackages: false }) {
-    if (process.env.UNI_APP_X === 'true') {
-        // 目前仅对x开放
-        (0, utils_3.checkPagesJson)(jsonStr, process.env.UNI_INPUT_DIR);
-    }
     return parsePagesJson(jsonStr, platform, options);
 }
 exports.parseMiniProgramPagesJson = parseMiniProgramPagesJson;

package/dist/json/pages.d.ts

@@ -1,8 +1,8 @@
 export declare const pagesCacheSet: Set<string>;
-export declare function isUniPageFile(file: string, inputDir?: string): boolean;
+export declare function isUniPageFile(file: string, inputDir?: string): any;
 export declare function isUniPageSetupAndUts(file: string): boolean;
 export declare function isUniPageSetupAndTs(file: string): boolean;
-export declare function isUniPageSfcFile(file: string, inputDir?: string): boolean;
+export declare function isUniPageSfcFile(file: string, inputDir?: string): any;
 /**
  * 小程序平台慎用，因为该解析不支持 subpackages
  * @param inputDir

package/dist/json/pages.js

@@ -18,7 +18,10 @@ const manifest_1 = require("./manifest");
 exports.pagesCacheSet = new Set();
 function isUniPageFile(file, inputDir = process.env.UNI_INPUT_DIR) {
     if (inputDir && path_1.default.isAbsolute(file)) {
-        file = (0, utils_1.normalizePath)(path_1.default.relative(inputDir, file));
+        file = (0, utils_1.normalizePath)(path_1.default.relative(inputDir, file.split('?')[0]));
+    }
+    if (process.env.UNI_COMPILE_EXT_API_PAGE_PATHS) {
+        return JSON.parse(process.env.UNI_COMPILE_EXT_API_PAGE_PATHS).includes((0, utils_1.removeExt)(file));
     }
     return exports.pagesCacheSet.has((0, utils_1.removeExt)(file));
 }

package/dist/json/uni-x/index.d.ts

@@ -7,5 +7,5 @@ export declare function normalizeUniAppXAppPagesJson(jsonStr: string): UniApp.Pa
  * @returns
  */
 export declare function normalizeUniAppXAppConfig(pagesJson: UniApp.PagesJson, manifestJson: Record<string, any>): string;
-export declare function isUniXPageFile(source: string, importer: string, inputDir?: string): boolean;
+export declare function isUniXPageFile(source: string, importer: string, inputDir?: string): any;
 export declare function getUniXPagePaths(): any;

package/dist/json/utils.js

@@ -11,6 +11,7 @@ const jsonc_parser_1 = require("jsonc-parser");
 const utils_1 = require("../utils");
 const utils_2 = require("../vite/plugins/vitejs/utils");
 const messages_1 = require("../messages");
+const logs_1 = require("../logs");
 function checkPagesJson(jsonStr, inputDir) {
     if (!inputDir) {
         return false;
@@ -36,41 +37,50 @@ function checkPagesJson(jsonStr, inputDir) {
         return false;
     }
     const pagePathNodes = walkNodes(findRootNode(root, ['pages']));
+    for (const node of pagePathNodes) {
+        const pagePath = node.value ?? '';
+        if (pagePath.startsWith('/')) {
+            throwCompilerError(jsonStr, node, messages_1.M['pages.json.page.slash'].replace('{pagePath}', pagePath));
+        }
+    }
     findRootNode(root, ['subPackages', 'subpackages']).forEach((node) => {
-        const subPackageRoot = findSubPackageRoot(node);
-        if (subPackageRoot) {
+        const subPackageRootNode = findSubPackageRoot(node);
+        if (subPackageRootNode) {
+            const subPackageRoot = subPackageRootNode.value ?? '';
+            if (subPackageRoot.startsWith('/')) {
+                throwCompilerError(jsonStr, subPackageRootNode, messages_1.M['pages.json.page.slash'].replace('{pagePath}', subPackageRoot));
+            }
             findRootNode(node, ['pages']).forEach((subNode) => {
                 walkNodes(subNode.children ?? []).forEach((node) => {
+                    const pagePath = node.value ?? '';
+                    if (pagePath.startsWith('/')) {
+                        throwCompilerError(jsonStr, node, messages_1.M['pages.json.page.slash'].replace('{pagePath}', pagePath));
+                    }
                     pagePathNodes.push({
                         ...node,
-                        value: (0, utils_1.normalizePath)(path_1.default.join(subPackageRoot, node.value)),
+                        value: (0, utils_1.normalizePath)(path_1.default.join(subPackageRoot, pagePath)),
                     });
                 });
             });
         }
     });
-    if (pagePathNodes.length) {
-        for (const node of pagePathNodes) {
-            const pagePath = node.value ?? '';
-            if (pageExistsWithCaseSync(path_1.default.join(inputDir, pagePath))) {
-                continue;
-            }
-            const { line, column } = (0, utils_2.offsetToLineColumn)(jsonStr, node.offset);
-            throw {
-                name: 'CompilerError',
-                code: 'CompilerError',
-                message: messages_1.M['pages.json.page.notfound'].replace('{pagePath}', pagePath),
-                loc: {
-                    start: { line, column },
-                },
-                offsetStart: node.offset,
-                offsetEnd: node.offset + node.length,
-            };
+    for (const node of pagePathNodes) {
+        const pagePath = node.value ?? '';
+        if (!pageExistsWithCaseSync(path_1.default.join(inputDir, pagePath))) {
+            throwCompilerError(jsonStr, node, messages_1.M['pages.json.page.notfound'].replace('{pagePath}', pagePath));
         }
     }
     return true;
 }
 exports.checkPagesJson = checkPagesJson;
+function throwCompilerError(jsonStr, node, message) {
+    const error = new Error(message);
+    error.loc = (0, utils_2.offsetToStartAndEnd)(jsonStr, node.offset, node.offset + node.length);
+    error.customPrint = () => {
+        (0, logs_1.onCompileLog)('error', error, jsonStr, 'pages.json');
+    };
+    throw error;
+}
 function pageExistsWithCaseSync(pagePath) {
     try {
         const files = fs_1.default.readdirSync(path_1.default.dirname(pagePath));
@@ -88,9 +98,8 @@ function findSubPackageRoot(node) {
         child.children &&
         child.children.find((child) => child.type === 'string' && child.value === 'root'));
     if (child && child.children?.length === 2) {
-        return child.children[1].value;
+        return child.children[1];
     }
-    return '';
 }
 function findRootNode(node, property) {
     const { type, children } = node;

package/dist/logs/console.js

@@ -22,7 +22,7 @@ function rewriteConsoleExpr(method, id, filename, code, sourceMap = false) {
             map: sourceMap ? s.generateMap({ hires: true }) : { mappings: '' },
         };
     }
-    return { code, map: { mappings: '' } };
+    return { code, map: null };
 }
 exports.rewriteConsoleExpr = rewriteConsoleExpr;
 function restoreConsoleExpr(code) {

package/dist/logs/index.d.ts

@@ -1,4 +1,15 @@
+import type { SourceLocation } from '@vue/compiler-core';
 export { formatErrMsg, formatInfoMsg, formatWarnMsg } from './format';
 type LogType = 'error' | 'warn' | 'info' | 'log';
 export declare function resetOutput(type: LogType): void;
 export declare function output(type: LogType, msg: string): void;
+export interface CompileLogError extends Error {
+    loc?: Omit<SourceLocation, 'source'>;
+    customPrint?: () => void;
+}
+export interface CompileLogOptions {
+    plugin?: string;
+    line?: number;
+    column?: number;
+}
+export declare function onCompileLog(type: 'warn' | 'error', error: CompileLogError, code: string, relativeFileName: string, options?: CompileLogOptions): void;