@dcloudio/uni-cli-shared 3.0.0-5000720260410001 → 3.0.0-5010420260703001

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

@@ -12,6 +12,7 @@ const uts_1 = require("../../../uts");
 const utils_1 = require("../../utils");
 const uni_modules_1 = require("../../../uni_modules");
 const uni_modules_cloud_1 = require("../../../uni_modules.cloud");
+const x_1 = require("../../../x");
 const utils_2 = require("../../../utils");
 const json_1 = require("../../../json");
 const fs_1 = require("../../../fs");
@@ -19,6 +20,7 @@ const context_1 = require("../../../preprocess/context");
 const hbx_1 = require("../../../hbx");
 const console_1 = require("../../../logs/console");
 const workers_1 = require("../../../workers");
+const dom2_1 = require("../../../dom2");
 /* eslint-disable no-restricted-globals */
 const { preprocess } = require('../../../../lib/preprocess');
 function rewriteUniModulesConsoleExpr(fileName, content) {
@@ -160,7 +162,7 @@ function getCurrentCompiledUTSProviders() {
     return utsProviders;
 }
 exports.getCurrentCompiledUTSProviders = getCurrentCompiledUTSProviders;
-let uniExtApiCompiler = async () => { };
+let uniExtApiCompiler = async (providerOnly = false) => { };
 let nonTreeShakingUniModulesCompiler = async () => { };
 function emptyCacheDir(platform) {
     const uvueOutputDir = (0, uts_1.uvueOutDir)(platform);
@@ -242,7 +244,10 @@ function uniUTSAppUniModulesPlugin(options = {}) {
     const uniXKotlinCompiler = process.env.UNI_APP_X_TSC === 'true' &&
         (process.env.UNI_UTS_PLATFORM === 'app-android' ||
             process.env.UNI_UTS_PLATFORM === 'app')
-        ? createUniXKotlinCompilerOnce({ resolveWorkers })
+        ? createUniXKotlinCompilerOnce({
+            resolveWorkers,
+            sourceFileCallback: (0, dom2_1.initSourceFileCallback)(),
+        })
         : null;
     const uniXSwiftCompiler = process.env.UNI_APP_X_TSC === 'true' &&
         (process.env.UNI_UTS_PLATFORM === 'app-ios' ||
@@ -418,16 +423,20 @@ function uniUTSAppUniModulesPlugin(options = {}) {
                     return filterAutoImports(autoImports, (0, uts_1.parseSwiftModuleWithPluginId)(pluginId, true));
                 });
             },
+            iosPreprocessor: createAppIosUniModulesSyncFilePreprocessorOnce(!!options.x),
+            androidPreprocessor: createAppAndroidUniModulesSyncFilePreprocessorOnce(!!options.x),
+            // harmonyPreprocessor: createAppHarmonyUniModulesSyncFilePreprocessorOnce(!!options.x),
         });
     };
