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

package/dist/easycom.js

@@ -10,6 +10,7 @@ const debug_1 = __importDefault(require("debug"));
 const shared_1 = require("@vue/shared");
 const pluginutils_1 = require("@rollup/pluginutils");
 const uni_shared_1 = require("@dcloudio/uni-shared");
+const x_1 = require("./x");
 const utils_1 = require("./utils");
 const pages_1 = require("./json/pages");
 const messages_1 = require("./messages");
@@ -64,6 +65,9 @@ function initEasycoms(inputDir, { dirs, platform, isX, }) {
             ;
             globalThis.uts2jsSourceCodeMap.initUts2jsEasycom(easycoms);
         }
+        // UTS / customElements 组件是在 initEasycom 之后补充进去的，
+        // 这里补一次状态，避免项目里只有这类组件时被误判为没有 easycom。
+        hasEasycom = !!easycoms.length;
     };
     const initUTSEasycomCustomElements = () => {
         (0, uts_1.initUTSCustomElements)(inputDir, platform).forEach((item) => {
@@ -109,8 +113,8 @@ function initEasycoms(inputDir, { dirs, platform, isX, }) {
                 clearEasycom();
                 (0, uts_1.clearUTSComponents)();
                 (0, uts_1.clearUTSCustomElements)();
-                initEasycom(easyComOptions);
-                if (isX) {
+                initEasycom(res.easyComOptions);
+                if (supportCustomElements) {
                     initUTSEasycomCustomElements();
                 }
                 initUTSEasycom();
@@ -194,9 +198,21 @@ function matchEasycom(tag) {
         easycomsInvalidCache.add(tag);
         return false;
     }
+    // dom2 不支持旧版 uni-app 兼容模式组件，这里在 easycom 真正命中时再报错，
+    // 避免扫描阶段就对未使用的插件组件产生误报。
+    if (process.env.UNI_APP_X_DOM2 === 'true' && matcher.dom2IncompatibleFile) {
+        throw new Error(messages_1.M['dom2.compatible.component']
+            .replace('{name}', `<${tag}>`)
+            .replace('{file}', matcher.dom2IncompatibleFile));
+    }
     source = tag.replace(matcher.pattern, matcher.replacement);
     easycomsCache.set(tag, source);
     debugEasycom('matchEasycom', tag, source);
+    // 检查 H5 专用组件 ask163203
+    const H5_ONLY_COMPONENTS = ['custom-tab-bar'];
+    if (H5_ONLY_COMPONENTS.includes(tag) && process.env.UNI_PLATFORM !== 'h5') {
+        console.warn(`[uni-app] 组件 <${tag}> 是 H5 平台专用组件，在 ${process.env.UNI_PLATFORM} 平台使用可能导致错误。如果你要引入自定义 tabBar 可重命名为其他名称。`);
+    }
     return source;
 }
 exports.matchEasycom = matchEasycom;
@@ -255,12 +271,7 @@ function initAutoScanEasycom(platform, dir, rootDir, extensions) {
                 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'}`))
+                        ? (0, utils_1.normalizePath)(path_1.default.join(rootDir, `uni_modules/${uni_modules_plugin_id}?${(0, x_1.isUniAppXAndroidNative)() ? 'uts-proxy' : 'uni_helpers'}`))
                         : `${importDir}/${name}${ext}`;
                 break;
             }
@@ -313,7 +324,10 @@ function createImportDeclaration(local, source, imported) {
 }
 const RESOLVE_EASYCOM_IMPORT_CODE = `import { resolveDynamicComponent as __resolveDynamicComponent } from 'vue';import { resolveEasycom } from '@dcloudio/uni-app';`;
 function genResolveEasycomCode(importDeclarations, code, name) {
-    if (process.env.UNI_APP_X_DOM2 === 'true') {
+    if (process.env.UNI_APP_X_DOM2 === 'true' ||
+        // 内部 dev 版本，需要本地开发内置组件，比如web-view，此时需要直接返回本地easycom，不然会找到基座内置的
+        (process.env.UNI_HX_VERSION_DEV === 'true' &&
+            process.env.UNI_APP_X === 'true')) {
         // dom2 模式下，为了性能，不再考虑优先级问题，如果开发者需要区别，可以手动导入为其他名称
         return name;
     }

package/dist/env/define.d.ts

@@ -2,7 +2,6 @@ export declare function initDefine(stringifyBoolean?: boolean): {
     __X_STYLE_ISOLATION__: string | boolean;
     __X_STYLE_ISOLATION_UP_ARROW__: string | boolean;
     'process.env.UNI_APP_X_NEW_STYLE_ISOLATION': string | boolean;
-    __UNI_FEATURE_VIRTUAL_HOST__: boolean;
     'process.env.NODE_ENV': string;
     'process.env.UNI_DEBUG': string | boolean;
     'process.env.UNI_APP_ID': string;

package/dist/env/define.js

@@ -15,17 +15,9 @@ function initDefine(stringifyBoolean = false) {
     const isNewStyleIsolationUpArrow = isNewStyleIsolation && process.env.UNI_PLATFORM === 'mp-weixin';
     const isMP = process.env.UNI_PLATFORM && process.env.UNI_PLATFORM.startsWith('mp-');
     process.env['UNI_APP_ID'] = manifestJson.appid;
-    let mpXDefine = isX && isMP
-        ? {
-            __UNI_FEATURE_VIRTUAL_HOST__: true,
-        }
-        : {
-            __UNI_FEATURE_VIRTUAL_HOST__: false,
-        };
-    if (isX && isMP) {
-        mpXDefine.__UNI_FEATURE_VIRTUAL_HOST__ =
-            platformManifestJson.enableVirtualHost !== false;
-    }
+    const mpXDefine = {
+        __UNI_FEATURE_VIRTUAL_HOST__: isX && isMP && platformManifestJson.enableVirtualHost !== false,
+    };
     const styleIsolation = stringifyBoolean
         ? JSON.stringify(isNewStyleIsolation)
         : isNewStyleIsolation;

package/dist/hbx/alias.js

@@ -1,10 +1,10 @@
 "use strict";
-// 注意：该文件尽可能少依赖其他文件，否则可能会导致还没有alias的时候，就加载了目标模块
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatInstallHBuilderXPluginTips = exports.moduleAliasFormatter = exports.installHBuilderXPlugin = exports.initModuleAlias = void 0;
+// 注意：该文件尽可能少依赖其他文件，否则可能会导致还没有alias的时候，就加载了目标模块
 const path_1 = __importDefault(require("path"));
 const module_alias_1 = __importDefault(require("module-alias"));
 const utils_1 = require("./utils");
@@ -15,23 +15,77 @@ const hbxPlugins = {
     stylus: 'compile-stylus/node_modules/stylus',
     pug: 'compile-pug-cli/node_modules/pug',
 };
+function isWebOrMpPlatform(platform) {
+    return platform === 'h5' || platform === 'web' || platform?.startsWith('mp-');
+}
 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');
+    if (process.env.UNI_OUTPUT_DIR) {
+        const baseOutDir = path_1.default.basename(process.env.UNI_OUTPUT_DIR);
+        process.env.UNI_APP_X_CACHE_DIR =
+            process.env.UNI_APP_X_CACHE_DIR ||
+                path_1.default.resolve(process.env.UNI_OUTPUT_DIR, '../cache/.' + baseOutDir);
+    }
+    // 对路径进行兼容
+    if (!process.env.UNI_APP_X_DOM2_CPP_DIR &&
+        process.env.UNI_APP_HARMONY_DOM2_CPP_DIR) {
+        process.env.UNI_APP_X_DOM2_CPP_DIR =
+            process.env.UNI_APP_HARMONY_DOM2_CPP_DIR;
+    }
+    // alias 初始化可能早于 CLI 环境初始化，这里仅依据外部预置的平台环境变量判断。
+    // 如果是 web 和小程序，目前强制非蒸汽。
+    const utsPlatform = process.env.UNI_UTS_PLATFORM;
+    const uniPlatform = process.env.UNI_PLATFORM;
+    if (isWebOrMpPlatform(utsPlatform) || isWebOrMpPlatform(uniPlatform)) {
+        delete process.env.UNI_APP_X_DOM2;
+        delete process.env.UNI_APP_X_DOM2_DYNAMIC;
+    }
     if (process.env.UNI_APP_X_DOM2 === 'true') {
-        if (
-        // 该代码执行较早，不能使用UNI_UTS_PLATFORM
-        process.env.UNI_PLATFORM === 'app-harmony') {
-            if (process.env.UNI_OUTPUT_DIR) {
-                if (!process.env.UNI_APP_HARMONY_DOM2_CPP_DIR) {
-                    process.env.UNI_APP_HARMONY_DOM2_CPP_DIR = path_1.default.resolve(process.env.UNI_OUTPUT_DIR, 'cpp');
+        if (process.env.UNI_OUTPUT_DIR &&
+            (process.env.UNI_PLATFORM === 'app' ||
+                process.env.UNI_PLATFORM === 'app-plus' ||
+                process.env.UNI_PLATFORM === 'app-harmony')) {
+            if (!process.env.UNI_APP_X_DOM2_CPP_DIR) {
+                let baseDir = '';
+                const isAndroid = process.env.UNI_APP_PLATFORM === 'android';
+                const isIOS = process.env.UNI_APP_PLATFORM === 'ios';
+                if (process.env.NODE_ENV !== 'development' && (isAndroid || isIOS)) {
+                    baseDir = path_1.default.resolve(process.env.UNI_OUTPUT_DIR, '.uniappx', isAndroid ? 'android' : 'ios');
+                }
+                else {
+                    baseDir =
+                        process.env.UNI_PLATFORM === 'app-harmony'
+                            ? process.env.UNI_OUTPUT_DIR
+                            : process.env.UNI_APP_X_CACHE_DIR || process.env.UNI_OUTPUT_DIR;
+                }
+                process.env.UNI_APP_X_DOM2_CPP_DIR = path_1.default.resolve(baseDir, 'cpp');
+                process.env.UNI_APP_X_DOM2_SO_DIR = path_1.default.resolve(baseDir, 'so');
+            }
+            if (!process.env.UNI_APP_X_DOM2_KT_DIR) {
+                if (process.env.NODE_ENV !== 'development') {
+                    process.env.UNI_APP_X_DOM2_KT_DIR = path_1.default.resolve(process.env.UNI_OUTPUT_DIR, '.uniappx/android', 'src');
+                }
+                else {
+                    process.env.UNI_APP_X_DOM2_KT_DIR = path_1.default.resolve(process.env.UNI_APP_X_CACHE_DIR ||
+                        path_1.default.resolve(process.env.UNI_OUTPUT_DIR, '../.cache'), 'src');
                 }
             }
         }
-        else {
-            // 目前仅支持 app-harmony 平台启用 dom2
-            delete process.env.UNI_APP_X_DOM2;
+        if (process.env.UNI_APP_PLATFORM ||
+            process.env.UNI_PLATFORM === 'app-harmony') {
+            if (!process.env.UNI_APP_X_VAPOR_RENDER_TARGET) {
+                // 默认 app 平台使用 bytecode 目标
+                process.env.UNI_APP_X_VAPOR_RENDER_TARGET = 'bytecode';
+            }
+            if (process.env.UNI_APP_X_VAPOR_RENDER_TARGET?.includes('bytecode')) {
+                process.env.UNI_APP_X_DOM2_DYNAMIC = 'true';
+            }
+            // 如果是 ext-api 目标，强制使用 nativecode 目标
+            if (process.env.UNI_COMPILE_TARGET === 'ext-api') {
+                delete process.env.UNI_APP_X_DOM2_DYNAMIC;
+            }
         }
     }
     if (process.env.UNI_APP_X_DOM2 === 'true') {

package/dist/hbx/log.js

@@ -10,9 +10,10 @@ const picocolors_1 = __importDefault(require("picocolors"));
 const compiler_core_1 = require("@vue/compiler-core");
 const shared_1 = require("@vue/shared");
 const utils_1 = require("../utils");
+const utils_2 = require("./utils");
 const constants_1 = require("../constants");
 const ast_1 = require("../vite/utils/ast");
-const utils_2 = require("../vite/plugins/vitejs/utils");
+const utils_3 = require("../vite/plugins/vitejs/utils");
 const SIGNAL_H5_LOCAL = ' ➜  Local:';
 const SIGNAL_H5_NETWORK = ' ➜  Network:';
 const networkLogs = [];
@@ -29,6 +30,12 @@ function overridedConsole(name, oldFn, char) {
     console[name] = function (...args) {
         oldFn.apply(this, args.map((arg) => {
             let item;
+            if ((0, utils_2.isInHBuilderX)() && typeof arg === 'string' && arg.includes('\n')) {
+                arg = arg
+                    .split('\n')
+                    .map((line) => `${char}${line}${char}`)
+                    .join('\n');
+            }
             if (typeof arg !== 'object') {
                 item = `${char}${arg}${char}`;
             }
@@ -200,7 +207,7 @@ function buildErrorMessage(err, args = [], includeStack = true) {
                     const scriptNode = ast.children.find((node) => node.type === compiler_core_1.NodeTypes.ELEMENT && node.tag === 'script');
                     if (scriptNode) {
                         const scriptLoc = scriptNode.loc;
-                        args.push(picocolors_1.default.yellow(pad((0, utils_2.generateCodeFrame)(scriptLoc.source, err.loc))));
+                        args.push(picocolors_1.default.yellow(pad((0, utils_3.generateCodeFrame)(scriptLoc.source, err.loc))));
                         // correct error location
                         err.loc.line = scriptLoc.start.line + err.loc.line - 1;
                     }

package/dist/index.d.ts

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

package/dist/index.js

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

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

@@ -117,7 +117,15 @@ function initUniStatistics(manifestJson) {
     if (!uniStatistics) {
         return;
     }
-    if (uniStatistics.version === 2 || uniStatistics.version === '2') {
+    /**
+     * 判断是否为私有版统计：
+     * - 新配置：type === 'private'
+     * - 旧配置兼容：version === 2
+     */
+    const isPrivateStat = uniStatistics.type === 'private' ||
+        uniStatistics.version === 2 ||
+        uniStatistics.version === '2';
+    if (isPrivateStat) {
         if (uniStatistics.uniCloud && uniStatistics.uniCloud.spaceId) {
             return;
         }

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

@@ -46,7 +46,9 @@ function defineNVuePageCode(pagesJson) {
         }
         const pagePathWithExtname = (0, utils_1.normalizePagePath)(page.path, 'app');
         if (pagePathWithExtname) {
-            importNVuePagesCode.push(`import('./${pagePathWithExtname}').then((res)=>{res()})`);
+            importNVuePagesCode.push(
+            // 使用 res.default 确保 rollup 不会摇树
+            `import('./${pagePathWithExtname}').then((res)=>{res.default})`);
         }
     });
     return importNVuePagesCode.join('\n');

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, parseUniXAppAndroidPackage, } from './uni-x';
+export { normalizeUniAppXAppPagesJson, normalizeUniAppXAppConfig, parseUniXPageOptions, 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.parseUniXAppAndroidPackage = 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.parseUniXPageOptions = exports.normalizeUniAppXAppConfig = exports.normalizeUniAppXAppPagesJson = void 0;
 __exportStar(require("./mp"), exports);
 __exportStar(require("./app"), exports);
 __exportStar(require("./json"), exports);
@@ -24,6 +24,7 @@ __exportStar(require("./theme"), exports);
 var uni_x_1 = require("./uni-x");
 Object.defineProperty(exports, "normalizeUniAppXAppPagesJson", { enumerable: true, get: function () { return uni_x_1.normalizeUniAppXAppPagesJson; } });
 Object.defineProperty(exports, "normalizeUniAppXAppConfig", { enumerable: true, get: function () { return uni_x_1.normalizeUniAppXAppConfig; } });
+Object.defineProperty(exports, "parseUniXPageOptions", { enumerable: true, get: function () { return uni_x_1.parseUniXPageOptions; } });
 Object.defineProperty(exports, "parseUniXFlexDirection", { enumerable: true, get: function () { return uni_x_1.parseUniXFlexDirection; } });
 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; } });

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

@@ -2,3 +2,5 @@ export * from './jsonFile';
 export { AppJson, ComponentJson, MiniProgramComponentsType } from './types';
 export { mergeMiniProgramAppJson, parseMiniProgramPagesJson } from './pages';
 export { parseMiniProgramProjectJson } from './project';
+export { MP_INDEPENDENT_ROOT_QUERY, MP_INDEPENDENT_MAIN_PREFIX, MP_INDEPENDENT_VIRTUAL_ROOT_QUERY, formatIndependentVirtualId, getIndependentRootByFilename, getIndependentRoots, getIndependentSubPackages, hasIndependentRoot, isAppPagesJson, isInIndependentRoot, normalizeIndependentRoot, parseIndependentMainRoot, parseIndependentRoot, parseIndependentSubPackages, parseIndependentVirtualRoot, resolveIndependentRoot, setIndependentSubPackages, stringifyIndependentRoots, withIndependentRoot, withIndependentRootIfNeeded, withoutIndependentRoot, } from './subpackage';
+export type { IndependentSubPackage } from './subpackage';

package/dist/json/mp/index.js

@@ -14,10 +14,32 @@ 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.parseMiniProgramProjectJson = exports.parseMiniProgramPagesJson = exports.mergeMiniProgramAppJson = void 0;
+exports.withoutIndependentRoot = exports.withIndependentRootIfNeeded = exports.withIndependentRoot = exports.stringifyIndependentRoots = exports.setIndependentSubPackages = exports.resolveIndependentRoot = exports.parseIndependentVirtualRoot = exports.parseIndependentSubPackages = exports.parseIndependentRoot = exports.parseIndependentMainRoot = exports.normalizeIndependentRoot = exports.isInIndependentRoot = exports.isAppPagesJson = exports.hasIndependentRoot = exports.getIndependentSubPackages = exports.getIndependentRoots = exports.getIndependentRootByFilename = exports.formatIndependentVirtualId = exports.MP_INDEPENDENT_VIRTUAL_ROOT_QUERY = exports.MP_INDEPENDENT_MAIN_PREFIX = exports.MP_INDEPENDENT_ROOT_QUERY = exports.parseMiniProgramProjectJson = exports.parseMiniProgramPagesJson = exports.mergeMiniProgramAppJson = void 0;
 __exportStar(require("./jsonFile"), exports);
 var pages_1 = require("./pages");
 Object.defineProperty(exports, "mergeMiniProgramAppJson", { enumerable: true, get: function () { return pages_1.mergeMiniProgramAppJson; } });
 Object.defineProperty(exports, "parseMiniProgramPagesJson", { enumerable: true, get: function () { return pages_1.parseMiniProgramPagesJson; } });
 var project_1 = require("./project");
 Object.defineProperty(exports, "parseMiniProgramProjectJson", { enumerable: true, get: function () { return project_1.parseMiniProgramProjectJson; } });
+var subpackage_1 = require("./subpackage");
+Object.defineProperty(exports, "MP_INDEPENDENT_ROOT_QUERY", { enumerable: true, get: function () { return subpackage_1.MP_INDEPENDENT_ROOT_QUERY; } });
+Object.defineProperty(exports, "MP_INDEPENDENT_MAIN_PREFIX", { enumerable: true, get: function () { return subpackage_1.MP_INDEPENDENT_MAIN_PREFIX; } });
+Object.defineProperty(exports, "MP_INDEPENDENT_VIRTUAL_ROOT_QUERY", { enumerable: true, get: function () { return subpackage_1.MP_INDEPENDENT_VIRTUAL_ROOT_QUERY; } });
+Object.defineProperty(exports, "formatIndependentVirtualId", { enumerable: true, get: function () { return subpackage_1.formatIndependentVirtualId; } });
+Object.defineProperty(exports, "getIndependentRootByFilename", { enumerable: true, get: function () { return subpackage_1.getIndependentRootByFilename; } });
+Object.defineProperty(exports, "getIndependentRoots", { enumerable: true, get: function () { return subpackage_1.getIndependentRoots; } });
+Object.defineProperty(exports, "getIndependentSubPackages", { enumerable: true, get: function () { return subpackage_1.getIndependentSubPackages; } });
+Object.defineProperty(exports, "hasIndependentRoot", { enumerable: true, get: function () { return subpackage_1.hasIndependentRoot; } });
+Object.defineProperty(exports, "isAppPagesJson", { enumerable: true, get: function () { return subpackage_1.isAppPagesJson; } });
+Object.defineProperty(exports, "isInIndependentRoot", { enumerable: true, get: function () { return subpackage_1.isInIndependentRoot; } });
+Object.defineProperty(exports, "normalizeIndependentRoot", { enumerable: true, get: function () { return subpackage_1.normalizeIndependentRoot; } });
+Object.defineProperty(exports, "parseIndependentMainRoot", { enumerable: true, get: function () { return subpackage_1.parseIndependentMainRoot; } });
+Object.defineProperty(exports, "parseIndependentRoot", { enumerable: true, get: function () { return subpackage_1.parseIndependentRoot; } });
+Object.defineProperty(exports, "parseIndependentSubPackages", { enumerable: true, get: function () { return subpackage_1.parseIndependentSubPackages; } });
+Object.defineProperty(exports, "parseIndependentVirtualRoot", { enumerable: true, get: function () { return subpackage_1.parseIndependentVirtualRoot; } });
+Object.defineProperty(exports, "resolveIndependentRoot", { enumerable: true, get: function () { return subpackage_1.resolveIndependentRoot; } });
+Object.defineProperty(exports, "setIndependentSubPackages", { enumerable: true, get: function () { return subpackage_1.setIndependentSubPackages; } });
+Object.defineProperty(exports, "stringifyIndependentRoots", { enumerable: true, get: function () { return subpackage_1.stringifyIndependentRoots; } });
+Object.defineProperty(exports, "withIndependentRoot", { enumerable: true, get: function () { return subpackage_1.withIndependentRoot; } });
+Object.defineProperty(exports, "withIndependentRootIfNeeded", { enumerable: true, get: function () { return subpackage_1.withIndependentRootIfNeeded; } });
+Object.defineProperty(exports, "withoutIndependentRoot", { enumerable: true, get: function () { return subpackage_1.withoutIndependentRoot; } });

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

@@ -6,11 +6,12 @@ export declare function getComponentJsonFilenames(): string[];
 export declare function findJsonFile(filename: string): Record<string, any> | ComponentJson | PageWindowOptions | undefined;
 export declare function findUsingComponents(filename: string): UsingComponents | undefined;
 export declare function normalizeJsonFilename(filename: string): string;
-export declare function findChangedJsonFiles(supportGlobalUsingComponents?: boolean): Map<string, string>;
+export declare function findChangedJsonFiles(supportGlobalUsingComponents?: boolean | ((filename: string) => boolean)): Map<string, string>;
 export declare function addMiniProgramAppJson(appJson: Record<string, any>): void;
 export declare function addMiniProgramPageJson(filename: string, json: PageWindowOptions): void;
 export declare function addMiniProgramComponentJson(filename: string, json: ComponentJson): void;
 export declare function addMiniProgramUsingComponents(filename: string, json: UsingComponents): void;
+export declare function resetMiniProgramJsonFiles(): void;
 export declare function isMiniProgramUsingComponent(name: string, options: {
     filename: string;
     inputDir: string;
@@ -39,5 +40,5 @@ export declare function findMiniProgramUsingComponents({ filename, inputDir, com
  * - "demo": "wxcomponents/demo"
  * - [TODO 待确认] "demo": "../wxcomponents/demo"
  */
-export declare function findUsingComponentsJson(pathInpages: string, componentsDir: string): Record<any, any>;
+export declare function findUsingComponentsJson(pathInpages: string, componentsDir: string, ownerFilename?: string): Record<any, any>;
 export {};

package/dist/json/mp/jsonFile.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.findUsingComponentsJson = exports.findMiniProgramUsingComponents = exports.isMiniProgramUsingComponent = exports.addMiniProgramUsingComponents = exports.addMiniProgramComponentJson = exports.addMiniProgramPageJson = exports.addMiniProgramAppJson = exports.findChangedJsonFiles = exports.normalizeJsonFilename = exports.findUsingComponents = exports.findJsonFile = exports.getComponentJsonFilenames = exports.hasJsonFile = exports.isMiniProgramPageSfcFile = exports.isMiniProgramPageFile = void 0;
+exports.findUsingComponentsJson = exports.findMiniProgramUsingComponents = exports.isMiniProgramUsingComponent = exports.resetMiniProgramJsonFiles = exports.addMiniProgramUsingComponents = exports.addMiniProgramComponentJson = exports.addMiniProgramPageJson = exports.addMiniProgramAppJson = exports.findChangedJsonFiles = exports.normalizeJsonFilename = exports.findUsingComponents = exports.findJsonFile = exports.getComponentJsonFilenames = exports.hasJsonFile = exports.isMiniProgramPageSfcFile = exports.isMiniProgramPageFile = void 0;
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
 const shared_1 = require("@vue/shared");
@@ -11,7 +11,9 @@ const utils_1 = require("../../utils");
 const resolve_1 = require("../../resolve");
 const utils_2 = require("../../vue/utils");
 const uni_shared_1 = require("@dcloudio/uni-shared");
+const subpackage_1 = require("./subpackage");
 let appJsonCache = {};
+let independentRootsCache = [];
 const jsonFilesCache = new Map();
 const jsonPagesCache = new Map();
 const jsonComponentsCache = new Map();
@@ -64,8 +66,12 @@ function findChangedJsonFiles(supportGlobalUsingComponents = true) {
         // app.json mp-baidu 在 win 不支持相对路径。所有平台改用绝对路径
         if (filename !== 'app') {
             let usingComponents = newJson.usingComponents;
-            // 如果小程序不支持 global 的 usingComponents
-            if (!supportGlobalUsingComponents) {
+            const independentRoot = findIndependentRoot(filename, independentRootsCache);
+            const supportGlobalUsingComponentsForFile = typeof supportGlobalUsingComponents === 'function'
+                ? supportGlobalUsingComponents(filename)
+                : supportGlobalUsingComponents;
+            // 如果小程序不支持 global 的 usingComponents，或独立分包冷启动不能依赖 app.json
+            if (!supportGlobalUsingComponentsForFile || independentRoot) {
                 // 从取全局的 usingComponents 并补充到子组件 usingComponents 中
                 const globalUsingComponents = appJsonCache?.usingComponents || {};
                 const globalComponents = findUsingComponents('app') || {};
@@ -75,6 +81,9 @@ function findChangedJsonFiles(supportGlobalUsingComponents = true) {
                     ...newJson.usingComponents,
                 };
             }
+            if (independentRoot) {
+                validateIndependentUsingComponents(filename, independentRoot, usingComponents);
+            }
             Object.keys(usingComponents).forEach((name) => {
                 const componentFilename = usingComponents[name];
                 if (componentFilename.startsWith('/')) {
@@ -102,8 +111,40 @@ function findChangedJsonFiles(supportGlobalUsingComponents = true) {
     return changedJsonFiles;
 }
 exports.findChangedJsonFiles = findChangedJsonFiles;
+function findIndependentRoot(filename, independentRoots) {
+    return independentRoots.find((root) => {
+        return filename === root || filename.startsWith(root + '/');
+    });
+}
+function validateIndependentUsingComponents(filename, root, usingComponents) {
+    Object.keys(usingComponents).forEach((name) => {
+        const componentFilename = usingComponents[name];
+        if (isLocalUsingComponent(componentFilename) &&
+            !isUsingComponentInRoot(componentFilename, root, filename)) {
+            throw new Error(`独立分包 "${root}" 不能在 "${filename}" 中使用 root 外组件 "${name}"（${componentFilename}），请移动到 "${root}" 内或改为页面局部组件。`);
+        }
+    });
+}
+function isUsingComponentInRoot(componentFilename, root, ownerFilename) {
+    const filename = normalizeUsingComponentFilename(componentFilename, ownerFilename);
+    return filename === root || filename.startsWith(root + '/');
+}
+function normalizeUsingComponentFilename(componentFilename, ownerFilename) {
+    if (componentFilename.startsWith('/')) {
+        return (0, utils_1.normalizePath)(componentFilename).replace(/^\/+/, '');
+    }
+    if (componentFilename.startsWith('.')) {
+        return (0, utils_1.normalizePath)(path_1.default.join(path_1.default.dirname(ownerFilename), componentFilename));
+    }
+    return (0, utils_1.normalizePath)(componentFilename);
+}
+function isLocalUsingComponent(componentFilename) {
+    return (!/^(?:plugin|dynamicLib|ext):\/\//.test(componentFilename) &&
+        !componentFilename.startsWith('weui-miniprogram'));
+}
 function addMiniProgramAppJson(appJson) {
     appJsonCache = appJson;
+    independentRootsCache = (0, subpackage_1.parseIndependentSubPackages)(appJson).map(({ root }) => root);
 }
 exports.addMiniProgramAppJson = addMiniProgramAppJson;
 function addMiniProgramPageJson(filename, json) {
@@ -118,6 +159,16 @@ function addMiniProgramUsingComponents(filename, json) {
     jsonUsingComponentsCache.set(filename, json);
 }
 exports.addMiniProgramUsingComponents = addMiniProgramUsingComponents;
+function resetMiniProgramJsonFiles() {
+    appJsonCache = {};
+    independentRootsCache = [];
+    (0, subpackage_1.setIndependentSubPackages)([]);
+    jsonFilesCache.clear();
+    jsonPagesCache.clear();
+    jsonComponentsCache.clear();
+    jsonUsingComponentsCache.clear();
+}
+exports.resetMiniProgramJsonFiles = resetMiniProgramJsonFiles;
 function isMiniProgramUsingComponent(name, options) {
     return !!findMiniProgramUsingComponents(options)[name];
 }
@@ -135,20 +186,21 @@ function findMiniProgramUsingComponents({ filename, inputDir, componentsDir, })
     if (globalUsingComponents) {
         (0, shared_1.extend)(miniProgramComponents, findMiniProgramUsingComponent(globalUsingComponents, componentsDir));
     }
-    const jsonFile = findJsonFile((0, utils_1.removeExt)((0, utils_1.normalizeMiniProgramFilename)(filename, inputDir)));
+    const ownerFilename = (0, utils_1.removeExt)((0, utils_1.normalizeMiniProgramFilename)(filename, inputDir));
+    const jsonFile = findJsonFile(ownerFilename);
     if (jsonFile) {
         if (jsonFile.usingComponents) {
-            (0, shared_1.extend)(miniProgramComponents, findMiniProgramUsingComponent(jsonFile.usingComponents, componentsDir));
+            (0, shared_1.extend)(miniProgramComponents, findMiniProgramUsingComponent(jsonFile.usingComponents, componentsDir, ownerFilename));
         }
         // mp-baidu 特有
         if (jsonFile.usingSwanComponents) {
-            (0, shared_1.extend)(miniProgramComponents, findMiniProgramUsingComponent(jsonFile.usingSwanComponents, componentsDir));
+            (0, shared_1.extend)(miniProgramComponents, findMiniProgramUsingComponent(jsonFile.usingSwanComponents, componentsDir, ownerFilename));
         }
     }
     return miniProgramComponents;
 }
 exports.findMiniProgramUsingComponents = findMiniProgramUsingComponents;
-function findMiniProgramUsingComponent(usingComponents, componentsDir) {
+function findMiniProgramUsingComponent(usingComponents, componentsDir, ownerFilename) {
     return Object.keys(usingComponents).reduce((res, name) => {
         const path = usingComponents[name];
         if (path.includes('plugin://')) {
@@ -165,7 +217,8 @@ function findMiniProgramUsingComponent(usingComponents, componentsDir) {
         }
         else if (componentsDir &&
             path.includes(componentsDir + '/') &&
-            findUsingComponentsJson(path, componentsDir).renderer === 'xr-frame') {
+            findUsingComponentsJson(path, componentsDir, ownerFilename).renderer ===
+                'xr-frame') {
             // mp-weixin & x-frame
             res[name] = 'xr-frame';
         }
@@ -193,17 +246,15 @@ function findMiniProgramUsingComponent(usingComponents, componentsDir) {
  * - "demo": "wxcomponents/demo"
  * - [TODO 待确认] "demo": "../wxcomponents/demo"
  */
-function findUsingComponentsJson(pathInpages, componentsDir) {
+function findUsingComponentsJson(pathInpages, componentsDir, ownerFilename) {
     // 兼容test case
     if (!process.env.UNI_INPUT_DIR)
         return {};
-    let [, dir] = pathInpages.split(componentsDir);
-    if (dir === '') {
+    const fulldir = resolveUsingComponentsDir(pathInpages, componentsDir, ownerFilename);
+    if (!fulldir) {
         console.warn(`${pathInpages} 路径里没有找到对应的 ${componentsDir} 目录`);
         return {};
     }
-    dir = '.' + dir;
-    const fulldir = path_1.default.resolve(process.env.UNI_INPUT_DIR, componentsDir, dir);
     let jsonPath = fulldir + '.json';
     if (fs_1.default.existsSync(jsonPath)) {
         return require(jsonPath);
@@ -216,3 +267,22 @@ function findUsingComponentsJson(pathInpages, componentsDir) {
     return {};
 }
 exports.findUsingComponentsJson = findUsingComponentsJson;
+function resolveUsingComponentsDir(pathInpages, componentsDir, ownerFilename) {
+    const normalizedPath = (0, utils_1.normalizePath)(pathInpages);
+    if (normalizedPath.startsWith('/')) {
+        return path_1.default.resolve(process.env.UNI_INPUT_DIR, '.' + normalizedPath);
+    }
+    if (ownerFilename && normalizedPath.startsWith('.')) {
+        return path_1.default.resolve(process.env.UNI_INPUT_DIR, path_1.default.dirname(ownerFilename), normalizedPath);
+    }
+    const marker = componentsDir + '/';
+    const index = normalizedPath.indexOf(marker);
+    if (index === -1) {
+        return;
+    }
+    const dir = normalizedPath.slice(index + componentsDir.length);
+    if (!dir) {
+        return;
+    }
+    return path_1.default.resolve(process.env.UNI_INPUT_DIR, componentsDir, '.' + dir);
+}

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

@@ -3,6 +3,7 @@ interface ParsePagesJsonOptions {
     debug?: boolean;
     darkmode?: boolean;
     subpackages: boolean;
+    independentSubpackages?: boolean;
     windowOptionsMap?: Record<string, string>;
     tabBarOptionsMap?: Record<string, string>;
     tabBarItemOptionsMap?: Record<string, string>;

package/dist/json/mp/pages.js

@@ -44,7 +44,7 @@ function mergeMiniProgramAppJson(appJson, platformJson = {}, source = {}) {
     });
 }
 exports.mergeMiniProgramAppJson = mergeMiniProgramAppJson;
-function parsePagesJson(jsonStr, platform, { debug, darkmode, networkTimeout, subpackages, windowOptionsMap, tabBarOptionsMap, tabBarItemOptionsMap, } = {
+function parsePagesJson(jsonStr, platform, { debug, darkmode, independentSubpackages, networkTimeout, subpackages, windowOptionsMap, tabBarOptionsMap, tabBarItemOptionsMap, } = {
     subpackages: false,
 }) {
     let appJson = {
@@ -81,7 +81,11 @@ function parsePagesJson(jsonStr, platform, { debug, darkmode, networkTimeout, su
     pagesJson.subPackages = pagesJson.subPackages || pagesJson.subpackages;
     if (pagesJson.subPackages) {
         if (subpackages) {
-            appJson.subPackages = pagesJson.subPackages.map(({ root, pages, ...rest }) => {
+            appJson.subPackages = pagesJson.subPackages.map((subPackage) => {
+                const { root, pages, ...rest } = subPackage;
+                if (!independentSubpackages) {
+                    delete rest.independent;
+                }
                 return (0, shared_1.extend)({
                     root,
                     pages: pages.map((page) => {