xhs-mp-compiler-cli 2.0.2 → 2.0.4-beta.0

package/dist/presets/configs/minigame/assets/assetsEntryPlugin.js

@@ -4,15 +4,15 @@
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "../../../../packs", "lodash", "../../../../utils/common", "xhs-mp-project"], factory);
+        define(["require", "exports", "../../../../packs", "lodash", "xhs-mp-project", "xhs-mp-compiler-utils"], factory);
     }
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     const packs_1 = require("../../../../packs");
     const lodash_1 = require("lodash");
-    const common_1 = require("../../../../utils/common");
     const xhs_mp_project_1 = require("xhs-mp-project");
+    const xhs_mp_compiler_utils_1 = require("xhs-mp-compiler-utils");
     class MpEntryPlugin {
         constructor(options) {
             this.options = options;
@@ -41,7 +41,7 @@
             assets['v1/app.json'] = appJsonSource;
             for (const subpackage of appJSON.subPackages) {
                 if (subpackage.independent) {
-                    assets[(0, common_1.unixJoin)("v1", subpackage.dirname, "app.json")] = appJsonSource;
+                    assets[(0, xhs_mp_compiler_utils_1.unixJoin)("v1", subpackage.dirname, "app.json")] = appJsonSource;
                 }
             }
             return assets;

package/dist/presets/configs/minigame/service/serviceChunkPlugin.js

@@ -4,14 +4,14 @@
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "../../../../packs", "../../../../packs", "../../../../utils/common"], factory);
+        define(["require", "exports", "xhs-mp-compiler-utils", "../../../../packs", "../../../../packs"], factory);
     }
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
+    const xhs_mp_compiler_utils_1 = require("xhs-mp-compiler-utils");
     const packs_1 = require("../../../../packs");
     const packs_2 = require("../../../../packs");