-    uniExtApiCompiler = async () => {
+    uniExtApiCompiler = async (providerOnly = false) => {
         // 此方法为兜底方法，确保uni_modules中的所有插件都会编译，目前仅用于编译provider
         // 获取 provider 扩展(编译所有uni)
         const plugins = (0, uni_modules_1.getUniExtApiPlugins)().filter((provider) => !utsPlugins.has(provider.plugin));
+        const providers = (0, uni_modules_1.getUniExtApiProviders)();
         for (const plugin of plugins) {
             const pluginDir = path_1.default.resolve(inputDir, 'uni_modules', plugin.plugin);
             // 如果是 app-js 环境
-            if (process.env.UNI_APP_X_UVUE_SCRIPT_ENGINE === 'js') {
+            if ((0, x_1.isUniAppXJsEngine)()) {
                 if (fs_extra_1.default.existsSync(path_1.default.resolve(pluginDir, 'utssdk', 'app-js', 'index.uts'))) {
                     continue;
                 }
@@ -440,14 +449,18 @@ function uniUTSAppUniModulesPlugin(options = {}) {
                     continue;
                 }
             }
+            const isProvider = providers.some((p) => p.plugin === plugin.plugin);
             utsProviders.add(plugin.plugin);
-            const result = await compilePlugin(pluginDir);
-            if (result) {
-                // 时机不对，不能addWatch
-                // result.deps.forEach((dep) => {
-                //   this.addWatchFile(dep)
-                // })
+            if ((providerOnly && isProvider) || !providerOnly) {
+                await compilePlugin(pluginDir);
             }
+            // const result = await compilePlugin(pluginDir)
+            // if (result) {
+            //   // 时机不对，不能addWatch
+            //   // result.deps.forEach((dep) => {
+            //   //   this.addWatchFile(dep)
+            //   // })
+            // }
         }
     };
     nonTreeShakingUniModulesCompiler = async () => {
@@ -570,8 +583,8 @@ function uniUTSAppUniModulesPlugin(options = {}) {
     };
 }
 exports.uniUTSAppUniModulesPlugin = uniUTSAppUniModulesPlugin;
-async function buildUniExtApis() {
-    await uniExtApiCompiler();
+async function buildUniExtApis(providerOnly = false) {
+    await uniExtApiCompiler(providerOnly);
 }
 exports.buildUniExtApis = buildUniExtApis;
 async function buildNonTreeShakingUniModules() {
@@ -610,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/dist/vite/plugins/vitejs/plugins/css.d.ts

@@ -47,9 +47,9 @@ export declare function cssPostPlugin(config: ResolvedConfig, { platform, isJsCo
     isJsCode?: boolean;
     preserveModules?: boolean;
     chunkCssFilename: (id: string) => string | void;
-    chunkCssCode: (filename: string, cssCode: string) => Promise<string> | string;
+    chunkCssCode: (filename: string, cssCode: string) => Promise<string | Uint8Array> | string;
     includeComponentCss?: boolean;
-    emitFile?: (filename: string, cssCode: string) => void;
+    emitFile?: (filename: string, cssCode: string | Uint8Array) => void;
 }): Plugin;
 export declare function formatPostcssSourceMap(rawMap: ExistingRawSourceMap, file: string): ExistingRawSourceMap;
 export type CssUrlReplacer = (url: string, importer?: string, source?: PostCSS.Source) => string | Promise<string>;

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

@@ -43,6 +43,7 @@ const preprocess_1 = require("../../../../preprocess");
 const uniapp_1 = require("../../../../postcss/plugins/uniapp");
 const cleanString_1 = require("../cleanString");
 const constants_1 = require("../../../../constants");
+const fontFamily_1 = require("../../../../dom2/fontFamily");
 const utils_2 = require("../../../utils/utils");
 const compiler_core_1 = require("@vue/compiler-core");
 const utils_3 = require("../../../../utils");
@@ -223,7 +224,8 @@ function cssPostPlugin(config, { platform, isJsCode, preserveModules, chunkCssFi
     // styles initialization in buildStart causes a styling loss in watch
     const styles = new Map();
     let cssChunks;
-    const isDom2Harmony = process.env.UNI_APP_X_DOM2 === 'true' && platform === 'app-harmony';
+    const isDom2 = process.env.UNI_APP_X_DOM2 === 'true';
+    const isDom2App = isDom2 && platform.startsWith('app');
     return {
         name: 'vite:css-post',
         buildStart() {
@@ -240,8 +242,8 @@ function cssPostPlugin(config, { platform, isJsCode, preserveModules, chunkCssFi
             return {
                 code: modulesCode ||
                     (isJsCode
-                        ? isDom2Harmony
-                            ? `export default ${constants_1.JS_STYLE_PLACEHOLDER_STR}`
+                        ? isDom2App
+                            ? `export default ${(0, fontFamily_1.createJsStylePlaceholder)(id)}`
                             : 'export default {}'
                         : ''),
                 map: { mappings: '' },
@@ -251,7 +253,7 @@ function cssPostPlugin(config, { platform, isJsCode, preserveModules, chunkCssFi
             };
         },
         async renderChunk(_code, chunk, _opts) {
-            if (isDom2Harmony) {
+            if (isDom2) {
                 // 通过 generateBundle 实现
                 return null;
             }
@@ -372,7 +374,10 @@ function cssPostPlugin(config, { platform, isJsCode, preserveModules, chunkCssFi
                     inlined: false,
                     minify: true,
                 });
-                if (source.trim()) {
+                if (typeof source === 'string') {
+                    source = source.trim();
+                }
+                if (source) {
                     emitFile
                         ? emitFile(filename, source)
                         : this.emitFile({

package/dist/vue/transforms/index.d.ts

@@ -16,3 +16,4 @@ export declare const transformTapToClick: import("@vue/compiler-core").NodeTrans
 export declare const transformComponentLink: (node: import("@vue/compiler-core").RootNode | import("@vue/compiler-core").TemplateChildNode, context: import("@vue/compiler-core").TransformContext) => void;
 export * from './x/transformMPBuiltInTag';
 export * from './x/transformDirection';
+export * from './transformTeleport';

package/dist/vue/transforms/index.js

@@ -56,3 +56,4 @@ exports.transformTapToClick = (0, transformEvent_1.createTransformEvent)({
 exports.transformComponentLink = (0, transformComponent_1.createTransformComponentLink)(constants_1.COMPONENT_BIND_LINK);
 __exportStar(require("./x/transformMPBuiltInTag"), exports);
 __exportStar(require("./x/transformDirection"), exports);
+__exportStar(require("./transformTeleport"), exports);

package/dist/vue/transforms/transformTeleport.d.ts

@@ -0,0 +1,2 @@
+import { type RootNode, type TemplateChildNode } from '@vue/compiler-core';
+export declare const transformTeleport: (node: RootNode | TemplateChildNode) => void;

package/dist/vue/transforms/transformTeleport.js

@@ -0,0 +1,68 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.transformTeleport = void 0;
+const utils_1 = require("../utils");
+const vite_1 = require("../../vite");
+const compiler_core_1 = require("@vue/compiler-core");
+const shared_1 = require("@vue/shared");
+const transformTeleport = function (node) {
+    if (!(0, vite_1.isElementNode)(node)) {
+        return;
+    }
+    if (node.tag !== 'teleport') {
+        return;
+    }
+    node.tag = 'root-portal';
+    node.tagType = compiler_core_1.ElementTypes.ELEMENT;
+    const disabledProp = (0, compiler_core_1.findProp)(node, 'disabled', false, true);
+    if (disabledProp) {
+        // transform `disabled` prop to `enable` prop with inverse value
+        if ((0, vite_1.isAttributeNode)(disabledProp)) {
+            const disabledPropIndex = node.props.indexOf(disabledProp);
+            node.props.splice(disabledPropIndex, 1, (0, utils_1.createBindDirectiveNode)('enable', (0, compiler_core_1.createSimpleExpression)('false', false)));
+        }
+        else if ((0, vite_1.isDirectiveNode)(disabledProp)) {
+            disabledProp.arg = (0, compiler_core_1.createSimpleExpression)('enable', true);
+            disabledProp.exp = createEnableExpression(disabledProp.exp);
+        }
+    }
+    const toProp = (0, compiler_core_1.findProp)(node, 'to');
+    if (toProp) {
+        // delete `to` prop since it is not supported in mini program
+        node.props.splice(node.props.indexOf(toProp), 1);
+    }
+    const deferProp = (0, compiler_core_1.findProp)(node, 'defer', false, true);
+    if (deferProp) {
+        // delete `defer` prop since it is not supported in mini program
+        node.props.splice(node.props.indexOf(deferProp), 1);
+    }
+};
+exports.transformTeleport = transformTeleport;
+function createEnableExpression(exp) {
+    const content = exp && stringifyExpression(exp);
+    return (0, compiler_core_1.createSimpleExpression)(content ? `!(${content})` : 'true', false);
+}
+function stringifyExpression(exp) {
+    if ((0, vite_1.isSimpleExpressionNode)(exp)) {
+        return exp.content;
+    }
+    if ((0, vite_1.isCompoundExpressionNode)(exp)) {
+        const children = [];
+        for (const child of exp.children) {
+            if ((0, shared_1.isString)(child)) {
+                children.push(child);
+            }
+            else if ((0, shared_1.isSymbol)(child)) {
+                return;
+            }
+            else {
+                const content = stringifyExpression(child);
+                if (content === undefined) {
+                    return;
+                }
+                children.push(content);
+            }
+        }
+        return children.join('');
+    }
+}

package/dist/vue/transforms/x/transformDirection.js

@@ -4,6 +4,7 @@ exports.transformDirection = void 0;
 const vite_1 = require("../../../vite");
 const utils_1 = require("../../utils");
 const compiler_core_1 = require("@vue/compiler-core");
+const shared_1 = require("@vue/shared");
 /**
  * 将direction属性转化为scroll-x和scroll-y
  * 注意transformMPBuiltInTag内会讲list-view转化为scroll-view，所以此transform应该在transformMPBuiltInTag之后执行
@@ -27,7 +28,7 @@ const transformDirection = function (node, context) {
         return;
     }
     const directionProp = node.props[directionPropIndex];
-    if (directionProp.type === compiler_core_1.NodeTypes.ATTRIBUTE) {
+    if ((0, vite_1.isAttributeNode)(directionProp)) {
         const directionValue = directionProp.value?.content;
         const scrollX = directionValue === 'horizontal' || directionValue === 'all';
         const scrollY = !directionValue ||
@@ -39,12 +40,16 @@ const transformDirection = function (node, context) {
     }
     else if (directionProp.type === compiler_core_1.NodeTypes.DIRECTIVE) {
         if (!directionProp.arg ||
-            directionProp.arg.type !== compiler_core_1.NodeTypes.SIMPLE_EXPRESSION ||
+            !(0, vite_1.isSimpleExpressionNode)(directionProp.arg) ||
             !directionProp.exp ||
-            directionProp.exp.type !== compiler_core_1.NodeTypes.SIMPLE_EXPRESSION) {
+            !((0, vite_1.isSimpleExpressionNode)(directionProp.exp) ||
+                (0, vite_1.isCompoundExpressionNode)(directionProp.exp))) {
+            return;
+        }
+        const exp = stringifyExpression(directionProp.exp);
+        if (!exp) {
             return;
         }
-        const exp = directionProp.exp.content;
         const scrollX = `(${exp}) === 'horizontal' || (${exp}) === 'all'`;
         const scrollY = `!(${exp}) || (${exp}) === 'vertical' || (${exp}) === 'all'`;
         node.props.splice(directionPropIndex, 1);
@@ -53,3 +58,27 @@ const transformDirection = function (node, context) {
     }
 };
 exports.transformDirection = transformDirection;
+function stringifyExpression(exp) {
+    if ((0, vite_1.isSimpleExpressionNode)(exp)) {
+        return exp.content;
+    }
+    if ((0, vite_1.isCompoundExpressionNode)(exp)) {
+        const children = [];
+        for (const child of exp.children) {
+            if ((0, shared_1.isString)(child)) {
+                children.push(child);
+            }
+            else if ((0, shared_1.isSymbol)(child)) {
+                return;
+            }
+            else {
+                const content = stringifyExpression(child);
+                if (content === undefined) {
+                    return;
+                }
+                children.push(content);
+            }
+        }
+        return children.join('');
+    }
+}

package/dist/workers.d.ts

@@ -11,5 +11,6 @@ export declare function getWorkersRootDirs(): string[];
 export declare function initWorkers(workersDirs: string[], rootDir: string): Record<string, string>;
 export declare function uniWorkersPlugin(): Plugin;
 export declare function resolveWorkersDir(inputDir: string): Array<string>;
+export declare function normalizeJavaScriptWorkerSource(content: string): string;
 export declare function uniJavaScriptWorkersPlugin(): Plugin;
 export declare function initUniXCompilerRootWorkers(rootDir: string, compiler: UniXCompiler): Promise<void>;

package/dist/workers.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.initUniXCompilerRootWorkers = exports.uniJavaScriptWorkersPlugin = exports.resolveWorkersDir = exports.uniWorkersPlugin = exports.initWorkers = exports.getWorkersRootDirs = exports.resolveWorkersRootDir = exports.getWorkers = void 0;
+exports.initUniXCompilerRootWorkers = exports.uniJavaScriptWorkersPlugin = exports.normalizeJavaScriptWorkerSource = exports.resolveWorkersDir = exports.uniWorkersPlugin = exports.initWorkers = exports.getWorkersRootDirs = exports.resolveWorkersRootDir = exports.getWorkers = void 0;
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const debug_1 = __importDefault(require("debug"));
@@ -13,6 +13,7 @@ const json_1 = require("./json");
 const uts_1 = require("./uts");
 const uni_modules_1 = require("./vite/plugins/uts/uni_modules");
 const resolve_1 = require("./resolve");
+const dom2_1 = require("./dom2");
 const debugWorkers = (0, debug_1.default)('uni:workers');
 let workersRootDir = null;
 let workersRootDirs = [];
@@ -76,6 +77,7 @@ function uniWorkersPlugin() {
     const uniXKotlinCompiler = platform === 'app-android'
         ? (0, uts_1.resolveUTSCompiler)().createUniXKotlinCompilerOnce({
             resolveWorkers,
+            sourceFileCallback: (0, dom2_1.initSourceFileCallback)(),
         })
         : null;
     const uniXSwiftCompiler = platform === 'app-ios'
@@ -154,6 +156,14 @@ function resolveWorkersDir(inputDir) {
     return workersDirs;
 }
 exports.resolveWorkersDir = resolveWorkersDir;
+function normalizeJavaScriptWorkerSource(content) {
+    const code = content
+        // 移除 export，worker 入口按普通脚本加载，不需要导出任务类。
+        .replace(/export\s+class\s+(.*)\s+extends\s+WorkerTaskImpl\s*{/, 'class $1 extends WorkerTaskImpl {');
+    // 保持模块语义，避免 uts2js 同时登记 .uts/.ts 快照时把任务类放到全局作用域导致重复声明。
+    return /(^|\n)\s*(import|export)\s/m.test(code) ? code : `${code}\nexport {}`;
+}
+exports.normalizeJavaScriptWorkerSource = normalizeJavaScriptWorkerSource;
 function uniJavaScriptWorkersPlugin() {
     // 仅小程序平台外置uni-worker.mp.js
     const external = (process.env.UNI_UTS_PLATFORM || '').startsWith('mp-');
@@ -220,10 +230,7 @@ function uniJavaScriptWorkersPlugin() {
             }
             if (fs_extra_1.default.existsSync(filename)) {
                 let code = (viteServer ? `import '${workerPolyfillPath}';` : '') +
-                    fs_extra_1.default
-                        .readFileSync(filename, 'utf-8')
-                        // 移除 export
-                        .replace(/export\s+class\s+(.*)\s+extends\s+WorkerTaskImpl\s*{/, 'class $1 extends WorkerTaskImpl {');
+                    normalizeJavaScriptWorkerSource(fs_extra_1.default.readFileSync(filename, 'utf-8'));
                 // 如果是入口文件，需要追加初始化代码
                 if (workerClass) {
                     code += `\n;new ${workerClass}().entry()`;

package/dist/x.d.ts

@@ -0,0 +1,10 @@
+type AppXPlatform = typeof process.env.UNI_UTS_PLATFORM;
+export declare function isUniAppX(): boolean;
+export declare function isUniAppXAndroid(platform?: AppXPlatform): boolean;
+export declare function isUniAppXIOS(platform?: AppXPlatform): boolean;
+export declare function isUniAppXVapor(): boolean;
+export declare function isUniAppXAndroidVapor(platform?: AppXPlatform): boolean;
+export declare function isUniAppXJsEngine(): boolean;
+export declare function isUniAppXAndroidJsEngine(platform?: AppXPlatform): boolean;
+export declare function isUniAppXAndroidNative(platform?: AppXPlatform): boolean;
+export {};

package/dist/x.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isUniAppXAndroidNative = exports.isUniAppXAndroidJsEngine = exports.isUniAppXJsEngine = exports.isUniAppXAndroidVapor = exports.isUniAppXVapor = exports.isUniAppXIOS = exports.isUniAppXAndroid = exports.isUniAppX = void 0;
+function isUniAppX() {
+    return process.env.UNI_APP_X === 'true';
+}
+exports.isUniAppX = isUniAppX;
+function isUniAppXAndroid(platform = process.env.UNI_UTS_PLATFORM) {
+    return isUniAppX() && platform === 'app-android';
+}
+exports.isUniAppXAndroid = isUniAppXAndroid;
+function isUniAppXIOS(platform = process.env.UNI_UTS_PLATFORM) {
+    return isUniAppX() && platform === 'app-ios';
+}
+exports.isUniAppXIOS = isUniAppXIOS;
+function isUniAppXVapor() {
+    return isUniAppX() && process.env.UNI_APP_X_DOM2 === 'true';
+}
+exports.isUniAppXVapor = isUniAppXVapor;
+function isUniAppXAndroidVapor(platform = process.env.UNI_UTS_PLATFORM) {
+    return isUniAppXAndroid(platform) && process.env.UNI_APP_X_DOM2 === 'true';
+}
+exports.isUniAppXAndroidVapor = isUniAppXAndroidVapor;
+function isUniAppXJsEngine() {
+    return isUniAppX() && process.env.UNI_APP_X_UVUE_SCRIPT_ENGINE === 'js';
+}
+exports.isUniAppXJsEngine = isUniAppXJsEngine;
+function isUniAppXAndroidJsEngine(platform = process.env.UNI_UTS_PLATFORM) {
+    return (isUniAppXAndroid(platform) &&
+        process.env.UNI_APP_X_UVUE_SCRIPT_ENGINE === 'js');
+}
+exports.isUniAppXAndroidJsEngine = isUniAppXAndroidJsEngine;
+function isUniAppXAndroidNative(platform = process.env.UNI_UTS_PLATFORM) {
+    return (isUniAppXAndroid(platform) &&
+        // 非 Vapor 或者 Vapor 但使用 native 引擎
+        (process.env.UNI_APP_X_DOM2 !== 'true' ||
+            process.env.UNI_APP_X_UVUE_SCRIPT_ENGINE === 'native'));
+}
+exports.isUniAppXAndroidNative = isUniAppXAndroidNative;

package/lib/dom2/app/@vitejs/plugin-vue/dist/index.cjs

@@ -320,13 +320,6 @@ function resolveTemplateCompilerOptions(descriptor, options, ssr) {
     expressionPlugins.push("typescript");
   }
   const extraOptions = options.template?.compilerOptions?.extraOptions?.(descriptor);
-  if (extraOptions.helper) {
-    extraOptions.className = extraOptions.helper.GCN(
-      descriptor.filename,
-      process.env.UNI_INPUT_DIR
-    );
-    extraOptions.r = extraOptions.helper.K;
-  }
   return {
     ...options.template,
     // @ts-expect-error TODO remove when 3.6 is out

package/lib/dom2/app/@vitejs/plugin-vue/dist/index.mjs

@@ -307,13 +307,6 @@ function resolveTemplateCompilerOptions(descriptor, options, ssr) {
     expressionPlugins.push("typescript");
   }
   const extraOptions = options.template?.compilerOptions?.extraOptions?.(descriptor);
-  if (extraOptions.helper) {
-    extraOptions.className = extraOptions.helper.GCN(
-      descriptor.filename,
-      process.env.UNI_INPUT_DIR
-    );
-    extraOptions.r = extraOptions.helper.K;
-  }
   return {
     ...options.template,
     // @ts-expect-error TODO remove when 3.6 is out