@tarojs/webpack5-runner 4.1.12-beta.26 → 4.1.12-beta.27

package/dist/plugins/MiniPlugin.js

@@ -51,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;
@@ -153,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
@@ -618,15 +657,47 @@ class TaroMiniPlugin {
     /**
      * 获取子分包独立模板配置列表（已规范化）
      */
+    /**
+     * 解析 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 = [] }) => ({
-            mainPackageRoot: this.normalizeIndieRoot(mainPackageRoot),
-            subPackageRoots: Array.from(new Set(subPackageRoots.map(root => this.normalizeIndieRoot(root))))
-        }));
+        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)));
@@ -641,7 +712,8 @@ class TaroMiniPlugin {
         const { newBlended } = this.options;
         if (!newBlended)
             return null;
-        for (const config of this.getSubPackageIndieConfigs()) {
+        const configs = this.getSubPackageIndieConfigs();
+        for (const config of configs) {
             if (pageName.startsWith(config.mainPackageRoot + '/') || pageName === config.mainPackageRoot) {
                 return {
                     config,
@@ -1015,6 +1087,9 @@ class TaroMiniPlugin {
         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',
@@ -1151,27 +1226,239 @@ class TaroMiniPlugin {
             return '';
         }
     }
-    isSubPackageIndieRootUsingCustomWrapperByModules(compilation, root) {
+    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;
-        const chunks = this.getChunksBySubPackageIndieRoot(compilation, root);
-        for (const chunk of chunks) {
-            const modules = chunk === null || chunk === void 0 ? void 0 : chunk.modulesIterable;
-            if (!modules)
+        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;
-            for (const module of modules) {
-                if (this.shouldSkipSubPackageIndieModule(module, root))
-                    continue;
-                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);
-                if (typeof resource !== 'string' || !resource.startsWith(this.options.sourceDir))
-                    continue;
-                const source = this.getModuleSourceContent(module);
-                if (!source)
-                    continue;
-                // 仅识别真实组件使用，避免被字符串文案中的 “CustomWrapper” 误判
-                const isJsxUsage = /<\s*CustomWrapper(?:\s|>)/.test(source);
-                const isImportUsage = /import\s*{[^}]*\bCustomWrapper\b[^}]*}\s*from\s*['"]@tarojs\/components['"]/.test(source);
-                const isCompiledUsage = /components-react/.test(source) && /\.(?:CustomWrapper|RW)\b/.test(source);
-                if (isJsxUsage || isImportUsage || isCompiledUsage) {
+            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;
                 }
             }
@@ -1179,8 +1466,7 @@ class TaroMiniPlugin {
         return false;
     }
     shouldSkipSubPackageIndieModule(module, root) {
-        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);
+        const resource = this.getModuleResource(module);
         if (typeof resource !== 'string' || !resource.startsWith(this.options.sourceDir)) {
             return false;
         }
@@ -1188,6 +1474,38 @@ class TaroMiniPlugin {
         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')) {
@@ -1209,32 +1527,15 @@ class TaroMiniPlugin {
     }
     collectScopedInnerComponents(compilation, root) {
         const includes = new Set();
-        const assetNames = new Set();
-        this.getChunksBySubPackageIndieRoot(compilation, root).forEach(chunk => {
-            chunk.files.forEach(file => {
-                if (typeof file === 'string' && file.endsWith('.js')) {
-                    assetNames.add(file);
-                }
-            });
-        });
-        assetNames.forEach(assetName => {
-            const asset = compilation.assets[assetName];
-            if (!asset)
-                return;
-            const source = asset.source().toString();
-            const componentImportReg = /var\s+([A-Za-z0-9_$]+)\s*=\s*__webpack_require__\([^)]*?@tarojs\/components[^)]*?components-react\.js"\);/g;
-            const importMatches = Array.from(source.matchAll(componentImportReg));
-            importMatches.forEach(([, alias]) => {
-                const usageReg = new RegExp(`${alias.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\.([A-Z][A-Za-z0-9_$]+)`, 'g');
-                Array.from(source.matchAll(usageReg)).forEach(([, componentName]) => {
-                    const dashedName = this.toDashedComponentName(componentName);
-                    if (!component_1.componentConfig.thirdPartyComponents.has(dashedName)) {
-                        includes.add(dashedName);
-                    }
-                });
-            });
-        });
-        return this.expandScopedIncludes(includes);
+        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)) {
@@ -1243,28 +1544,6 @@ class TaroMiniPlugin {
         if (this.isSubPackageIndieRootUsingCustomWrapperByModules(compilation, root)) {
             return true;
         }
-        const assetNames = new Set();
-        this.getChunksBySubPackageIndieRoot(compilation, root).forEach(chunk => {
-            chunk.files.forEach(file => {
-                if (typeof file === 'string' && file.endsWith('.js')) {
-                    assetNames.add(file);
-                }
-            });
-        });
-        for (const assetName of assetNames) {
-            const asset = compilation.assets[assetName];
-            if (!asset)
-                continue;
-            const source = asset.source().toString();
-            const componentImportReg = /var\s+([A-Za-z0-9_$]+)\s*=\s*__webpack_require__\([^)]*?@tarojs\/components[^)]*?components-react\.js"\);/g;
-            const importMatches = Array.from(source.matchAll(componentImportReg));
-            for (const [, alias] of importMatches) {
-                const usageReg = new RegExp(`${alias.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\.CustomWrapper\\b`, 'g');
-                if (usageReg.test(source)) {
-                    return true;
-                }
-            }
-        }
         return false;
     }
     resolveUsingComponentTarget(filePath, componentPath) {
@@ -1326,7 +1605,8 @@ class TaroMiniPlugin {
             includes: this.collectScopedInnerComponents(compilation, root),
             exclude: new Set(component_1.componentConfig.exclude),
             thirdPartyComponents,
-            includeAll: false
+            includeAll: false,
+            skipRecursiveComponent: false
         };
     }
     /**
@@ -1344,7 +1624,14 @@ class TaroMiniPlugin {
         const allIndieRoots = this.getAllIndieRoots();
         allIndieRoots.forEach(root => {
             const scopedComponentConfig = this.getScopedSubPackageIndieComponentConfig(compilation, root);
-            const isRootUsingCustomWrapper = this.isSubPackageIndieRootUsingCustomWrapper(compilation, root, scopedComponentConfig.thirdPartyComponents);
+            // ★ 检查该 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 模板不会漏掉
@@ -1357,8 +1644,8 @@ class TaroMiniPlugin {
             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) {
+            // 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 = {
@@ -1583,10 +1870,11 @@ class TaroMiniPlugin {
                         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);
-                        if (isRootUsingCustomWrapper && !config.content.usingComponents[customWrapperName]) {
+                        const isRootRecursiveDisabled = this.isRecursiveComponentDisabledForRoot(indieMatch.root);
+                        if (isRootUsingCustomWrapper && !isRootRecursiveDisabled && !config.content.usingComponents[customWrapperName]) {
                             config.content.usingComponents[customWrapperName] = importCustomWrapperPath;
                         }
-                        if (!template.isSupportRecursive && !config.content.usingComponents[baseCompName]) {
+                        if (!template.isSupportRecursive && !isRootRecursiveDisabled && !config.content.usingComponents[baseCompName]) {
                             config.content.usingComponents[baseCompName] = importBaseCompPath;
                         }
                     }
@@ -1631,13 +1919,16 @@ class TaroMiniPlugin {
                         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);
+                    const isPageRecursiveDisabled = subPackageIndieRoot
+                        ? this.isRecursiveComponentDisabledForRoot(subPackageIndieRoot)
+                        : false;
                     const shouldUseCustomWrapper = subPackageIndieRoot
-                        ? subPackageIndieCustomWrapperRoots.has(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);
@@ -1688,6 +1979,17 @@ class TaroMiniPlugin {
             });
             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);