xhs-mp-compiler-cli 2.0.8-beta.0 → 2.0.9

package/dist/compiler.d.ts

@@ -51,7 +51,7 @@ export declare class MPPackDevCompiler extends AbstractCompiler {
     constructor(props: any, args: any);
     makePoolReady(): void;
     reset(): void;
-    doCompilePkgs(opts: ICheckOptions): Promise<unknown>;
+    private doCompilePkgs;
     private compilePkgsAndWatch;
     private addPkgsToWatch;
     changeCompileOptions(options: any): void;
@@ -63,7 +63,8 @@ export declare class WebPackDevCompiler extends AbstractCompiler {
     private pendingTask?;
     constructor(props: any, args: any);
     makePoolReady(args: any): void;
-    makePkgsReady(opts: any): Promise<unknown>;
+    private doCompilePkgs;
+    makePkgsReady(opts: any): Promise<void>;
     reCompilePkgs(opts: any): Promise<void>;
 }
 export declare class BuildCompiler extends AbstractCompiler {

package/dist/compiler.js

@@ -265,10 +265,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
         reCompilePkgs(options) {
             return __awaiter(this, void 0, void 0, function* () {
                 this.readyPkgs = [];
-                this.changeCompileOptions(options);
-                if (!this.pending && !this.watching) {
-                    this.pendingPkgs = {};
-                }
+                this.pendingPkgs = {};
+                this.pending = false;
+                this.watching = false;
+                this.close();
                 yield this.doCompilePkgs(options);
             });
         }
@@ -294,7 +294,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
             }
             this.pool.emitWorkerMessage = this.emit.bind(this);
         }
-        makePkgsReady(opts) {
+        doCompilePkgs(opts) {
             return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
                 var _a, _b, _c, _d;
                 if (this.watching) {
@@ -327,21 +327,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                 }
             }));
         }
+        makePkgsReady(opts) {
+            return __awaiter(this, void 0, void 0, function* () {
+                yield this.doCompilePkgs(opts);
+            });
+        }
         reCompilePkgs(opts) {
             return __awaiter(this, void 0, void 0, function* () {
-                if (!this.watching) {
-                    yield this.makePkgsReady(opts);
-                    return;
-                }
-                try {
-                    this.emit('buildStart');
-                    yield this.call('runTask', Object.assign({ action: 'dev' }, opts));
-                    this.emit('buildSuccess');
-                }
-                catch (error) {
-                    this.emit('buildError', { errors: [error.message] });
-                    throw error;
-                }
+                this.pendingTask = undefined;
+                this.watching = false;
+                this.close();
+                yield this.doCompilePkgs(opts);
             });
         }
     }

package/dist/compilerImpl.js

@@ -166,6 +166,7 @@ const handlers = {
         var _a;
         (_a = projectPacker === null || projectPacker === void 0 ? void 0 : projectPacker.close) === null || _a === void 0 ? void 0 : _a.call(projectPacker, () => { });
         projectPacker = null;
+        globalConfig = null;
     }
 };
 workerpool.worker(handlers);

package/dist/compilerManager.js

@@ -167,12 +167,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
             if (fs_extra_1.default.existsSync(parenCacheDir)) {
                 fs_extra_1.default.removeSync(parenCacheDir);
             }
