@dcloudio/uni-cli-shared 3.0.0-5010520260709002 → 3.0.0-5020320260806002

package/dist/dom2/vue.d.ts

@@ -9,7 +9,6 @@ export declare function initVueTemplateCompilerExtraOptions(descriptor: SFCDescr
     enableRootScrollViewTransform: boolean;
     rootScrollView: import("src/json/uni-x").UniXPageOptions | undefined;
     scriptCppBlocks: any;
-    disableStaticStyle: boolean;
     onVueTemplateCompileLog(type: 'warn' | 'error', error: CompilerError): void;
     r: any;
     className: any;

package/dist/dom2/vue.js

@@ -13,32 +13,19 @@ function initVueTemplateCompilerExtraOptions(descriptor) {
     const relativeFilename = (0, utils_1.normalizePath)(path_1.default.relative(process.env.UNI_INPUT_DIR, filename));
     const rootScrollView = (0, json_1.parseUniXPageOptions)(filename);
     const componentType = rootScrollView || (0, json_1.isUniPageFile)(filename) ? 'page' : 'component';
-    const isDevX = process.env.UNI_HX_VERSION_DEV === 'true' &&
-        process.env.UNI_APP_X === 'true';
     const isDynamic = process.env.UNI_APP_X_DOM2_DYNAMIC === 'true';
-    let disableStaticStyle = false;
-    if (isDevX &&
-        // 动态渲染时，仍旧使用静态样式，避免性能问题。
-        !isDynamic &&
-        process.env.NODE_ENV === 'development') {
-        if (process.env.UNI_UTS_PLATFORM === 'app-harmony') {
-            // 开发版本、开发模式下，非鸿蒙release模式打包
-            disableStaticStyle = process.env.UNI_APP_HARMONY_RUN_MODE !== 'release';
-        }
-    }
     const helper = (0, utils_1.requireUniHelpers)();
     return {
         root: (0, utils_1.normalizePath)(process.env.UNI_INPUT_DIR),
         platform: process.env.UNI_UTS_PLATFORM,
         componentType,
-        filename: filename,
+        filename,
         relativeFilename,
         helper,
         enableRootScrollViewTransform: true,
         // 仅页面透传 rootScrollView，避免非页面组件误触发 ROOT 自动包裹逻辑。
         rootScrollView: componentType === 'page' ? rootScrollView : undefined,
         scriptCppBlocks: descriptor.scriptCppBlocks,
-        disableStaticStyle,
         onVueTemplateCompileLog(type, error) {
             return (0, vue_1.onVueTemplateCompileLog)(type, error, descriptor.source, relativeFilename);
         },

package/dist/hbx/alias.js

@@ -5,11 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatInstallHBuilderXPluginTips = exports.moduleAliasFormatter = exports.installHBuilderXPlugin = exports.initModuleAlias = void 0;
 // 注意：该文件尽可能少依赖其他文件，否则可能会导致还没有alias的时候，就加载了目标模块
-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");
-const jsonc_parser_1 = require("jsonc-parser");
 const hbxPlugins = {
     typescript: 'compile-typescript/node_modules/typescript',
     less: 'compile-less/node_modules/less',
@@ -17,32 +15,32 @@ 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;
     }
-    // TODO 等待正式对外推出后，删除这个兼容逻辑
-    if (process.env.UNI_APP_PLATFORM === 'ios' ||
-        process.env.UNI_APP_PLATFORM === 'android') {
-        if (process.env.UNI_INPUT_DIR) {
-            const manifestJsonFilename = path_1.default.resolve(process.env.UNI_INPUT_DIR, 'manifest.json');
-            if (fs_1.default.existsSync(manifestJsonFilename)) {
-                const manifestJsonStr = fs_1.default.readFileSync(manifestJsonFilename, 'utf-8');
-                const manifestJson = (0, jsonc_parser_1.parse)(manifestJsonStr);
-                if (manifestJson?.['uni-app-x']?.vapor === true) {
-                    const vaporFilename = path_1.default.resolve(process.env.UNI_INPUT_DIR, '.vapor');
-                    if (fs_1.default.existsSync(vaporFilename)) {
-                        process.env.UNI_APP_X_DOM2 = 'true';
-                    }
-                }
-            }
-        }
+    // 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 (process.env.UNI_OUTPUT_DIR &&

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/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) => {

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

@@ -0,0 +1,26 @@
+export declare const MP_INDEPENDENT_ROOT_QUERY = "uni_mp_independent_root";
+export declare const MP_INDEPENDENT_MAIN_PREFIX = "\0uni:mp-independent-main";
+export declare const MP_INDEPENDENT_VIRTUAL_ROOT_QUERY = "root";
+export interface IndependentSubPackage {
+    root: string;
+    pages: string[];
+    independent: true;
+}
+export declare function parseIndependentSubPackages(pagesJson: UniApp.PagesJson | undefined): IndependentSubPackage[];
+export declare function setIndependentSubPackages(packages: IndependentSubPackage[]): void;
+export declare function getIndependentSubPackages(): IndependentSubPackage[];
+export declare function getIndependentRoots(): Set<string>;
+export declare function getIndependentRootByFilename(filename: string, inputDir: string | undefined): string | undefined;
+export declare function resolveIndependentRoot(id: string, importer: string | undefined, inputDir: string | undefined, platform: string | undefined): string | undefined;
+export declare function withIndependentRootIfNeeded(id: string, root: string | undefined, inputDir: string | undefined): string;
+export declare function isInIndependentRoot(filename: string, inputDir: string, root: string): boolean;
+export declare function isAppPagesJson(filename: string, inputDir: string): boolean;
+export declare function stringifyIndependentRoots(packages: IndependentSubPackage[]): string;
+export declare function normalizeIndependentRoot(root: string): string;
+export declare function parseIndependentRoot(id: string): string | undefined;
+export declare function withIndependentRoot(id: string, root: string): string;
+export declare function withoutIndependentRoot(id: string): string;
+export declare function hasIndependentRoot(id: string): boolean;
+export declare function formatIndependentVirtualId(prefix: string, root: string): string;
+export declare function parseIndependentMainRoot(id: string): string | undefined;
+export declare function parseIndependentVirtualRoot(id: string, prefix: string): string | undefined;