@dcloudio/uni-cli-shared 3.0.0-alpha-5010120260525001 → 3.0.0-alpha-5010220260604001

package/dist/index.d.ts

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

package/dist/index.js

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

package/dist/uni_modules.cloud.d.ts

@@ -49,6 +49,7 @@ 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';
@@ -57,6 +58,8 @@ 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>;
@@ -67,5 +70,6 @@ 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.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.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;
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const fast_glob_1 = require("fast-glob");
@@ -429,6 +429,7 @@ 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({
@@ -446,6 +447,7 @@ async function checkEncryptUniModules(inputDir, params, sdkType = 'all') {
         }
     }
     else {
+        await Promise.resolve(copyEncryptUniModulesDom2Bytes());
         const useUniAppXAndroidNative = (0, x_1.isUniAppXAndroidNative)(params.platform);
         // 仅旧版 Android x 需要在缓存命中时额外初始化
         if (useUniAppXAndroidNative) {
@@ -480,6 +482,83 @@ 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/vite/plugins/uts/uni_modules.js

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

package/lib/dom2/app/@vue/compiler-sfc/dist/compiler-sfc.esm-browser.js

@@ -27415,7 +27415,8 @@ const transformVBind = (dir, node, context) => {
 		exp = createSimpleExpression("", true, loc);
 	}
 	const isComponent = node.tagType === 1;
-	exp = resolveExpression(exp, isComponent);
+	const isDom2DataAttr = context.options.platform && arg.isStatic && arg.content.length > 5 && arg.content.startsWith("data-");
+	exp = resolveExpression(exp, isComponent || isDom2DataAttr);
 	arg = resolveExpression(arg);
 	if (arg.isStatic && isReservedProp(arg.content)) return;
 	let camel = false;
@@ -27593,7 +27594,8 @@ function transformNativeElement(node, propsResult, staticKey, singleRoot, contex
 			node,
 			element: context.reference(),
 			props: dynamicArgs,
-			tag
+			tag,
+			root: singleRoot && context.effectiveParent === context.root && context.options.componentType === "component"
 		}, getEffectIndex);
 	} else {
 		const changeProps = [];
@@ -27621,6 +27623,7 @@ function transformNativeElement(node, propsResult, staticKey, singleRoot, contex
 		}
 		let hasStaticStyle = false;
 		let hasClass = false;
+		const datasetProps = [];
 		let prevWasQuoted = false;
 		for (const prop of propsResult[1]) {
 			const { key, values } = prop;
@@ -27679,6 +27682,17 @@ function transformNativeElement(node, propsResult, staticKey, singleRoot, contex
 			}
 		}
 		if (hasStaticStyle && hasClass) template += ` ext:style`;
+		if (datasetProps.length) {
+			const expressions = datasetProps.flatMap((prop) => prop.values);
+			context.registerEffect(expressions, {
+				type: 3,
+				node,
+				element: context.reference(),
+				prop: _objectSpread2(_objectSpread2({}, datasetProps[0]), {}, { datasetProps }),
+				tag,
+				root: singleRoot && context.effectiveParent === context.root && context.options.componentType === "component"
+			}, getEffectIndex);
+		}
 	}
 	template += `>` + context.childrenTemplate.join("");
 	if (!isVoidTag(tag) && !omitEndTag) template += `</${tag}>`;

package/lib/dom2/app/@vue/compiler-vapor/dist/compiler-vapor.cjs.js

@@ -2530,7 +2530,8 @@ const transformVBind = (dir, node, context) => {
 		exp = (0, _vue_compiler_dom.createSimpleExpression)("", true, loc);
 	}
 	const isComponent = node.tagType === 1;
-	exp = resolveExpression(exp, isComponent);
+	const isDom2DataAttr = context.options.platform && arg.isStatic && arg.content.length > 5 && arg.content.startsWith("data-");
+	exp = resolveExpression(exp, isComponent || isDom2DataAttr);
 	arg = resolveExpression(arg);
 	if (arg.isStatic && isReservedProp(arg.content)) return;
 	let camel = false;
@@ -2707,7 +2708,8 @@ function transformNativeElement(node, propsResult, staticKey, singleRoot, contex
 			node,
 			element: context.reference(),
 			props: dynamicArgs,
-			tag
+			tag,
+			root: singleRoot && context.effectiveParent === context.root && context.options.componentType === "component"
 		}, getEffectIndex);
 	} else {
 		const changeProps = [];
@@ -2735,6 +2737,7 @@ function transformNativeElement(node, propsResult, staticKey, singleRoot, contex
 		}
 		let hasStaticStyle = false;
 		let hasClass = false;
+		const datasetProps = [];
 		let prevWasQuoted = false;
 		for (const prop of propsResult[1]) {
 			const { key, values } = prop;
@@ -2793,6 +2796,20 @@ function transformNativeElement(node, propsResult, staticKey, singleRoot, contex
 			}
 		}
 		if (hasStaticStyle && hasClass) template += ` ext:style`;
+		if (datasetProps.length) {
+			const expressions = datasetProps.flatMap((prop) => prop.values);
+			context.registerEffect(expressions, {
+				type: 3,
+				node,
+				element: context.reference(),
+				prop: {
+					...datasetProps[0],
+					datasetProps
+				},
+				tag,
+				root: singleRoot && context.effectiveParent === context.root && context.options.componentType === "component"
+			}, getEffectIndex);
+		}
 	}
 	template += `>` + context.childrenTemplate.join("");
 	if (!(0, _vue_shared.isVoidTag)(tag) && !omitEndTag) template += `</${tag}>`;

