@tarojs/webpack5-runner 3.7.0-canary.6 → 3.8.0-canary.1

package/dist/plugins/MiniPlugin.js

@@ -166,7 +166,7 @@ class TaroMiniPlugin {
                 }
                 else if (module.miniType === helper_1.META_TYPE.PAGE) {
                     let isIndependent = false;
-                    this.independentPackages.forEach(pages => {
+                    this.independentPackages.forEach(({ pages }) => {
                         if (pages.includes(module.resource)) {
                             isIndependent = true;
                         }
@@ -325,6 +325,14 @@ class TaroMiniPlugin {
         compiler.options.entry = {};
         return appEntryPath;
     }
+    getIndependentPackage(pagePath) {
+        return Array.from(this.independentPackages.values()).find(independentPackage => {
+            const { pages } = independentPackage;
+            if (pages.includes(pagePath)) {
+                return independentPackage;
+            }
+        });
+    }
     getChangedFiles(compiler) {
         return compiler.modifiedFiles;
     }
@@ -333,18 +341,20 @@ class TaroMiniPlugin {
      * 往 this.dependencies 中添加资源模块
      */
     run(compiler) {
-        if (this.options.isBuildPlugin) {
-            this.getPluginFiles();
-            this.getConfigFiles(compiler);
-        }
-        else {
-            this.appConfig = this.getAppConfig();
-            this.getPages();
-            this.getPagesConfig();
-            this.getDarkMode();
-            this.getConfigFiles(compiler);
-            this.addEntries();
-        }
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.options.isBuildPlugin) {
+                this.getPluginFiles();
+                this.getConfigFiles(compiler);
+            }
+            else {
+                this.appConfig = yield this.getAppConfig();
+                this.getPages();
+                this.getPagesConfig();
+                this.getDarkMode();
+                this.getConfigFiles(compiler);
+                this.addEntries();
+            }
+        });
     }
     getPluginFiles() {
         const fileList = new Set();
@@ -367,14 +377,14 @@ class TaroMiniPlugin {
                 Object.keys(pluginConfig).forEach(pluginKey => {
                     if (pluginKey === 'pages') {
                         Object.keys(pluginConfig[pluginKey]).forEach(pageKey => {
-                            if (`plugin/${pluginConfig[pluginKey][pageKey]}` === key) {
+                            if (`${pluginConfig[pluginKey][pageKey]}` === key) {
                                 isPage = true;
                             }
                         });
                     }
                     if (pluginKey === 'publicComponents') {
                         Object.keys(pluginConfig[pluginKey]).forEach(pageKey => {
-                            if (`plugin/${pluginConfig[pluginKey][pageKey]}` === key) {
+                            if (`${pluginConfig[pluginKey][pageKey]}` === key) {
                                 isComponent = true;
                             }
                         });
@@ -404,9 +414,9 @@ class TaroMiniPlugin {
             }
         });
         if (!template.isSupportRecursive) {
-            this.addEntry(path_1.default.resolve(__dirname, '..', 'template/comp'), this.getIsBuildPluginPath('comp', true), helper_1.META_TYPE.STATIC);
+            this.addEntry(path_1.default.resolve(__dirname, '..', 'template/comp'), 'comp', helper_1.META_TYPE.STATIC);
         }
-        this.addEntry(path_1.default.resolve(__dirname, '..', 'template/custom-wrapper'), this.getIsBuildPluginPath('custom-wrapper', true), helper_1.META_TYPE.STATIC);
+        this.addEntry(path_1.default.resolve(__dirname, '..', 'template/custom-wrapper'), 'custom-wrapper', helper_1.META_TYPE.STATIC);
         normalFiles.forEach(item => {
             this.addEntry(item.path, item.name, helper_1.META_TYPE.NORMAL, {
                 library: {
@@ -471,18 +481,24 @@ class TaroMiniPlugin {
      * @returns app config 配置内容
      */
     getAppConfig() {
-        const appName = path_1.default.basename(this.appEntry).replace(path_1.default.extname(this.appEntry), '');
-        this.compileFile({
-            name: appName,
-            path: this.appEntry,
-            isNative: false
+        return __awaiter(this, void 0, void 0, function* () {
+            const appName = path_1.default.basename(this.appEntry).replace(path_1.default.extname(this.appEntry), '');
+            this.compileFile({
+                name: appName,
+                path: this.appEntry,
+                isNative: false
+            });
+            const fileConfig = this.filesConfig[this.getConfigFilePath(appName)];
+            const appConfig = fileConfig ? fileConfig.content || {} : {};
+            if ((0, helper_1.isEmptyObject)(appConfig)) {
+                throw new Error('缺少 app 全局配置文件，请检查！');
+            }
+            const { modifyAppConfig } = this.options.combination.config;
+            if (typeof modifyAppConfig === 'function') {
+                yield modifyAppConfig(appConfig);
+            }
+            return appConfig;
         });
-        const fileConfig = this.filesConfig[this.getConfigFilePath(appName)];
-        const appConfig = fileConfig ? fileConfig.content || {} : {};
-        if ((0, helper_1.isEmptyObject)(appConfig)) {
-            throw new Error('缺少 app 全局配置文件，请检查！');
-        }
-        return appConfig;
     }
     /**
      * 根据 app config 的 pages 配置项，收集所有页面信息，
@@ -490,7 +506,6 @@ class TaroMiniPlugin {
      */
     getPages() {
         var _a;
-        const { newBlended } = this.options;
         if ((0, helper_1.isEmptyObject)(this.appConfig)) {
             throw new Error('缺少 app 全局配置文件，请检查！');
         }
@@ -501,7 +516,7 @@ class TaroMiniPlugin {
         if (!this.isWatch && ((_a = this.options.logger) === null || _a === void 0 ? void 0 : _a.quiet) === false) {
             (0, helper_1.printLog)("compile" /* processTypeEnum.COMPILE */, '发现入口', this.getShowPath(this.appEntry));
         }
-        const { frameworkExts, combination } = this.options;
+        const { newBlended, frameworkExts, combination } = this.options;
         const { prerender } = combination.config;
         this.prerenderPages = new Set((0, prerender_1.validatePrerenderPages)(appPages, prerender).map(p => p.path));
         this.getTabBarFiles(this.appConfig);
@@ -554,7 +569,9 @@ class TaroMiniPlugin {
             if (!this.isWatch && ((_a = this.options.logger) === null || _a === void 0 ? void 0 : _a.quiet) === false) {
                 (0, helper_1.printLog)("compile" /* processTypeEnum.COMPILE */, '发现页面', this.getShowPath(page.path));
             }
-            this.compileFile(page);
+            const pagePath = page.path;
+            const independentPackage = this.getIndependentPackage(pagePath);
+            this.compileFile(page, independentPackage);
         });
     }
     /**
@@ -643,12 +660,12 @@ class TaroMiniPlugin {
     /**
      * 读取页面、组件的配置，并递归读取依赖的组件的配置
      */
-    compileFile(file) {
+    compileFile(file, independentPackage) {
+        var _a;
         const filePath = file.path;
         const fileConfigPath = file.isNative ? this.replaceExt(filePath, '.json') : this.getConfigFilePath(filePath);
         const fileConfig = (0, helper_1.readConfig)(fileConfigPath, this.options.combination.config);
-        const { componentGenerics } = fileConfig;
-        const usingComponents = fileConfig.usingComponents;
+        const { componentGenerics, usingComponents } = fileConfig;
         if (this.options.isBuildPlugin && componentGenerics) {
             Object.keys(componentGenerics).forEach(component => {
                 if (componentGenerics[component]) {
@@ -662,7 +679,8 @@ class TaroMiniPlugin {
         if (usingComponents) {
             const componentNames = Object.keys(usingComponents);
             const depComponents = [];
-            const alias = this.options.combination.config.alias;
+            // alias 的值需要从最终的 chain 中拿，避免用户在 webpackChain 中设置的 alias 无法被读取到
+            const alias = (_a = this.options.combination.chain.toConfig().resolve) === null || _a === void 0 ? void 0 : _a.alias;
             for (const compName of componentNames) {
                 let compPath = usingComponents[compName];
                 if ((0, helper_1.isAliasPath)(compPath, alias)) {
@@ -671,9 +689,9 @@ class TaroMiniPlugin {
                 }
                 // 判断是否为第三方依赖的正则，如果 test 为 false 则为第三方依赖
                 const notNpmPkgReg = /^[.\\/]/;
-                if (!this.options.skipProcessUsingComponents
-                    && !compPath.startsWith('plugin://')
-                    && !notNpmPkgReg.test(compPath)) {
+                if (!this.options.skipProcessUsingComponents &&
+                    !compPath.startsWith('plugin://') &&
+                    !notNpmPkgReg.test(compPath)) {
                     const tempCompPath = (0, helper_1.getNpmPackageAbsolutePath)(compPath);
                     if (tempCompPath) {
                         compPath = tempCompPath;
@@ -689,6 +707,7 @@ class TaroMiniPlugin {
                 }
             }
             depComponents.forEach(item => {
+                var _a;
                 const componentPath = (0, helper_1.resolveMainFilePath)(path_1.default.resolve(path_1.default.dirname(file.path), item.path));
                 if (helper_1.fs.existsSync(componentPath) && !Array.from(this.components).some(item => item.path === componentPath)) {
                     const componentName = this.getComponentName(componentPath);
@@ -704,8 +723,10 @@ class TaroMiniPlugin {
                         stylePath: isNative ? this.getStylePath(componentPath) : undefined,
                         templatePath: isNative ? this.getTemplatePath(componentPath) : undefined
                     };
+                    // 收集独立分包的组件，用于后续单独编译
+                    (_a = independentPackage === null || independentPackage === void 0 ? void 0 : independentPackage.components) === null || _a === void 0 ? void 0 : _a.push(componentPath);
                     this.components.add(componentObj);
-                    this.compileFile(componentObj);
+                    this.compileFile(componentObj, independentPackage);
                 }
             });
         }
@@ -726,9 +747,10 @@ class TaroMiniPlugin {
                     const root = item.root;
                     const isIndependent = !!item.independent;
                     if (isIndependent) {
-                        this.independentPackages.set(root, []);
+                        this.independentPackages.set(root, { pages: [], components: [] });
                     }
                     item.pages.forEach(page => {
+                        var _a;
                         let pageItem = `${root}/${page}`;
                         pageItem = pageItem.replace(/\/{2,}/g, '/');
                         let hasPageIn = false;
@@ -742,7 +764,7 @@ class TaroMiniPlugin {
                             const templatePath = this.getTemplatePath(pagePath);
                             const isNative = this.isNativePageORComponent(templatePath);
                             if (isIndependent) {
-                                const independentPages = this.independentPackages.get(root);
+                                const independentPages = (_a = this.independentPackages.get(root)) === null || _a === void 0 ? void 0 : _a.pages;
                                 independentPages === null || independentPages === void 0 ? void 0 : independentPages.push(pagePath);
                             }
                             this.pages.add({
@@ -776,7 +798,7 @@ class TaroMiniPlugin {
             const SplitChunksPlugin = require('webpack/lib/optimize/SplitChunksPlugin');
             const RuntimeChunkPlugin = require('webpack/lib/optimize/RuntimeChunkPlugin');
             const MiniCssExtractPlugin = require('mini-css-extract-plugin');
-            independentPackages.forEach((pages, name) => {
+            independentPackages.forEach(({ pages, components }, name) => {
                 const childCompiler = compilation.createChildCompiler(PLUGIN_NAME, {
                     path: `${compiler.options.output.path}/${name}`,
                     chunkLoadingGlobal: `subpackage_${name}`
@@ -830,6 +852,13 @@ class TaroMiniPlugin {
                     });
                     dependencies.delete(pagePath);
                 });
+                components.forEach(componentPath => {
+                    if (dependencies.has(componentPath)) {
+                        const dep = dependencies.get(componentPath);
+                        new TaroSingleEntryPlugin_1.default(compiler.context, dep === null || dep === void 0 ? void 0 : dep.request, dep === null || dep === void 0 ? void 0 : dep.name, dep === null || dep === void 0 ? void 0 : dep.miniType, dep === null || dep === void 0 ? void 0 : dep.options).apply(childCompiler);
+                    }
+                    dependencies.delete(componentPath);
+                });
                 new TaroLoadChunksPlugin_1.default({
                     commonChunks: [`${name}/runtime`, `${name}/vendors`, `${name}/common`],
                     isBuildPlugin: false,
@@ -924,8 +953,8 @@ class TaroMiniPlugin {
     /** 生成小程序独立分包的相关文件 */
     generateIndependentMiniFiles(compilation, compiler) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { template, isBuildPlugin, sourceDir } = this.options;
-            const baseTemplateName = this.getIsBuildPluginPath('base', isBuildPlugin);
+            const { template, sourceDir } = this.options;
+            const baseTemplateName = 'base';
             const isUsingCustomWrapper = component_1.componentConfig.thirdPartyComponents.has('custom-wrapper');
             // @ts-ignore
             const childName = compilation.__name;
@@ -953,14 +982,14 @@ class TaroMiniPlugin {
                     }
                 });
                 this.generateTemplateFile(compilation, compiler, `${name}/${customWrapperName}`, template.buildCustomComponentTemplate, this.options.fileType.templ);
-                this.generateXSFile(compilation, compiler, `${name}/utils`, isBuildPlugin);
+                this.generateXSFile(compilation, compiler, `${name}/utils`);
             });
             this.pages.forEach(page => {
                 let importBaseTemplatePath = (0, helper_1.promoteRelativePath)(path_1.default.relative(page.path, path_1.default.join(sourceDir, this.getTemplatePath(baseTemplateName))));
                 const config = this.filesConfig[this.getConfigFilePath(page.name)];
                 let isIndependent = false;
                 let independentName = '';
-                this.independentPackages.forEach((pages, name) => {
+                this.independentPackages.forEach(({ pages }, name) => {
                     // independentPackages 是包含了所有 ChildCompiler 的资源，如果不是当前 ChildCompiler 的资源不做处理
                     if (pages.includes(page.path) && name === childName) {
                         isIndependent = true;
@@ -975,8 +1004,8 @@ class TaroMiniPlugin {
                     this.generateTemplateFile(compilation, compiler, page.path, template.buildPageTemplate, importBaseTemplatePath, config);
                 }
                 if (config) {
-                    const importBaseCompPath = (0, helper_1.promoteRelativePath)(path_1.default.relative(page.path, path_1.default.join(sourceDir, independentName, this.getTargetFilePath(this.getIsBuildPluginPath(baseCompName, isBuildPlugin), ''))));
-                    const importCustomWrapperPath = (0, helper_1.promoteRelativePath)(path_1.default.relative(page.path, path_1.default.join(sourceDir, independentName, this.getTargetFilePath(this.getIsBuildPluginPath(customWrapperName, isBuildPlugin), ''))));
+                    const importBaseCompPath = (0, helper_1.promoteRelativePath)(path_1.default.relative(page.path, path_1.default.join(sourceDir, independentName, this.getTargetFilePath(baseCompName, ''))));
+                    const importCustomWrapperPath = (0, helper_1.promoteRelativePath)(path_1.default.relative(page.path, path_1.default.join(sourceDir, independentName, this.getTargetFilePath(customWrapperName, ''))));
                     config.content.usingComponents = Object.assign({}, config.content.usingComponents);
                     if (isUsingCustomWrapper) {
                         config.content.usingComponents[customWrapperName] = importCustomWrapperPath;
@@ -995,7 +1024,7 @@ class TaroMiniPlugin {
             const { RawSource } = compiler.webpack.sources;
             const { template, combination, isBuildPlugin, sourceDir } = this.options;
             const { modifyMiniConfigs } = combination.config;
-            const baseTemplateName = this.getIsBuildPluginPath('base', isBuildPlugin);
+            const baseTemplateName = 'base';
             const isUsingCustomWrapper = component_1.componentConfig.thirdPartyComponents.has('custom-wrapper');
             /**
              * 与原生小程序混写时解析模板与样式
@@ -1018,7 +1047,7 @@ class TaroMiniPlugin {
             }
             if (!template.isSupportRecursive) {
                 // 如微信、QQ 不支持递归模版的小程序，需要使用自定义组件协助递归
-                this.generateTemplateFile(compilation, compiler, this.getIsBuildPluginPath(baseCompName, isBuildPlugin), template.buildBaseComponentTemplate, this.options.fileType.templ);
+                this.generateTemplateFile(compilation, compiler, baseCompName, template.buildBaseComponentTemplate, this.options.fileType.templ);
                 const baseCompConfig = {
                     component: true,
                     usingComponents: {
@@ -1027,19 +1056,20 @@ class TaroMiniPlugin {
                 };
                 if (isUsingCustomWrapper) {
                     baseCompConfig.usingComponents[customWrapperName] = `./${customWrapperName}`;
-                    this.generateConfigFile(compilation, compiler, this.getIsBuildPluginPath(customWrapperName, isBuildPlugin), {
+                    this.generateConfigFile(compilation, compiler, customWrapperName, {
                         component: true,
+                        styleIsolation: 'apply-shared',
                         usingComponents: {
                             [baseCompName]: `./${baseCompName}`,
                             [customWrapperName]: `./${customWrapperName}`
                         }
                     });
                 }
-                this.generateConfigFile(compilation, compiler, this.getIsBuildPluginPath(baseCompName, isBuildPlugin), baseCompConfig);
+                this.generateConfigFile(compilation, compiler, baseCompName, baseCompConfig);
             }
             else {
                 if (isUsingCustomWrapper) {
-                    this.generateConfigFile(compilation, compiler, this.getIsBuildPluginPath(customWrapperName, isBuildPlugin), {
+                    this.generateConfigFile(compilation, compiler, customWrapperName, {
                         component: true,
                         usingComponents: {
                             [customWrapperName]: `./${customWrapperName}`
@@ -1048,10 +1078,10 @@ class TaroMiniPlugin {
                 }
             }
             this.generateTemplateFile(compilation, compiler, baseTemplateName, template.buildTemplate, component_1.componentConfig);
-            isUsingCustomWrapper && this.generateTemplateFile(compilation, compiler, this.getIsBuildPluginPath(customWrapperName, isBuildPlugin), template.buildCustomComponentTemplate, this.options.fileType.templ);
-            this.generateXSFile(compilation, compiler, 'utils', isBuildPlugin);
+            isUsingCustomWrapper && this.generateTemplateFile(compilation, compiler, customWrapperName, template.buildCustomComponentTemplate, this.options.fileType.templ);
+            this.generateXSFile(compilation, compiler, 'utils');
             this.components.forEach(component => {
-                const importBaseTemplatePath = (0, helper_1.promoteRelativePath)(path_1.default.relative(component.path, path_1.default.join(sourceDir, this.getTemplatePath(baseTemplateName))));
+                const importBaseTemplatePath = (0, helper_1.promoteRelativePath)(path_1.default.relative(component.path, path_1.default.join(sourceDir, isBuildPlugin ? 'plugin' : '', this.getTemplatePath(baseTemplateName))));
                 const config = this.filesConfig[this.getConfigFilePath(component.name)];
                 if (config) {
                     this.generateConfigFile(compilation, compiler, component.path, config.content);
@@ -1061,15 +1091,10 @@ class TaroMiniPlugin {
                 }
             });
             this.pages.forEach(page => {
-                const importBaseTemplatePath = (0, helper_1.promoteRelativePath)(path_1.default.relative(page.path, path_1.default.join(sourceDir, this.getTemplatePath(baseTemplateName))));
+                const importBaseTemplatePath = (0, helper_1.promoteRelativePath)(path_1.default.relative(page.path, path_1.default.join(sourceDir, isBuildPlugin ? 'plugin' : '', this.getTemplatePath(baseTemplateName))));
                 const config = this.filesConfig[this.getConfigFilePath(page.name)];
-                let isIndependent = false;
                 // pages 里面会混合独立分包的，在这里需要过滤一下，避免重复生成 assets
-                this.independentPackages.forEach(pages => {
-                    if (pages.includes(page.path)) {
-                        isIndependent = true;
-                    }
-                });
+                const isIndependent = !!this.getIndependentPackage(page.path);
                 if (isIndependent)
                     return;
                 // 生成页面模板需要在生成页面配置之前，因为会依赖到页面配置的部分内容
@@ -1077,8 +1102,8 @@ class TaroMiniPlugin {
                     this.generateTemplateFile(compilation, compiler, page.path, template.buildPageTemplate, importBaseTemplatePath, config);
                 }
                 if (config) {
-                    const importBaseCompPath = (0, helper_1.promoteRelativePath)(path_1.default.relative(page.path, path_1.default.join(sourceDir, this.getTargetFilePath(this.getIsBuildPluginPath(baseCompName, isBuildPlugin), ''))));
-                    const importCustomWrapperPath = (0, helper_1.promoteRelativePath)(path_1.default.relative(page.path, path_1.default.join(sourceDir, this.getTargetFilePath(this.getIsBuildPluginPath(customWrapperName, isBuildPlugin), ''))));
+                    const importBaseCompPath = (0, helper_1.promoteRelativePath)(path_1.default.relative(page.path, path_1.default.join(sourceDir, this.getTargetFilePath(baseCompName, ''))));
+                    const importCustomWrapperPath = (0, helper_1.promoteRelativePath)(path_1.default.relative(page.path, path_1.default.join(sourceDir, this.getTargetFilePath(customWrapperName, ''))));
                     config.content.usingComponents = Object.assign({}, config.content.usingComponents);
                     if (isUsingCustomWrapper) {
                         config.content.usingComponents[customWrapperName] = importCustomWrapperPath;
@@ -1099,8 +1124,7 @@ class TaroMiniPlugin {
                 if (helper_1.fs.existsSync(pluginJSONPath)) {
                     const pluginJSON = helper_1.fs.readJSONSync(pluginJSONPath);
                     this.modifyPluginJSON(pluginJSON);
-                    const relativePath = pluginJSONPath.replace(sourceDir, '').replace(/\\/g, '/');
-                    compilation.assets[relativePath] = new RawSource(JSON.stringify(pluginJSON));
+                    compilation.assets['plugin.json'] = new RawSource(JSON.stringify(pluginJSON));
                 }
             }
         });
@@ -1151,7 +1175,7 @@ class TaroMiniPlugin {
         }
         compilation.assets[fileTemplName] = new RawSource(templStr);
     }
-    generateXSFile(compilation, compiler, xsPath, isBuildPlugin) {
+    generateXSFile(compilation, compiler, xsPath) {
         const { RawSource } = compiler.webpack.sources;
         const ext = this.options.fileType.xs;
         const isSupportXS = this.options.template.supportXS;
@@ -1160,7 +1184,7 @@ class TaroMiniPlugin {
         }
         const xs = this.options.template.buildXScript();
         const fileXsName = this.getTargetFilePath(xsPath, ext);
-        const filePath = this.getIsBuildPluginPath(fileXsName, isBuildPlugin);
+        const filePath = fileXsName;
         compilation.assets[filePath] = new RawSource(xs);
     }
     getComponentName(componentPath) {
@@ -1171,12 +1195,12 @@ class TaroMiniPlugin {
         }
         else {
             componentName = componentPath.replace(this.options.sourceDir, '').replace(/\\/g, '/').replace(path_1.default.extname(componentPath), '');
+            if (this.options.isBuildPlugin) {
+                componentName = componentName.replace(/plugin\//, '');
+            }
         }
         return componentName.replace(/^(\/|\\)/, '');
     }
-    getIsBuildPluginPath(filePath, isBuildPlugin) {
-        return isBuildPlugin ? `plugin/${filePath}` : filePath;
-    }
     /**
      * 根据 app、页面、组件的路径获取对应的 config 配置文件的路径
      * @returns config 的路径
@@ -1245,10 +1269,10 @@ class TaroMiniPlugin {
         this.independentPackages.forEach((_, name) => { independentPackageNames.push(name); });
         Object.keys(assets).forEach(assetName => {
             const fileName = path_1.default.basename(assetName, path_1.default.extname(assetName));
-            if ((helper_1.REG_STYLE.test(assetName) || REG_STYLE_EXT.test(assetName))
-                && this.options.commonChunks.includes(fileName)
+            if ((helper_1.REG_STYLE.test(assetName) || REG_STYLE_EXT.test(assetName)) &&
+                this.options.commonChunks.includes(fileName) &&
                 // app.wxss 不能引入独立分包中的 common 样式文件
-                && independentPackageNames.every(name => !assetName.includes(name))) {
+                independentPackageNames.every(name => !assetName.includes(name))) {
                 commons.add('\n');
                 commons.add(`@import ${JSON.stringify((0, loader_utils_1.urlToRequest)(assetName))};`);
                 componentCommons.push(assetName);
@@ -1285,7 +1309,7 @@ class TaroMiniPlugin {
                         if (pageStyle in assets) {
                             const source = new ConcatSource('');
                             const originSource = assets[pageStyle];
-                            source.add(`@import ${JSON.stringify((0, loader_utils_1.urlToRequest)(path_1.default.posix.relative(path_1.default.dirname(pageStyle), 'app.wxss')))};\n`);
+                            source.add(`@import ${JSON.stringify((0, loader_utils_1.urlToRequest)(path_1.default.posix.relative(path_1.default.dirname(pageStyle), 'app' + styleExt)))};\n`);
                             source.add(originSource);
                             assets[pageStyle] = source;
                         }