xhs-mp-compiler-cli 1.9.6 → 1.9.7

package/dist/compiler.d.ts

@@ -22,7 +22,8 @@ export interface ForkWebpackOption {
 }
 export interface ICheckOptions {
     compilePkgs?: string[];
-    compressJs: boolean;
+    compressCss?: boolean;
+    compressJs?: boolean;
     enableV2?: boolean;
     enableV1?: boolean;
 }

package/dist/compiler.js

@@ -91,9 +91,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
             }
         }
         kill() {
-            // if (this.pool) {
-            // this.pool.terminate(true)
-            // }
+            if (this.pool) {
+                this.pool.terminate(true);
+                this.pool = null;
+            }
         }
     }
     exports.AbstractCompiler = AbstractCompiler;
@@ -346,7 +347,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                 }
                 finally {
                     // 进程不退出，手动kill下
-                    this.kill();
+                    // this.kill()
                 }
             });
         }

package/dist/index.d.ts

@@ -21,8 +21,10 @@ export type ICompilerProps = ({
     project: Project;
 }) & ICompileOpts;
 interface ICompileBaseConfig {
-    compressJs: boolean;
-    enableSourcemap: boolean;
+    compressCss?: boolean;
+    compressJs?: boolean;
+    enableSourcemap?: boolean;
+    appendSourcemapComment?: boolean;
     enableV2: boolean;
     enableV1: boolean;
     enableVDom: boolean;

package/dist/index.js

@@ -142,7 +142,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                     enableV2 = supportV2 && settings.enableV2;
                     // 开启v2不编译vdom
                     enableVDom = !enableV2 && supportVDom && settings.enableVDom;
-                    // enableVDom = !enableV2 && settings.enableVDom
                     enableV1 = !enableV2;
                 }
                 else {
@@ -246,17 +245,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
             return __awaiter(this, void 0, void 0, function* () {
                 var _a, _b, _c;
                 try {
-                    const { entryType, compressJs, enableSourcemap, enableV2, enableV1, enableVDom, mpUploadOptions } = config;
+                    const { entryType, compressCss, compressJs, enableSourcemap, appendSourcemapComment, enableV2, enableV1, enableVDom, mpUploadOptions } = config;
                     this.emit('compile-project-start');
                     (_a = this.logger) === null || _a === void 0 ? void 0 : _a.log('Compile project...');
                     const compilerImpl = this.getComilerImpl(entryType);
                     yield compilerImpl.build({
+                        compressCss,
                         compressJs,
                         enableSourcemap,
+                        appendSourcemapComment,
                         enableV2,
                         enableV1,
                         enableVDom,
-                        mpUploadOptions,
+                        mpUploadOptions
                     });
                     this.emit('compile-project-done');
                     (_b = this.logger) === null || _b === void 0 ? void 0 : _b.log('Compile project done');
@@ -278,6 +279,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
         }
         compileAndZip(opts) {
             return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
+                var _a;
                 const { can_upload_ext_json, upload_app_id, entryType } = opts;
                 try {
                     const appJsonContent = this.project.appJsonContent;
@@ -288,18 +290,31 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                         this.project.appMode === constant_config_1.MiniMode.miniprogram ? subPackages : formatGameAppJSON(subPackages);
                     const { enableV2, enableV1, enableVDom } = yield this.getUsingPackageType(entryType);
                     let compressJs = false;
+                    let compressCss = false;
                     let enableSourcemap = true;
-                    if (entryType === constant_config_1.COMPILE_ENTRY.upload || entryType === constant_config_1.COMPILE_ENTRY.preview) {
+                    let appendSourcemapComment = true;
+                    if (entryType === constant_config_1.COMPILE_ENTRY.preview) {
+                        compressCss = true;
                         compressJs = true;
-                        enableSourcemap = false;
                     }
-                    else if (settings.hasOwnProperty('minified')) {
-                        compressJs = settings.minified;
+                    else if (entryType === constant_config_1.COMPILE_ENTRY.upload) {
+                        compressCss = true;
+                        compressJs = true;
+                        enableSourcemap = true;
+                        appendSourcemapComment = false;
+                    }
+                    else {
+                        compressCss = false;
+                        compressJs = (_a = settings.minified) !== null && _a !== void 0 ? _a : false;
+                        enableSourcemap = true;
+                        appendSourcemapComment = true;
                     }
                     const buildConfig = {
                         entryType,
+                        compressCss,
                         compressJs,
                         enableSourcemap,
+                        appendSourcemapComment,
                         enableV2,
                         enableV1,
                         enableVDom,

package/dist/packs/mp-pack/index.js

@@ -19,7 +19,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     const apm_1 = require("../../utils/apm");
     const constant_config_1 = require("../../config/constant.config");
     const createCompiler = (startConfig) => {
-        // const {action, enableDevServer} = startConfig
         const mppack = new xhs_mp_pack_1.MPPack(startConfig);
         const compilerOptions = {
             project: mppack.project,

package/dist/packs/webpack/index.js

@@ -42,7 +42,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
         };
     };
     const formatCompilerConfig = startConfig => {
-        const { projectPath, action, tsConfigPath, platform, extJsonPath, compressJs = false, enableSourcemap = false, mpUploadOptions = false } = startConfig;
+        const { projectPath, action, tsConfigPath, platform, extJsonPath, compressCss = false, compressJs = false, enableSourcemap = false, appendSourcemapComment = false, mpUploadOptions = false } = startConfig;
         const { enableV1, enableV2, enableVDom } = handleVersion(startConfig);
         const distDir = startConfig.distDir || path_1.default.join(process.cwd(), 'dist');
         process.env.__platform = platform;
@@ -67,8 +67,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
             env: action === 'dev' ? types_1.ENV.development : types_1.ENV.production,
             tsConfigPath: tsConfigPath || (0, common_1.getTsConfigPath)(projectPath),
             cacheDirectory: startConfig.cacheDirectory,
+            compressCss,
             compressJs,
             enableSourcemap,
+            appendSourcemapComment,
             enableV1,
             enableV2,
             enableVDom,
@@ -77,7 +79,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
         return config;
     };
     const createPacker = (startConfig) => {
-        const { projectPath, action, enableDevServer } = startConfig;
+        const { projectPath } = startConfig;
         startConfig = formatCompilerConfig(startConfig);
         const project = new xhs_mp_project_1.Project({
             projectPath,

package/dist/presets/common.js

@@ -15,7 +15,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     const path_1 = __importDefault(require("path"));
     const presetCommon = (chain, options) => {
         const { packSetting, project } = options;
-        const { env, watch, enableSourcemap, cacheDirectory } = packSetting;
+        const { action, enableSourcemap } = packSetting;
         chain.merge({
             stats: 'errors-only',
             output: {
@@ -35,24 +35,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                 extensions: ['.js', '.ts'],
             },
         });
-        chain.watch(!!watch);
+        chain.watch(action === 'dev');
         chain.mode('development');
         chain.devtool(enableSourcemap ? 'source-map' : false);
         // @ts-ignore
         chain.target(['web', 'es5']);
-        // chain.cache(
-        //   env === ENV.production
-        //     ? false
-        //     : {
-        //         type: 'filesystem',
-        //         cacheDirectory:
-        //           cacheDirectory || path.join(__dirname, '../../node_modules/.cache'),
-        //         version: project.miniprogramDir,
-        //         buildDependencies: {
-        //           config: [path.join(project.miniprogramDir, 'app.json')],
-        //         },
-        //       },
-        // )
     };
     exports.default = presetCommon;
 });

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

@@ -7,7 +7,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "path", "./serviceEntryPlugin", "./serviceChunkPlugin", "./resolveLimitPlugin", "../../../plugins/InjectorPlugin", "../../../../utils/cache"], factory);
+        define(["require", "exports", "path", "./serviceEntryPlugin", "./serviceChunkPlugin", "./resolveLimitPlugin", "../../../plugins/InjectorPlugin", "../../../plugins/SourceMapDevToolPlugin", "../../../../utils/cache"], factory);
     }
 })(function (require, exports) {
     "use strict";
@@ -18,10 +18,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     const serviceChunkPlugin_1 = __importDefault(require("./serviceChunkPlugin"));
     const resolveLimitPlugin_1 = __importDefault(require("./resolveLimitPlugin"));
     const InjectorPlugin_1 = require("../../../plugins/InjectorPlugin");
+    const SourceMapDevToolPlugin_1 = require("../../../plugins/SourceMapDevToolPlugin");
     const cache_1 = require("../../../../utils/cache");
     const presetService = (chain, options) => {
         const { packSetting } = options;
-        const { distDir, cacheDirectory } = packSetting;
+        const { distDir, cacheDirectory, enableSourcemap, appendSourcemapComment } = packSetting;
         const absCacheDirectory = path_1.default.join(cacheDirectory, 'service');
         chain.merge(Object.assign(Object.assign({}, (0, cache_1.getCacheConfig)(absCacheDirectory, options)), { output: {
                 path: distDir,
@@ -30,6 +31,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
         chain.plugin('InjectorPlugin').use(InjectorPlugin_1.InjectorPlugin, [options]);
         chain.plugin('ServiceEntryPlugin').use(serviceEntryPlugin_1.default, [options]);
         chain.plugin('ServiceChunkPlugin').use(serviceChunkPlugin_1.default, [options]);
+        if (enableSourcemap && !appendSourcemapComment) {
+            const SourceMapDevToolPlugin = (0, SourceMapDevToolPlugin_1.getSourceMapDevtoolPlugin)(options.packMode);
+            chain.plugin('SourceMapDevToolPlugin').use(SourceMapDevToolPlugin, [{
+                    filename: '[file].map',
+                    append: false
+                }]);
+        }
         chain.resolve.plugin('ResolveLimitPlugin').use(resolveLimitPlugin_1.default, [options]);
         chain.optimization
             .runtimeChunk({

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

@@ -7,7 +7,7 @@ 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", "../../../../utils/getSuffixName", "./sjsEntryPlugin", "./render", "./component", "./renderChunkPlugin", "../../../../types", "../../../plugins/InjectorPlugin", "../../../../utils/cache", "path"], factory);
+        define(["require", "exports", "../../../../utils/css", "../../../../utils/getSuffixName", "./sjsEntryPlugin", "./render", "./component", "./renderChunkPlugin", "../../../../types", "../../../plugins/InjectorPlugin", "../../../plugins/SourceMapDevToolPlugin", "../../../../utils/cache", "path"], factory);
     }
 })(function (require, exports) {
     "use strict";
@@ -21,6 +21,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     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 getRenderEntry = (options) => () => {
@@ -30,7 +31,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     exports.getRenderEntry = getRenderEntry;
     const presetRender = (chain, options) => {
         const { packSetting } = options;
-        const { enableVDom, env, distDir, cacheDirectory } = packSetting;
+        const { enableVDom, env, distDir, cacheDirectory, enableSourcemap, appendSourcemapComment } = packSetting;
         const mlReg = new RegExp(`.${(0, getSuffixName_1.getMlSuffixName)()}$`);
         const cssReg = new RegExp(`.${(0, getSuffixName_1.getCssSuffixName)()}$`);
         const isProd = env === types_1.ENV.production;
@@ -77,6 +78,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
         chain.plugin('InjectorPlugin').use(InjectorPlugin_1.InjectorPlugin, [options]);
         chain.plugin('SjsEntryPlugin').use(sjsEntryPlugin_1.default, [options]);
         chain.plugin("RenderChunkPlugin").use(renderChunkPlugin_1.default, [options]);
+        if (enableSourcemap && !appendSourcemapComment) {
+            const SourceMapDevToolPlugin = (0, SourceMapDevToolPlugin_1.getSourceMapDevtoolPlugin)(options.packMode);
+            chain.plugin('SourceMapDevToolPlugin').use(SourceMapDevToolPlugin, [{
+                    filename: '[file].map',
+                    append: false
+                }]);
+        }
     };
     exports.presetRender = presetRender;
 });

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

@@ -12,12 +12,13 @@
     const packs_1 = require("../../../../packs");
     const injectCSS = `
 globalThis.__XHS_IS_WEBVIEW = (globalThis.localStorage && globalThis.document && globalThis.document.querySelectorAll)
-globalThis.__XHS_APPEND_CSS = function(cssText){
+globalThis.__XHS_APPEND_CSS = function(cssText, src){
     if (!globalThis.__XHS_IS_WEBVIEW) return;
     var headTags = document.getElementsByTagName('head')
     var head = document.head || (headTags && headTags[0])
     var cssTextNode = document.createTextNode(String(cssText))
     var styleNode = document.createElement('style')
+    styleNode.setAttribute('xhs:path', src)
     styleNode.appendChild(cssTextNode)
     head.appendChild(styleNode)
 };

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

@@ -7,7 +7,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "path", "xhs-mp-pack", "./serviceChunkPlugin", "../../../plugins/InjectorPlugin", "../../../../utils/cache"], factory);
+        define(["require", "exports", "path", "xhs-mp-pack", "./serviceChunkPlugin", "../../../plugins/InjectorPlugin", "../../../plugins/SourceMapDevToolPlugin", "../../../../utils/cache"], factory);
     }
 })(function (require, exports) {
     "use strict";
@@ -17,6 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     const xhs_mp_pack_1 = require("xhs-mp-pack");
     const serviceChunkPlugin_1 = __importDefault(require("./serviceChunkPlugin"));
     const InjectorPlugin_1 = require("../../../plugins/InjectorPlugin");
+    const SourceMapDevToolPlugin_1 = require("../../../plugins/SourceMapDevToolPlugin");
     const cache_1 = require("../../../../utils/cache");
     const getServiceEntry = options => () => {
         const entries = {};
@@ -52,7 +53,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     };
     const presetService = (chain, options) => {
         const { packSetting } = options;
-        const { env, distDir, cacheDirectory } = packSetting;
+        const { env, distDir, cacheDirectory, enableSourcemap, appendSourcemapComment } = packSetting;
         const absCacheDirectory = path_1.default.join(cacheDirectory, 'service');
         chain.merge(Object.assign({ 
             // target: 'webworker',
@@ -64,6 +65,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
             } }, (0, cache_1.getCacheConfig)(absCacheDirectory, options)));
         chain.plugin('InjectorPlugin').use(InjectorPlugin_1.InjectorPlugin, [options]);
         chain.plugin('ServiceChunkPlugin').use(serviceChunkPlugin_1.default, [options]);
+        if (enableSourcemap && !appendSourcemapComment) {
+            const SourceMapDevToolPlugin = (0, SourceMapDevToolPlugin_1.getSourceMapDevtoolPlugin)(options.packMode);
+            chain.plugin('SourceMapDevToolPlugin').use(SourceMapDevToolPlugin, [{
+                    filename: '[file].map',
+                    append: false
+                }]);
+        }
         chain.optimization.runtimeChunk({
             name: 'runtime'
         });

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

@@ -50,33 +50,41 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
         var _a;
         const callback = this.async();
         const { resourcePath } = this;
-        // const {miniprogramDir, enableVDom, enableV1, enableV2, independent} = this.getOptions() as any
         const { project, packSetting, independent } = this.getOptions();
         const { miniprogramDir } = project;
         const { enableVDom, enableV1, enableV2 } = packSetting;
         const shortPath = (0, common_1.getShortPath)(miniprogramDir, resourcePath).replace(/\.wxss$/, '.css');
         source = (_a = source === null || source === void 0 ? void 0 : source.trim) === null || _a === void 0 ? void 0 : _a.call(source);
-        function result(code) {
+        const emitFiles = (code) => {
+            // vdom架构下emit出一份css文件
+            if ((independent || enableVDom) && code) {
+                enableV1 && this.emitFile(`v1/${shortPath}`, code);
+                enableV2 && this.emitFile(`v2/${shortPath}`, code);
+            }
+        };
+        const result = (code) => {
             if (!code) {
                 return `export default void 0;`;
             }
             // 判断浏览器环境，注入css添加逻辑
-            return new packs_1.RawSource(`globalThis.__XHS_IS_WEBVIEW && globalThis.__XHS_APPEND_CSS(${JSON.stringify(code)});` +
+            return new packs_1.RawSource(`globalThis.__XHS_IS_WEBVIEW && globalThis.__XHS_APPEND_CSS(${JSON.stringify(code)}, '${shortPath}');` +
                 `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));
         }
-        // 压缩css
-        minify(source, shortPath)
-            .then(({ code, warnings }) => {
-            // vdom架构下emit出一份css文件
-            if ((independent || enableVDom) && code) {
-                enableV1 && this.emitFile(`v1/${shortPath}`, code);
-                enableV2 && this.emitFile(`v2/${shortPath}`, code);
-            }
-            callback(null, result(code));
-        })
-            .catch(error => {
-            callback(error);
-        });
     }
     module.exports = miniStyleLoader;
 });

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

@@ -21,6 +21,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+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);
@@ -32,12 +35,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    const fs_extra_1 = __importStar(require("fs-extra"));
+    const fs_extra_1 = __importDefault(require("fs-extra"));
     const path_1 = __importStar(require("path"));
     const xhs_mp_pack_1 = require("xhs-mp-pack");
     const loader_utils_1 = require("../../utils/loader-utils");
     const getSuffixName_1 = require("../../utils/getSuffixName");
-    function genComponentLoaderScript(project, context, opts) {
+    function genComponentLoaderScript(project, packSetting, context, opts) {
         const { pkg, root, mode, compPath } = opts;
         const { projectMiniprogramPath, jsonDependencies = [] } = project;
         const componentsMap = project.getComponentsMap();
@@ -74,23 +77,24 @@ var __importStar = (this && this.__importStar) || function (mod) {
   ;${entries.join('\n  ')}
   `;
     }
-    const genRenderLoaderScript = (project, context, opts) => {
+    const genRenderLoaderScript = (project, packSetting, context, opts) => {
         const { projectMiniprogramPath, appJSON, jsonDependencies } = project;
+        const { enableVDom } = packSetting;
         const { pkg, mode } = opts;
         const isFull = pkg === 'full';
+        const appCssPath = (0, path_1.resolve)(projectMiniprogramPath, 'app.css');
         for (const file of jsonDependencies) {
             context.addDependency(file);
         }
-        const appCssPath = (0, path_1.resolve)(projectMiniprogramPath, 'app.css');
-        const appCssExist = (0, fs_extra_1.existsSync)(appCssPath);
         const resourcePath = (0, loader_utils_1.formatPath)(context.resourcePath);
         const path = (0, loader_utils_1.formatPath)(resourcePath.replace(`${projectMiniprogramPath}/`, '').replace(`.${(0, getSuffixName_1.getMlSuffixName)()}`, ''));
         const subPackage = (appJSON.subPackages || []).find(subPack => !!subPack.pages.find(page => page.path === path));
         const enableLazyCodeLoading = mode === 'v2';
         // 资源文件
-        const resources = (0, loader_utils_1.getResourceUris)({
-            appCssExist,
+        const { resourceList, appCssCode } = (0, loader_utils_1.getResourceUris)({
+            appCssPath,
             subPackage,
+            enableVDom,
             enableLazyCodeLoading
         });
         // 开启了按需注入，注入依赖组件
@@ -108,16 +112,18 @@ var __importStar = (this && this.__importStar) || function (mod) {
                 depends.push(uri);
             }
             return `
+      ${appCssCode};
       import Component from '${resourcePath}';
-      globalThis.__render.mount(Component, '${path}', ${JSON.stringify(resources)}, ${JSON.stringify(depends)})
+      globalThis.__render.mount(Component, '${path}', ${JSON.stringify(resourceList)}, ${JSON.stringify(depends)})
     `;
         }
         return `
+    ${appCssCode}
     import Component from '${resourcePath}';
-    globalThis.__render.mount(Component, '${path}', ${JSON.stringify(resources)})
+    globalThis.__render.mount(Component, '${path}', ${JSON.stringify(resourceList)})
   `;
     };
-    function genServiceLoderScript(project, context, opts) {
+    function genServiceLoderScript(project, packSetting, context, opts) {
         const { appJSON, legacyAppJSON, projectMiniprogramPath, jsonDependencies } = project;
         const { pkg, root } = opts;
         const modules = [];
@@ -199,7 +205,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
         if (!handler) {
             throw new Error(`not found loader handler of ${type}`);
         }
-        return handler(this._compiler.project, this, options);
+        return handler(this._compiler.project, this._compiler.packSetting, this, options);
     }
     module.exports = entryLoader;
 });

package/dist/presets/plugins/SourceMapDevToolPlugin.d.ts

@@ -0,0 +1 @@
+export declare const getSourceMapDevtoolPlugin: (packMode: any) => any;

package/dist/presets/plugins/SourceMapDevToolPlugin.js

@@ -0,0 +1,23 @@
+(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", "../../config/constant.config"], factory);
+    }
+})(function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.getSourceMapDevtoolPlugin = void 0;
+    const constant_config_1 = require("../../config/constant.config");
+    const getSourceMapDevtoolPlugin = (packMode) => {
+        if (packMode === constant_config_1.PACK_MODE.WEBPACK) {
+            const { SourceMapDevToolPlugin } = require('webpack');
+            return SourceMapDevToolPlugin;
+        }
+        const { SourceMapDevToolPlugin } = require('xhs-mp-pack');
+        return SourceMapDevToolPlugin;
+    };
+    exports.getSourceMapDevtoolPlugin = getSourceMapDevtoolPlugin;
+});

package/dist/types/index.d.ts

@@ -53,42 +53,42 @@ export interface ICompilerConfig {
      */
     projectPath: string;
     miniprogramDir: string;
-    /**
-     * 构建产物目录
-     */
-    distDir?: string;
+    tsConfigPath?: string;
+    extJsonPath?: string;
     action: "dev" | "build";
-    watch?: boolean;
     env: ENV;
-    tsConfigPath?: string;
     /**
-     * ext json path
+     * 构建产物目录
      */
-    extJsonPath?: string;
+    distDir?: string;
     enablePersistCache?: boolean;
     cacheDirectory?: string;
+    /**
+     * 是否开启 CSS 编译压缩
+     * 默认true
+     */
+    compressCss?: boolean;
     /**
      * 是否开启 Js 编译压缩
+     * 默认true
      */
     compressJs?: boolean;
     /**
      * 打包是否包含 js 文件
      */
     noJs?: boolean;
-    /**
-     * dev 模式是否开启 sourcemap，默认开启
-     */
     enableSourcemap?: boolean;
-    /**
-     * 服务端口
-     */
-    port?: number;
+    appendSourcemapComment?: boolean;
     enableV1?: boolean;
     enableV2?: boolean;
     enableVDom?: boolean;
     mpUploadOptions?: any;
+    /**
+     * 服务端口
+     */
+    port?: number;
 }
-type CliPick = 'projectPath' | 'distDir' | 'watch' | 'tsConfigPath' | 'extJsonPath' | 'cacheDirectory' | 'compressJs' | 'enableSourcemap' | 'enableV1' | 'enableV2' | 'enableVDom' | 'mpUploadOptions';
+type CliPick = 'projectPath' | 'distDir' | 'tsConfigPath' | 'extJsonPath' | 'cacheDirectory' | 'compressCss' | 'compressJs' | 'enableSourcemap' | 'appendSourcemapComment' | 'enableV1' | 'enableV2' | 'enableVDom' | 'mpUploadOptions';
 export interface IStart extends Pick<ICompilerConfig, CliPick> {
     packMode?: 'webpack' | 'mp-pack';
     /**

package/dist/utils/loader-utils.d.ts

@@ -4,10 +4,14 @@ export declare const getShortPath: (projectMiniprogramPath: string, rootContext:
  * 根据是否分包获取资源路径
  */
 export declare const getResourceUris: (options: {
-    appCssExist: boolean;
+    appCssPath: string;
+    enableVDom: boolean;
     enableLazyCodeLoading: boolean;
     subPackage: any;
-}) => string[];
+}) => {
+    appCssCode: string;
+    resourceList: string[];
+};
 /**
  * @NOTE
  *  Create a request and handle the conversion of esModule modules

package/dist/utils/loader-utils.js

@@ -7,7 +7,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "path", "./common", "./getSuffixName"], factory);
+        define(["require", "exports", "path", "./common", "./getSuffixName", "fs-extra"], factory);
     }
 })(function (require, exports) {
     "use strict";
@@ -17,6 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     const path_1 = __importDefault(require("path"));
     const common_1 = require("./common");
     const getSuffixName_1 = require("./getSuffixName");
+    const fs_extra_1 = __importDefault(require("fs-extra"));
     const formatPath = (pathStr = '') => pathStr.split(path_1.default.sep).join(path_1.default.posix.sep);
     exports.formatPath = formatPath;
     const getShortPath = (projectMiniprogramPath, rootContext) => {
@@ -34,12 +35,26 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
      */
     const getResourceUris = (options) => {
         const resourceList = [];
-        const { appCssExist, enableLazyCodeLoading, subPackage } = options;
+        const { appCssPath, enableVDom, enableLazyCodeLoading, subPackage } = options;
+        const appCssExist = fs_extra_1.default.existsSync(appCssPath);
         // sjs 无法识别是否引用 所以一律push
-        // 加载顺序 app.css  主包sjs  分包sjs  主包components.js  分包components.js 
+        // 加载顺序 主包sjs  分包sjs  主包components.js  分包components.js
+        let appCssCode = '';
+        const genAppCss = () => {
+            if (appCssExist) {
+                // 运行时v2架构下，还是传递给运行时控制
+                if (enableVDom) {
+                    resourceList.push(`app.css`);
+                }
+                else {
+                    // 运行时v1架构下，需要放在appCssCode，避免页面样式优先级高于app.css
+                    appCssCode = `import '${appCssPath}'`;
+                }
+            }
+        };
         if (!subPackage) {
             // 主包
-            appCssExist && resourceList.push(`app.css`);
+            genAppCss();
             resourceList.push('sjs.js');
             !enableLazyCodeLoading && resourceList.push(`components.js`);
         }
@@ -49,14 +64,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
             !enableLazyCodeLoading && resourceList.push(`${subPackage === null || subPackage === void 0 ? void 0 : subPackage.root}/components.js`);
         }
         else if (subPackage) {
-            // 普通分包, 自己的components.js，主包components.js app.css
-            appCssExist && resourceList.push(`app.css`);
+            // 普通分包, 自己的components.js，主包components.js
+            genAppCss();
             resourceList.push('sjs.js');
             resourceList.push(`${subPackage === null || subPackage === void 0 ? void 0 : subPackage.root}/sjs.js`);
             !enableLazyCodeLoading && resourceList.push(`components.js`);
             !enableLazyCodeLoading && resourceList.push(`${subPackage === null || subPackage === void 0 ? void 0 : subPackage.root}/components.js`);
         }
-        return resourceList;
+        return { appCssCode, resourceList };
     };
     exports.getResourceUris = getResourceUris;
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xhs-mp-compiler-cli",
-  "version": "1.9.6",
+  "version": "1.9.7",
   "description": "xhs mp command tool.",
   "preferGlobal": true,
   "category": "esm",
@@ -94,13 +94,13 @@
     "webpack-chain": "^6.5.1",
     "webpack-sources": "^3.2.2",
     "xhs-mp-workerpool": "^9.1.3",
-    "xhs-mp-compiler-ml-loader": "3.0.6",
-    "xhs-mp-compiler-utils": "1.9.6",
-    "xhs-mp-pack": "1.9.6",
-    "xhs-mp-project": "1.9.6",
-    "xhs-mp-utils": "1.9.6",
-    "xhs-mp-shared-fs": "1.4.6",
-    "xhs-mp-compiler-sjs-loader": "1.9.6",
+    "xhs-mp-compiler-ml-loader": "3.0.7",
+    "xhs-mp-compiler-utils": "1.9.7",
+    "xhs-mp-pack": "1.9.7",
+    "xhs-mp-project": "1.9.7",
+    "xhs-mp-utils": "1.9.7",
+    "xhs-mp-shared-fs": "1.4.7",
+    "xhs-mp-compiler-sjs-loader": "1.9.7",
     "yauzl": "^2.10.0"
   },
   "devDependencies": {