@dcloudio/uni-cli-shared 3.0.0-alpha-5010320260611001 → 3.0.0-alpha-1000920260615733

package/dist/hbx/alias.js

@@ -78,8 +78,27 @@ function initModuleAlias() {
         if (process.env.UNI_APP_PLATFORM ||
             process.env.UNI_PLATFORM === 'app-harmony') {
             if (!process.env.UNI_APP_X_VAPOR_RENDER_TARGET) {
-                // 默认 app 平台使用 bytecode 目标
-                process.env.UNI_APP_X_VAPOR_RENDER_TARGET = 'bytecode';
+                // 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';
+                    }
+                }
             }
             if (process.env.UNI_APP_X_VAPOR_RENDER_TARGET?.includes('bytecode')) {
                 process.env.UNI_APP_X_DOM2_DYNAMIC = 'true';

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 { copyEncryptUniModulesDom2Bytes, getUniModulesEncryptType, parseUniModulesArtifacts, resolveEncryptUniModule, } from './uni_modules.cloud';
+export { 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.copyEncryptUniModulesDom2Bytes = exports.formatExtApiProviderName = exports.getUniExtApiProviderRegisters = exports.parseInjects = exports.parseUniExtApis = exports.parseUniExtApi = void 0;
+exports.checkUpdate = exports.M = exports.resolveEncryptUniModule = exports.parseUniModulesArtifacts = exports.getUniModulesEncryptType = 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,7 +49,6 @@ 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,15 +117,7 @@ function initUniStatistics(manifestJson) {
     if (!uniStatistics) {
         return;
     }
-    /**
-     * 判断是否为私有版统计：
-     * - 新配置：type === 'private'
-     * - 旧配置兼容：version === 2
-     */
-    const isPrivateStat = uniStatistics.type === 'private' ||
-        uniStatistics.version === 2 ||
-        uniStatistics.version === '2';
-    if (isPrivateStat) {
+    if (uniStatistics.version === 2 || uniStatistics.version === '2') {
         if (uniStatistics.uniCloud && uniStatistics.uniCloud.spaceId) {
             return;
         }

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

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

package/dist/logs/console.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.appendConsoleExpr = exports.restoreConsoleExpr = exports.rewriteConsoleExpr = void 0;
 const magic_string_1 = __importDefault(require("magic-string"));
 const utils_1 = require("../utils");
+const x_1 = require("../x");
 function rewriteConsoleExpr(method, id, filename, code, sourceMap = false) {
     filename = (0, utils_1.normalizePath)(filename);
     const re = /(console\.(log|info|debug|warn|error))\s*\(([^)]+)\)/g;
@@ -19,7 +20,9 @@ function rewriteConsoleExpr(method, id, filename, code, sourceMap = false) {
     if (s.hasChanged()) {
         return {
             code: s.toString(),
-            map: sourceMap ? s.generateMap({ hires: true }) : { mappings: '' },
+            map: sourceMap
+                ? s.generateMap({ hires: (0, x_1.shouldUseHighResolutionSourceMap)() })
+                : { mappings: '' },
         };
     }
     return { code, map: null };

package/dist/messages/en.d.ts

@@ -15,12 +15,11 @@ 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.vapor.render.target': "vapor-render-target in manifest.json was changed to {manifestTarget}, but the running console is still {runtimeTarget}.";
     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";
-    readonly 'stat.warn.version': "The uni statistics type is not configured. The default type is public. You can set it to public or private. Details: https://uniapp.dcloud.io/uni-stat";
-    readonly 'stat.warn.tip': "uni statistics enabled: {type}";
+    readonly 'stat.warn.version': "The uni statistics version is not configured. The default version is 1.0.uni statistics version 2.0 is recommended, private deployment data is more secure and code is open source and customizable. details: https://uniapp.dcloud.io/uni-stat";
+    readonly 'stat.warn.tip': "uni statistics version: {version}";
     readonly 'i18n.fallbackLocale.default': "fallbackLocale is missing in manifest.json, use: {locale}";
     readonly 'i18n.fallbackLocale.missing': "./local/{locale}.json is missing";
     readonly 'easycom.conflict': "easycom component conflict: ";

package/dist/messages/en.js

@@ -17,12 +17,11 @@ 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.vapor.render.target': 'vapor-render-target in manifest.json was changed to {manifestTarget}, but the running console is still {runtimeTarget}.',
     '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',
-    'stat.warn.version': 'The uni statistics type is not configured. The default type is public. You can set it to public or private. Details: https://uniapp.dcloud.io/uni-stat',
-    'stat.warn.tip': 'uni statistics enabled: {type}',
+    'stat.warn.version': 'The uni statistics version is not configured. The default version is 1.0.uni statistics version 2.0 is recommended, private deployment data is more secure and code is open source and customizable. details: https://uniapp.dcloud.io/uni-stat',
+    'stat.warn.tip': 'uni statistics version: {version}',
     'i18n.fallbackLocale.default': 'fallbackLocale is missing in manifest.json, use: {locale}',
     'i18n.fallbackLocale.missing': './local/{locale}.json is missing',
     'easycom.conflict': 'easycom component conflict: ',

package/dist/messages/index.d.ts

@@ -15,12 +15,11 @@ export declare const M: {
     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. 切换蒸汽模式需要重新运行才能生效。";
-    readonly 'dev.watching.vapor.render.target': "manifest.json 中更改了视图层编译目标为{manifestTarget}，但注意运行控制台还是{runtimeTarget}。";
     readonly 'build.failed': "DONE  Build failed.";
     readonly 'compiler.build.failed': "编译失败";
     readonly 'stat.warn.appid': "当前应用未配置 appid，无法使用 uni 统计，详情参考：https://ask.dcloud.net.cn/article/36303";
-    readonly 'stat.warn.version': "当前应用未配置 uni 统计版本，默认使用公有版；可配置为公有版或私有版。详情：https://uniapp.dcloud.io/uni-stat";
-    readonly 'stat.warn.tip': "已开启uni 统计 2.0{type}";
+    readonly 'stat.warn.version': "当前应用未配置uni统计版本，默认使用1.0版本；建议使用uni统计2.0版本 ，私有部署数据更安全，代码开源可定制。详情：https://uniapp.dcloud.io/uni-stat";
+    readonly 'stat.warn.tip': "已开启 uni统计{version} 版本";
     readonly 'i18n.fallbackLocale.default': "当前应用未在 manifest.json 配置 fallbackLocale，默认使用：{locale}";
     readonly 'i18n.fallbackLocale.missing': "当前应用配置的 fallbackLocale 或 locale 为：{locale}，但 locale 目录缺少该语言文件";
     readonly 'easycom.conflict': "easycom组件冲突：";
@@ -72,12 +71,11 @@ export declare const M: {
     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.vapor.render.target': "vapor-render-target in manifest.json was changed to {manifestTarget}, but the running console is still {runtimeTarget}.";
     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";
-    readonly 'stat.warn.version': "The uni statistics type is not configured. The default type is public. You can set it to public or private. Details: https://uniapp.dcloud.io/uni-stat";
-    readonly 'stat.warn.tip': "uni statistics enabled: {type}";
+    readonly 'stat.warn.version': "The uni statistics version is not configured. The default version is 1.0.uni statistics version 2.0 is recommended, private deployment data is more secure and code is open source and customizable. details: https://uniapp.dcloud.io/uni-stat";
+    readonly 'stat.warn.tip': "uni statistics version: {version}";
     readonly 'i18n.fallbackLocale.default': "fallbackLocale is missing in manifest.json, use: {locale}";
     readonly 'i18n.fallbackLocale.missing': "./local/{locale}.json is missing";
     readonly 'easycom.conflict': "easycom component conflict: ";

package/dist/messages/zh_CN.d.ts

@@ -15,12 +15,11 @@ 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. 切换蒸汽模式需要重新运行才能生效。";
-    readonly 'dev.watching.vapor.render.target': "manifest.json 中更改了视图层编译目标为{manifestTarget}，但注意运行控制台还是{runtimeTarget}。";
     readonly 'build.failed': "DONE  Build failed.";
     readonly 'compiler.build.failed': "编译失败";
     readonly 'stat.warn.appid': "当前应用未配置 appid，无法使用 uni 统计，详情参考：https://ask.dcloud.net.cn/article/36303";
-    readonly 'stat.warn.version': "当前应用未配置 uni 统计版本，默认使用公有版；可配置为公有版或私有版。详情：https://uniapp.dcloud.io/uni-stat";
-    readonly 'stat.warn.tip': "已开启uni 统计 2.0{type}";
+    readonly 'stat.warn.version': "当前应用未配置uni统计版本，默认使用1.0版本；建议使用uni统计2.0版本 ，私有部署数据更安全，代码开源可定制。详情：https://uniapp.dcloud.io/uni-stat";
+    readonly 'stat.warn.tip': "已开启 uni统计{version} 版本";
     readonly 'i18n.fallbackLocale.default': "当前应用未在 manifest.json 配置 fallbackLocale，默认使用：{locale}";
     readonly 'i18n.fallbackLocale.missing': "当前应用配置的 fallbackLocale 或 locale 为：{locale}，但 locale 目录缺少该语言文件";
     readonly 'easycom.conflict': "easycom组件冲突：";

package/dist/messages/zh_CN.js

@@ -17,12 +17,11 @@ 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. 切换蒸汽模式需要重新运行才能生效。',
-    'dev.watching.vapor.render.target': 'manifest.json 中更改了视图层编译目标为{manifestTarget}，但注意运行控制台还是{runtimeTarget}。',
     'build.failed': 'DONE  Build failed.',
     'compiler.build.failed': '编译失败',
     'stat.warn.appid': '当前应用未配置 appid，无法使用 uni 统计，详情参考：https://ask.dcloud.net.cn/article/36303',
-    'stat.warn.version': '当前应用未配置 uni 统计版本，默认使用公有版；可配置为公有版或私有版。详情：https://uniapp.dcloud.io/uni-stat',
-    'stat.warn.tip': '已开启uni 统计 2.0{type}',
+    'stat.warn.version': '当前应用未配置uni统计版本，默认使用1.0版本；建议使用uni统计2.0版本 ，私有部署数据更安全，代码开源可定制。详情：https://uniapp.dcloud.io/uni-stat',
+    'stat.warn.tip': '已开启 uni统计{version} 版本',
     'i18n.fallbackLocale.default': '当前应用未在 manifest.json 配置 fallbackLocale，默认使用：{locale}',
     'i18n.fallbackLocale.missing': '当前应用配置的 fallbackLocale 或 locale 为：{locale}，但 locale 目录缺少该语言文件',
     'easycom.conflict': 'easycom组件冲突：',

package/dist/uni_modules.cloud.d.ts

@@ -49,7 +49,6 @@ export interface EncryptPackageJson {
 export declare function initCheckEnv(): Record<string, unknown>;
 export declare function resolveEncryptUniModule(id: string, platform: typeof process.env.UNI_UTS_PLATFORM, isX?: boolean): string | undefined;
 type CloudCompileSdkType = 'utssdk' | 'easycom' | 'all';
-type VaporRenderTarget = 'bytecode' | 'nativecode';
 export interface CloudCompileParams {
     mode: 'development' | 'production';
     packType: 'debug' | 'release';
@@ -58,8 +57,6 @@ export interface CloudCompileParams {
     appname: string;
     platform: typeof process.env.UNI_UTS_PLATFORM;
     'uni-app-x': boolean;
-    vapor: boolean;
-    vaporRenderTarget?: VaporRenderTarget;
     env: Record<string, string>;
 }
 export declare function checkEncryptUniModules(inputDir: string, params: CloudCompileParams, sdkType?: CloudCompileSdkType): Promise<{} | undefined>;
@@ -70,6 +67,5 @@ export declare function parseUniModulesArtifacts(): {
     scopedSlots: string[];
     declaration: string;
 }[];
-export declare function copyEncryptUniModulesDom2Bytes(): boolean | Promise<boolean>;
 export declare function virtualComponentPath(filepath: string): string;
 export {};

package/dist/uni_modules.cloud.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.virtualComponentPath = exports.copyEncryptUniModulesDom2Bytes = exports.parseUniModulesArtifacts = exports.getUniModulesEncryptType = exports.checkEncryptUniModules = exports.resolveEncryptUniModule = exports.initCheckEnv = exports.packUploadEncryptUniModules = exports.findUploadEncryptUniModulesFiles = exports.findCloudEncryptUniModules = exports.parseEasyComComponents = exports.parseUniModulesWithComponents = exports.genEncryptUTSModuleCode = exports.genEncryptEasyComModuleCode = void 0;
+exports.virtualComponentPath = exports.parseUniModulesArtifacts = exports.getUniModulesEncryptType = exports.checkEncryptUniModules = exports.resolveEncryptUniModule = exports.initCheckEnv = exports.packUploadEncryptUniModules = exports.findUploadEncryptUniModulesFiles = exports.findCloudEncryptUniModules = exports.parseEasyComComponents = exports.parseUniModulesWithComponents = exports.genEncryptUTSModuleCode = exports.genEncryptEasyComModuleCode = void 0;
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const fast_glob_1 = require("fast-glob");
@@ -429,7 +429,6 @@ async function checkEncryptUniModules(inputDir, params, sdkType = 'all') {
             const AdmZip = require('adm-zip');
             const zip = new AdmZip(downloadFile);
             zip.extractAllTo(cacheDir, true);
-            await Promise.resolve(copyEncryptUniModulesDom2Bytes());
             fs_extra_1.default.unlinkSync(zipFile);
             fs_extra_1.default.unlinkSync(downloadFile);
             R({
@@ -447,7 +446,6 @@ async function checkEncryptUniModules(inputDir, params, sdkType = 'all') {
         }
     }
     else {
-        await Promise.resolve(copyEncryptUniModulesDom2Bytes());
         const useUniAppXAndroidNative = (0, x_1.isUniAppXAndroidNative)(params.platform);
         // 仅旧版 Android x 需要在缓存命中时额外初始化
         if (useUniAppXAndroidNative) {
@@ -482,83 +480,6 @@ function parseUniModulesArtifacts() {
     return res;
 }
 exports.parseUniModulesArtifacts = parseUniModulesArtifacts;
-function copyEncryptUniModulesDom2Bytes() {
-    if (process.env.UNI_APP_X_DOM2 !== 'true') {
-        return false;
-    }
-    if (!['app-android', 'app-ios', 'app-harmony'].includes(process.env.UNI_UTS_PLATFORM)) {
-        return false;
-    }
-    const cacheDir = process.env.UNI_MODULES_ENCRYPT_CACHE_DIR;
-    const outputDir = process.env.UNI_OUTPUT_DIR;
-    if (!cacheDir || !outputDir) {
-        return false;
-    }
-    if (process.env.UNI_APP_X_VAPOR_RENDER_TARGET === 'bytecode') {
-        return copyEncryptUniModulesDom2BytesTarget(cacheDir, outputDir);
-    }
-    if (process.env.UNI_APP_X_VAPOR_RENDER_TARGET === 'nativecode') {
-        return copyEncryptUniModulesDom2CppTarget(cacheDir, outputDir);
-    }
-    return false;
-}
-exports.copyEncryptUniModulesDom2Bytes = copyEncryptUniModulesDom2Bytes;
-function copyEncryptUniModulesDom2BytesTarget(cacheDir, outputDir) {
-    // 只依赖编译环境变量定位缓存目录和输出目录，避免拼接具体 unpackage/dist 路径。
-    const sourceBytesDir = path_1.default.resolve(cacheDir, 'bytes');
-    if (!fs_extra_1.default.existsSync(sourceBytesDir) ||
-        !fs_extra_1.default.statSync(sourceBytesDir).isDirectory()) {
-        return false;
-    }
-    const outputBytesDir = path_1.default.resolve(outputDir, 'bytes');
-    // 云编译产出的 bytecode 在缓存目录中，这里只合并复制到当前编译输出目录。
-    fs_extra_1.default.copySync(sourceBytesDir, outputBytesDir, { overwrite: true });
-    return true;
-}
-async function copyEncryptUniModulesDom2CppTarget(cacheDir, outputDir) {
-    const sourceCppDir = path_1.default.resolve(cacheDir, 'cpp');
-    if (!fs_extra_1.default.existsSync(sourceCppDir) ||
-        !fs_extra_1.default.statSync(sourceCppDir).isDirectory()) {
-        return false;
-    }
-    const outputCppDir = process.env.UNI_APP_X_DOM2_CPP_DIR || path_1.default.resolve(outputDir, 'cpp');
-    // nativecode 的 cpp/h 暂时不走 DUM 解密，直接复制云端产物。
-    // const cppFiles = sync('**/*.{cpp,h}', {
-    //   absolute: false,
-    //   cwd: sourceCppDir,
-    //   onlyFiles: true,
-    // }).filter((file) => !isIgnoreDom2CppFile(file))
-    // if (cppFiles.length) {
-    //   const files = cppFiles.reduce((files, file) => {
-    //     files[path.resolve(sourceCppDir, file)] = path.resolve(outputCppDir, file)
-    //     return files
-    //   }, {} as Record<string, string>)
-    //   const { DUM } = requireUniHelpers()
-    //   const errMsg = await DUM(path.basename(sourceCppDir), files)
-    //   if (errMsg) {
-    //     console.error(errMsg)
-    //     process.exit(0)
-    //   }
-    // }
-    // cpp 目录保持原目录结构直接复制，shared_data_init.h 由当前编译流程生成，不复制云端缓存版本。
-    fs_extra_1.default.copySync(sourceCppDir, outputCppDir, {
-        filter(src) {
-            if (fs_extra_1.default.statSync(src).isDirectory()) {
-                return true;
-            }
-            // shared_data_init.h 由当前编译生成，不能复制云端缓存里的旧文件覆盖本地结果。
-            if (isIgnoreDom2CppFile(src)) {
-                return false;
-            }
-            return true;
-        },
-        overwrite: true,
-    });
-    return true;
-}
-function isIgnoreDom2CppFile(filename) {
-    return path_1.default.basename(filename) === 'shared_data_init.h';
-}
 const uniComponentPrefix = 'uniComponent://';
 function virtualComponentPath(filepath) {
     return uniComponentPrefix + (0, url_1.encodeBase64Url)(filepath);

package/dist/utils.d.ts

@@ -15,7 +15,7 @@ export declare function normalizePagePath(pagePath: string, platform: UniApp.PLA
 export declare function removeExt(str: string): string;
 export declare function normalizeNodeModules(str: string): string;
 export declare function normalizeMiniProgramFilename(filename: string, inputDir?: string): string;
-export declare function normalizeParsePlugins(importer: string, babelParserPlugins?: ParserPlugin[]): (import("@babel/parser").ParserPluginWithOptions | ("jsx" | "typescript" | "asyncDoExpressions" | "asyncGenerators" | "bigInt" | "classPrivateMethods" | "classPrivateProperties" | "classProperties" | "classStaticBlock" | "decimal" | "decorators-legacy" | "deferredImportEvaluation" | "decoratorAutoAccessors" | "destructuringPrivate" | "doExpressions" | "dynamicImport" | "explicitResourceManagement" | "exportDefaultFrom" | "exportNamespaceFrom" | "flow" | "flowComments" | "functionBind" | "functionSent" | "importMeta" | "logicalAssignment" | "importAssertions" | "importAttributes" | "importReflection" | "moduleBlocks" | "moduleStringNames" | "nullishCoalescingOperator" | "numericSeparator" | "objectRestSpread" | "optionalCatchBinding" | "optionalChaining" | "partialApplication" | "placeholders" | "privateIn" | "regexpUnicodeSets" | "sourcePhaseImports" | "throwExpressions" | "topLevelAwait" | "v8intrinsic" | "decorators" | "estree" | "moduleAttributes" | "optionalChainingAssign" | "pipelineOperator" | "recordAndTuple"))[];
+export declare function normalizeParsePlugins(importer: string, babelParserPlugins?: ParserPlugin[]): ParserPlugin[];
 export declare function pathToGlob(pathString: string, glob: string, options?: {
     windows?: boolean;
     escape?: boolean;

package/dist/vite/cloud.js

@@ -135,7 +135,9 @@ function uniEncryptUniModulesPlugin() {
                         type: 'asset',
                         fileName: pkg,
                         name: pkg,
+                        names: [pkg],
                         originalFileName: null,
+                        originalFileNames: [],
                         needsCodeReference: false,
                         source: genUniModulesPackageJson(uniModuleId, process.env.UNI_INPUT_DIR, {
                             env: (0, uni_modules_cloud_1.initCheckEnv)(),

package/dist/vite/plugins/console.js

@@ -22,7 +22,8 @@ function uniConsolePlugin(options) {
             resolvedConfig = config;
             // 理论上发行模式就不应该有这个逻辑了，只不过为了尽量不引发兼容性问题，目前严谨一些判断是否配置了 drop_console
             if (process.env.NODE_ENV !== 'development') {
-                const compressOptions = resolvedConfig.build.terserOptions?.compress;
+                const compressOptions = resolvedConfig.build.terserOptions
+                    ?.compress;
                 if (compressOptions && typeof compressOptions === 'object') {
                     dropConsole = !!compressOptions.drop_console;
                 }

package/dist/vite/plugins/inject.js

@@ -12,6 +12,7 @@ const shared_1 = require("@vue/shared");
 const magic_string_1 = __importDefault(require("magic-string"));
 const utils_1 = require("../utils");
 const uts_1 = require("../../uts");
+const x_1 = require("../../x");
 const debugInject = (0, debug_1.default)('uni:inject');
 // const debugInjectTry = debug('uni:inject-try')
 function uniViteInjectPlugin(name, options) {
@@ -128,7 +129,7 @@ function uniViteInjectPlugin(name, options) {
             }
             (0, estree_walker_1.walk)(ast, {
                 enter(node, parent) {
-                    if (sourceMap) {
+                    if (sourceMap && (0, x_1.shouldUseHighResolutionSourceMap)()) {
                         magicString.addSourcemapLocation(node.start);
                         magicString.addSourcemapLocation(node.end);
                     }
@@ -170,7 +171,11 @@ function uniViteInjectPlugin(name, options) {
             magicString.prepend(`${importBlock}\n\n`);
             return {
                 code: magicString.toString(),
-                map: sourceMap ? magicString.generateMap({ hires: true }) : null,
+                map: sourceMap
+                    ? magicString.generateMap({
+                        hires: (0, x_1.shouldUseHighResolutionSourceMap)(),
+                    })
+                    : null,
             };
         },
     };

package/dist/vite/plugins/sfc.js

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

package/dist/vite/plugins/stats.js

@@ -9,23 +9,6 @@ const utils_1 = require("../../utils");
 const json_1 = require("../../json");
 const messages_1 = require("../../messages");
 const emittedHashMap = new WeakMap();
-function normalizeVaporRenderTarget(target) {
-    if (typeof target !== 'string') {
-        return;
-    }
-    if (target.includes('bytecode')) {
-        return 'bytecode';
-    }
-    if (target.includes('nativecode')) {
-        return 'nativecode';
-    }
-}
-function formatVaporRenderTarget(target) {
-    return messages_1.M[`view.render.compiler.target.${target}`];
-}
-function getManifestVaporRenderTarget(manifest) {
-    return normalizeVaporRenderTarget(manifest['uni-app-x']?.['vapor-render-target']);
-}
 function uniStatsPlugin() {
     let resolvedConfig;
     let isManifestChanged = false;
@@ -45,15 +28,6 @@ function uniStatsPlugin() {
                 try {
                     const manifest = (0, json_1.parseJson)(fs_extra_1.default.readFileSync(id, 'utf-8'), true, 'manifest.json');
                     const uniAppX = manifest['uni-app-x'] || {};
-                    const vaporRenderTarget = getManifestVaporRenderTarget(manifest);
-                    const runtimeVaporRenderTarget = normalizeVaporRenderTarget(process.env.UNI_APP_X_VAPOR_RENDER_TARGET);
-                    if (vaporRenderTarget &&
-                        runtimeVaporRenderTarget &&
-                        vaporRenderTarget !== runtimeVaporRenderTarget) {
-                        console.warn(messages_1.M['dev.watching.vapor.render.target']
-                            .replace('{manifestTarget}', formatVaporRenderTarget(vaporRenderTarget))
-                            .replace('{runtimeTarget}', formatVaporRenderTarget(runtimeVaporRenderTarget)));
-                    }
                     if (uniAppX.vapor !== isVapor) {
                         isVapor = uniAppX.vapor === true;
                         console.warn(messages_1.M['dev.watching.restart.vapor']);

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

@@ -623,13 +623,8 @@ function uniDecryptUniModulesPlugin() {
                     appname: manifest.name,
                     platform: process.env.UNI_UTS_PLATFORM,
                     'uni-app-x': isX,
-                    vapor: process.env.UNI_APP_X_DOM2 === 'true',
                     env,
                 };
-                if (options.vapor) {
-                    options.vaporRenderTarget =
-                        process.env.UNI_APP_X_VAPOR_RENDER_TARGET || 'bytecode';
-                }
                 // 鸿蒙平台需要拆分两次云编译
                 if (process.env.UNI_UTS_PLATFORM === 'app-harmony') {
                     const harmonyEnv = {

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

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import type { OutputOptions, PluginContext, RenderedChunk } from 'rollup';
 import type { Plugin } from '../plugin';
 import type { ResolvedConfig } from '../config';

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

@@ -37,6 +37,7 @@ const shared_1 = require("@vue/shared");
 const utils_1 = require("../utils");
 const utils_2 = require("../../../../vite/utils/utils");
 const utils_3 = require("../../../../utils");
+const x_1 = require("../../../../x");
 const static_1 = require("./static");
 exports.assetUrlRE = /__VITE_ASSET__([a-z\d]{8})__(?:\$_(.*?)__)?/g;
 const rawRE = /(\?|&)raw(?:&|$)/;
@@ -124,7 +125,9 @@ function assetPlugin(config, options) {
             if (s) {
                 return {
                     code: s.toString(),
-                    map: (0, utils_2.withSourcemap)(config) ? s.generateMap({ hires: true }) : null,
+                    map: (0, utils_2.withSourcemap)(config)
+                        ? s.generateMap({ hires: (0, x_1.shouldUseHighResolutionSourceMap)() })
+                        : null,
                 };
             }
             else {
@@ -237,7 +240,9 @@ function assetFileNamesToFileName(assetFileNames, file, contentHash, content) {
     if ((0, shared_1.isFunction)(assetFileNames)) {
         assetFileNames = assetFileNames({
             name: file,
+            names: [file],
             originalFileName: null,
+            originalFileNames: [],
             source: content,
             type: 'asset',
         });

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

@@ -42,6 +42,7 @@ const shared_1 = require("@vue/shared");
 const preprocess_1 = require("../../../../preprocess");
 const uniapp_1 = require("../../../../postcss/plugins/uniapp");
 const cleanString_1 = require("../cleanString");
+const x_1 = require("../../../../x");
 const constants_1 = require("../../../../constants");
 const fontFamily_1 = require("../../../../dom2/fontFamily");
 const utils_2 = require("../../../utils/utils");
@@ -935,6 +936,9 @@ const scss = async (source, root, options, resolvers, isNVue) => {
                 if (err) {
                     reject(err);
                 }
+                else if (!res) {
+                    reject(new Error('Sass render result is empty.'));
+                }
                 else {
                     resolve(res);
                 }
@@ -1175,7 +1179,7 @@ async function getSource(source, filename, additionalData, enableSourcemap, sep
     const ms = new magic_string_1.default(source);
     ms.appendLeft(0, sep);
     ms.appendLeft(0, additionalData);
-    const map = ms.generateMap({ hires: true });
+    const map = ms.generateMap({ hires: (0, x_1.shouldUseHighResolutionSourceMap)() });
     map.file = filename;
     map.sources = [filename];
     return {

package/dist/vue/transforms/templateTransformAssetUrl.js

@@ -140,7 +140,7 @@ function getImportsExpressionExp(path, hash, loc, context) {
         }
         else {
             name = `_imports_${context.imports.length}`;
-            exp = (0, compiler_core_1.createSimpleExpression)(name, false, loc, compiler_core_1.ConstantTypes.CAN_HOIST);
+            exp = (0, compiler_core_1.createSimpleExpression)(name, false, loc, compiler_core_1.ConstantTypes.CAN_CACHE);
             context.imports.push({ exp, path });
         }
         if (!hash) {
@@ -154,11 +154,11 @@ function getImportsExpressionExp(path, hash, loc, context) {
                 h.content === hashExp);
         });
         if (existingHoistIndex > -1) {
-            return (0, compiler_core_1.createSimpleExpression)(`_hoisted_${existingHoistIndex + 1}`, false, loc, compiler_core_1.ConstantTypes.CAN_HOIST);
+            return (0, compiler_core_1.createSimpleExpression)(`_hoisted_${existingHoistIndex + 1}`, false, loc, compiler_core_1.ConstantTypes.CAN_CACHE);
         }
-        return context.hoist((0, compiler_core_1.createSimpleExpression)(hashExp, false, loc, compiler_core_1.ConstantTypes.CAN_HOIST));
+        return context.hoist((0, compiler_core_1.createSimpleExpression)(hashExp, false, loc, compiler_core_1.ConstantTypes.CAN_CACHE));
     }
     else {
-        return (0, compiler_core_1.createSimpleExpression)(`''`, false, loc, compiler_core_1.ConstantTypes.CAN_HOIST);
+        return (0, compiler_core_1.createSimpleExpression)(`''`, false, loc, compiler_core_1.ConstantTypes.CAN_CACHE);
     }
 }

package/dist/vue/transforms/templateTransformSrcset.js

@@ -80,17 +80,17 @@ const transformSrcset = (node, context, options = templateTransformAssetUrl_1.de
                             if (path) {
                                 const existingImportsIndex = context.imports.findIndex((i) => i.path === path);
                                 if (existingImportsIndex > -1) {
-                                    exp = (0, compiler_core_1.createSimpleExpression)(`_imports_${existingImportsIndex}`, false, attr.loc, compiler_core_1.ConstantTypes.CAN_HOIST);
+                                    exp = (0, compiler_core_1.createSimpleExpression)(`_imports_${existingImportsIndex}`, false, attr.loc, compiler_core_1.ConstantTypes.CAN_CACHE);
                                 }
                                 else {
-                                    exp = (0, compiler_core_1.createSimpleExpression)(`_imports_${context.imports.length}`, false, attr.loc, compiler_core_1.ConstantTypes.CAN_HOIST);
+                                    exp = (0, compiler_core_1.createSimpleExpression)(`_imports_${context.imports.length}`, false, attr.loc, compiler_core_1.ConstantTypes.CAN_CACHE);
                                     context.imports.push({ exp, path });
                                 }
                                 compoundExpression.children.push(exp);
                             }
                         }
                         else {
-                            const exp = (0, compiler_core_1.createSimpleExpression)(`"${url}"`, false, attr.loc, compiler_core_1.ConstantTypes.CAN_HOIST);
+                            const exp = (0, compiler_core_1.createSimpleExpression)(`"${url}"`, false, attr.loc, compiler_core_1.ConstantTypes.CAN_CACHE);
                             compoundExpression.children.push(exp);
                         }
                         const isNotLast = imageCandidates.length - 1 > index;
@@ -105,7 +105,7 @@ const transformSrcset = (node, context, options = templateTransformAssetUrl_1.de
                         }
                     });
                     const hoisted = context.hoist(compoundExpression);
-                    hoisted.constType = compiler_core_1.ConstantTypes.CAN_HOIST;
+                    hoisted.constType = compiler_core_1.ConstantTypes.CAN_CACHE;
                     node.props[index] = {
                         type: compiler_core_1.NodeTypes.DIRECTIVE,
                         name: 'bind',