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

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

@@ -40,7 +40,7 @@ Object.defineProperty(exports, "matchTransformOn", { enumerable: true, get: func
 var vModel_1 = require("./vModel");
 Object.defineProperty(exports, "createTransformModel", { enumerable: true, get: function () { return vModel_1.createTransformModel; } });
 Object.defineProperty(exports, "matchTransformModel", { enumerable: true, get: function () { return vModel_1.defaultMatch; } });
-exports.transformH5BuiltInComponents = (0, transformTag_1.createTransformTag)(uni_shared_1.BUILT_IN_TAG_NAMES.reduce((tags, tag) => ((tags[tag] = uni_shared_1.COMPONENT_PREFIX + tag), tags), {}));
+exports.transformH5BuiltInComponents = (0, transformTag_1.createTransformTag)(uni_shared_1.H5_BUILT_IN_TAG_NAMES.reduce((tags, tag) => ((tags[tag] = uni_shared_1.COMPONENT_PREFIX + tag), tags), {}));
 exports.transformMatchMedia = (0, transformTag_1.createTransformTag)({
     'match-media': 'uni-match-media',
 });
@@ -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,11 @@
+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 shouldUseHighResolutionSourceMap(): 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,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isUniAppXAndroidNative = exports.isUniAppXAndroidJsEngine = exports.isUniAppXJsEngine = exports.isUniAppXAndroidVapor = exports.shouldUseHighResolutionSourceMap = 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 shouldUseHighResolutionSourceMap() {
+    return !(process.env.NODE_ENV === 'development' && isUniAppXVapor());
+}
+exports.shouldUseHighResolutionSourceMap = shouldUseHighResolutionSourceMap;
+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