@dcloudio/uni-cli-shared 3.0.0-4070520250711001 → 3.0.0-4080420251103001

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.d.ts

@@ -18,4 +18,5 @@ export declare function initDefine(stringifyBoolean?: boolean): {
     'process.env.UNICLOUD_DEBUG': string;
     'process.env.VUE_APP_PLATFORM': string;
     'process.env.VUE_APP_DARK_MODE': string;
+    __UNI_PRELOAD_SHADOW_IMAGE__: string;
 };

package/dist/env/define.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initDefine = void 0;
+const utils_1 = require("../utils");
 const env_1 = require("../hbx/env");
 const json_1 = require("../json");
 function initDefine(stringifyBoolean = false) {
@@ -9,7 +10,7 @@ function initDefine(stringifyBoolean = false) {
     const isRunByHBuilderX = (0, env_1.runByHBuilderX)();
     const isDebug = !!manifestJson.debug;
     const isX = process.env.UNI_APP_X === 'true';
-    const isMP = process.env.UNI_PLATFORM.startsWith('mp');
+    const isMP = process.env.UNI_PLATFORM && process.env.UNI_PLATFORM.startsWith('mp-');
     process.env['UNI_APP_ID'] = manifestJson.appid;
     let mpXDefine = isX && isMP
         ? {
@@ -47,6 +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.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,19 @@ 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 workersDirs = (0, workers_1.resolveWorkersDir)(process.env.UNI_INPUT_DIR);
+        if (workersDirs.length) {
+            // 排除workers目录
+            for (const workersDir of workersDirs) {
+                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/app/manifest/env.d.ts

@@ -1,3 +1,3 @@
 export declare function getAppRenderer(manifestJson: Record<string, any>): "" | "native";
-export declare function getAppCodeSpliting(manifestJson: Record<string, any>): boolean;
+export declare function getAppCodeSplitting(manifestJson: Record<string, any>): boolean;
 export declare function getAppStyleIsolation(manifestJson: Record<string, any>): 'apply-shared' | 'isolated' | 'shared';

package/dist/json/app/manifest/env.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAppStyleIsolation = exports.getAppCodeSpliting = exports.getAppRenderer = void 0;
+exports.getAppStyleIsolation = exports.getAppCodeSplitting = exports.getAppRenderer = void 0;
 function getAppRenderer(manifestJson) {
     const platformOptions = manifestJson['app-plus'];
     if (platformOptions && platformOptions.renderer === 'native') {
@@ -9,13 +9,13 @@ function getAppRenderer(manifestJson) {
     return '';
 }
 exports.getAppRenderer = getAppRenderer;
-function getAppCodeSpliting(manifestJson) {
-    if (manifestJson['app-plus']?.optimization?.codeSpliting === true) {
+function getAppCodeSplitting(manifestJson) {
+    if (manifestJson['app-plus']?.optimization?.codeSplitting === true) {
         return true;
     }
     return false;
 }
-exports.getAppCodeSpliting = getAppCodeSpliting;
+exports.getAppCodeSplitting = getAppCodeSplitting;
 function getAppStyleIsolation(manifestJson) {
     return (manifestJson['app-plus']?.optimization?.styleIsolation ?? 'apply-shared');
 }

package/dist/json/app/manifest/index.js

@@ -31,9 +31,11 @@ const checksystemwebview_1 = require("./checksystemwebview");
 const tabBar_1 = require("./tabBar");
 const i18n_1 = require("./i18n");
 const theme_1 = require("../../theme");
+const manifest_1 = require("../../manifest");
 function normalizeAppManifestJson(userManifestJson, pagesJson) {
     const manifestJson = (0, merge_1.initRecursiveMerge)((0, defaultManifestJson_1.initDefaultManifestJson)(), userManifestJson);
-    const { pages, globalStyle, tabBar } = (0, theme_1.initTheme)(manifestJson, pagesJson);
+    const manifestJsonPlatform = (0, manifest_1.getPlatformManifestJson)(manifestJson);
+    const { pages, globalStyle, tabBar } = (0, theme_1.initTheme)(manifestJsonPlatform, pagesJson);
     (0, shared_1.extend)(pagesJson, JSON.parse(JSON.stringify({ pages, globalStyle, tabBar })));
     (0, statusbar_1.initAppStatusbar)(manifestJson, pagesJson);
     (0, arguments_1.initArguments)(manifestJson, pagesJson);

package/dist/json/app/pages/definePage.d.ts

@@ -1,2 +1,3 @@
-export declare function definePageCode(pagesJson: Record<string, any>, platform?: UniApp.PLATFORM): string;
+export declare function staticImportPageCode(pagesJson: Record<string, any>): string;
+export declare function definePageCode(pagesJson: Record<string, any>, platform?: UniApp.PLATFORM, dynamicImport?: boolean): string;
 export declare function defineNVuePageCode(pagesJson: Record<string, any>): string;

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

@@ -1,8 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.defineNVuePageCode = exports.definePageCode = void 0;
+exports.defineNVuePageCode = exports.definePageCode = exports.staticImportPageCode = void 0;
 const utils_1 = require("../../../utils");
-function definePageCode(pagesJson, platform = 'app') {
+function staticImportPageCode(pagesJson) {
+    const importPagesCode = [];
+    pagesJson.pages.forEach((page) => {
+        const pagePath = page.path;
+        const pagePathWithExtname = (0, utils_1.normalizePagePath)(pagePath, 'app');
+        if (pagePathWithExtname) {
+            importPagesCode.push(`import '../assets/${(0, utils_1.removeExt)(pagePathWithExtname)}'`);
+        }
+    });
+    return importPagesCode.join('\n');
+}
+exports.staticImportPageCode = staticImportPageCode;
+function definePageCode(pagesJson, platform = 'app', dynamicImport = false) {
     const importPagesCode = [];
     const definePagesCode = [];
     pagesJson.pages.forEach((page) => {
@@ -13,7 +25,7 @@ function definePageCode(pagesJson, platform = 'app') {
         const pageIdentifier = (0, utils_1.normalizeIdentifier)(pagePath);
         const pagePathWithExtname = (0, utils_1.normalizePagePath)(pagePath, platform);
         if (pagePathWithExtname) {
-            if (process.env.UNI_APP_CODE_SPLITING) {
+            if (dynamicImport) {
                 // 拆分页面
                 importPagesCode.push(`const ${pageIdentifier} = ()=>import('./${pagePathWithExtname}')`);
             }

package/dist/json/app/pages/index.d.ts

@@ -1,3 +1,4 @@
-export declare function normalizeAppPagesJson(pagesJson: Record<string, any>, platform?: UniApp.PLATFORM): string;
+export { staticImportPageCode } from './definePage';
+export declare function normalizeAppPagesJson(pagesJson: Record<string, any>, platform?: UniApp.PLATFORM, dynamicImport?: boolean): string;
 export declare function normalizeAppNVuePagesJson(pagesJson: Record<string, any>): string;
 export declare function normalizeAppConfigService(pagesJson: UniApp.PagesJson, manifestJson: Record<string, any>): string;

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

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeAppConfigService = exports.normalizeAppNVuePagesJson = exports.normalizeAppPagesJson = void 0;
+exports.normalizeAppConfigService = exports.normalizeAppNVuePagesJson = exports.normalizeAppPagesJson = exports.staticImportPageCode = void 0;
 const code_1 = require("./code");
 const definePage_1 = require("./definePage");
 const uniConfig_1 = require("./uniConfig");
 const uniRoutes_1 = require("./uniRoutes");
-function normalizeAppPagesJson(pagesJson, platform = 'app') {
-    return (0, definePage_1.definePageCode)(pagesJson, platform);
+var definePage_2 = require("./definePage");
+Object.defineProperty(exports, "staticImportPageCode", { enumerable: true, get: function () { return definePage_2.staticImportPageCode; } });
+function normalizeAppPagesJson(pagesJson, platform = 'app', dynamicImport = false) {
+    return (0, definePage_1.definePageCode)(pagesJson, platform, dynamicImport);
 }
 exports.normalizeAppPagesJson = normalizeAppPagesJson;
 function normalizeAppNVuePagesJson(pagesJson) {

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

@@ -10,6 +10,7 @@ const shared_1 = require("@vue/shared");
 const utils_1 = require("../../utils");
 const resolve_1 = require("../../resolve");
 const utils_2 = require("../../vue/utils");
+const uni_shared_1 = require("@dcloudio/uni-shared");
 let appJsonCache = {};
 const jsonFilesCache = new Map();
 const jsonPagesCache = new Map();
@@ -93,8 +94,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;
 }
@@ -121,7 +124,14 @@ function isMiniProgramUsingComponent(name, options) {
 exports.isMiniProgramUsingComponent = isMiniProgramUsingComponent;
 function findMiniProgramUsingComponents({ filename, inputDir, componentsDir, }) {
     const globalUsingComponents = appJsonCache && appJsonCache.usingComponents;
-    const miniProgramComponents = {};
+    // 避免 uniad 相关插件 被当作 vue 组件处理
+    const enableUniAdPlugin = process.env.UNI_PLATFORM === 'mp-weixin';
+    const miniProgramComponents = enableUniAdPlugin
+        ? uni_shared_1.UNI_AD_PLUGINS.reduce((acc, name) => {
+            acc[name] = 'plugin';
+            return acc;
+        }, {})
+        : {};
     if (globalUsingComponents) {
         (0, shared_1.extend)(miniProgramComponents, findMiniProgramUsingComponent(globalUsingComponents, componentsDir));
     }

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

@@ -37,6 +37,7 @@ interface SubPackage {
     root: string;
     pages: string[];
     independent?: boolean;
+    plugins?: Plugins;
 }
 interface TabBarItem {
     pagePath: string;
@@ -63,6 +64,8 @@ interface Plugins {
     [name: string]: {
         version: string;
         provider: string;
+        export?: string;
+        lazy?: boolean;
     };
 }
 interface PreloadRule {
@@ -101,7 +104,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/theme.js

@@ -8,7 +8,6 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const json_1 = require("./json");
 const uni_shared_1 = require("@dcloudio/uni-shared");
-const manifest_1 = require("./manifest");
 function hasThemeJson(themeLocation) {
     if (!fs_1.default.existsSync(themeLocation)) {
         return false;
@@ -84,9 +83,7 @@ exports.normalizeThemeConfigOnce = (0, uni_shared_1.once)((manifestJsonPlatform
     return themeConfig;
 });
 function initTheme(manifestJson, pagesJson) {
-    const platform = process.env.UNI_PLATFORM === 'app' ? 'app-plus' : process.env.UNI_PLATFORM;
-    const manifestPlatform = (0, manifest_1.getPlatformManifestJson)(manifestJson, platform) || {};
-    const themeConfig = (0, exports.normalizeThemeConfigOnce)(manifestPlatform);
+    const themeConfig = (0, exports.normalizeThemeConfigOnce)(manifestJson);
     return (0, uni_shared_1.normalizeStyles)(pagesJson, themeConfig);
 }
 exports.initTheme = initTheme;

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}"不存在，请确保填写的页面路径不包含文件后缀，且必须与真实的文件路径大小写保持一致。',