@dcloudio/uni-cli-shared 3.0.0-alpha-5020720260921001 → 3.0.0-alpha-5030120260930001

package/dist/dom2/script.js

@@ -4,16 +4,23 @@ exports.uniVaporScriptPlugin = void 0;
 const uts_1 = require("../uts");
 const extApi_1 = require("../uts/extApi");
 const utils_1 = require("../utils");
+const scriptMacros_1 = require("../uts/scriptMacros");
 const sharedData_1 = require("./sharedData");
 function uniVaporScriptPlugin(options = {}) {
     const { uasm, ...sharedData } = options;
     const { D2SP } = (0, utils_1.requireUniHelpers)();
     const nodeEnv = process.env.UNI_NODE_ENV || process.env.NODE_ENV;
-    const extApi = (0, utils_1.isNormalCompileTarget)() && nodeEnv !== 'development'
+    /**
+     * 鸿蒙平台push、一键登录必须获取摇树结果，因此在非开发模式下或鸿蒙平台必须执行摇树逻辑
+     */
+    const extApi = (0, utils_1.isNormalCompileTarget)() &&
+        (nodeEnv !== 'development' ||
+            process.env.UNI_UTS_PLATFORM === 'app-harmony')
         ? (0, extApi_1.initUts2jsExtApiOptions)()
         : undefined;
     return D2SP({
         typescript: (0, uts_1.resolveUTSCompiler)().getTypeScript(),
+        createUniAppXScriptMacrosTransformer: scriptMacros_1.createUniAppXScriptMacrosTransformer,
         extApi,
         uasm,
         sharedData: {

package/dist/dom2/sharedData.d.ts

@@ -3,4 +3,5 @@ export declare function uniSharedDataPlugin(): Plugin;
 export declare function initSourceFileCallback(): ((sourceFile: import('typescript').SourceFile) => void) | undefined;
 export declare function initUts2jsSharedDataOptions(): {
     resolveFieldMeta: any;
+    createSharedDataTransformer: any;
 } | undefined;

package/dist/dom2/sharedData.js

@@ -45,9 +45,14 @@ function initSourceFileCallback() {
 exports.initSourceFileCallback = initSourceFileCallback;
 function initUts2jsSharedDataOptions() {
     if (process.env.UNI_APP_X_DOM2 === 'true') {
+        const uniHelpers = (0, utils_1.requireUniHelpers)();
+        if (typeof uniHelpers.CSDT !== 'function') {
+            throw new Error('DOM2 requires the SharedData transformer (CSDT)');
+        }
         return {
             resolveFieldMeta: require('@dcloudio/compiler-vapor-dom2')
                 .resolveSharedDataFieldMeta,
+            createSharedDataTransformer: uniHelpers.CSDT,
         };
     }
 }

package/dist/hbx/alias.d.ts

@@ -1,4 +1,7 @@
 import type { Formatter } from '../logs/format';
+export declare function resolveWebVaporPackage(packageName: string): string;
+export declare function initWebVaporAliases(): void;
+export declare function normalizeUniAppXVaporEnv(): void;
 export declare function initModuleAlias(): void;
 export declare function installHBuilderXPlugin(plugin: string): void;
 export declare const moduleAliasFormatter: Formatter;

package/dist/hbx/alias.js

@@ -3,22 +3,166 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatInstallHBuilderXPluginTips = exports.moduleAliasFormatter = exports.installHBuilderXPlugin = exports.initModuleAlias = void 0;
+exports.formatInstallHBuilderXPluginTips = exports.moduleAliasFormatter = exports.installHBuilderXPlugin = exports.initModuleAlias = exports.normalizeUniAppXVaporEnv = exports.initWebVaporAliases = exports.resolveWebVaporPackage = 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 pluginPaths_1 = require("./pluginPaths");
 const hbxPlugins = {
-    typescript: 'compile-typescript/node_modules/typescript',
-    less: 'compile-less/node_modules/less',
-    sass: 'compile-dart-sass/node_modules/sass',
-    stylus: 'compile-stylus/node_modules/stylus',
-    pug: 'compile-pug-cli/node_modules/pug',
+    typescript: ['compile-typescript', 'node_modules/typescript'],
+    less: ['compile-less', 'node_modules/less'],
+    sass: ['compile-dart-sass', 'node_modules/sass'],
+    stylus: ['compile-stylus', 'node_modules/stylus'],
+    pug: ['compile-pug-cli', 'node_modules/pug'],
 };
+const commonVuePackages = [
+    '@vue/compiler-core',
+    '@vue/compiler-dom',
+    '@vue/compiler-sfc',
+    '@vue/shared',
+];
+const vaporVuePackages = [...commonVuePackages, '@vue/compiler-vapor'];
+const webVaporVuePackages = [
+    ...commonVuePackages,
+    '@vue/compiler-ssr',
+    '@vue/compiler-vapor',
+    '@vue/server-renderer',
+];
+function addVaporVuePackageAliases(vueDir, packages) {
+    const aliases = {};
+    packages.forEach((pkg) => {
+        aliases[pkg] = path_1.default.resolve(vueDir, pkg.slice(pkg.lastIndexOf('/') + 1));
+    });
+    module_alias_1.default.addAliases(aliases);
+}
+function resolveWebVaporPackage(packageName) {
+    return path_1.default.resolve(__dirname, '../../lib/dom2/web', packageName);
+}
+exports.resolveWebVaporPackage = resolveWebVaporPackage;
+function resolveWebVaporPluginVue() {
+    return resolveWebVaporPackage('@vitejs/plugin-vue/dist/index.cjs');
+}
+function initWebVaporAliases() {
+    const webDir = resolveWebVaporPackage('');
+    const webVueDir = path_1.default.join(webDir, '@vue');
+    addVaporVuePackageAliases(webVueDir, webVaporVuePackages);
+    module_alias_1.default.addAliases({
+        '@vitejs/plugin-vue': resolveWebVaporPluginVue(),
+        '@dcloudio/compiler-vapor-web': path_1.default.join(webVueDir, 'compiler-vapor-web'),
+        'vue/compiler-sfc': path_1.default.join(webVueDir, 'compiler-sfc'),
+        'vue/server-renderer': path_1.default.join(webVueDir, 'server-renderer'),
+    });
+}
+exports.initWebVaporAliases = initWebVaporAliases;
+function addAppVaporAliases(libDir) {
+    const appVueDir = path_1.default.resolve(libDir, 'dom2', 'app', '@vue');
+    addVaporVuePackageAliases(appVueDir, vaporVuePackages);
+    module_alias_1.default.addAliases({
+        '@vitejs/plugin-vue': path_1.default.resolve(libDir, 'dom2', 'app', '@vitejs', 'plugin-vue'),
+        '@dcloudio/compiler-vapor-dom2': path_1.default.join(appVueDir, 'compiler-vapor-dom2'),
+    });
+}
+function addNonVaporVuePackageAliases(libDir, compilerSfcPath, serverRendererPath) {
+    module_alias_1.default.addAliases({
+        '@vue/shared': require.resolve('@vue/shared'),
+        '@vue/shared/dist/shared.esm-bundler.js': require.resolve('@vue/shared/dist/shared.esm-bundler.js'),
+        '@vue/compiler-core': path_1.default.resolve(libDir, '@vue/compiler-core'),
+        '@vue/compiler-dom': require.resolve('@vue/compiler-dom'),
+        '@vue/compiler-sfc': compilerSfcPath,
+        '@vue/server-renderer': serverRendererPath,
+        'vue/compiler-sfc': compilerSfcPath,
+        'vue/server-renderer': serverRendererPath,
+    });
+}
 function isWebOrMpPlatform(platform) {
     return platform === 'h5' || platform === 'web' || platform?.startsWith('mp-');
 }
+function isWebPlatform(platform) {
+    return platform === 'h5' || platform === 'web';
+}
+function hasWebVaporConfig() {
+    // 框架自身生成 dist-x-vapor 时没有用户项目目录，通过内部构建标记绕过配置文件检查。
+    if (process.env.UNI_APP_X_VAPOR_BUILD === 'true') {
+        return true;
+    }
+    // HBuilderX/CLI 会在加载框架前传入项目根目录。
+    const inputDir = process.env.UNI_INPUT_DIR;
+    return !!inputDir && fs_1.default.existsSync(path_1.default.resolve(inputDir, '.vapor'));
+}
+function resolveUniCliPlatform() {
+    const entry = process.argv[1];
+    if (!entry || !['uni', 'uni.js'].includes(path_1.default.basename(entry))) {
+        return;
+    }
+    const args = process.argv.slice(2);
+    for (let index = 0; index < args.length; index++) {
+        const arg = args[index];
+        if (arg === '--') {
+            break;
+        }
+        if (arg === '-p' || arg === '--platform') {
+            const platform = args[index + 1];
+            if (platform && !platform.startsWith('-')) {
+                return platform;
+            }
+        }
+        else if (arg.startsWith('-p=') || arg.startsWith('--platform=')) {
+            const platform = arg.slice(arg.indexOf('=') + 1);
+            if (platform) {
+                return platform;
+            }
+        }
+    }
+    return 'h5';
+}
+function normalizeUniAppXVaporEnv() {
+    // App 使用 UNI_APP_X_VAPOR 作为对外开关；Web 仅在项目根目录存在 .vapor 时启用。
+    const utsPlatform = process.env.UNI_UTS_PLATFORM;
+    const uniPlatform = process.env.UNI_PLATFORM;
+    const cliPlatform = resolveUniCliPlatform();
+    const platform = cliPlatform || utsPlatform || uniPlatform;
+    const webVaporConfigured = isWebPlatform(platform) && hasWebVaporConfig();
+    // Web 以项目根目录的 .vapor 作为显式开关。HBuilderX dev 不会预先注入
+    // UNI_APP_X，因此这里需要同步补齐 uni-app x 环境标记。
+    const isWebVapor = webVaporConfigured;
+    if (isWebVapor) {
+        process.env.UNI_APP_X = 'true';
+    }
+    if (process.env.UNI_APP_X_VAPOR === 'true' || isWebVapor) {
+        process.env.UNI_APP_X_DOM2 = 'true';
+    }
+    else if (process.env.UNI_APP_X_VAPOR === 'false') {
+        delete process.env.UNI_APP_X_DOM2;
+    }
+    // alias 初始化早于 CLI 环境初始化，优先读取 CLI 参数，否则使用预置的平台环境变量。
+    // 小程序仍关闭 Vapor，Web 平台使用独立的 Web Vapor 产物。
+    const shouldDisableVapor = cliPlatform
+        ? isWebOrMpPlatform(cliPlatform) && !isWebVapor
+        : (isWebOrMpPlatform(utsPlatform) || isWebOrMpPlatform(uniPlatform)) &&
+            !isWebVapor;
+    if (shouldDisableVapor) {
+        delete process.env.UNI_APP_X_DOM2;
+    }
+    // 将平台归一化后的实际状态同步回对外开关。
+    if (isWebVapor) {
+        process.env.UNI_APP_X_VAPOR = 'true';
+        process.env.UNI_APP_X_DOM2 = 'true';
+    }
+    if (process.env.UNI_APP_X_DOM2 === 'true') {
+        process.env.UNI_APP_X_VAPOR = 'true';
+    }
+    else {
+        delete process.env.UNI_APP_X_DOM2;
+        delete process.env.UNI_APP_X_VAPOR;
+        delete process.env.UNI_APP_X_DOM2_DYNAMIC;
+        delete process.env.UNI_APP_X_VAPOR_RENDER_TARGET;
+    }
+}
+exports.normalizeUniAppXVaporEnv = normalizeUniAppXVaporEnv;
 function initModuleAlias() {
+    normalizeUniAppXVaporEnv();
     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');
@@ -34,15 +178,14 @@ function initModuleAlias() {
         process.env.UNI_APP_X_DOM2_CPP_DIR =
             process.env.UNI_APP_HARMONY_DOM2_CPP_DIR;
     }
-    // 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;
+    const platform = resolveUniCliPlatform() ||
+        process.env.UNI_UTS_PLATFORM ||
+        process.env.UNI_PLATFORM;
+    const webVapor = process.env.UNI_APP_X_VAPOR === 'true' && isWebPlatform(platform);
+    if (webVapor) {
+        initWebVaporAliases();
     }
-    if (process.env.UNI_APP_X_DOM2 === 'true') {
+    else if (process.env.UNI_APP_X_DOM2 === 'true') {
         if (process.env.UNI_OUTPUT_DIR &&
             (process.env.UNI_PLATFORM === 'app' ||
                 process.env.UNI_PLATFORM === 'app-plus' ||
@@ -88,31 +231,11 @@ function initModuleAlias() {
             }
         }
     }
-    if (process.env.UNI_APP_X_DOM2 === 'true') {
-        const vuePkgs = [
-            '@vue/compiler-core',
-            '@vue/compiler-dom',
-            '@vue/compiler-sfc',
-            '@vue/compiler-vapor',
-            '@vue/shared',
-        ];
-        vuePkgs.forEach((pkg) => {
-            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, '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'));
+    if (process.env.UNI_APP_X_DOM2 === 'true' && !webVapor) {
+        addAppVaporAliases(libDir);
     }
-    else {
-        module_alias_1.default.addAliases({
-            '@vue/shared': require.resolve('@vue/shared'),
-            '@vue/shared/dist/shared.esm-bundler.js': require.resolve('@vue/shared/dist/shared.esm-bundler.js'),
-            '@vue/compiler-core': path_1.default.resolve(libDir, '@vue/compiler-core'),
-            '@vue/compiler-dom': require.resolve('@vue/compiler-dom'),
-            '@vue/compiler-sfc': compilerSfcPath,
-            '@vue/server-renderer': serverRendererPath,
-            'vue/compiler-sfc': compilerSfcPath,
-            'vue/server-renderer': serverRendererPath,
-        });
+    else if (!webVapor) {
+        addNonVaporVuePackageAliases(libDir, compilerSfcPath, serverRendererPath);
     }
     if (process.env.VITEST) {
         module_alias_1.default.addAliases({
@@ -123,11 +246,15 @@ function initModuleAlias() {
     if ((0, utils_1.isInHBuilderX)()) {
         // 又是为了复用 HBuilderX 的插件逻辑，硬编码映射
         Object.keys(hbxPlugins).forEach((lang) => {
-            const realPath = path_1.default.resolve(process.env.UNI_HBUILDERX_PLUGINS, hbxPlugins[lang]);
+            const [pluginName, subpath] = hbxPlugins[lang];
+            const realPath = (0, pluginPaths_1.resolveHBuilderXPluginPath)(pluginName, subpath);
             module_alias_1.default.addAlias(lang, 
             // @ts-expect-error
             () => {
                 try {
+                    if (!realPath) {
+                        throw new Error(`HBuilder plugin "${pluginName}" is not found`);
+                    }
                     require.resolve(realPath);
                 }
                 catch (e) {
@@ -139,8 +266,7 @@ function initModuleAlias() {
             });
         });
         // web 平台用了 vite 内置 css 插件，该插件会加载预编译器如scss、less等，需要转向到 HBuilderX 的对应编译器插件
-        if (process.env.UNI_PLATFORM === 'h5' ||
-            process.env.UNI_PLATFORM === 'web') {
+        if (isWebPlatform(process.env.UNI_PLATFORM)) {
             // https://github.com/vitejs/vite/blob/main/packages/vite/src/node/packages.ts#L92
             // 拦截预编译器
             const join = path_1.default.join;
@@ -154,7 +280,9 @@ function initModuleAlias() {
                     if (nodeModules === 'node_modules' &&
                         packageJson === 'package.json' &&
                         hbxPlugins[pkgName]) {
-                        return path_1.default.resolve(process.env.UNI_HBUILDERX_PLUGINS, hbxPlugins[pkgName], packageJson);
+                        const [pluginName, subpath] = hbxPlugins[pkgName];
+                        return ((0, pluginPaths_1.resolveHBuilderXPluginPath)(pluginName, subpath, packageJson) ||
+                            join(...paths));
                     }
                 }
                 return join(...paths);

package/dist/hbx/env.js

@@ -15,7 +15,7 @@ const utils_2 = require("./utils");
 var utils_3 = require("./utils");
 Object.defineProperty(exports, "isInHBuilderX", { enumerable: true, get: function () { return utils_3.isInHBuilderX; } });
 exports.runByHBuilderX = (0, uni_shared_1.once)(() => {
-    return (!!process.env.UNI_HBUILDERX_PLUGINS &&
+    return ((!!process.env.HX_PLUGIN_PATHS || !!process.env.UNI_HBUILDERX_PLUGINS) &&
         (!!process.env.RUN_BY_HBUILDERX || !!process.env.HX_Version));
 });
 /**

package/dist/hbx/index.d.ts

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

package/dist/hbx/index.js

@@ -17,7 +17,7 @@ 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.createErrorWithBlockFlag = exports.formatAtFilename = void 0;
+exports.isEnableConsole = exports.uniHBuilderXConsolePlugin = exports.formatInstallHBuilderXPluginTips = exports.installHBuilderXPlugin = exports.normalizeUniAppXVaporEnv = exports.initModuleAlias = exports.resolveWebVaporPackage = exports.initWebVaporAliases = exports.resolveHBuilderXPluginPath = exports.createErrorWithBlockFlag = exports.formatAtFilename = void 0;
 const path_1 = __importDefault(require("path"));
 const utils_1 = require("../utils");
 const console_1 = require("../vite/plugins/console");
@@ -26,8 +26,13 @@ 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 pluginPaths_1 = require("./pluginPaths");
+Object.defineProperty(exports, "resolveHBuilderXPluginPath", { enumerable: true, get: function () { return pluginPaths_1.resolveHBuilderXPluginPath; } });
 var alias_1 = require("./alias");
+Object.defineProperty(exports, "initWebVaporAliases", { enumerable: true, get: function () { return alias_1.initWebVaporAliases; } });
+Object.defineProperty(exports, "resolveWebVaporPackage", { enumerable: true, get: function () { return alias_1.resolveWebVaporPackage; } });
 Object.defineProperty(exports, "initModuleAlias", { enumerable: true, get: function () { return alias_1.initModuleAlias; } });
+Object.defineProperty(exports, "normalizeUniAppXVaporEnv", { enumerable: true, get: function () { return alias_1.normalizeUniAppXVaporEnv; } });
 Object.defineProperty(exports, "installHBuilderXPlugin", { enumerable: true, get: function () { return alias_1.installHBuilderXPlugin; } });
 Object.defineProperty(exports, "formatInstallHBuilderXPluginTips", { enumerable: true, get: function () { return alias_1.formatInstallHBuilderXPluginTips; } });
 function uniHBuilderXConsolePlugin(method = '__f__') {

package/dist/hbx/pluginPaths.d.ts

@@ -0,0 +1 @@
+export declare function resolveHBuilderXPluginPath(pluginName: string, ...subpaths: string[]): string | undefined;

package/dist/hbx/pluginPaths.js

@@ -0,0 +1,31 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveHBuilderXPluginPath = void 0;
+const path_1 = __importDefault(require("path"));
+const uni_shared_1 = require("@dcloudio/uni-shared");
+const getHBuilderXPluginPaths = (0, uni_shared_1.once)(() => {
+    const raw = process.env.HX_PLUGIN_PATHS;
+    if (!raw) {
+        return;
+    }
+    const pluginPaths = JSON.parse(raw);
+    if (!pluginPaths ||
+        typeof pluginPaths !== 'object' ||
+        Array.isArray(pluginPaths)) {
+        throw new Error('Invalid HX_PLUGIN_PATHS');
+    }
+    return pluginPaths;
+});
+function resolveHBuilderXPluginPath(pluginName, ...subpaths) {
+    const pluginPaths = getHBuilderXPluginPaths();
+    const pluginPath = pluginPaths
+        ? pluginPaths[pluginName]
+        : process.env.UNI_HBUILDERX_PLUGINS
+            ? path_1.default.resolve(process.env.UNI_HBUILDERX_PLUGINS, pluginName)
+            : undefined;
+    return pluginPath ? path_1.default.resolve(pluginPath, ...subpaths) : undefined;
+}
+exports.resolveHBuilderXPluginPath = resolveHBuilderXPluginPath;

package/dist/hbx/utils.js

@@ -9,7 +9,10 @@ const uni_shared_1 = require("@dcloudio/uni-shared");
 exports.isInHBuilderX = (0, uni_shared_1.once)(() => {
     // 自动化测试传入了 HX_APP_ROOT(其实就是UNI_HBUILDERX_PLUGINS)
     if (process.env.HX_APP_ROOT) {
-        process.env.UNI_HBUILDERX_PLUGINS = process.env.HX_APP_ROOT + '/plugins';
+        process.env.UNI_HBUILDERX_PLUGINS = path_1.default.resolve(process.env.HX_APP_ROOT, 'plugins');
+        return true;
+    }
+    if (process.env.HX_PLUGIN_PATHS && process.env.UNI_HBUILDERX_PLUGINS) {
         return true;
     }
     try {
@@ -22,5 +25,8 @@ exports.isInHBuilderX = (0, uni_shared_1.once)(() => {
     catch (e) {
         // console.error(e)
     }
+    if (process.env.HX_PLUGIN_PATHS) {
+        return true;
+    }
     return false;
 });

package/dist/index.d.ts

@@ -7,6 +7,7 @@ export * from './ssr';
 export * from './vue';
 export * from './uts';
 export * from './uts/extApi';
+export * from './uts/scriptMacros';
 export * from './x';
 export * from './logs';
 export * from './dom2';

package/dist/index.js

@@ -24,6 +24,7 @@ __exportStar(require("./ssr"), exports);
 __exportStar(require("./vue"), exports);
 __exportStar(require("./uts"), exports);
 __exportStar(require("./uts/extApi"), exports);
+__exportStar(require("./uts/scriptMacros"), exports);
 __exportStar(require("./x"), exports);
 __exportStar(require("./logs"), exports);
 __exportStar(require("./dom2"), exports);

package/dist/json/manifest.d.ts

@@ -1,5 +1,8 @@
 export declare const parseManifestJson: (inputDir: string) => any;
 export declare const parseManifestJsonOnce: (inputDir: string) => any;
+export type UniAppXVaporScriptLang = 'js' | 'ts' | 'uts';
+export declare function resolveUniAppXVaporScriptLang(manifestJson: Record<string, any>): UniAppXVaporScriptLang;
+export declare function getUniAppXVaporScriptLang(inputDir?: string): UniAppXVaporScriptLang;
 export declare const parseRpx2UnitOnce: (inputDir: string, platform?: UniApp.PLATFORM) => any;
 export declare function getNativeTags(inputDir?: string, platform?: UniApp.PLATFORM): any;
 interface CompilerCompatConfig {

package/dist/json/manifest.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.validateThemeValue = exports.getPlatformManifestJsonOnce = exports.getPlatformManifestJson = exports.getDevServerOptions = exports.isEnableTreeShaking = exports.getRouterOptions = exports.isUniPushOffline = exports.hasPushModule = exports.isEnableSecureNetwork = exports.isEnableUniPushV2 = exports.isEnableUniPushV1 = exports.getUniStatistics = exports.normalizeNetworkTimeout = exports.parseCompatConfigOnce = exports.getNativeTags = exports.parseRpx2UnitOnce = exports.parseManifestJsonOnce = exports.parseManifestJson = void 0;
+exports.validateThemeValue = exports.getPlatformManifestJsonOnce = exports.getPlatformManifestJson = exports.getDevServerOptions = exports.isEnableTreeShaking = exports.getRouterOptions = exports.isUniPushOffline = exports.hasPushModule = exports.isEnableSecureNetwork = exports.isEnableUniPushV2 = exports.isEnableUniPushV1 = exports.getUniStatistics = exports.normalizeNetworkTimeout = exports.parseCompatConfigOnce = exports.getNativeTags = exports.parseRpx2UnitOnce = exports.getUniAppXVaporScriptLang = exports.resolveUniAppXVaporScriptLang = exports.parseManifestJsonOnce = exports.parseManifestJson = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const shared_1 = require("@vue/shared");
@@ -21,6 +21,18 @@ const parseManifestJson = (inputDir) => {
 };
 exports.parseManifestJson = parseManifestJson;
 exports.parseManifestJsonOnce = (0, uni_shared_1.once)(exports.parseManifestJson);
+function resolveUniAppXVaporScriptLang(manifestJson) {
+    const lang = manifestJson['uni-app-x']?.['vapor-default-script-lang'];
+    return lang === 'js' || lang === 'ts' || lang === 'uts' ? lang : 'ts';
+}
+exports.resolveUniAppXVaporScriptLang = resolveUniAppXVaporScriptLang;
+function getUniAppXVaporScriptLang(inputDir) {
+    if (!inputDir) {
+        return 'ts';
+    }
+    return resolveUniAppXVaporScriptLang((0, exports.parseManifestJsonOnce)(inputDir));
+}
+exports.getUniAppXVaporScriptLang = getUniAppXVaporScriptLang;
 exports.parseRpx2UnitOnce = (0, uni_shared_1.once)((inputDir, platform = 'h5') => {
     const rpx2unit = platform === 'h5' || platform === 'app' || platform === 'app-harmony'
         ? uni_shared_1.defaultRpx2Unit

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

@@ -8,6 +8,7 @@ export interface UniXPageOptions {
     androidOverscroll?: boolean;
     androidRefresherColor?: string;
     backgroundColor?: string;
+    backgroundTextStyle?: 'dark' | 'light';
 }
 export declare function normalizeUniAppXAppPagesJson(jsonStr: string): UniApp.PagesJson;
 export declare function parseUniXPageOptions(filename: string): UniXPageOptions | undefined;

package/dist/json/uni-x/index.js

@@ -97,6 +97,7 @@ function updateUniXPageOptions(pagesJson) {
 function normalizeRootPageOptions(pageStyle, globalStyle) {
     const androidRefresherColor = pageStyle?.androidRefresherColor ?? globalStyle.androidRefresherColor;
     const backgroundColor = pageStyle?.backgroundColor ?? globalStyle.backgroundColor;
+    const backgroundTextStyle = pageStyle?.backgroundTextStyle ?? globalStyle.backgroundTextStyle;
     return {
         disableScroll: pageStyle?.disableScroll === true || undefined,
         enablePullDownRefresh: (pageStyle && isEnablePullDownRefresh(pageStyle)) || undefined,
@@ -111,6 +112,9 @@ function normalizeRootPageOptions(pageStyle, globalStyle) {
         backgroundColor: backgroundColor?.startsWith('@')
             ? undefined
             : backgroundColor,
+        backgroundTextStyle: backgroundTextStyle?.startsWith('@')
+            ? undefined
+            : backgroundTextStyle,
     };
 }
 function initUniXPageOptions() {

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

@@ -10,6 +10,7 @@ interface AppXUniConfig {
     conditionUrl?: string;
     realEntryPagePath?: string;
     themeConfig?: unknown;
+    pageSelectorBackgroundColor?: unknown;
 }
 export declare function normalizeAppXUniConfig(pagesJson: UniApp.PagesJson, manifestJson: Record<string, any>): AppXUniConfig;
 export {};

package/dist/json/uni-x/uniConfig.js

@@ -21,6 +21,11 @@ function normalizeAppXUniConfig(pagesJson, manifestJson) {
     if (pagesJson.themeConfig) {
         config.themeConfig = pagesJson.themeConfig;
     }
+    const pageSelectorBackgroundColor = pagesJson
+        .pageSelectorBackgroundColor;
+    if (pageSelectorBackgroundColor) {
+        config.pageSelectorBackgroundColor = pageSelectorBackgroundColor;
+    }
     // TODO 待支持分包
     return config;
 }

package/dist/messages/en.d.ts

@@ -3,6 +3,7 @@ declare const _default: {
     readonly 'view.render.compiler.target': "Current view.render compile target: {target}";
     readonly 'view.render.compiler.target.bytecode': "bytecode";
     readonly 'view.render.compiler.target.nativecode': "nativecode";
+    readonly 'vapor.default.script.lang': "Default script lang for current uvue/vue files: {lang}";
     readonly 'style.isolation.version': "Style isolation version: {version}";
     readonly 'style.isolation.version.upgrade': "Style isolation version: {version}. Upgrading to 2.0 is recommended.";
     readonly compiling: "Compiling...";
@@ -16,8 +17,10 @@ declare const _default: {
     readonly 'dev.watching.end.pages': "DONE  Build complete. PAGES:{pages}";
     readonly 'dev.watching.end.files': "DONE  Build complete. FILES:{files}";
     readonly 'dev.watching.restart.vapor': "DONE  Restart required. Switching vapor mode requires restarting to take effect.";
+    readonly 'dev.watching.restart.script.engine': "DONE  Restart required. Script engine changes require restarting to take effect.";
     readonly 'dev.watching.restart.independentSubPackages': "DONE  Restart required. Changing independent subpackage roots requires restarting to take effect.";
     readonly 'dev.watching.vapor.render.target': "vapor-render-target in manifest.json was changed to {manifestTarget}, but the running console is still {runtimeTarget}.";
+    readonly 'harmony.vapor.script.engine': "Invalid Harmony script engine ({engine}) specified, using default.";
     readonly 'build.failed': "DONE  Build failed.";
     readonly 'compiler.build.failed': "Build failed with errors.";
     readonly 'stat.warn.appid': "The current application is not configured with Appid, and uni statistics cannot be used. For details, see https://ask.dcloud.net.cn/article/36303";
@@ -58,5 +61,6 @@ declare const _default: {
     readonly 'pages.json.page.notfound': "The page \"{pagePath}\" does not exist.";
     readonly 'pages.json.page.slash': "The Path \"{pagePath}\" cannot start with \"/\"";
     readonly 'pages.json.tabbar.page.notfound': "The tabBar page \"{pagePath}\" is not declared in \"pages.json\".";
+    readonly 'vapor.tree.shaking.applied': "Based on the module selection and tree-shaking scan results in manifest.json, the following built-in modules and plugins will be included in this build:\n{modules}\nIf you need to add more modules, please add them in manifest.json (you need to rebuild after adding). For third-party SDKs, select more modules in the visual interface, and add other modules according to the documentation in the source view of manifest.json. [Details](https://doc.dcloud.net.cn/uni-app-x/collocation/manifest-modules.html)\nNote: If a module is not included in the custom playground, the related APIs cannot be used in the custom playground; if a module is not included in the official package, the related APIs cannot be used after subsequent wgt resource updates.";
 };
 export default _default;

package/dist/messages/en.js

@@ -5,6 +5,7 @@ exports.default = {
     'view.render.compiler.target': 'Current view.render compile target: {target}',
     'view.render.compiler.target.bytecode': 'bytecode',
     'view.render.compiler.target.nativecode': 'nativecode',
+    'vapor.default.script.lang': 'Default script lang for current uvue/vue files: {lang}',
     'style.isolation.version': 'Style isolation version: {version}',
     'style.isolation.version.upgrade': 'Style isolation version: {version}. Upgrading to 2.0 is recommended.',
     compiling: 'Compiling...',
@@ -18,8 +19,10 @@ exports.default = {
     'dev.watching.end.pages': 'DONE  Build complete. PAGES:{pages}',
     'dev.watching.end.files': 'DONE  Build complete. FILES:{files}',
     'dev.watching.restart.vapor': 'DONE  Restart required. Switching vapor mode requires restarting to take effect.',
+    'dev.watching.restart.script.engine': 'DONE  Restart required. Script engine changes require restarting to take effect.',
     'dev.watching.restart.independentSubPackages': 'DONE  Restart required. Changing independent subpackage roots requires restarting to take effect.',
     'dev.watching.vapor.render.target': 'vapor-render-target in manifest.json was changed to {manifestTarget}, but the running console is still {runtimeTarget}.',
+    'harmony.vapor.script.engine': 'Invalid Harmony script engine ({engine}) specified, using default.',
     'build.failed': 'DONE  Build failed.',
     'compiler.build.failed': 'Build failed with errors.',
     'stat.warn.appid': 'The current application is not configured with Appid, and uni statistics cannot be used. For details, see https://ask.dcloud.net.cn/article/36303',
@@ -60,4 +63,8 @@ exports.default = {
     'pages.json.page.notfound': 'The page "{pagePath}" does not exist.',
     'pages.json.page.slash': 'The Path "{pagePath}" cannot start with "/"',
     'pages.json.tabbar.page.notfound': 'The tabBar page "{pagePath}" is not declared in "pages.json".',
+    'vapor.tree.shaking.applied': `Based on the module selection and tree-shaking scan results in manifest.json, the following built-in modules and plugins will be included in this build:
+{modules}
+If you need to add more modules, please add them in manifest.json (you need to rebuild after adding). For third-party SDKs, select more modules in the visual interface, and add other modules according to the documentation in the source view of manifest.json. [Details](https://doc.dcloud.net.cn/uni-app-x/collocation/manifest-modules.html)
+Note: If a module is not included in the custom playground, the related APIs cannot be used in the custom playground; if a module is not included in the official package, the related APIs cannot be used after subsequent wgt resource updates.`,
 };