@tarojs/webpack5-runner 4.1.12-beta.3 → 4.1.12-beta.32

package/dist/plugins/MiniPlugin.js

@@ -25,8 +25,13 @@ const TaroNormalModulesPlugin_1 = __importDefault(require("./TaroNormalModulesPl
 const TaroSingleEntryPlugin_1 = __importDefault(require("./TaroSingleEntryPlugin"));
 const baseCompName = 'comp';
 const customWrapperName = 'custom-wrapper';
+const subPackageIndieCustomWrapperRootsKey = '__taroSubPackageIndieCustomWrapperRoots';
+const recursiveComponentName = 'recursive-component';
 const PLUGIN_NAME = 'TaroMiniPlugin';
 const CHILD_COMPILER_TAG = 'child';
+const SUBPACKAGE_STANDALONE_CHILD_TAG = 'sub_package_indie_standalone_child';
+const STYLE_ISOLATION_APPLY_SHARED = 'apply-shared';
+const STYLE_ISOLATION_SHARED = 'shared';
 function isLoaderExist(loaders, loaderName) {
     return loaders.some(item => item.loader === loaderName);
 }
@@ -46,6 +51,7 @@ class TaroMiniPlugin {
         this.dependencies = new Map();
         this.pageLoaderName = '@tarojs/taro-loader/lib/page';
         this.independentPackages = new Map();
+        this.moduleRequestMap = new Map();
         const { combination } = options;
         const miniBuildConfig = combination.config;
         const { template, baseLevel = 16, experimental } = miniBuildConfig;
@@ -135,6 +141,7 @@ class TaroMiniPlugin {
             const dependencies = this.dependencies;
             const promises = [];
             this.compileIndependentPages(compiler, compilation, dependencies, promises);
+            this.compileSubPackageIndieStandaloneEntries(compiler, compilation, promises);
             dependencies.forEach(dep => {
                 promises.push(new Promise((resolve, reject) => {
                     compilation.addEntry(this.options.sourceDir, dep, Object.assign({ name: dep.name }, dep.options), err => err ? reject(err) : resolve(null));
@@ -147,6 +154,44 @@ class TaroMiniPlugin {
             /** For Webpack compilation get factory from compilation.dependencyFactories by denpendence's constructor */
             compilation.dependencyFactories.set(EntryDependency_1.default, normalModuleFactory);
             compilation.dependencyFactories.set(TaroSingleEntryDependency_1.default, normalModuleFactory);
+            if (this.options.newBlended) {
+                normalModuleFactory.hooks.afterResolve.tap(PLUGIN_NAME, (resolveData) => {
+                    var _a, _b;
+                    const issuer = (_a = resolveData.contextInfo) === null || _a === void 0 ? void 0 : _a.issuer;
+                    const request = resolveData.request;
+                    const resource = ((_b = resolveData.createData) === null || _b === void 0 ? void 0 : _b.resource) || resolveData.resource;
+                    if (!issuer || !request || !resource)
+                        return;
+                    this.setResolvedRequestResource(issuer, request, resource);
+                });
+            }
+            // 在 afterResolve 阶段收集每个 subPackageIndieRoot 实际使用的组件
+            if (this.options.newBlended) {
+                normalModuleFactory.hooks.afterResolve.tap(PLUGIN_NAME, (resolveData) => {
+                    var _a;
+                    if (resolveData.request !== helper_1.taroJsComponents)
+                        return;
+                    const issuer = (_a = resolveData.contextInfo) === null || _a === void 0 ? void 0 : _a.issuer;
+                    if (!issuer || !issuer.startsWith(this.options.sourceDir))
+                        return;
+                    const componentName = this.getComponentName(issuer);
+                    const root = this.isInSubPackageIndieRoot(componentName);
+                    if (!root)
+                        return;
+                    resolveData.dependencies.forEach((dependency) => {
+                        var _a;
+                        if (((_a = dependency.ids) === null || _a === void 0 ? void 0 : _a.length) > 0) {
+                            dependency.ids.forEach((id) => {
+                                const dashedName = this.toDashedComponentName(id);
+                                if (!component_1.componentConfig.scopedIncludes.has(root)) {
+                                    component_1.componentConfig.scopedIncludes.set(root, new Set());
+                                }
+                                component_1.componentConfig.scopedIncludes.get(root).add(dashedName);
+                            });
+                        }
+                    });
+                });
+            }
             /**
              * webpack NormalModule 在 runLoaders 真正解析资源的前一刻，
              * 往 NormalModule.loaders 中插入对应的 Taro Loader
@@ -225,6 +270,8 @@ class TaroMiniPlugin {
                 name: PLUGIN_NAME,
                 stage: PROCESS_ASSETS_STAGE_ADDITIONAL
             }, this.tryAsync(() => __awaiter(this, void 0, void 0, function* () {
+                if (compilation.__tag === SUBPACKAGE_STANDALONE_CHILD_TAG)
+                    return;
                 // 如果是子编译器，证明是编译独立分包，进行单独的处理
                 if (compilation.__tag === CHILD_COMPILER_TAG) {
                     yield this.generateIndependentMiniFiles(compilation, compiler);
@@ -239,6 +286,8 @@ class TaroMiniPlugin {
                 // Stage 触发顺序：https://webpack.js.org/api/compilation-hooks/#list-of-asset-processing-stages
                 stage: PROCESS_ASSETS_STAGE_OPTIMIZE
             }, this.tryAsync(() => __awaiter(this, void 0, void 0, function* () {
+                if (compilation.__tag === SUBPACKAGE_STANDALONE_CHILD_TAG)
+                    return;
                 yield this.optimizeMiniFiles(compilation, compiler);
             })));
             compilation.hooks.processAssets.tapAsync({
@@ -246,6 +295,8 @@ class TaroMiniPlugin {
                 // 该 stage 是最后执行的，确保 taro 暴露给用户的钩子 modifyBuildAssets 在内部处理完 assets 之后再调用
                 stage: PROCESS_ASSETS_STAGE_REPORT
             }, this.tryAsync(() => __awaiter(this, void 0, void 0, function* () {
+                if (compilation.__tag === SUBPACKAGE_STANDALONE_CHILD_TAG)
+                    return;
                 if (typeof modifyBuildAssets === 'function') {
                     yield modifyBuildAssets(compilation.assets, this);
                 }
@@ -293,14 +344,27 @@ class TaroMiniPlugin {
                     const entryChunk = [{ name: 'app' }];
                     // 所有模块都依赖app.js，确保@tarojs\plugin-platform-xxx\dist\runtime.js先于@tarojs/runtime执行，避免Taro API未被初始化
                     if (this.nativeComponents.has(id) || miniType === helper_1.META_TYPE.STATIC) {
+                        // ★ 检查是否属于子分包独立模板
+                        const isSubPackageIndie = this.isInSubPackageIndieRoot(id);
+                        if (isSubPackageIndie) {
+                            // 子分包组件不注入 require，直接返回原始模块
+                            return modules;
+                        }
                         fileChunks.forEach((v, k) => {
                             if (k === id) {
                                 source = (0, webpack_1.addRequireToSource)(id, modules, v);
                             }
                         });
-                        return source;
+                        // 如果没有依赖需要注入，返回原始模块
+                        return source || modules;
                     }
                     else if (miniType === helper_1.META_TYPE.PAGE) {
+                        // ★ 检查是否属于子分包独立模板，使用本地 app.js
+                        const subPackageIndieRoot = this.isInSubPackageIndieRoot(id);
+                        if (subPackageIndieRoot) {
+                            const localAppChunk = [{ name: `${subPackageIndieRoot}/app` }];
+                            return (0, webpack_1.addRequireToSource)(id, modules, localAppChunk);
+                        }
                         return (0, webpack_1.addRequireToSource)(id, modules, entryChunk);
                     }
                 }
@@ -570,6 +634,113 @@ class TaroMiniPlugin {
             this.nativeComponents.set(item, componentObj);
         });
     }
+    /**
+     * 规范化子分包独立模板的根路径
+     * 如果路径以 /index 结尾（表示页面路径），则返回其父目录（文件所在目录）
+     * @example 'pages/index/index' => 'pages/index'
+     * @example 'pages/order' => 'pages/order'
+     */
+    normalizeIndieRoot(root) {
+        // 如果以 /index 结尾，说明是页面路径，需要取其所在目录
+        if (root.endsWith('/index')) {
+            return node_path_1.default.dirname(root);
+        }
+        return root;
+    }
+    /**
+     * 获取所有子分包独立模板的根路径列表（已规范化）
+     * @returns 规范化后的分包根路径数组，如果未配置则返回空数组
+     */
+    getAllIndieRoots() {
+        return Array.from(new Set(this.getSubPackageIndieConfigs().flatMap(({ mainPackageRoot, subPackageRoots }) => [mainPackageRoot, ...subPackageRoots])));
+    }
+    /**
+     * 获取子分包独立模板配置列表（已规范化）
+     */
+    /**
+     * 解析 SubPackageIndieRootConfig 联合类型，返回归一化后的路径和是否禁用递归组件
+     */
+    parseIndieRootConfig(rootConfig) {
+        if (typeof rootConfig === 'string') {
+            return { path: this.normalizeIndieRoot(rootConfig), disableRecursiveComponent: false };
+        }
+        return {
+            path: this.normalizeIndieRoot(rootConfig.path),
+            disableRecursiveComponent: !!rootConfig.disableRecursiveComponent
+        };
+    }
+    getSubPackageIndieConfigs() {
+        var _a;
+        const subPackageIndie = (_a = this.appConfig) === null || _a === void 0 ? void 0 : _a.subPackageIndie;
+        if (!Array.isArray(subPackageIndie))
+            return [];
+        return subPackageIndie.map(({ mainPackageRoot, subPackageRoots = [] }) => {
+            const mainParsed = this.parseIndieRootConfig(mainPackageRoot);
+            const subParsedList = subPackageRoots.map(root => this.parseIndieRootConfig(root));
+            const disableRecursiveComponentRoots = new Set();
+            if (mainParsed.disableRecursiveComponent) {
+                disableRecursiveComponentRoots.add(mainParsed.path);
+            }
+            subParsedList.forEach(sub => {
+                if (sub.disableRecursiveComponent) {
+                    disableRecursiveComponentRoots.add(sub.path);
+                }
+            });
+            return {
+                mainPackageRoot: mainParsed.path,
+                subPackageRoots: Array.from(new Set(subParsedList.map(sub => sub.path))),
+                disableRecursiveComponentRoots
+            };
+        });
+    }
+    /**
+     * 判断给定的 indie root 是否禁用了递归组件（comp/custom-wrapper/recursive-component）
+     */
+    isRecursiveComponentDisabledForRoot(root) {
+        return this.getSubPackageIndieConfigs().some(config => config.disableRecursiveComponentRoots.has(root));
+    }
+    getAllMainPackageRoots() {
+        return Array.from(new Set(this.getSubPackageIndieConfigs().map(item => item.mainPackageRoot)));
+    }
+    getAllSubPackageRoots() {
+        return Array.from(new Set(this.getSubPackageIndieConfigs().flatMap(item => item.subPackageRoots)));
+    }
+    hasSubPackageIndieMainPackageRoot() {
+        return this.getAllMainPackageRoots().length > 0;
+    }
+    getSubPackageIndieMatch(pageName) {
+        const { newBlended } = this.options;
+        if (!newBlended)
+            return null;
+        const configs = this.getSubPackageIndieConfigs();
+        for (const config of configs) {
+            if (pageName.startsWith(config.mainPackageRoot + '/') || pageName === config.mainPackageRoot) {
+                return {
+                    config,
+                    root: config.mainPackageRoot,
+                    isMainPackageRoot: true
+                };
+            }
+            for (const root of config.subPackageRoots) {
+                if (pageName.startsWith(root + '/') || pageName === root) {
+                    return {
+                        config,
+                        root,
+                        isMainPackageRoot: false
+                    };
+                }
+            }
+        }
+        return null;
+    }
+    /**
+     * 判断给定路径是否属于子分包独立模板的分包（包括 mainPackageRoot 和 subPackageRoots）
+     * @returns 匹配的分包根路径（已规范化），或 null
+     */
+    isInSubPackageIndieRoot(pageName) {
+        var _a;
+        return ((_a = this.getSubPackageIndieMatch(pageName)) === null || _a === void 0 ? void 0 : _a.root) || null;
+    }
     /**
      * 读取页面及其依赖的组件的配置
      */
@@ -611,8 +782,11 @@ class TaroMiniPlugin {
      */
     addEntry(entryPath, entryName, entryType, options = {}) {
         let dep;
-        if (this.dependencies.has(entryPath)) {
-            dep = this.dependencies.get(entryPath);
+        // ★ 对于 STATIC 类型（如 comp/custom-wrapper），使用 entryName 作为 key 的一部分
+        // 这允许同一个模板文件被多次添加为不同名称的入口
+        const depKey = entryType === helper_1.META_TYPE.STATIC ? `${entryPath}#${entryName}` : entryPath;
+        if (this.dependencies.has(depKey)) {
+            dep = this.dependencies.get(depKey);
             dep.name = entryName;
             dep.loc = { name: entryName };
             dep.request = entryPath;
@@ -623,18 +797,23 @@ class TaroMiniPlugin {
         else {
             dep = new TaroSingleEntryDependency_1.default(entryPath, entryName, { name: entryName }, entryType, options);
         }
-        this.dependencies.set(entryPath, dep);
+        this.dependencies.set(depKey, dep);
     }
     /**
      * 在 this.dependencies 中新增或修改 app、模板组件、页面、组件等资源模块
      */
     addEntries() {
-        const { template } = this.options;
+        const { template, newBlended } = this.options;
         this.addEntry(this.appEntry, 'app', helper_1.META_TYPE.ENTRY);
-        if (!template.isSupportRecursive) {
+        // ★ 当配置了 mainPackageRoot 时，跳过根目录 comp 和 custom-wrapper 入口
+        const skipRootEntries = this.hasSubPackageIndieMainPackageRoot() && newBlended;
+        if (!template.isSupportRecursive && !skipRootEntries) {
             this.addEntry(node_path_1.default.resolve(__dirname, '..', 'template/comp'), 'comp', helper_1.META_TYPE.STATIC);
         }
-        this.addEntry(node_path_1.default.resolve(__dirname, '..', 'template/custom-wrapper'), 'custom-wrapper', helper_1.META_TYPE.STATIC);
+        if (!skipRootEntries) {
+            this.addEntry(node_path_1.default.resolve(__dirname, '..', 'template/custom-wrapper'), 'custom-wrapper', helper_1.META_TYPE.STATIC);
+        }
+        // subPackageIndie 下的 comp/custom-wrapper 统一走独立子编译器，避免被主编译的公共 chunk 共享
         this.pages.forEach(item => {
             if (item.isNative) {
                 this.addEntry(item.path, item.name, helper_1.META_TYPE.NORMAL, { isNativePage: true });
@@ -900,6 +1079,45 @@ class TaroMiniPlugin {
             });
         }
     }
+    compileSubPackageIndieStandaloneEntries(compiler, compilation, promises) {
+        const { newBlended } = this.options;
+        const indieRoots = this.getAllIndieRoots();
+        if (!newBlended || !indieRoots.length)
+            return;
+        const JsonpTemplatePlugin = require('webpack/lib/web/JsonpTemplatePlugin');
+        const NaturalChunkIdsPlugin = require('webpack/lib/ids/NaturalChunkIdsPlugin');
+        indieRoots.forEach(root => {
+            // ★ 禁用递归组件的 root 不需要编译 recursive-component
+            if (this.isRecursiveComponentDisabledForRoot(root))
+                return;
+            const childCompiler = compilation.createChildCompiler(PLUGIN_NAME, {
+                path: compiler.options.output.path,
+                filename: '[name].js',
+                chunkFilename: '[name].js',
+                chunkLoadingGlobal: `subpackage_indie_${root.replace(/[\\/]/g, '_')}`
+            });
+            childCompiler.inputFileSystem = compiler.inputFileSystem;
+            childCompiler.outputFileSystem = compiler.outputFileSystem;
+            childCompiler.context = compiler.context;
+            new JsonpTemplatePlugin().apply(childCompiler);
+            new NaturalChunkIdsPlugin().apply(childCompiler);
+            new compiler.webpack.DefinePlugin(this.options.constantsReplaceList).apply(childCompiler);
+            childCompiler.hooks.compilation.tap(PLUGIN_NAME, (childCompilation) => {
+                childCompilation.__tag = SUBPACKAGE_STANDALONE_CHILD_TAG;
+                childCompilation.__name = root;
+            });
+            childCompiler.options.optimization = Object.assign(Object.assign({}, childCompiler.options.optimization), { splitChunks: false, runtimeChunk: false });
+            const outputOptions = childCompiler.options.output || {};
+            const libraryOptions = typeof outputOptions.library === 'object' && outputOptions.library !== null
+                ? outputOptions.library
+                : {};
+            childCompiler.options.output = Object.assign(Object.assign({}, outputOptions), { library: Object.assign(Object.assign({}, libraryOptions), { type: 'commonjs2' }) });
+            new TaroSingleEntryPlugin_1.default(compiler.context, node_path_1.default.resolve(__dirname, '..', 'template/recursive-component'), `${root}/${recursiveComponentName}`, helper_1.META_TYPE.EXPORTS).apply(childCompiler);
+            promises.push(new Promise((resolve, reject) => {
+                childCompiler.runAsChild(err => err ? reject(err) : resolve(null));
+            }));
+        });
+    }
     /**
      * 搜集 tabbar icon 图标路径
      * 收集自定义 tabbar 组件
@@ -962,6 +1180,552 @@ class TaroMiniPlugin {
             usingComponents[key] = match ? `${node_path_1.default.sep}${match[0]}` : compPath;
         }
     }
+    cloneThirdPartyComponent(thirdPartyComponents, componentName) {
+        const attrs = component_1.componentConfig.thirdPartyComponents.get(componentName);
+        if (!attrs || thirdPartyComponents.has(componentName))
+            return;
+        thirdPartyComponents.set(componentName, new Set(attrs));
+    }
+    getSubPackageIndieEntriesByRoot(root) {
+        const entries = new Map();
+        [...this.pages, ...this.components].forEach(item => {
+            if (this.isInSubPackageIndieRoot(item.name) === root) {
+                entries.set(item.name, item);
+            }
+        });
+        return Array.from(entries.values());
+    }
+    getSubPackageIndieEntryNamesByRoot(root) {
+        return this.getSubPackageIndieEntriesByRoot(root).map(item => item.name);
+    }
+    getComponentByName(componentName) {
+        return [...this.pages, ...this.components].find(item => item.name === componentName);
+    }
+    getChunksBySubPackageIndieRoot(compilation, root) {
+        const chunks = new Set();
+        this.getSubPackageIndieEntryNamesByRoot(root).forEach(entryName => {
+            const entryChunk = Array.from(compilation.chunks).find(chunk => chunk.name === entryName);
+            if (!entryChunk)
+                return;
+            chunks.add(entryChunk);
+            entryChunk.groupsIterable.forEach(group => {
+                group.chunks.forEach(chunk => chunks.add(chunk));
+            });
+        });
+        return chunks;
+    }
+    getModuleSourceContent(module) {
+        var _a;
+        try {
+            const source = (_a = module === null || module === void 0 ? void 0 : module.originalSource) === null || _a === void 0 ? void 0 : _a.call(module);
+            if (!source || typeof source.source !== 'function')
+                return '';
+            return String(source.source() || '');
+        }
+        catch (_err) {
+            return '';
+        }
+    }
+    getModuleResource(module) {
+        var _a;
+        const resource = (module === null || module === void 0 ? void 0 : module.resource) || ((_a = module === null || module === void 0 ? void 0 : module.rootModule) === null || _a === void 0 ? void 0 : _a.resource);
+        return typeof resource === 'string' ? resource : undefined;
+    }
+    collectFlattenedModules(module, collected, visited = new Set()) {
+        if (!module || visited.has(module))
+            return;
+        visited.add(module);
+        collected.add(module);
+        const nestedModuleCollections = [module.rootModule, module.modules, module._modules];
+        nestedModuleCollections.forEach(item => {
+            if (!item)
+                return;
+            if (item && typeof item[Symbol.iterator] === 'function') {
+                for (const nested of item) {
+                    this.collectFlattenedModules(nested, collected, visited);
+                }
+            }
+            else {
+                this.collectFlattenedModules(item, collected, visited);
+            }
+        });
+    }
+    getCompilationModuleResourceMap(compilation) {
+        const moduleMap = new Map();
+        for (const module of compilation.modules) {
+            const flattenedModules = new Set();
+            this.collectFlattenedModules(module, flattenedModules);
+            flattenedModules.forEach(flattenedModule => {
+                const resource = this.getModuleResource(flattenedModule);
+                if (resource) {
+                    moduleMap.set(resource, flattenedModule);
+                }
+            });
+        }
+        return moduleMap;
+    }
+    getSubPackageIndieModules(compilation, root) {
+        const modules = new Set();
+        this.getChunksBySubPackageIndieRoot(compilation, root).forEach(chunk => {
+            for (const module of compilation.chunkGraph.getChunkModulesIterable(chunk)) {
+                this.collectFlattenedModules(module, modules);
+            }
+        });
+        return modules;
+    }
+    normalizeModuleRequestMapKey(resource) {
+        if (!resource || typeof resource !== 'string')
+            return null;
+        const resourceWithoutLoader = resource.split('!').pop();
+        if (!resourceWithoutLoader)
+            return null;
+        const resourcePath = resourceWithoutLoader.split('?')[0];
+        if (!resourcePath)
+            return null;
+        return node_path_1.default.normalize(resourcePath);
+    }
+    getModuleRequestMapKeys(resource) {
+        const keys = new Set();
+        if (resource && typeof resource === 'string') {
+            keys.add(resource);
+        }
+        const normalizedResource = this.normalizeModuleRequestMapKey(resource);
+        if (normalizedResource) {
+            keys.add(normalizedResource);
+        }
+        return Array.from(keys);
+    }
+    setResolvedRequestResource(issuer, request, resource) {
+        this.getModuleRequestMapKeys(issuer).forEach(key => {
+            if (!this.moduleRequestMap.has(key)) {
+                this.moduleRequestMap.set(key, new Map());
+            }
+            this.moduleRequestMap.get(key).set(request, resource);
+        });
+    }
+    getResolvedRequestResource(issuerResource, request) {
+        var _a;
+        for (const key of this.getModuleRequestMapKeys(issuerResource)) {
+            const resolvedResource = (_a = this.moduleRequestMap.get(key)) === null || _a === void 0 ? void 0 : _a.get(request);
+            if (resolvedResource)
+                return resolvedResource;
+        }
+    }
+    getResolvedModuleByResource(moduleResourceMap, resource) {
+        const exactModule = moduleResourceMap.get(resource);
+        if (exactModule)
+            return exactModule;
+        const normalizedResource = this.normalizeModuleRequestMapKey(resource);
+        if (!normalizedResource)
+            return null;
+        const normalizedModule = moduleResourceMap.get(normalizedResource);
+        if (normalizedModule)
+            return normalizedModule;
+        for (const [moduleResource, module] of moduleResourceMap.entries()) {
+            if (this.normalizeModuleRequestMapKey(moduleResource) === normalizedResource) {
+                return module;
+            }
+        }
+        return null;
+    }
+    resolveRequestedModule(moduleResourceMap, issuerModule, request) {
+        const issuerResource = this.getModuleResource(issuerModule);
+        const resolvedResource = this.getResolvedRequestResource(issuerResource, request);
+        if (resolvedResource) {
+            const resolvedModule = this.getResolvedModuleByResource(moduleResourceMap, resolvedResource);
+            if (resolvedModule)
+                return resolvedModule;
+        }
+        if (issuerResource && /^[.\\/]/.test(request)) {
+            const requestPath = node_path_1.default.resolve(node_path_1.default.dirname(issuerResource), request);
+            const resolvedPath = (0, helper_1.resolveMainFilePath)(requestPath);
+            const requestModule = this.getResolvedModuleByResource(moduleResourceMap, resolvedPath);
+            if (requestModule)
+                return requestModule;
+        }
+        for (const module of moduleResourceMap.values()) {
+            if (!module)
+                continue;
+            if (module.rawRequest === request || module.userRequest === request || module.request === request) {
+                return module;
+            }
+        }
+        return null;
+    }
+    resolveImportBindingToTaroComponentName(moduleResourceMap, issuerModule, binding, propertyName, visited = new Set()) {
+        if (!(binding === null || binding === void 0 ? void 0 : binding.source))
+            return null;
+        if (binding.kind === 'namespace') {
+            if (!propertyName)
+                return null;
+            if (binding.source === helper_1.taroJsComponents) {
+                return propertyName;
+            }
+            const targetModule = this.resolveRequestedModule(moduleResourceMap, issuerModule, binding.source);
+            if (!targetModule) {
+                if (!/^[.\\/]/.test(binding.source)) {
+                    return propertyName;
+                }
+                return null;
+            }
+            return this.resolveModuleExportToTaroComponentName(moduleResourceMap, targetModule, propertyName, visited);
+        }
+        const importedName = binding.imported || propertyName;
+        if (!importedName || importedName === 'default')
+            return null;
+        if (binding.source === helper_1.taroJsComponents) {
+            return importedName;
+        }
+        const targetModule = this.resolveRequestedModule(moduleResourceMap, issuerModule, binding.source);
+        if (!targetModule) {
+            if (!/^[.\\/]/.test(binding.source)) {
+                return importedName;
+            }
+            return null;
+        }
+        return this.resolveModuleExportToTaroComponentName(moduleResourceMap, targetModule, importedName, visited);
+    }
+    resolveModuleExportToTaroComponentName(moduleResourceMap, module, exportName, visited = new Set()) {
+        var _a, _b;
+        const moduleResource = this.getModuleResource(module);
+        if (!moduleResource)
+            return null;
+        const visitKey = `${moduleResource}::${exportName}`;
+        if (visited.has(visitKey))
+            return null;
+        visited.add(visitKey);
+        const exportBinding = (_a = module === null || module === void 0 ? void 0 : module.exportBindings) === null || _a === void 0 ? void 0 : _a[exportName];
+        if (exportBinding) {
+            if (exportBinding.kind === 'reexport' && exportBinding.source) {
+                if (exportBinding.source === helper_1.taroJsComponents) {
+                    return exportBinding.imported || exportName;
+                }
+                const targetModule = this.resolveRequestedModule(moduleResourceMap, module, exportBinding.source);
+                if (targetModule) {
+                    const resolvedName = this.resolveModuleExportToTaroComponentName(moduleResourceMap, targetModule, exportBinding.imported || exportName, visited);
+                    if (resolvedName)
+                        return resolvedName;
+                }
+            }
+            if (exportBinding.kind === 'local' && exportBinding.local) {
+                const importedBinding = (_b = module === null || module === void 0 ? void 0 : module.importedBindings) === null || _b === void 0 ? void 0 : _b[exportBinding.local];
+                if (importedBinding) {
+                    const resolvedName = this.resolveImportBindingToTaroComponentName(moduleResourceMap, module, importedBinding, undefined, visited);
+                    if (resolvedName)
+                        return resolvedName;
+                }
+            }
+        }
+        for (const source of (module === null || module === void 0 ? void 0 : module.exportAllSources) || []) {
+            if (source === helper_1.taroJsComponents) {
+                return exportName;
+            }
+            const targetModule = this.resolveRequestedModule(moduleResourceMap, module, source);
+            if (!targetModule)
+                continue;
+            const resolvedName = this.resolveModuleExportToTaroComponentName(moduleResourceMap, targetModule, exportName, visited);
+            if (resolvedName)
+                return resolvedName;
+        }
+        return null;
+    }
+    resolveUsedComponentRefToTaroComponentName(moduleResourceMap, module, componentRef) {
+        var _a, _b;
+        if (!componentRef)
+            return null;
+        if (componentRef.kind === 'identifier') {
+            const binding = (_a = module === null || module === void 0 ? void 0 : module.importedBindings) === null || _a === void 0 ? void 0 : _a[componentRef.name];
+            if (!binding) {
+                return componentRef.name;
+            }
+            const resolvedName = this.resolveImportBindingToTaroComponentName(moduleResourceMap, module, binding);
+            return resolvedName || componentRef.name;
+        }
+        if (componentRef.kind === 'member') {
+            const binding = (_b = module === null || module === void 0 ? void 0 : module.importedBindings) === null || _b === void 0 ? void 0 : _b[componentRef.object];
+            if (!binding) {
+                return componentRef.property || null;
+            }
+            const resolvedName = this.resolveImportBindingToTaroComponentName(moduleResourceMap, module, binding, componentRef.property);
+            return resolvedName || componentRef.property || null;
+        }
+        return null;
+    }
+    isSubPackageIndieRootUsingCustomWrapperByModules(compilation, root) {
+        const moduleResourceMap = this.getCompilationModuleResourceMap(compilation);
+        for (const module of this.getSubPackageIndieModules(compilation, root)) {
+            if (this.shouldSkipSubPackageIndieModule(module, root))
+                continue;
+            for (const componentRef of (module === null || module === void 0 ? void 0 : module.usedComponentRefs) || []) {
+                const resolvedComponentName = this.resolveUsedComponentRefToTaroComponentName(moduleResourceMap, module, componentRef);
+                if (resolvedComponentName === 'CustomWrapper') {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+    shouldSkipSubPackageIndieModule(module, root) {
+        const resource = this.getModuleResource(module);
+        if (typeof resource !== 'string' || !resource.startsWith(this.options.sourceDir)) {
+            return false;
+        }
+        const componentName = this.getComponentName(resource);
+        const targetRoot = this.isInSubPackageIndieRoot(componentName);
+        return !!targetRoot && targetRoot !== root;
+    }
+    collectModuleResolvedComponentIncludes(compilation, root) {
+        const includes = new Set();
+        const moduleResourceMap = this.getCompilationModuleResourceMap(compilation);
+        for (const module of this.getSubPackageIndieModules(compilation, root)) {
+            if (this.shouldSkipSubPackageIndieModule(module, root))
+                continue;
+            for (const elementName of (module === null || module === void 0 ? void 0 : module.elementNameSet) || []) {
+                if (!component_1.componentConfig.thirdPartyComponents.has(elementName)) {
+                    includes.add(elementName);
+                }
+            }
+            for (const binding of Object.values((module === null || module === void 0 ? void 0 : module.importedBindings) || {})) {
+                const resolvedComponentName = this.resolveImportBindingToTaroComponentName(moduleResourceMap, module, binding);
+                if (!resolvedComponentName)
+                    continue;
+                const dashedName = this.toDashedComponentName(resolvedComponentName);
+                if (!component_1.componentConfig.thirdPartyComponents.has(dashedName)) {
+                    includes.add(dashedName);
+                }
+            }
+            for (const componentRef of (module === null || module === void 0 ? void 0 : module.usedComponentRefs) || []) {
+                const resolvedComponentName = this.resolveUsedComponentRefToTaroComponentName(moduleResourceMap, module, componentRef);
+                if (!resolvedComponentName)
+                    continue;
+                const dashedName = this.toDashedComponentName(resolvedComponentName);
+                if (!component_1.componentConfig.thirdPartyComponents.has(dashedName)) {
+                    includes.add(dashedName);
+                }
+            }
+        }
+        return includes;
+    }
+    expandScopedIncludes(includes) {
+        const scopedIncludes = new Set(includes);
+        if (scopedIncludes.has('view')) {
+            scopedIncludes.add('catch-view');
+            scopedIncludes.add('static-view');
+            scopedIncludes.add('pure-view');
+            scopedIncludes.add('click-view');
+        }
+        if (scopedIncludes.has('image')) {
+            scopedIncludes.add('static-image');
+        }
+        if (scopedIncludes.has('text')) {
+            scopedIncludes.add('static-text');
+        }
+        return scopedIncludes;
+    }
+    toDashedComponentName(componentName) {
+        return componentName.replace(/[A-Z]/g, (match, offset) => `${offset === 0 ? '' : '-'}${match.toLowerCase()}`);
+    }
+    collectScopedInnerComponents(compilation, root) {
+        const includes = new Set();
+        const scopedIncludes = component_1.componentConfig.scopedIncludes.get(root);
+        if (scopedIncludes && scopedIncludes.size > 0) {
+            scopedIncludes.forEach(name => includes.add(name));
+        }
+        this.collectModuleResolvedComponentIncludes(compilation, root).forEach(name => includes.add(name));
+        const finalIncludes = includes.size > 0
+            ? includes
+            : new Set(component_1.componentConfig.includes);
+        return this.expandScopedIncludes(finalIncludes);
+    }
+    isSubPackageIndieRootUsingCustomWrapper(compilation, root, scopedThirdPartyComponents) {
+        if (scopedThirdPartyComponents === null || scopedThirdPartyComponents === void 0 ? void 0 : scopedThirdPartyComponents.has(customWrapperName)) {
+            return true;
+        }
+        if (this.isSubPackageIndieRootUsingCustomWrapperByModules(compilation, root)) {
+            return true;
+        }
+        return false;
+    }
+    resolveUsingComponentTarget(filePath, componentPath) {
+        if (componentPath.startsWith('plugin://'))
+            return null;
+        let sourcePath = componentPath;
+        if (node_path_1.default.isAbsolute(componentPath)) {
+            sourcePath = helper_1.fs.existsSync(componentPath)
+                ? componentPath
+                : node_path_1.default.resolve(this.options.sourceDir, `.${componentPath}`);
+        }
+        else {
+            const isRelativePath = /^[.\\/]/;
+            if (!isRelativePath.test(componentPath))
+                return null;
+            sourcePath = node_path_1.default.resolve(node_path_1.default.dirname(filePath), componentPath);
+        }
+        const targetPath = (0, helper_1.resolveMainFilePath)(sourcePath);
+        const targetName = this.getComponentName(targetPath);
+        return {
+            path: targetPath,
+            name: targetName,
+            root: this.isInSubPackageIndieRoot(targetName)
+        };
+    }
+    getScopedSubPackageIndieComponentConfig(compilation, root) {
+        var _a;
+        const thirdPartyComponents = new Map();
+        const queue = this.getSubPackageIndieEntriesByRoot(root);
+        const visited = new Set();
+        while (queue.length) {
+            const current = queue.shift();
+            if (!current || visited.has(current.name))
+                continue;
+            visited.add(current.name);
+            const fileConfig = (_a = this.filesConfig[this.getConfigFilePath(current.name)]) === null || _a === void 0 ? void 0 : _a.content;
+            const usingComponents = fileConfig === null || fileConfig === void 0 ? void 0 : fileConfig.usingComponents;
+            if (!usingComponents)
+                continue;
+            for (const [componentName, componentValue] of Object.entries(usingComponents)) {
+                if (componentName === customWrapperName) {
+                    this.cloneThirdPartyComponent(thirdPartyComponents, componentName);
+                    continue;
+                }
+                if (!component_1.componentConfig.thirdPartyComponents.has(componentName))
+                    continue;
+                const componentPath = componentValue instanceof Array ? componentValue[0] : componentValue;
+                const target = this.resolveUsingComponentTarget(current.path, componentPath);
+                this.cloneThirdPartyComponent(thirdPartyComponents, componentName);
+                if (!target)
+                    continue;
+                const targetComponent = this.getComponentByName(target.name);
+                if (targetComponent && (!target.root || target.root === root) && !visited.has(targetComponent.name)) {
+                    queue.push(targetComponent);
+                }
+            }
+        }
+        return {
+            includes: this.collectScopedInnerComponents(compilation, root),
+            exclude: new Set(component_1.componentConfig.exclude),
+            thirdPartyComponents,
+            includeAll: false,
+            skipRecursiveComponent: false
+        };
+    }
+    /**
+     * 为子分包独立模板生成相关文件
+     * - base.wxml: 完整模板
+     * - utils.wxs: WXS 辅助脚本
+     * - comp.wxml: 组件模板（引用本地 base.wxml）
+     * - comp.json: 组件配置
+     * - custom-wrapper.wxml/json: (如果需要)
+     */
+    generateSubPackageIndieFiles(compilation, compiler, template, baseTemplateName) {
+        const customWrapperRoots = new Set();
+        if (!this.getSubPackageIndieConfigs().length)
+            return customWrapperRoots;
+        const allIndieRoots = this.getAllIndieRoots();
+        allIndieRoots.forEach(root => {
+            const scopedComponentConfig = this.getScopedSubPackageIndieComponentConfig(compilation, root);
+            // ★ 检查该 root 是否禁用了递归组件
+            const isRecursiveDisabled = this.isRecursiveComponentDisabledForRoot(root);
+            if (isRecursiveDisabled) {
+                scopedComponentConfig.skipRecursiveComponent = true;
+            }
+            const isRootUsingCustomWrapper = isRecursiveDisabled
+                ? false
+                : this.isSubPackageIndieRootUsingCustomWrapper(compilation, root, scopedComponentConfig.thirdPartyComponents);
+            if (isRootUsingCustomWrapper) {
+                customWrapperRoots.add(root);
+                // base.wxml 模板生成依赖 thirdPartyComponents，确保 custom-wrapper 模板不会漏掉
+                if (!scopedComponentConfig.thirdPartyComponents.has(customWrapperName)) {
+                    const attrs = component_1.componentConfig.thirdPartyComponents.get(customWrapperName);
+                    scopedComponentConfig.thirdPartyComponents.set(customWrapperName, new Set(attrs || []));
+                }
+            }
+            // 1. 生成 base.wxml
+            this.generateTemplateFile(compilation, compiler, `${root}/${baseTemplateName}`, template.buildTemplate, scopedComponentConfig);
+            // 2. 生成 utils.wxs
+            this.generateXSFile(compilation, compiler, `${root}/utils`);
+            // 3. 生成 comp.wxml 和 comp.json（如果不支持递归模板且未禁用递归组件）
+            if (!template.isSupportRecursive && !isRecursiveDisabled) {
+                this.generateSubPackageIndieScriptFile(compilation, compiler, `${root}/${baseCompName}`, this.createRecursiveComponentWrapperSource());
+                this.generateTemplateFile(compilation, compiler, `${root}/${baseCompName}`, template.buildBaseComponentTemplate, this.options.fileType.templ);
+                const compConfig = {
+                    component: true,
+                    styleIsolation: STYLE_ISOLATION_APPLY_SHARED,
+                    usingComponents: {
+                        [baseCompName]: `./${baseCompName}`
+                    }
+                };
+                // 只有使用 custom-wrapper 时才添加引用
+                if (isRootUsingCustomWrapper) {
+                    compConfig.usingComponents[customWrapperName] = `./${customWrapperName}`;
+                }
+                this.generateConfigFile(compilation, compiler, `${root}/${baseCompName}`, compConfig);
+            }
+            // 4. 生成 custom-wrapper（如果需要）
+            if (isRootUsingCustomWrapper) {
+                this.generateSubPackageIndieScriptFile(compilation, compiler, `${root}/${customWrapperName}`, this.createRecursiveComponentWrapperSource(customWrapperName));
+                this.generateTemplateFile(compilation, compiler, `${root}/${customWrapperName}`, template.buildCustomComponentTemplate, this.options.fileType.templ);
+                this.generateConfigFile(compilation, compiler, `${root}/${customWrapperName}`, {
+                    component: true,
+                    styleIsolation: STYLE_ISOLATION_APPLY_SHARED,
+                    usingComponents: {
+                        [baseCompName]: `./${baseCompName}`,
+                        [customWrapperName]: `./${customWrapperName}`
+                    }
+                });
+            }
+        });
+        return customWrapperRoots;
+    }
+    /**
+     * 为所有 mainPackageRoot 生成 runtime chunks 文件
+     * 将 app.js, runtime.js, taro.js, vendors.js, common.js 等文件复制到各 mainPackageRoot 目录
+     */
+    generateMainPackageRuntimeFiles(compilation, _compiler) {
+        const { commonChunks, fileType } = this.options;
+        const mainPackageRoots = this.getAllMainPackageRoots();
+        if (!mainPackageRoots.length)
+            return;
+        const styleExt = fileType.style;
+        // runtime chunks 列表
+        const runtimeChunks = ['app', ...commonChunks];
+        mainPackageRoots.forEach(mainPackageRoot => {
+            runtimeChunks.forEach(chunkName => {
+                var _a, _b, _c;
+                // 复制 JS 文件
+                const jsFile = `${chunkName}.js`;
+                if (compilation.assets[jsFile]) {
+                    let jsContent = compilation.assets[jsFile];
+                    // 对 app.js 注入递归组件全局初始化代码（subpackageindie 模式）
+                    // 这里必须注入到 webpack 模块上下文中，避免在文件顶层使用小程序原生 require('@tarojs/runtime') 导致运行时异常
+                    if (chunkName === 'app') {
+                        const { RawSource } = ((_b = (_a = compilation.compiler) === null || _a === void 0 ? void 0 : _a.webpack) === null || _b === void 0 ? void 0 : _b.sources) || require('webpack').sources;
+                        const originalSource = String(((_c = jsContent.source) === null || _c === void 0 ? void 0 : _c.call(jsContent)) || jsContent.toString());
+                        const registrarExpr = `(typeof globalThis.__taroRegisterRecursiveComponent==="function"||(globalThis.__taroRegisterRecursiveComponent=function(componentName){const cache=__webpack_require__.c||{};let createRecursiveComponentConfig;for(const key in cache){const exports=cache[key]&&cache[key].exports;if(exports&&typeof exports.createRecursiveComponentConfig==="function"){createRecursiveComponentConfig=exports.createRecursiveComponentConfig;break;}}if(typeof createRecursiveComponentConfig!=="function"){const modules=__webpack_require__.m||{};for(const moduleId in modules){const moduleFactory=modules[moduleId];if(!moduleFactory||typeof moduleFactory!=="function")continue;const source=String(moduleFactory);if(source.indexOf("createRecursiveComponentConfig")===-1)continue;const exports=__webpack_require__(moduleId);if(exports&&typeof exports.createRecursiveComponentConfig==="function"){createRecursiveComponentConfig=exports.createRecursiveComponentConfig;break;}}}if(typeof createRecursiveComponentConfig!=="function"){throw new Error("Cannot find createRecursiveComponentConfig in webpack modules");}Component(createRecursiveComponentConfig(componentName));}))`;
+                        let patchedSource = originalSource;
+                        if (/,\s*exports\.taroApp\s*=/.test(patchedSource)) {
+                            patchedSource = patchedSource.replace(/,\s*exports\.taroApp\s*=/, `,${registrarExpr},exports.taroApp=`);
+                        }
+                        else {
+                            patchedSource = patchedSource.replace(/exports\.taroApp\s*=/, `;${registrarExpr};exports.taroApp=`);
+                        }
+                        jsContent = new RawSource(patchedSource);
+                    }
+                    compilation.assets[`${mainPackageRoot}/${jsFile}`] = jsContent;
+                }
+                // 复制 wxss 文件
+                const cssFile = `${chunkName}${styleExt}`;
+                if (compilation.assets[cssFile]) {
+                    compilation.assets[`${mainPackageRoot}/${cssFile}`] = compilation.assets[cssFile];
+                }
+            });
+            // 复制 app-origin.wxss（原始样式文件）
+            const appOriginCss = `app-origin${styleExt}`;
+            if (compilation.assets[appOriginCss]) {
+                compilation.assets[`${mainPackageRoot}/${appOriginCss}`] = compilation.assets[appOriginCss];
+            }
+        });
+    }
     /** 生成小程序独立分包的相关文件 */
     generateIndependentMiniFiles(compilation, compiler) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -978,19 +1742,22 @@ class TaroMiniPlugin {
                 this.generateTemplateFile(compilation, compiler, `${name}/${baseTemplateName}`, template.buildTemplate, component_1.componentConfig);
                 if (!template.isSupportRecursive) {
                     // 如微信、QQ 不支持递归模版的小程序，需要使用自定义组件协助递归
-                    this.generateConfigFile(compilation, compiler, `${name}/${baseCompName}`, {
+                    const compConfig = {
                         component: true,
-                        styleIsolation: 'apply-shared',
+                        styleIsolation: STYLE_ISOLATION_APPLY_SHARED,
                         usingComponents: {
-                            [baseCompName]: `./${baseCompName}`,
-                            [customWrapperName]: `./${customWrapperName}`
+                            [baseCompName]: `./${baseCompName}`
                         }
-                    });
+                    };
+                    if (isUsingCustomWrapper) {
+                        compConfig.usingComponents[customWrapperName] = `./${customWrapperName}`;
+                    }
+                    this.generateConfigFile(compilation, compiler, `${name}/${baseCompName}`, compConfig);
                     this.generateTemplateFile(compilation, compiler, `${name}/${baseCompName}`, template.buildBaseComponentTemplate, this.options.fileType.templ);
                 }
                 this.generateConfigFile(compilation, compiler, `${name}/${customWrapperName}`, {
                     component: true,
-                    styleIsolation: 'apply-shared',
+                    styleIsolation: STYLE_ISOLATION_APPLY_SHARED,
                     usingComponents: {
                         [customWrapperName]: `./${customWrapperName}`
                     }
@@ -1040,6 +1807,8 @@ class TaroMiniPlugin {
             const { modifyMiniConfigs } = combination.config;
             const baseTemplateName = 'base';
             const isUsingCustomWrapper = component_1.componentConfig.thirdPartyComponents.has('custom-wrapper');
+            let subPackageIndieCustomWrapperRoots = new Set();
+            compilation[subPackageIndieCustomWrapperRootsKey] = subPackageIndieCustomWrapperRoots;
             /**
              * 与原生小程序混写时解析模板与样式
              */
@@ -1059,12 +1828,14 @@ class TaroMiniPlugin {
                 const appConfigName = node_path_1.default.basename(appConfigPath).replace(node_path_1.default.extname(appConfigPath), '');
                 this.generateConfigFile(compilation, compiler, this.appEntry, this.filesConfig[appConfigName].content);
             }
-            if (!template.isSupportRecursive) {
+            // ★ 当配置了 mainPackageRoot 时，跳过根目录模板文件的生成
+            const skipRootTemplates = this.hasSubPackageIndieMainPackageRoot() && this.options.newBlended;
+            if (!template.isSupportRecursive && !skipRootTemplates) {
                 // 如微信、QQ 不支持递归模版的小程序，需要使用自定义组件协助递归
                 this.generateTemplateFile(compilation, compiler, baseCompName, template.buildBaseComponentTemplate, this.options.fileType.templ);
                 const baseCompConfig = {
                     component: true,
-                    styleIsolation: 'apply-shared',
+                    styleIsolation: STYLE_ISOLATION_APPLY_SHARED,
                     usingComponents: {
                         [baseCompName]: `./${baseCompName}`
                     }
@@ -1073,7 +1844,7 @@ class TaroMiniPlugin {
                     baseCompConfig.usingComponents[customWrapperName] = `./${customWrapperName}`;
                     this.generateConfigFile(compilation, compiler, customWrapperName, {
                         component: true,
-                        styleIsolation: 'apply-shared',
+                        styleIsolation: STYLE_ISOLATION_APPLY_SHARED,
                         usingComponents: {
                             [baseCompName]: `./${baseCompName}`,
                             [customWrapperName]: `./${customWrapperName}`
@@ -1082,24 +1853,48 @@ class TaroMiniPlugin {
                 }
                 this.generateConfigFile(compilation, compiler, baseCompName, baseCompConfig);
             }
-            else {
+            else if (!skipRootTemplates) {
                 if (isUsingCustomWrapper) {
                     this.generateConfigFile(compilation, compiler, customWrapperName, {
                         component: true,
-                        styleIsolation: 'apply-shared',
+                        styleIsolation: STYLE_ISOLATION_APPLY_SHARED,
                         usingComponents: {
                             [customWrapperName]: `./${customWrapperName}`
                         }
                     });
                 }
             }
-            this.generateTemplateFile(compilation, compiler, baseTemplateName, template.buildTemplate, component_1.componentConfig);
-            isUsingCustomWrapper && this.generateTemplateFile(compilation, compiler, customWrapperName, template.buildCustomComponentTemplate, this.options.fileType.templ);
-            this.generateXSFile(compilation, compiler, 'utils');
+            // ★ 当配置了 mainPackageRoot 时，跳过根目录 base.wxml 和 utils.wxs 的生成
+            if (!skipRootTemplates) {
+                this.generateTemplateFile(compilation, compiler, baseTemplateName, template.buildTemplate, component_1.componentConfig);
+                isUsingCustomWrapper && this.generateTemplateFile(compilation, compiler, customWrapperName, template.buildCustomComponentTemplate, this.options.fileType.templ);
+                this.generateXSFile(compilation, compiler, 'utils');
+            }
+            // ★ 为子分包生成独立的模板文件（base.wxml, utils.wxs, comp.*, custom-wrapper.*）
+            if (this.getSubPackageIndieConfigs().length && this.options.newBlended) {
+                subPackageIndieCustomWrapperRoots = this.generateSubPackageIndieFiles(compilation, compiler, template, baseTemplateName);
+                compilation[subPackageIndieCustomWrapperRootsKey] = subPackageIndieCustomWrapperRoots;
+                // 注意：runtime chunks (app.js, app.wxss 等) 需要在 injectCommonStyles 之后生成，
+                // 因为 injectCommonStyles 会修改 app.wxss 并创建 app-origin.wxss
+            }
             this.components.forEach(component => {
                 const importBaseTemplatePath = (0, helper_1.promoteRelativePath)(node_path_1.default.relative(component.path, node_path_1.default.join(sourceDir, isBuildPlugin ? 'plugin' : '', this.getTemplatePath(baseTemplateName))));
                 const config = this.filesConfig[this.getConfigFilePath(component.name)];
                 if (config) {
+                    const indieMatch = this.getSubPackageIndieMatch(component.name);
+                    if (indieMatch && !component.isNative) {
+                        const importBaseCompPath = (0, helper_1.promoteRelativePath)(node_path_1.default.relative(component.path, node_path_1.default.join(sourceDir, indieMatch.root, this.getTargetFilePath(baseCompName, ''))));
+                        const importCustomWrapperPath = (0, helper_1.promoteRelativePath)(node_path_1.default.relative(component.path, node_path_1.default.join(sourceDir, indieMatch.root, this.getTargetFilePath(customWrapperName, ''))));
+                        config.content.usingComponents = Object.assign({}, config.content.usingComponents);
+                        const isRootUsingCustomWrapper = subPackageIndieCustomWrapperRoots.has(indieMatch.root);
+                        const isRootRecursiveDisabled = this.isRecursiveComponentDisabledForRoot(indieMatch.root);
+                        if (isRootUsingCustomWrapper && !isRootRecursiveDisabled && !config.content.usingComponents[customWrapperName]) {
+                            config.content.usingComponents[customWrapperName] = importCustomWrapperPath;
+                        }
+                        if (!template.isSupportRecursive && !isRootRecursiveDisabled && !config.content.usingComponents[baseCompName]) {
+                            config.content.usingComponents[baseCompName] = importBaseCompPath;
+                        }
+                    }
                     this.generateConfigFile(compilation, compiler, component.path, config.content);
                 }
                 if (!component.isNative) {
@@ -1107,7 +1902,17 @@ class TaroMiniPlugin {
                 }
             });
             this.pages.forEach(page => {
-                const importBaseTemplatePath = (0, helper_1.promoteRelativePath)(node_path_1.default.relative(page.path, node_path_1.default.join(sourceDir, isBuildPlugin ? 'plugin' : '', this.getTemplatePath(baseTemplateName))));
+                // ★ 检查是否属于子分包独立模板的子分包
+                const subPackageIndieRoot = this.isInSubPackageIndieRoot(page.name);
+                let importBaseTemplatePath;
+                if (subPackageIndieRoot) {
+                    // 子分包：引用本地的 base.wxml
+                    importBaseTemplatePath = (0, helper_1.promoteRelativePath)(node_path_1.default.relative(page.path, node_path_1.default.join(sourceDir, subPackageIndieRoot, this.getTemplatePath(baseTemplateName))));
+                }
+                else {
+                    // 主包/普通分包：引用根目录的 base.wxml
+                    importBaseTemplatePath = (0, helper_1.promoteRelativePath)(node_path_1.default.relative(page.path, node_path_1.default.join(sourceDir, isBuildPlugin ? 'plugin' : '', this.getTemplatePath(baseTemplateName))));
+                }
                 const config = this.filesConfig[this.getConfigFilePath(page.name)];
                 // pages 里面会混合独立分包的，在这里需要过滤一下，避免重复生成 assets
                 const isIndependent = !!this.getIndependentPackage(page.path);
@@ -1118,13 +1923,29 @@ class TaroMiniPlugin {
                     this.generateTemplateFile(compilation, compiler, page.path, template.buildPageTemplate, importBaseTemplatePath, config);
                 }
                 if (config) {
-                    const importBaseCompPath = (0, helper_1.promoteRelativePath)(node_path_1.default.relative(page.path, node_path_1.default.join(sourceDir, isBuildPlugin ? 'plugin' : '', this.getTargetFilePath(baseCompName, ''))));
-                    const importCustomWrapperPath = (0, helper_1.promoteRelativePath)(node_path_1.default.relative(page.path, node_path_1.default.join(sourceDir, isBuildPlugin ? 'plugin' : '', this.getTargetFilePath(customWrapperName, ''))));
+                    let importBaseCompPath;
+                    let importCustomWrapperPath;
+                    if (subPackageIndieRoot) {
+                        // 子分包：引用本地的 comp 和 custom-wrapper
+                        importBaseCompPath = (0, helper_1.promoteRelativePath)(node_path_1.default.relative(page.path, node_path_1.default.join(sourceDir, subPackageIndieRoot, this.getTargetFilePath(baseCompName, ''))));
+                        importCustomWrapperPath = (0, helper_1.promoteRelativePath)(node_path_1.default.relative(page.path, node_path_1.default.join(sourceDir, subPackageIndieRoot, this.getTargetFilePath(customWrapperName, ''))));
+                    }
+                    else {
+                        // 主包：引用根目录
+                        importBaseCompPath = (0, helper_1.promoteRelativePath)(node_path_1.default.relative(page.path, node_path_1.default.join(sourceDir, isBuildPlugin ? 'plugin' : '', this.getTargetFilePath(baseCompName, ''))));
+                        importCustomWrapperPath = (0, helper_1.promoteRelativePath)(node_path_1.default.relative(page.path, node_path_1.default.join(sourceDir, isBuildPlugin ? 'plugin' : '', this.getTargetFilePath(customWrapperName, ''))));
+                    }
                     config.content.usingComponents = Object.assign({}, config.content.usingComponents);
-                    if (isUsingCustomWrapper) {
+                    const isPageRecursiveDisabled = subPackageIndieRoot
+                        ? this.isRecursiveComponentDisabledForRoot(subPackageIndieRoot)
+                        : false;
+                    const shouldUseCustomWrapper = subPackageIndieRoot
+                        ? subPackageIndieCustomWrapperRoots.has(subPackageIndieRoot) && !isPageRecursiveDisabled
+                        : isUsingCustomWrapper;
+                    if (shouldUseCustomWrapper) {
                         config.content.usingComponents[customWrapperName] = importCustomWrapperPath;
                     }
-                    if (!template.isSupportRecursive && !page.isNative) {
+                    if (!template.isSupportRecursive && !page.isNative && !isPageRecursiveDisabled) {
                         config.content.usingComponents[baseCompName] = importBaseCompPath;
                     }
                     this.generateConfigFile(compilation, compiler, page.path, config.content);
@@ -1132,6 +1953,10 @@ class TaroMiniPlugin {
             });
             this.generateTabBarFiles(compilation, compiler);
             this.injectCommonStyles(compilation, compiler);
+            // ★ 为 mainPackageRoot 生成 runtime chunks（必须在 injectCommonStyles 之后，因为需要复制处理后的 app.wxss）
+            if (this.hasSubPackageIndieMainPackageRoot() && this.options.newBlended) {
+                this.generateMainPackageRuntimeFiles(compilation, compiler);
+            }
             if (this.themeLocation) {
                 this.generateDarkModeFile(compilation, compiler);
             }
@@ -1148,6 +1973,11 @@ class TaroMiniPlugin {
     optimizeMiniFiles(compilation, _compiler) {
         return __awaiter(this, void 0, void 0, function* () {
             const isUsingCustomWrapper = component_1.componentConfig.thirdPartyComponents.has('custom-wrapper');
+            const shouldKeepRecursiveComponent = !this.options.template.isSupportRecursive || isUsingCustomWrapper;
+            const hasSubPackageIndieCustomWrapperRoots = compilation[subPackageIndieCustomWrapperRootsKey] instanceof Set;
+            const subPackageIndieCustomWrapperRoots = hasSubPackageIndieCustomWrapperRoots
+                ? compilation[subPackageIndieCustomWrapperRootsKey]
+                : new Set();
             /**
              * 与原生小程序混写时解析模板与样式
              */
@@ -1164,11 +1994,67 @@ class TaroMiniPlugin {
                     delete compilation.assets[assetPath];
                 }
             });
+            if (this.options.newBlended) {
+                this.getAllIndieRoots().forEach(root => {
+                    // ★ 禁用递归组件的 root，清理所有 comp/custom-wrapper/recursive-component 残留产物
+                    if (this.isRecursiveComponentDisabledForRoot(root)) {
+                        delete compilation.assets[`${root}/${baseCompName}.js`];
+                        delete compilation.assets[`${root}/${baseCompName}${this.options.fileType.config}`];
+                        delete compilation.assets[`${root}/${baseCompName}${this.options.fileType.templ}`];
+                        delete compilation.assets[`${root}/${customWrapperName}.js`];
+                        delete compilation.assets[`${root}/${customWrapperName}${this.options.fileType.config}`];
+                        delete compilation.assets[`${root}/${customWrapperName}${this.options.fileType.templ}`];
+                        delete compilation.assets[`${root}/${recursiveComponentName}.js`];
+                        return;
+                    }
+                    const isRootUsingCustomWrapper = hasSubPackageIndieCustomWrapperRoots
+                        ? subPackageIndieCustomWrapperRoots.has(root)
+                        : this.isSubPackageIndieRootUsingCustomWrapper(compilation, root, this.getScopedSubPackageIndieComponentConfig(compilation, root).thirdPartyComponents);
+                    if (isRootUsingCustomWrapper)
+                        return;
+                    delete compilation.assets[`${root}/${customWrapperName}.js`];
+                    delete compilation.assets[`${root}/${customWrapperName}${this.options.fileType.config}`];
+                    delete compilation.assets[`${root}/${customWrapperName}${this.options.fileType.templ}`];
+                });
+            }
+            if (!shouldKeepRecursiveComponent && this.options.newBlended) {
+                this.getAllIndieRoots().forEach(root => {
+                    delete compilation.assets[`${root}/${recursiveComponentName}.js`];
+                });
+            }
+            // ★ 当配置了 mainPackageRoot 时，删除根目录的 runtime chunks
+            const { newBlended, commonChunks, fileType } = this.options;
+            if (this.hasSubPackageIndieMainPackageRoot() && newBlended) {
+                const styleExt = fileType.style;
+                const runtimeChunks = ['app', ...commonChunks];
+                runtimeChunks.forEach(chunkName => {
+                    // 删除根目录 JS 文件
+                    delete compilation.assets[`${chunkName}.js`];
+                    // 删除根目录 wxss 文件
+                    delete compilation.assets[`${chunkName}${styleExt}`];
+                });
+                // 删除 app-origin.wxss
+                delete compilation.assets[`app-origin${styleExt}`];
+                // 删除根目录的 comp.js (由 addEntries 生成)
+                delete compilation.assets[`${baseCompName}.js`];
+                // 删除根目录的 custom-wrapper.js
+                delete compilation.assets[`${customWrapperName}.js`];
+            }
         });
     }
     generateConfigFile(compilation, compiler, filePath, config) {
         const { RawSource } = compiler.webpack.sources;
         const fileConfigName = this.getConfigPath(this.getComponentName(filePath));
+        // ★ 为子分包独立模板的组件注入额外配置
+        const componentName = this.getComponentName(filePath);
+        const subPackageIndieRoot = this.isInSubPackageIndieRoot(componentName);
+        if (subPackageIndieRoot && this.nativeComponents.has(componentName)) {
+            const styleIsolation = this.options.template.isSupportRecursive
+                ? STYLE_ISOLATION_APPLY_SHARED
+                : STYLE_ISOLATION_SHARED;
+            config.styleIsolation = config.styleIsolation || styleIsolation;
+            config.isNewBlended = true;
+        }
         const unofficialConfigs = ['enableShareAppMessage', 'enableShareTimeline', 'enablePageMeta', 'components'];
         unofficialConfigs.forEach(item => {
             delete config[item];
@@ -1177,6 +2063,21 @@ class TaroMiniPlugin {
         const fileConfigStr = JSON.stringify(config);
         compilation.assets[fileConfigName] = new RawSource(fileConfigStr);
     }
+    generateSubPackageIndieScriptFile(compilation, compiler, filePath, content) {
+        const { RawSource } = compiler.webpack.sources;
+        compilation.assets[this.getTargetFilePath(filePath, '.js')] = new RawSource(content);
+    }
+    createRecursiveComponentWrapperSource(componentName) {
+        const args = componentName ? JSON.stringify(componentName) : '';
+        return `const registerRecursiveComponent = globalThis.__taroRegisterRecursiveComponent
+
+if (typeof registerRecursiveComponent !== 'function') {
+  throw new Error('globalThis.__taroRegisterRecursiveComponent is not a function')
+}
+
+registerRecursiveComponent(${args})
+`;
+    }
     generateTemplateFile(compilation, compiler, filePath, templateFn, ...options) {
         var _a;
         const { RawSource } = compiler.webpack.sources;
@@ -1315,12 +2216,18 @@ class TaroMiniPlugin {
                 });
             });
         }
-        if (commons.size() > 0) {
+        // ★ 判断是否需要处理样式：有 common chunks 或者有 app.wxss
+        const hasMainPackageRoot = this.hasSubPackageIndieMainPackageRoot() && newBlended;
+        const hasAppStyle = !!assets[appStyle];
+        const shouldProcessStyles = commons.size() > 0 || (hasMainPackageRoot && hasAppStyle);
+        if (shouldProcessStyles) {
             const APP_STYLE_NAME = 'app-origin' + styleExt;
             assets[APP_STYLE_NAME] = new ConcatSource(originSource);
             const source = new ConcatSource('');
             source.add(`@import ${JSON.stringify((0, loader_utils_1.urlToRequest)(APP_STYLE_NAME))};`);
-            source.add(commons);
+            if (commons.size() > 0) {
+                source.add(commons);
+            }
             source.add('\n');
             assets[appStyle] = source;
             if (newBlended) {
@@ -1329,6 +2236,7 @@ class TaroMiniPlugin {
                     if (page.isNative)
                         return;
                     const pageStyle = `${page.name}${styleExt}`;
+                    const indieMatch = this.getSubPackageIndieMatch(page.name);
                     if (this.nativeComponents.has(page.name)) {
                         // 本地化组件如果没有wxss则直接写入一个空的
                         if (!(pageStyle in assets)) {
@@ -1336,14 +2244,39 @@ class TaroMiniPlugin {
                         }
                         const source = new ConcatSource('');
                         const originSource = assets[pageStyle];
-                        componentCommons.forEach(item => {
-                            source.add(`@import ${JSON.stringify((0, loader_utils_1.urlToRequest)(node_path_1.default.posix.relative(node_path_1.default.dirname(pageStyle), item)))};\n`);
-                        });
+                        // ★ 检查组件是否属于 subPackageIndie 分包
+                        if (indieMatch) {
+                            if (indieMatch.isMainPackageRoot) {
+                                // mainPackageRoot 下的入口组件：只需引用 ./app.wxss（它已包含 common.wxss 等）
+                                source.add(`@import ${JSON.stringify((0, loader_utils_1.urlToRequest)('./app' + styleExt))};\n`);
+                            }
+                            // subPackageRoots 下的子分包组件：不注入公共样式引用
+                            // 通过 styleIsolation: "apply-shared" 继承入口组件的样式
+                        }
+                        else {
+                            // 非 subPackageIndie 分包：引用根目录的公共样式
+                            componentCommons.forEach(item => {
+                                source.add(`@import ${JSON.stringify((0, loader_utils_1.urlToRequest)(node_path_1.default.posix.relative(node_path_1.default.dirname(pageStyle), item)))};\n`);
+                            });
+                        }
                         source.add(originSource);
                         assets[pageStyle] = source;
                     }
                     else {
-                        if (pageStyle in assets) {
+                        // 普通页面（非本地化组件）
+                        if (indieMatch === null || indieMatch === void 0 ? void 0 : indieMatch.isMainPackageRoot) {
+                            // mainPackageRoot 下的页面：只需 @import './app.wxss'（它已包含 common.wxss 等）
+                            const source = new ConcatSource('');
+                            if (pageStyle in assets) {
+                                source.add(assets[pageStyle]);
+                            }
+                            // 创建或更新样式文件，添加 app.wxss 引用
+                            const importSource = new ConcatSource('');
+                            importSource.add(`@import ${JSON.stringify((0, loader_utils_1.urlToRequest)('./app' + styleExt))};\n`);
+                            importSource.add(source);
+                            assets[pageStyle] = importSource;
+                        }
+                        else if (pageStyle in assets) {
                             const source = new ConcatSource('');
                             const originSource = assets[pageStyle];
                             source.add(`@import ${JSON.stringify((0, loader_utils_1.urlToRequest)(node_path_1.default.posix.relative(node_path_1.default.dirname(pageStyle), 'app' + styleExt)))};\n`);