-    const common_1 = require("../../../../utils/common");
     class ServiceChunkPlugin {
         constructor(options) {
             this.options = options;
@@ -45,7 +45,7 @@
                     const services = [
                         "v1/service.js",
                         // @ts-ignore
-                        ...(_a = project.appJSON.subPackages) === null || _a === void 0 ? void 0 : _a.map(i => (0, common_1.unixJoin)('v1', `${i.entry}.js`))
+                        ...(_a = project.appJSON.subPackages) === null || _a === void 0 ? void 0 : _a.map(i => (0, xhs_mp_compiler_utils_1.unixJoin)('v1', `${i.entry}.js`))
                     ];
                     services.forEach(servicePath => {
                         if (servicePath in assets) {
@@ -63,7 +63,7 @@
             const independent = (_a = project.appJSON.subPackages) === null || _a === void 0 ? void 0 : _a.filter(sub => sub.independent);
             const services = [
                 "v1/service.js",
-                ...independent === null || independent === void 0 ? void 0 : independent.map(i => (0, common_1.unixJoin)('v1', `${i.entry}.js`))
+                ...independent === null || independent === void 0 ? void 0 : independent.map(i => (0, xhs_mp_compiler_utils_1.unixJoin)('v1', `${i.entry}.js`))
             ];
             services.forEach(servicePath => {
                 var _a;

package/dist/presets/configs/minigame/service/serviceEntryPlugin.js

@@ -4,13 +4,14 @@
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "../../../../packs", "../../../../utils/common"], factory);
+        define(["require", "exports", "../../../../packs", "../../../../utils/common", "xhs-mp-compiler-utils"], factory);
     }
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     const packs_1 = require("../../../../packs");
     const common_1 = require("../../../../utils/common");
+    const xhs_mp_compiler_utils_1 = require("xhs-mp-compiler-utils");
     class ServiceEntryPlugin {
         constructor(options) {
             this.options = options;
@@ -23,7 +24,7 @@
             const subPackages = appJSON.subPackages || [];
             this.makeUmdEntry(compiler, 'v1/service.js', `mg-entry-loader?entry=${common_1.DEFAULT_ENTRY}!`, `XHS_SERVICE_${common_1.DEFAULT_ENTRY}`);
             for (const { entry } of subPackages) {
-                this.makeUmdEntry(compiler, (0, common_1.unixJoin)('v1', `${entry}.js`), `mg-entry-loader?entry=${entry}!`, `XHS_SERVICE_${entry}`);
+                this.makeUmdEntry(compiler, (0, xhs_mp_compiler_utils_1.unixJoin)('v1', `${entry}.js`), `mg-entry-loader?entry=${entry}!`, `XHS_SERVICE_${entry}`);
             }
         }
         makeUmdEntry(compiler, filename, url, libraryName) {

package/dist/presets/configs/miniprogram/assets/index.js

@@ -7,13 +7,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "../../../../utils/css", "xhs-mp-compiler-utils", "./assetsEntryPlugin", "../../../../config/constant.config", "../../../plugins/InjectorPlugin", "path", "../../../../utils/cache"], factory);
+        define(["require", "exports", "xhs-mp-compiler-utils", "./assetsEntryPlugin", "../../../../config/constant.config", "../../../plugins/InjectorPlugin", "path", "../../../../utils/cache"], factory);
     }
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.presetAssets = exports.getAssetsEntry = void 0;
-    const css_1 = __importDefault(require("../../../../utils/css"));
     const xhs_mp_compiler_utils_1 = require("xhs-mp-compiler-utils");
     const assetsEntryPlugin_1 = __importDefault(require("./assetsEntryPlugin"));
     const constant_config_1 = require("../../../../config/constant.config");
@@ -28,17 +27,31 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     };
     exports.getAssetsEntry = getAssetsEntry;
     const presetAssets = (chain, options) => {
-        const { packSetting, project } = options;
+        const { packSetting } = options;
         const { distDir, cacheDirectory } = packSetting;
         const absCacheDirectory = path_1.default.join(cacheDirectory, 'assets');
-        const cssReg = new RegExp(`.${(0, xhs_mp_compiler_utils_1.getCssSuffixName)()}$`);
         chain.merge(Object.assign(Object.assign({ output: {
                 path: distDir
             } }, (0, cache_1.getCacheConfig)(absCacheDirectory, options)), { module: {
                 rule: {
-                    [(0, xhs_mp_compiler_utils_1.getCssSuffixName)()]: {
-                        test: cssReg,
-                        use: (0, css_1.default)(packSetting, options, ['mini-style-loader', 'postcss-loader', 'wxss-loader'], true)
+                    style: {
+                        test: constant_config_1.CSS_REG,
+                        use: {
+                            "mini-style-loader": {
+                                loader: "mini-style-loader",
+                                options: {
+                                    // app.css 独立加载
+                                    independentFile: true,
+                                    emitDirs: [
+                                        packSetting.enableV1 && 'v1',
+                                        packSetting.enableV2 && 'v2',
+                                    ].filter(Boolean),
+                                }
+                            },
+                            "wxss-loader": {
+                                loader: "wxss-loader",
+                            }
+                        }
                     }
                 }
             } }));

package/dist/presets/configs/miniprogram/render/index.js

@@ -7,35 +7,46 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "../../../../utils/css", "xhs-mp-compiler-utils", "./sjsEntryPlugin", "./render", "./component", "./renderChunkPlugin", "../../../../types", "../../../plugins/InjectorPlugin", "../../../plugins/SourceMapDevToolPlugin", "../../../../utils/cache", "path"], factory);
+        define(["require", "exports", "path", "./sjsEntryPlugin", "./render", "./component", "./sketch", "./renderChunkPlugin", "../../../../types", "../../../plugins/InjectorPlugin", "../../../plugins/SourceMapDevToolPlugin", "../../../../utils/cache", "../../../../config/constant.config"], factory);
     }
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.presetRender = exports.getRenderEntry = void 0;
-    const css_1 = __importDefault(require("../../../../utils/css"));
-    const xhs_mp_compiler_utils_1 = require("xhs-mp-compiler-utils");
+    const path_1 = __importDefault(require("path"));
     const sjsEntryPlugin_1 = __importDefault(require("./sjsEntryPlugin"));
     const render_1 = require("./render");
     const component_1 = require("./component");
+    const sketch_1 = require("./sketch");
     const renderChunkPlugin_1 = __importDefault(require("./renderChunkPlugin"));
     const types_1 = require("../../../../types");
     const InjectorPlugin_1 = require("../../../plugins/InjectorPlugin");
     const SourceMapDevToolPlugin_1 = require("../../../plugins/SourceMapDevToolPlugin");
     const cache_1 = require("../../../../utils/cache");
-    const path_1 = __importDefault(require("path"));
+    const constant_config_1 = require("../../../../config/constant.config");
     const getRenderEntry = (options) => () => {
-        const entries = Object.assign(Object.assign({}, (0, render_1.getRenderEntry)(options)), (0, component_1.getComponentEntry)(options));
+        const entries = Object.assign(Object.assign(Object.assign({}, (0, render_1.getRenderEntry)(options)), (0, component_1.getComponentEntry)(options)), (0, sketch_1.getSketchEntry)(options));
         return entries;
     };
     exports.getRenderEntry = getRenderEntry;
     const presetRender = (chain, options) => {
         const { packSetting } = options;
         const { enableVDom, env, distDir, cacheDirectory, enableSourcemap, appendSourcemapComment } = packSetting;
-        const mlReg = new RegExp(`.${(0, xhs_mp_compiler_utils_1.getMlSuffixName)()}$`);
-        const cssReg = new RegExp(`.${(0, xhs_mp_compiler_utils_1.getCssSuffixName)()}$`);
         const isProd = env === types_1.ENV.production;
         const absCacheDirectory = path_1.default.join(cacheDirectory, 'render');
+        const transfomLoader = isProd ?
+            {
+                'swc-loader': {
+                    loader: require.resolve('swc-loader'),
+                    options: {
+                        jsc: {
+                            // ?. ?? 运算符号从  es2020支持
+                            target: 'es2019',
+                            externalHelpers: false
+                        },
+                    }
+                }
+            } : {};
         chain.merge(Object.assign(Object.assign({ externals: { vue: 'vue' }, output: {
                 path: distDir,
                 globalObject: 'globalThis',
@@ -44,34 +55,52 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
             } }, (0, cache_1.getCacheConfig)(absCacheDirectory, options)), { module: {
                 rule: {
                     ml: {
-                        test: mlReg,
-                        use: Object.assign(Object.assign({}, (isProd ?
-                            {
-                                'swc-loader': {
-                                    loader: require.resolve('swc-loader'),
-                                    options: {
-                                        jsc: {
-                                            // ?. ?? 运算符号从  es2020支持
-                                            target: 'es2019',
-                                            externalHelpers: false
-                                        },
-                                    }
-                                }
-                            } : {})), { 'ml-loader': {
+                        test: constant_config_1.ML_REG,
+                        use: Object.assign(Object.assign({}, transfomLoader), { 'ml-loader': {
                                 loader: require.resolve('xhs-mp-ml-loader'),
                                 options: {
                                     removeComentNode: isProd,
-                                    vdom: enableVDom,
                                 },
                             } }),
                     },
-                    [(0, xhs_mp_compiler_utils_1.getCssSuffixName)()]: {
-                        test: cssReg,
-                        use: (0, css_1.default)(packSetting, options, [
-                            "mini-style-loader",
-                            'postcss-loader',
-                            'wxss-loader',
-                        ]),
+                    sketchMl: {
+                        test: constant_config_1.SKETCH_ML_REG,
+                        use: Object.assign(Object.assign({}, transfomLoader), { 'sketch-loader': {
+                                loader: require.resolve('xhs-mp-sketch-loader'),
+                                options: {
+                                    removeComentNode: isProd,
+                                },
+                            } }),
+                    },
+                    style: {
+                        test: constant_config_1.CSS_REG,
+                        use: {
+                            "mini-style-loader": {
+                                loader: "mini-style-loader",
+                                options: {
+                                    // vdom 模式下 页面或者组件 css 独立加载
+                                    independentFile: enableVDom,
+                                    emitDirs: [
+                                        packSetting.enableV1 && 'v1',
+                                        packSetting.enableV2 && 'v2',
+                                    ].filter(Boolean),
+                                }
+                            },
+                            "wxss-loader": {
+                                loader: "wxss-loader",
+                            }
+                        }
+                    },
+                    sketchStyle: {
+                        test: constant_config_1.SKETCH_CSS_REG,
+                        use: {
+                            "string-loader": {
+                                loader: "string-loader"
+                            },
+                            "wxss-loader": {
+                                loader: "wxss-loader",
+                            }
+                        }
                     },
                 },
             } }));

package/dist/presets/configs/miniprogram/render/sjsEntryPlugin.js

@@ -30,7 +30,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "fs-extra", "glob", "path", "../../../../packs", "xhs-mp-sjs-loader", "../../../../utils/common"], factory);
+        define(["require", "exports", "fs-extra", "glob", "path", "../../../../packs", "xhs-mp-sjs-loader", "xhs-mp-compiler-utils"], factory);
     }
 })(function (require, exports) {
     "use strict";
@@ -40,7 +40,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     const path_1 = __importDefault(require("path"));
     const packs_1 = require("../../../../packs");
     const xhs_mp_sjs_loader_1 = __importStar(require("xhs-mp-sjs-loader"));
-    const common_1 = require("../../../../utils/common");
+    const xhs_mp_compiler_utils_1 = require("xhs-mp-compiler-utils");
     /**
      * @NOTE 分包中使用 SJS 的规则
      *
@@ -102,7 +102,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                     .concat(glob_1.default.sync('**/*.wxs', { cwd: miniprogramDir }));
                 relativePaths.forEach(relativePath => {
                     var _a;
-                    const sjsAbsPath = (0, common_1.unixJoin)(miniprogramDir, relativePath);
+                    const sjsAbsPath = (0, xhs_mp_compiler_utils_1.unixJoin)(miniprogramDir, relativePath);
                     // 如果是主包内的文件
                     if (this.isFileInMainPkg(relativePath)) {
                         this.mainpkgPaths.push(sjsAbsPath);
@@ -142,7 +142,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                 }
                 let sjsAbsPath = '';
                 if (/\.(sjs|wxs)$/.test(sjsPath)) {
-                    sjsAbsPath = (0, common_1.toUnixPath)(sjsPath);
+                    sjsAbsPath = (0, xhs_mp_compiler_utils_1.toUnixPath)(sjsPath);
                 }
                 else {
                     this.emitError(this.generateMessage(`文件后缀不正确 ${sjsPath}`));
@@ -150,8 +150,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                 const content = fs_extra_1.default.readFileSync(sjsAbsPath, 'utf8');
                 try {
                     const result = xhs_mp_sjs_loader_1.default.call(compilation, content, requirePath => {
-                        const realPath = (0, common_1.unixResolve)(path_1.default.dirname(sjsAbsPath), requirePath);
-                        const relativePath = (0, common_1.getShortPath)(project.miniprogramDir, realPath);
+                        const realPath = (0, xhs_mp_compiler_utils_1.unixResolve)(path_1.default.dirname(sjsAbsPath), requirePath);
+                        const relativePath = (0, xhs_mp_compiler_utils_1.getShortPath)(project.miniprogramDir, realPath);
                         /**
                          * 不是当前分包的 sjs 文件不处理
                          */
@@ -172,7 +172,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                     if ((_a = result.errors) === null || _a === void 0 ? void 0 : _a.length) {
                         this.emitError(this.generateMessage(result.errors.map(i => i.message).join("\n"), sjsAbsPath));
                     }
-                    const moduleName = (0, common_1.getShortPath)(project.miniprogramDir, sjsAbsPath);
+                    const moduleName = (0, xhs_mp_compiler_utils_1.getShortPath)(project.miniprogramDir, sjsAbsPath);
                     // 老版本兼容代码
                     sjsModules.push(`"${moduleName}": ${JSON.stringify(result.legacyCode)}`);
                     // 模块化代码

package/dist/presets/configs/miniprogram/render/sketch.d.ts

@@ -0,0 +1,3 @@
+import { IPresetOptions } from '../../../../types';
+declare const getSketchEntry: (options: IPresetOptions) => {};
+export { getSketchEntry };

package/dist/presets/configs/miniprogram/render/sketch.js

@@ -0,0 +1,45 @@
+(function (factory) {
+    if (typeof module === "object" && typeof module.exports === "object") {
+        var v = factory(require, exports);
+        if (v !== undefined) module.exports = v;
+    }
+    else if (typeof define === "function" && define.amd) {
+        define(["require", "exports", "xhs-mp-pack"], factory);
+    }
+})(function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.getSketchEntry = void 0;
+    const xhs_mp_pack_1 = require("xhs-mp-pack");
+    const getSketchEntry = (options) => {
+        const entries = {};
+        const { packSetting } = options;
+        if (packSetting.enableV2) {
+            appendSketchEntry(options, entries, 'v2');
+        }
+        if (packSetting.enableV1) {
+            appendSketchEntry(options, entries, 'v1');
+        }
+        return entries;
+    };
+    exports.getSketchEntry = getSketchEntry;
+    const appendSketchEntry = (options, entries, mode) => {
+        const { project, packSetting } = options;
+        const { mainPkg, subPkgs } = packSetting.getCompilePkgsForEntries();
+        if (mainPkg) {
+            const pages = project.getPages();
+            for (const { skeleton } of pages) {
+                if (skeleton === null || skeleton === void 0 ? void 0 : skeleton.path) {
+                    entries[`${mode}/${skeleton === null || skeleton === void 0 ? void 0 : skeleton.path}`] = `mp-entry-loader?type=sketch&mode=${mode}&pkg=${xhs_mp_pack_1.CONSTANTS.MAIN_PKG}&path=${skeleton === null || skeleton === void 0 ? void 0 : skeleton.path}!`;
+                }
+            }
+        }
+        for (const { pages, root } of subPkgs) {
+            for (const { skeleton } of pages) {
+                if (skeleton === null || skeleton === void 0 ? void 0 : skeleton.path) {
+                    entries[`${mode}/${skeleton === null || skeleton === void 0 ? void 0 : skeleton.path}`] = `mp-entry-loader?type=sketch&mode=${mode}&pkg=${xhs_mp_pack_1.CONSTANTS.SUB_PKG}&root=${root}&path=${skeleton === null || skeleton === void 0 ? void 0 : skeleton.path}!`;
+                }
+            }
+        }
+    };
+});

package/dist/presets/loaders/mg-entry-loader.js

@@ -7,20 +7,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "fs-extra", "../../utils/common", "xhs-mp-project"], factory);
+        define(["require", "exports", "fs-extra", "xhs-mp-project", "xhs-mp-compiler-utils"], factory);
     }
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     const fs_extra_1 = __importDefault(require("fs-extra"));
-    const common_1 = require("../../utils/common");
     const xhs_mp_project_1 = require("xhs-mp-project");
+    const xhs_mp_compiler_utils_1 = require("xhs-mp-compiler-utils");
     function entryLoader() {
         // @ts-ignore
         const { appJSON, projectPath } = this._compiler.project;
         const { entry } = this.getOptions();
         const addAppJs = () => {
-            const absolutePath = (0, common_1.unixJoin)(projectPath, entry);
+            const absolutePath = (0, xhs_mp_compiler_utils_1.unixJoin)(projectPath, entry);
             if (fs_extra_1.default.existsSync(`${absolutePath}.js`)) {
                 return `require('${absolutePath}.js')`;
             }

package/dist/presets/loaders/mini-style-loader.js

@@ -1,65 +1,32 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 (function (factory) {
     if (typeof module === "object" && typeof module.exports === "object") {
         var v = factory(require, exports);
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "../../packs", "cssnano", "../../utils/common"], factory);
+        define(["require", "exports", "xhs-mp-compiler-utils", "../../packs", "../../config/constant.config"], factory);
     }
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
+    const xhs_mp_compiler_utils_1 = require("xhs-mp-compiler-utils");
     const packs_1 = require("../../packs");
-    const cssnano_1 = __importDefault(require("cssnano"));
-    const common_1 = require("../../utils/common");
-    const CSS_MINIMIZER_OPTIONS = {
-        preset: ['default', { normalizeUrl: false, calc: false }]
-    };
-    const minify = (source, name) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b;
-        const postcssOptions = {
-            to: name,
-            from: name
-        };
-        try {
-            const result = yield cssnano_1.default.process(source, postcssOptions, CSS_MINIMIZER_OPTIONS);
-            return {
-                code: result.css,
-                warnings: (_b = (_a = result.warnings()) === null || _a === void 0 ? void 0 : _a.map) === null || _b === void 0 ? void 0 : _b.call(_a, i => i.toString())
-            };
-        }
-        catch (error) {
-            return {
-                code: source
-            };
-        }
-    });
+    const constant_config_1 = require("../../config/constant.config");
     function miniStyleLoader(source) {
         var _a;
         const callback = this.async();
         const { resourcePath } = this;
-        const { project, packSetting, independentFile } = this.getOptions();
+        // @ts-ignore
+        const { project } = this._compiler;
+        const { independentFile, emitDirs = [] } = this.getOptions();
         const { miniprogramDir } = project;
-        const { enableVDom, enableV1, enableV2 } = packSetting;
-        const shortPath = (0, common_1.getShortPath)(miniprogramDir, resourcePath).replace(/\.wxss$/, '.css');
+        const shortPath = (0, xhs_mp_compiler_utils_1.getShortPath)(miniprogramDir, resourcePath).replace(constant_config_1.CSS_REG, '.css');
         source = (_a = source === null || source === void 0 ? void 0 : source.trim) === null || _a === void 0 ? void 0 : _a.call(source);
         const emitFiles = (code) => {
-            // vdom架构下emit出一份css文件
-            if ((independentFile || enableVDom) && code) {
-                enableV1 && this.emitFile(`v1/${shortPath}`, code);
-                enableV2 && this.emitFile(`v2/${shortPath}`, code);
+            if ((independentFile) && code) {
+                emitDirs.forEach((dir) => {
+                    this.emitFile(`${dir}/${shortPath}`, code);
+                });
             }
         };
         const result = (code) => {
@@ -67,7 +34,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                 return `export default void 0;`;
             }
             // 判断浏览器环境，注入css添加逻辑
-            if (enableVDom) {
+            if (independentFile) {
                 return new packs_1.RawSource(`globalThis.__XHS_ADD_LINK(${JSON.stringify(shortPath)});` +
                     `export default ${JSON.stringify(shortPath)};`).source();
             }
@@ -76,21 +43,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                     `export default ${JSON.stringify(shortPath)};`).source();
             }
         };
-        if (packSetting.compressCss) {
-            // 压缩css
-            minify(source, shortPath)
-                .then(({ code, warnings }) => {
-                emitFiles(code);
-                callback(null, result(code));
-            })
-                .catch(error => {
-                callback(error);
-            });
-        }
-        else {
-            emitFiles(source);
-            callback(null, result(source));
-        }
+        emitFiles(source);
+        callback(null, result(source));
     }
     module.exports = miniStyleLoader;
 });