package/lib/dom2/app/@vue/compiler-vapor/dist/compiler-vapor.d.ts

@@ -22385,6 +22385,10 @@ export interface IRProp extends Omit<DirectiveTransformResult, "value"> {
     ident?: string;
     classRef?: string;
   };
+  /**
+  * fixed by uts synthetic data-* group for dom2 dataset callbacks.
+  */
+  datasetProps?: IRProp[];
 }
 export declare enum IRDynamicPropsKind {
   EXPRESSION = 0,
@@ -22556,6 +22560,10 @@ export interface SetPropIRNode extends BaseIRNode {
   element: number;
   prop: IRProp;
   tag: string;
+  /**
+  * fixed by uts 当前操作的目标元素是否为组件模板单根根节点，可用于后续 root-only 逻辑。
+  */
+  root?: boolean;
   isChangeProp?: boolean;
 }
 export interface SetDynamicPropsIRNode extends BaseIRNode {
@@ -22564,6 +22572,10 @@ export interface SetDynamicPropsIRNode extends BaseIRNode {
   props: IRProps[];
   tag: string;
   /**
+  * fixed by uts 当前操作的目标元素是否为组件模板单根根节点，可用于后续 root-only 逻辑。
+  */
+  root?: boolean;
+  /**
   * fixed by uts 当前整个动态绑定表达式对应的标识符，因为动态绑定需要在sharedData层对数据做格式化，不能单个生成标识符，不然需要在c层再格式化一次
   */
   sharedData?: SimpleExpressionNode["sharedData"];

package/lib/dom2/app/@vue/compiler-vapor/dist/compiler-vapor.esm-browser.js

@@ -21425,7 +21425,8 @@ const transformVBind = (dir, node, context) => {
 		exp = createSimpleExpression("", true, loc);
 	}
 	const isComponent = node.tagType === 1;
-	exp = resolveExpression(exp, isComponent);
+	const isDom2DataAttr = context.options.platform && arg.isStatic && arg.content.length > 5 && arg.content.startsWith("data-");
+	exp = resolveExpression(exp, isComponent || isDom2DataAttr);
 	arg = resolveExpression(arg);
 	if (arg.isStatic && isReservedProp(arg.content)) return;
 	let camel = false;
@@ -21663,7 +21664,8 @@ function transformNativeElement(node, propsResult, staticKey, singleRoot, contex
 			node,
 			element: context.reference(),
 			props: dynamicArgs,
-			tag
+			tag,
+			root: singleRoot && context.effectiveParent === context.root && context.options.componentType === "component"
 		}, getEffectIndex);
 	} else {
 		const changeProps = [];
@@ -21691,6 +21693,7 @@ function transformNativeElement(node, propsResult, staticKey, singleRoot, contex
 		}
 		let hasStaticStyle = false;
 		let hasClass = false;
+		const datasetProps = [];
 		let prevWasQuoted = false;
 		for (const prop of propsResult[1]) {
 			const { key, values } = prop;
@@ -21749,6 +21752,17 @@ function transformNativeElement(node, propsResult, staticKey, singleRoot, contex
 			}
 		}
 		if (hasStaticStyle && hasClass) template += ` ext:style`;
+		if (datasetProps.length) {
+			const expressions = datasetProps.flatMap((prop) => prop.values);
+			context.registerEffect(expressions, {
+				type: 3,
+				node,
+				element: context.reference(),
+				prop: _objectSpread2(_objectSpread2({}, datasetProps[0]), {}, { datasetProps }),
+				tag,
+				root: singleRoot && context.effectiveParent === context.root && context.options.componentType === "component"
+			}, getEffectIndex);
+		}
 	}
 	template += `>` + context.childrenTemplate.join("");
 	if (!isVoidTag(tag) && !omitEndTag) template += `</${tag}>`;