@dcloudio/uni-cli-shared 3.0.0-alpha-4070620250731001 → 3.0.0-alpha-4070720250804001

package/dist/easycom.d.ts

@@ -1,4 +1,5 @@
 interface EasycomOption {
+    platform: UniApp.PLATFORM;
     isX?: boolean;
     dirs?: string[];
     rootDir: string;

package/dist/easycom.js

@@ -32,6 +32,7 @@ function initEasycoms(inputDir, { dirs, platform, isX, }) {
         // 初始化时，从once中读取缓存，refresh时，实时读取
         const { easycom } = pagesJson || (0, pages_1.parsePagesJson)(inputDir, platform, false);
         const easycomOptions = {
+            platform,
             isX,
             dirs: easycom && easycom.autoscan === false
                 ? [...dirs] // 禁止自动扫描
@@ -127,11 +128,11 @@ function initUniModulesEasycomDirs(uniModulesDir, componentsDir = 'components')
     })
         .filter(Boolean);
 }
-function initEasycom({ isX, dirs, rootDir, custom, extensions, }) {
+function initEasycom({ platform, isX, dirs, rootDir, custom, extensions, }) {
     rootDir = (0, utils_1.normalizePath)(rootDir);
     const easycomsObj = Object.create(null);
     if (dirs && dirs.length && rootDir) {
-        const autoEasyComObj = initAutoScanEasycoms(dirs, rootDir, extensions);
+        const autoEasyComObj = initAutoScanEasycoms(platform, dirs, rootDir, extensions);
         if (isX) {
             Object.keys(autoEasyComObj).forEach((tagName) => {
                 let source = autoEasyComObj[tagName];
@@ -201,7 +202,7 @@ const isDir = (path) => {
     }
     return false;
 };
-function initAutoScanEasycom(dir, rootDir, extensions) {
+function initAutoScanEasycom(platform, dir, rootDir, extensions) {
     if (!path_1.default.isAbsolute(dir)) {
         dir = path_1.default.resolve(rootDir, dir);
     }
@@ -209,6 +210,7 @@ function initAutoScanEasycom(dir, rootDir, extensions) {
     if (!fs_1.default.existsSync(dir)) {
         return easycoms;
     }
+    const isMp = platform.startsWith('mp-');
     const is_uni_modules = path_1.default.basename(path_1.default.resolve(dir, '../..')) === 'uni_modules';
     const is_easycom_encrypt_uni_modules = // uni_modules模式不需要此逻辑
      process.env.UNI_COMPILE_TARGET !== 'uni_modules' &&
@@ -228,24 +230,26 @@ function initAutoScanEasycom(dir, rootDir, extensions) {
         for (let i = 0; i < extensions.length; i++) {
             const ext = extensions[i];
             if (files.includes(name + ext)) {
-                easycoms[`^${name}$`] = is_easycom_encrypt_uni_modules
-                    ? (0, utils_1.normalizePath)(path_1.default.join(rootDir, `uni_modules/${uni_modules_plugin_id}?${
-                    // android 走 proxy
-                    process.env.UNI_APP_X === 'true' &&
-                        process.env.UNI_UTS_PLATFORM === 'app-android'
-                        ? 'uts-proxy'
-                        : 'uni_helpers'}`))
-                    : `${importDir}/${name}${ext}`;
+                easycoms[`^${name}$`] =
+                    // mp平台，这里不处理，由uniEntryPlugin处理
+                    is_easycom_encrypt_uni_modules && !isMp
+                        ? (0, utils_1.normalizePath)(path_1.default.join(rootDir, `uni_modules/${uni_modules_plugin_id}?${
+                        // android 走 proxy
+                        process.env.UNI_APP_X === 'true' &&
+                            process.env.UNI_UTS_PLATFORM === 'app-android'
+                            ? 'uts-proxy'
+                            : 'uni_helpers'}`))
+                        : `${importDir}/${name}${ext}`;
                 break;
             }
         }
     });
     return easycoms;
 }
-function initAutoScanEasycoms(dirs, rootDir, extensions) {
+function initAutoScanEasycoms(platform, dirs, rootDir, extensions) {
     const conflict = {};
     const res = dirs.reduce((easycoms, dir) => {
-        const curEasycoms = initAutoScanEasycom(dir, rootDir, extensions);
+        const curEasycoms = initAutoScanEasycom(platform, dir, rootDir, extensions);
         Object.keys(curEasycoms).forEach((name) => {
             // Use the first component when name conflict
             const componentPath = easycoms[name];

package/dist/env/define.js

@@ -48,9 +48,7 @@ function initDefine(stringifyBoolean = false) {
         // 兼容旧版本
         'process.env.VUE_APP_PLATFORM': JSON.stringify(process.env.UNI_PLATFORM || ''),
         'process.env.VUE_APP_DARK_MODE': JSON.stringify(platformManifestJson.darkmode || false),
-        __UNI_PRELOAD_SHADOW_IMAGE__: JSON.stringify(process.env.UNI_PLATFORM === 'mp-weixin'
-            ? (0, utils_1.createShadowImageUrl)(1, 'grey').slice(5)
-            : ''),
+        __UNI_PRELOAD_SHADOW_IMAGE__: JSON.stringify(process.env.UNI_PLATFORM === 'mp-weixin' ? (0, utils_1.getShadowImagePath)('grey') : ''),
         ...mpXDefine,
     };
 }

package/dist/hbx/alias.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatInstallHBuilderXPluginTips = exports.moduleAliasFormatter = exports.installHBuilderXPlugin = exports.initModuleAlias = void 0;
+const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const module_alias_1 = __importDefault(require("module-alias"));
 const utils_1 = require("./utils");
@@ -19,16 +20,48 @@ function initModuleAlias() {
     const libDir = path_1.default.resolve(__dirname, '../../lib');
     const compilerSfcPath = path_1.default.resolve(libDir, '@vue/compiler-sfc');
     const serverRendererPath = require.resolve('@vue/server-renderer');
-    module_alias_1.default.addAliases({
-        '@vue/shared': require.resolve('@vue/shared'),
-        '@vue/shared/dist/shared.esm-bundler.js': require.resolve('@vue/shared/dist/shared.esm-bundler.js'),
-        '@vue/compiler-core': path_1.default.resolve(libDir, '@vue/compiler-core'),
-        '@vue/compiler-dom': require.resolve('@vue/compiler-dom'),
-        '@vue/compiler-sfc': compilerSfcPath,
-        '@vue/server-renderer': serverRendererPath,
-        'vue/compiler-sfc': compilerSfcPath,
-        'vue/server-renderer': serverRendererPath,
-    });
+    // TODO 临时开关启用vapor
+    if (!process.env.UNI_VUE_VAPOR &&
+        process.env.UNI_INPUT_DIR &&
+        // 该代码执行较早，不能使用UNI_UTS_PLATFORM
+        (process.env.UNI_PLATFORM === 'app-harmony' ||
+            (process.env.UNI_PLATFORM === 'app' &&
+                process.env.UNI_APP_PLATFORM === 'ios'))) {
+        const vaporConfig = path_1.default.resolve(process.env.UNI_INPUT_DIR, '.vapor');
+        if (fs_1.default.existsSync(vaporConfig)) {
+            process.env.UNI_VUE_VAPOR = 'true';
+            if (fs_1.default.readFileSync(vaporConfig, 'utf-8').trim() === '*') {
+                process.env.UNI_VUE_VAPOR_ALL = 'true';
+            }
+        }
+    }
+    if (process.env.UNI_VUE_VAPOR === 'true') {
+        const vuePkgs = [
+            '@vue/compiler-core',
+            '@vue/compiler-dom',
+            '@vue/compiler-sfc',
+            '@vue/compiler-ssr',
+            '@vue/compiler-vapor',
+            '@vue/server-renderer',
+            '@vue/shared',
+        ];
+        vuePkgs.forEach((pkg) => {
+            module_alias_1.default.addAlias(pkg, path_1.default.resolve(libDir, 'vapor', '@vue', pkg.split('/').pop()));
+        });
+        module_alias_1.default.addAlias('@vitejs/plugin-vue', path_1.default.resolve(libDir, 'vapor', '@vitejs', 'plugin-vue'));
+    }
+    else {
+        module_alias_1.default.addAliases({
+            '@vue/shared': require.resolve('@vue/shared'),
+            '@vue/shared/dist/shared.esm-bundler.js': require.resolve('@vue/shared/dist/shared.esm-bundler.js'),
+            '@vue/compiler-core': path_1.default.resolve(libDir, '@vue/compiler-core'),
+            '@vue/compiler-dom': require.resolve('@vue/compiler-dom'),
+            '@vue/compiler-sfc': compilerSfcPath,
+            '@vue/server-renderer': serverRendererPath,
+            'vue/compiler-sfc': compilerSfcPath,
+            'vue/server-renderer': serverRendererPath,
+        });
+    }
     if (process.env.VITEST) {
         module_alias_1.default.addAliases({
             vue: '@dcloudio/uni-h5-vue',

package/dist/hbx/index.js

@@ -21,6 +21,7 @@ exports.isEnableConsole = exports.uniHBuilderXConsolePlugin = exports.formatInst
 const path_1 = __importDefault(require("path"));
 const utils_1 = require("../utils");
 const console_1 = require("../vite/plugins/console");
+const workers_1 = require("../workers");
 var log_1 = require("./log");
 Object.defineProperty(exports, "formatAtFilename", { enumerable: true, get: function () { return log_1.formatAtFilename; } });
 __exportStar(require("./env"), exports);
@@ -29,8 +30,17 @@ Object.defineProperty(exports, "initModuleAlias", { enumerable: true, get: funct
 Object.defineProperty(exports, "installHBuilderXPlugin", { enumerable: true, get: function () { return alias_1.installHBuilderXPlugin; } });
 Object.defineProperty(exports, "formatInstallHBuilderXPluginTips", { enumerable: true, get: function () { return alias_1.formatInstallHBuilderXPluginTips; } });
 function uniHBuilderXConsolePlugin(method = '__f__') {
+    const exclude = [];
+    if (process.env.UNI_APP_X === 'true') {
+        const workersDir = (0, workers_1.resolveWorkersDir)(process.env.UNI_INPUT_DIR);
+        if (workersDir) {
+            // 排除workers目录
+            exclude.push((0, utils_1.pathToGlob)(path_1.default.join(process.env.UNI_INPUT_DIR, workersDir), '**/*'));
+        }
+    }
     return (0, console_1.uniConsolePlugin)({
         method,
+        exclude,
         filename(filename) {
             filename = path_1.default.relative(process.env.UNI_INPUT_DIR, filename);
             if (filename.startsWith('.') || path_1.default.isAbsolute(filename)) {

package/dist/hbx/log.js

@@ -125,7 +125,22 @@ exports.errorFormatter = {
         return buildErrorMessage(opts.error, [], false);
     },
 };
+const VITE_ROLLUP_FAILED_TO_RESOLVE_IMPORT_RE = /\[vite\]: Rollup failed to resolve import "([^"]+)" from "([^"]+)"/;
 function buildErrorMessage(err, args = [], includeStack = true) {
+    if (err.customPrint) {
+        err.customPrint();
+        return '';
+    }
+    if (VITE_ROLLUP_FAILED_TO_RESOLVE_IMPORT_RE.test(err.message)) {
+        const [, importPath, fromPath] = err.message.match(VITE_ROLLUP_FAILED_TO_RESOLVE_IMPORT_RE) || [];
+        err.message = `Could not resolve "${importPath}" from "${fromPath}"`;
+        err.id = fromPath;
+    }
+    // 移除 from 后面的内容
+    // 主要是处理：Could not resolve "./static/logo1.png" from "../../../../../../Users/xxx/HBuilderProjects/test-x/pages/index/index.uvue?vue&type=script&lang.uts"
+    if (err.id && err.message.startsWith('Could not resolve ')) {
+        err.message = err.message.split(' from ')[0];
+    }
     if (err.plugin) {
         // 避免出现这样的错误：[plugin:vite:vue] [plugin vite:vue]
         if (err.message.startsWith(`[plugin ${err.plugin}]`)) {
@@ -134,7 +149,7 @@ function buildErrorMessage(err, args = [], includeStack = true) {
                 // [plugin:vite:vue]  pages/index/index.vue (2:12): v-on="" is not supported
                 const locStr = `(${err.loc.line}:${err.loc.column}):`;
                 if (msg.includes(locStr)) {
-                    msg = msg.split(locStr)[1];
+                    msg = msg.split(locStr)[1].trim();
                 }
             }
             args.push(`${picocolors_1.default.magenta('[plugin:' + err.plugin + ']')} ${picocolors_1.default.red(msg)}`);
@@ -148,6 +163,13 @@ function buildErrorMessage(err, args = [], includeStack = true) {
                     otherMsgs.push(`[plugin:${msg}`);
                 });
             }
+            if (err.loc) {
+                // [plugin:vite:vue]  pages/index/index.vue (2:12): v-on="" is not supported
+                const locStr = `(${err.loc.line}:${err.loc.column}):`;
+                if (err.message.includes(locStr)) {
+                    err.message = err.message.split(locStr)[1].trim();
+                }
+            }
             args.push(`${picocolors_1.default.magenta('[plugin:' + err.plugin + ']')} ${picocolors_1.default.red(err.message)}`);
             args.push(...otherMsgs);
             if (err.loc &&

package/dist/index.d.ts

@@ -22,8 +22,9 @@ export * from './resolve';
 export * from './scripts';
 export * from './platform';
 export * from './utsUtils';
+export * from './workers';
 export { parseUniExtApi, parseUniExtApis, parseInjects, Define, DefineOptions, Defines, getUniExtApiProviderRegisters, formatExtApiProviderName, } from './uni_modules';
-export { 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.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);
@@ -39,6 +39,7 @@ __exportStar(require("./resolve"), exports);
 __exportStar(require("./scripts"), exports);
 __exportStar(require("./platform"), exports);
 __exportStar(require("./utsUtils"), exports);
+__exportStar(require("./workers"), exports);
 var uni_modules_1 = require("./uni_modules");
 Object.defineProperty(exports, "parseUniExtApi", { enumerable: true, get: function () { return uni_modules_1.parseUniExtApi; } });
 Object.defineProperty(exports, "parseUniExtApis", { enumerable: true, get: function () { return uni_modules_1.parseUniExtApis; } });
@@ -46,6 +47,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, "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; } });
 var messages_1 = require("./messages");

package/dist/json/index.d.ts

@@ -4,5 +4,5 @@ export * from './json';
 export * from './pages';
 export * from './manifest';
 export * from './theme';
-export { normalizeUniAppXAppPagesJson, normalizeUniAppXAppConfig, parseUniXFlexDirection, parseUniXSplashScreen, isUniXPageFile, getUniXPagePaths, } from './uni-x';
+export { normalizeUniAppXAppPagesJson, normalizeUniAppXAppConfig, parseUniXFlexDirection, parseUniXSplashScreen, isUniXPageFile, getUniXPagePaths, parseUniXAppAndroidPackage, } from './uni-x';
 export { checkPagesJson } from './utils';

package/dist/json/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.checkPagesJson = exports.getUniXPagePaths = exports.isUniXPageFile = exports.parseUniXSplashScreen = exports.parseUniXFlexDirection = exports.normalizeUniAppXAppConfig = exports.normalizeUniAppXAppPagesJson = void 0;
+exports.checkPagesJson = exports.parseUniXAppAndroidPackage = exports.getUniXPagePaths = exports.isUniXPageFile = exports.parseUniXSplashScreen = exports.parseUniXFlexDirection = exports.normalizeUniAppXAppConfig = exports.normalizeUniAppXAppPagesJson = void 0;
 __exportStar(require("./mp"), exports);
 __exportStar(require("./app"), exports);
 __exportStar(require("./json"), exports);
@@ -28,5 +28,6 @@ Object.defineProperty(exports, "parseUniXFlexDirection", { enumerable: true, get
 Object.defineProperty(exports, "parseUniXSplashScreen", { enumerable: true, get: function () { return uni_x_1.parseUniXSplashScreen; } });
 Object.defineProperty(exports, "isUniXPageFile", { enumerable: true, get: function () { return uni_x_1.isUniXPageFile; } });
 Object.defineProperty(exports, "getUniXPagePaths", { enumerable: true, get: function () { return uni_x_1.getUniXPagePaths; } });
+Object.defineProperty(exports, "parseUniXAppAndroidPackage", { enumerable: true, get: function () { return uni_x_1.parseUniXAppAndroidPackage; } });
 var utils_1 = require("./utils");
 Object.defineProperty(exports, "checkPagesJson", { enumerable: true, get: function () { return utils_1.checkPagesJson; } });

package/dist/json/manifest.d.ts

@@ -1,6 +1,7 @@
 export declare const parseManifestJson: (inputDir: string) => any;
 export declare const parseManifestJsonOnce: (inputDir: string) => any;
 export declare const parseRpx2UnitOnce: (inputDir: string, platform?: UniApp.PLATFORM) => any;
+export declare function getNativeTags(inputDir?: string, platform?: UniApp.PLATFORM): any;
 interface CompilerCompatConfig {
     MODE?: 2 | 3;
 }

package/dist/json/manifest.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateThemeValue = exports.getPlatformManifestJsonOnce = exports.getPlatformManifestJson = exports.getDevServerOptions = exports.isEnableTreeShaking = exports.getRouterOptions = exports.isUniPushOffline = exports.hasPushModule = exports.isEnableSecureNetwork = exports.isEnableUniPushV2 = exports.isEnableUniPushV1 = exports.getUniStatistics = exports.normalizeNetworkTimeout = exports.parseCompatConfigOnce = exports.parseRpx2UnitOnce = exports.parseManifestJsonOnce = exports.parseManifestJson = void 0;
+exports.validateThemeValue = exports.getPlatformManifestJsonOnce = exports.getPlatformManifestJson = exports.getDevServerOptions = exports.isEnableTreeShaking = exports.getRouterOptions = exports.isUniPushOffline = exports.hasPushModule = exports.isEnableSecureNetwork = exports.isEnableUniPushV2 = exports.isEnableUniPushV1 = exports.getUniStatistics = exports.normalizeNetworkTimeout = exports.parseCompatConfigOnce = exports.getNativeTags = exports.parseRpx2UnitOnce = exports.parseManifestJsonOnce = exports.parseManifestJson = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const shared_1 = require("@vue/shared");
@@ -32,6 +32,16 @@ exports.parseRpx2UnitOnce = (0, uni_shared_1.once)((inputDir, platform = 'h5') =
     }
     return (0, shared_1.extend)({}, rpx2unit);
 });
+// 获取配置的小程序原生组件
+function getNativeTags(inputDir, platform) {
+    if (!inputDir || !platform) {
+        return [];
+    }
+    const manifestJson = (0, exports.parseManifestJsonOnce)(inputDir);
+    const platformOptions = getPlatformManifestJson(manifestJson, platform);
+    return platformOptions?.nativeTags || [];
+}
+exports.getNativeTags = getNativeTags;
 function parseCompatConfig(_inputDir) {
     // 不支持 mode:2
     return { MODE: 3 }; //parseManifestJsonOnce(inputDir).compatConfig || {}

package/dist/json/mp/jsonFile.js

@@ -93,8 +93,10 @@ function findChangedJsonFiles(supportGlobalUsingComponents = true) {
             findChangedFile(name, jsonsCache.get(name));
         }
     }
-    findChangedFile('app', appJsonCache);
-    findChangedFiles(jsonPagesCache);
+    if (process.env.UNI_COMPILE_TARGET !== 'uni_modules') {
+        findChangedFile('app', appJsonCache);
+        findChangedFiles(jsonPagesCache);
+    }
     findChangedFiles(jsonComponentsCache);
     return changedJsonFiles;
 }

package/dist/json/mp/pages.js

@@ -33,6 +33,7 @@ const NON_APP_JSON_KEYS = [
     'mergeVirtualHostAttributes',
     'styleIsolation',
     'enableVirtualHost',
+    'nativeTags',
 ];
 function mergeMiniProgramAppJson(appJson, platformJson = {}, source = {}) {
     Object.keys(source).forEach((key) => {

package/dist/json/mp/types.d.ts

@@ -101,7 +101,10 @@ export interface AppJson {
     debug?: boolean;
     functionalPages?: boolean;
     subPackages?: SubPackage[];
-    workers?: string;
+    workers?: string | {
+        path: string;
+        isSubpackage: boolean;
+    };
     requiredBackgroundModes?: string[];
     plugins?: Plugins;
     preloadRule?: PreloadRule;

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

@@ -1,2 +1,3 @@
 export declare function parseUniXFlexDirection(manifestJson: Record<string, any>): any;
 export declare function parseUniXSplashScreen(platform: 'app-android' | 'app-ios' | 'app-harmony', manifestJson: Record<string, any>): false | object;
+export declare function parseUniXAppAndroidPackage(appid: string): string;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseUniXSplashScreen = exports.parseUniXFlexDirection = void 0;
+exports.parseUniXAppAndroidPackage = exports.parseUniXSplashScreen = exports.parseUniXFlexDirection = void 0;
 const shared_1 = require("@vue/shared");
 const flexDirs = ['row', 'row-reverse', 'column', 'column-reverse'];
 function parseUniXFlexDirection(manifestJson) {
@@ -19,3 +19,7 @@ function parseUniXSplashScreen(platform, manifestJson) {
     return false;
 }
 exports.parseUniXSplashScreen = parseUniXSplashScreen;
+function parseUniXAppAndroidPackage(appid) {
+    return 'uni.' + appid.replace(/_/g, '');
+}
+exports.parseUniXAppAndroidPackage = parseUniXAppAndroidPackage;

package/dist/messages/zh_CN.js

@@ -44,6 +44,7 @@ exports.default = {
     'prompt.run.devtools.quickapp-webview-huawei': '华为快应用开发者工具',
     'prompt.run.devtools.quickapp-webview-union': '快应用联盟开发者工具',
     'uvue.unsupported': 'uvue 暂不支持 {platform} 平台',
+    // 重要：HBuilderX也会用到，如果调整了文案，需要同步调整HBuilderX的文案
     'uvue.dev.watching.end.empty': '本次代码变更，编译结果未发生变化，跳过同步手机端程序文件。',
     'uni_modules.import': '插件[{0}]仅支持 @/uni_modules/{1} 方式引入，不支持直接导入内部文件 {2}。',
     'pages.json.page.notfound': '页面"{pagePath}"不存在，请确保填写的页面路径不包含文件后缀，且必须与真实的文件路径大小写保持一致。',

package/dist/uni_modules.cloud.d.ts

@@ -1,4 +1,4 @@
-export declare function genEncryptEasyComModuleCode(platform: typeof process.env.UNI_UTS_PLATFORM, components: Record<string, '.vue' | '.uvue'>): string;
+export declare function genEncryptEasyComModuleCode(pluginId: string, platform: typeof process.env.UNI_UTS_PLATFORM, components: Record<string, '.vue' | '.uvue'>): string;
 export declare function genEncryptUTSModuleCode(module: string, inputDir: string, platform: typeof process.env.UNI_UTS_PLATFORM): string;
 export declare function parseUniModulesWithComponents(inputDir: string, platform: typeof process.env.UNI_UTS_PLATFORM): Record<string, string>;
 /**
@@ -19,7 +19,7 @@ export declare function parseEasyComComponents(pluginId: string, inputDir: strin
  * @param cacheDir
  * @returns
  */
-export declare function findCloudEncryptUniModules(platform: typeof process.env.UNI_UTS_PLATFORM, inputDir: string, cacheDir?: string): Record<string, EncryptPackageJson | undefined>;
+export declare function findCloudEncryptUniModules(platform: typeof process.env.UNI_UTS_PLATFORM, inputDir: string, cacheDir?: string, sdkType?: CloudCompileSdkType): Record<string, EncryptPackageJson | undefined>;
 export declare function findUploadEncryptUniModulesFiles(uniModules: Record<string, EncryptPackageJson | undefined>, platform: typeof process.env.UNI_UTS_PLATFORM, inputDir: string): Record<string, string[]>;
 export declare function packUploadEncryptUniModules(uniModules: Record<string, EncryptPackageJson | undefined>, platform: typeof process.env.UNI_UTS_PLATFORM, inputDir: string, cacheDir: string): {
     zipFile: string;
@@ -47,7 +47,8 @@ export interface EncryptPackageJson {
 }
 export declare function initCheckEnv(): Record<string, string>;
 export declare function resolveEncryptUniModule(id: string, platform: typeof process.env.UNI_UTS_PLATFORM, isX?: boolean): string | undefined;
-export declare function checkEncryptUniModules(inputDir: string, params: {
+type CloudCompileSdkType = 'utssdk' | 'easycom' | 'all';
+export interface CloudCompileParams {
     mode: 'development' | 'production';
     packType: 'debug' | 'release';
     compilerVersion: string;
@@ -55,10 +56,15 @@ export declare function checkEncryptUniModules(inputDir: string, params: {
     appname: string;
     platform: typeof process.env.UNI_UTS_PLATFORM;
     'uni-app-x': boolean;
-}): Promise<{} | undefined>;
+    env: Record<string, string>;
+}
+export declare function checkEncryptUniModules(inputDir: string, params: CloudCompileParams, sdkType?: CloudCompileSdkType): Promise<{} | undefined>;
+export declare function getUniModulesEncryptType(pluginId: string): "" | "utssdk" | "easycom" | undefined;
 export declare function parseUniModulesArtifacts(): {
     name: string;
     package: string;
     scopedSlots: string[];
     declaration: string;
 }[];
+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.parseUniModulesArtifacts = 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");
@@ -11,32 +11,49 @@ const utils_1 = require("./utils");
 const easycom_1 = require("./easycom");
 const messages_1 = require("./messages");
 const constants_1 = require("./constants");
-function genEncryptEasyComModuleIndex(platform, components) {
+const url_1 = require("./url");
+function genEncryptEasyComModuleIndex(pluginId, platform, components) {
+    const isMp = platform.startsWith('mp-');
     const imports = [];
+    const code = [];
     const ids = [];
     Object.keys(components).forEach((component) => {
         const id = (0, utils_1.capitalize)((0, utils_1.camelize)(component));
-        ids.push(id);
+        if (!isMp) {
+            ids.push(id);
+        }
         let instance = '';
         if (platform === 'app-android') {
             instance = (0, easycom_1.genUTSComponentPublicInstanceIdent)(component);
             // 类型
             ids.push(instance);
         }
-        imports.push(`import ${id}${instance ? `, { ${instance} }` : ''} from './components/${component}/${component}${components[component]}'`);
+        if (isMp) {
+            const filename = `uni_modules/${pluginId}/components/${component}/${component}${components[component]}`;
+            // 为了触发json、wxss的生成
+            imports.push(`import ${id} from '${virtualComponentPath(filename)}'`);
+            code.push(`function defineComponent${id}(){
+  ${process.env.UNI_MP_GLOBAL || 'uni'}.createComponent(${id})
+}`);
+            ids.push(`defineComponent${id}`);
+        }
+        else {
+            imports.push(`import ${id}${instance ? `, { ${instance} }` : ''} from './components/${component}/${component}${components[component]}'`);
+        }
     });
     return `
 ${imports.join('\n')}
+${code.join('\n')}
 export { 
   ${ids.join(',\n  ')} 
 }
   `;
 }
 // easyCom
-function genEncryptEasyComModuleCode(platform, components) {
+function genEncryptEasyComModuleCode(pluginId, platform, components) {
     // easyCom
     if (components && Object.keys(components).length) {
-        return genEncryptEasyComModuleIndex(platform, components);
+        return genEncryptEasyComModuleIndex(pluginId, platform, components);
     }
     return '';
 }
@@ -83,7 +100,7 @@ function parseUniModulesWithComponents(inputDir, platform) {
                 // 解析加密的 easyCom 插件列表
                 const components = parseEasyComComponents(uniModuleDir, inputDir, false);
                 if (Object.keys(components).length) {
-                    codes.push(genEncryptEasyComModuleCode(platform, components));
+                    codes.push(genEncryptEasyComModuleCode(uniModuleDir, platform, components));
                 }
                 if (codes.length) {
                     uniModules[uniModuleDir] = codes.join(`\n`);
@@ -145,7 +162,7 @@ const uniModulesEncryptTypes = new Map();
  * @param cacheDir
  * @returns
  */
-function findCloudEncryptUniModules(platform, inputDir, cacheDir = '') {
+function findCloudEncryptUniModules(platform, inputDir, cacheDir = '', sdkType = 'all') {
     uniModulesEncryptTypes.clear();
     const uniModules = {};
     const modulesDir = path_1.default.resolve(inputDir, 'uni_modules');
@@ -159,10 +176,7 @@ function findCloudEncryptUniModules(platform, inputDir, cacheDir = '') {
             let type = '';
             if (fs_extra_1.default.existsSync(utssdkDir)) {
                 // app-android 和 app-ios 不能云编译 utssdk 插件，而是需要自定义基座
-                // app-harmony 平台目前不支持云编译
-                if (platform === 'app-android' ||
-                    platform === 'app-ios' ||
-                    platform === 'app-harmony') {
+                if (platform === 'app-android' || platform === 'app-ios') {
                     return;
                 }
                 // 其他平台必须有平台index.uts或根目录index.uts
@@ -181,6 +195,12 @@ function findCloudEncryptUniModules(platform, inputDir, cacheDir = '') {
                 }
                 type = 'easycom';
             }
+            if (sdkType === 'utssdk' && type === 'easycom') {
+                return;
+            }
+            if (sdkType === 'easycom' && type === 'utssdk') {
+                return;
+            }
             const pkg = require(path_1.default.resolve(uniModuleRootDir, 'package.json'));
             uniModules[uniModuleDir] = findEncryptUniModuleCache(uniModuleDir, cacheDir, {
                 version: pkg.version,
@@ -331,12 +351,21 @@ function resolveEncryptUniModule(id, platform, isX = true) {
             // 为了避免兼容性问题，
             // 目前排除 app-android 和 app-ios 平台，其他平台需要判断是否uvue文件，比如web端。加密utssdk插件，但同时easycom使用了非加密组件
             if (platform !== 'app-android' && platform !== 'app-ios') {
-                if (uniModulesEncryptTypes.get(uniModuleId) === 'utssdk') {
+                const encryptType = getUniModulesEncryptType(uniModuleId);
+                if (encryptType === 'utssdk') {
                     // 如果是utssdk加密插件，且是vue文件，则不走uts-proxy
                     if (constants_1.EXTNAME_VUE_RE.test(id)) {
                         return;
                     }
                 }
+                // 小程序平台不使用uni_helpers来处理easycom组件，而是用uniEntryPlugin处理
+                if (platform.startsWith('mp-')) {
+                    if (encryptType === 'easycom') {
+                        if (constants_1.EXTNAME_VUE_RE.test(id)) {
+                            return;
+                        }
+                    }
+                }
             }
             // 原生平台走旧的uts-proxy
             return (0, utils_1.normalizePath)(path_1.default.join(process.env.UNI_INPUT_DIR, `uni_modules/${uniModuleId}?${isX && platform === 'app-android' ? 'uts-proxy' : 'uni_helpers'}`));
@@ -344,17 +373,17 @@ function resolveEncryptUniModule(id, platform, isX = true) {
     }
 }
 exports.resolveEncryptUniModule = resolveEncryptUniModule;
-async function checkEncryptUniModules(inputDir, params) {
-    // 扫描加密插件云编译
-    encryptUniModules = findCloudEncryptUniModules(params.platform, inputDir, process.env.UNI_MODULES_ENCRYPT_CACHE_DIR);
-    if (!Object.keys(encryptUniModules).length) {
+async function checkEncryptUniModules(inputDir, params, sdkType = 'all') {
+    // 初始化指定 sdk 类型的加密插件
+    const curEncryptUniModules = findCloudEncryptUniModules(params.platform, inputDir, process.env.UNI_MODULES_ENCRYPT_CACHE_DIR, sdkType);
+    if (!Object.keys(curEncryptUniModules).length) {
         return {};
     }
     if (!process.env.UNI_HBUILDERX_PLUGINS) {
         return {};
     }
     const cacheDir = process.env.UNI_MODULES_ENCRYPT_CACHE_DIR;
-    const { zipFile, modules } = packUploadEncryptUniModules(encryptUniModules, process.env.UNI_UTS_PLATFORM, inputDir, cacheDir);
+    const { zipFile, modules } = packUploadEncryptUniModules(curEncryptUniModules, process.env.UNI_UTS_PLATFORM, inputDir, cacheDir);
     if (zipFile) {
         const downloadFile = path_1.default.resolve(cacheDir, 'uni_modules.download.zip');
         const { C, D, R, U } = (0, utils_1.requireUniHelpers)();
@@ -411,9 +440,14 @@ async function checkEncryptUniModules(inputDir, params) {
             });
         }
     }
-    encryptUniModules = findCloudEncryptUniModules(params.platform, inputDir, process.env.UNI_MODULES_ENCRYPT_CACHE_DIR);
+    // 初始化所有
+    encryptUniModules = findCloudEncryptUniModules(params.platform, inputDir, process.env.UNI_MODULES_ENCRYPT_CACHE_DIR, 'all');
 }
 exports.checkEncryptUniModules = checkEncryptUniModules;
+function getUniModulesEncryptType(pluginId) {
+    return uniModulesEncryptTypes.get(pluginId);
+}
+exports.getUniModulesEncryptType = getUniModulesEncryptType;
 function parseUniModulesArtifacts() {
     const res = [];
     Object.keys(encryptUniModules).forEach((uniModuleId) => {
@@ -430,3 +464,8 @@ function parseUniModulesArtifacts() {
     return res;
 }
 exports.parseUniModulesArtifacts = parseUniModulesArtifacts;
+const uniComponentPrefix = 'uniComponent://';
+function virtualComponentPath(filepath) {
+    return uniComponentPrefix + (0, url_1.encodeBase64Url)(filepath);
+}
+exports.virtualComponentPath = virtualComponentPath;

package/dist/uni_modules.d.ts

@@ -17,6 +17,8 @@ export type Defines = {
 export interface Exports {
     [name: string]: Define | Defines | false;
 }
+export declare function getNonTreeShakingPlugins(): string[];
+export declare function isNonTreeShakingPlugin(platform: typeof process.env.UNI_UTS_PLATFORM, uni_modules: Record<string, any>): boolean;
 export declare function getUniExtApiProviders(): {
     plugin: string;
     service: string;