-            // 移除编译产物
-            const distDir = this.getDistDir();
-            const parentDistDir = path_1.default.dirname(distDir);
-            if (fs_extra_1.default.existsSync(parentDistDir)) {
-                fs_extra_1.default.removeSync(parentDistDir);
-            }
         }
         createCompiler(entryType = constant_config_1.COMPILE_ENTRY.simulator) {
             const { nodeJsPath } = this.compilerProps;
@@ -204,38 +198,39 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
         // 使用的编译目标包类型
         getUsingPackageType() {
             return __awaiter(this, arguments, void 0, function* (entryType = constant_config_1.COMPILE_ENTRY.simulator) {
-                let enableV1 = false;
-                let enableV2 = true;
+                let enableV1 = true;
+                // let enableV2 = false
                 let enableVDom = false;
                 const settings = this.project.settings || {};
                 const isUpload = entryType === constant_config_1.COMPILE_ENTRY.upload;
                 if (this.project.appMode === constant_config_1.MiniMode.minigame) {
-                    enableV1 = true;
-                    enableV2 = false;
+                    // enableV1 = true
+                    // enableV2 = false
                     enableVDom = false;
                 }
                 else if (entryType === constant_config_1.COMPILE_ENTRY.simulator) {
                     if (this.compilerProps.getLibFeatures) {
                         const libFeatures = yield this.compilerProps.getLibFeatures();
-                        enableV2 = libFeatures.supportV2 && settings.enableV2;
-                        enableVDom = !enableV2 && libFeatures.supportVDom && settings.enableVDom;
+                        // enableV2 = libFeatures.supportV2 && settings.enableV2
+                        enableVDom = libFeatures.supportVDom && settings.enableVDom;
                     }
                     else {
-                        enableV2 = settings.enableV2;
-                        enableVDom = !enableV2 && settings.enableVDom;
+                        // enableV2 = settings.enableV2
+                        enableVDom = settings.enableVDom;
                     }
                     // enableVDom = !enableV2 && settings.enableVDom
-                    enableV1 = !enableV2;
+                    // enableV1 = !enableV2
                 }
                 else {
                     // 上传模式下按照勾选开启
                     enableVDom = settings.enableVDom;
-                    enableV2 = settings.enableV2;
-                    enableV1 = true;
+                    // enableV2 = settings.enableV2
+                    // enableV1 = true
                 }
                 return {
                     enableV1,
-                    enableV2,
+                    // 下掉v2 按需注入包
+                    enableV2: false,
                     enableVDom
                 };
             });
@@ -284,7 +279,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
         }
         reCompilePkgs(opts) {
             return __awaiter(this, void 0, void 0, function* () {
-                var _a, _b;
+                var _a, _b, _c;
                 const { compilePkgs } = opts;
                 const entryType = constant_config_1.COMPILE_ENTRY.simulator;
                 const compiler = this.getCompiler(entryType);
@@ -294,10 +289,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                 console.log('[compiler]reCompilePkgs', config);
                 try {
                     this.emit('recompile-pkgs-start', { config });
-                    // getSharedFs(true)?.clear()
+                    this.removeCacheDir();
+                    this.removeDistDir();
+                    (_a = (0, sharedFs_1.default)(true)) === null || _a === void 0 ? void 0 : _a.clear();
                     yield compiler.reCompilePkgs(config);
                     this.emit('recompile-pkgs-end', { config });
-                    (_a = this.report) === null || _a === void 0 ? void 0 : _a.call(this, 'compile', {
+                    (_b = this.report) === null || _b === void 0 ? void 0 : _b.call(this, 'compile', {
                         result: 'success',
                         entryType,
                         config: JSON.stringify(config),
@@ -306,7 +303,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                 }
                 catch (error) {
                     this.emit('recompile-pkgs-error', { config, error });
-                    (_b = this.report) === null || _b === void 0 ? void 0 : _b.call(this, 'compile', {
+                    (_c = this.report) === null || _c === void 0 ? void 0 : _c.call(this, 'compile', {
                         result: 'fail',
                         entryType,
                         config: JSON.stringify(config),

package/dist/presets/common.js

@@ -37,7 +37,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
         });
         chain.watch(action === 'dev');
         chain.mode('development');
-        chain.devtool(enableSourcemap ? 'source-map' : false);
+        chain.devtool(false);
         // @ts-ignore
         chain.target(['web', 'es5']);
     };

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

@@ -31,6 +31,8 @@ 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]);
+        // sourcemap
+        chain.devtool(enableSourcemap ? 'source-map' : false);
         if (enableSourcemap && !appendSourcemapComment) {
             const SourceMapDevToolPlugin = (0, SourceMapDevToolPlugin_1.getSourceMapDevtoolPlugin)(options.packMode);
             chain.plugin('SourceMapDevToolPlugin').use(SourceMapDevToolPlugin, [{

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", "path", "./sjsEntryPlugin", "./render", "./component", "./sketch", "./renderChunkPlugin", "../../../../types", "../../../plugins/InjectorPlugin", "../../../plugins/SourceMapDevToolPlugin", "../../../../utils/cache", "../../../../config/constant.config"], factory);
+        define(["require", "exports", "path", "./sjsEntryPlugin", "./render", "./component", "./sketch", "./renderChunkPlugin", "../../../../types", "../../../plugins/InjectorPlugin", "../../../../utils/cache", "../../../../config/constant.config"], factory);
     }
 })(function (require, exports) {
     "use strict";
@@ -21,7 +21,6 @@ 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 constant_config_1 = require("../../../../config/constant.config");
     const getRenderEntry = (options) => () => {
@@ -107,13 +106,6 @@ 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/service/index.js

@@ -65,6 +65,8 @@ 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]);
+        // sourcemap
+        chain.devtool(enableSourcemap ? 'source-map' : false);
         if (enableSourcemap && !appendSourcemapComment) {
             const SourceMapDevToolPlugin = (0, SourceMapDevToolPlugin_1.getSourceMapDevtoolPlugin)(options.packMode);
             chain.plugin('SourceMapDevToolPlugin').use(SourceMapDevToolPlugin, [{

package/dist/presets/index.js

@@ -32,9 +32,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
         const assetsChain = new xhs_mp_pack_1.Config();
         const serviceChain = new xhs_mp_pack_1.Config();
         const renderChain = new xhs_mp_pack_1.Config();
-        const assetsPresets = [assets_1.presetAssets, common_1.default];
-        const servicePresets = [service_1.presetService, common_1.default, babel_1.default];
-        const renderPresets = [render_1.presetRender, common_1.default, babel_1.default];
+        const assetsPresets = [common_1.default, assets_1.presetAssets];
+        const servicePresets = [common_1.default, service_1.presetService, babel_1.default];
+        const renderPresets = [common_1.default, render_1.presetRender, babel_1.default];
         if (env === xhs_mp_pack_1.ENV.production) {
             assetsPresets.push(prod_1.default);
             servicePresets.push(prod_1.default);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xhs-mp-compiler-cli",
-  "version": "2.0.8-beta.0",
+  "version": "2.0.9",
   "description": "xhs mp command tool.",
   "preferGlobal": true,
   "category": "esm",
@@ -88,18 +88,18 @@
     "webpack-chain": "^6.5.1",
     "webpack-sources": "^3.2.2",
     "xhs-mp-workerpool": "^9.1.3",
-    "xhs-mp-ml-loader": "2.0.8-beta.0",
-    "xhs-mp-compiler-utils": "2.0.8-beta.0",
-    "xhs-mp-pack": "2.0.8-beta.0",
-    "xhs-mp-project": "2.0.8-beta.0",
-    "xhs-mp-shared": "2.0.8-beta.0",
-    "xhs-mp-shared-fs": "2.0.8-beta.0",
-    "xhs-mp-sjs-loader": "2.0.8-beta.0",
-    "xhs-mp-sketch-loader": "2.0.8-beta.0",
+    "xhs-mp-ml-loader": "2.0.9",
+    "xhs-mp-compiler-utils": "2.0.9",
+    "xhs-mp-pack": "2.0.9",
+    "xhs-mp-project": "2.0.9",
+    "xhs-mp-shared": "2.0.9",
+    "xhs-mp-shared-fs": "2.0.9",
+    "xhs-mp-sjs-loader": "2.0.9",
+    "xhs-mp-sketch-loader": "2.0.9",
     "yauzl": "^2.10.0"
   },
   "peerDependencies": {
-    "xhs-mp-ml-parser": "2.0.8-beta.0"
+    "xhs-mp-ml-parser": "2.0.9"
   },
   "devDependencies": {
     "@types/babel__generator": "7.6.3",
@@ -123,7 +123,7 @@
     "typescript": "5.1.6",
     "vue3-jest": "27.0.0-alpha.2",
     "webpack-dev-server": "4.0.0-beta.3",
-    "xhs-mp-ml-parser": "2.0.8-beta.0"
+    "xhs-mp-ml-parser": "2.0.9"
   },
   "scripts": {
     "version": "formula changelog && git add .",