xhs-mp-compiler-cli 2.0.8 → 2.0.10

package/dist/compiler.d.ts

@@ -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

@@ -83,6 +83,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                         pool === null || pool === void 0 ? void 0 : pool.emitWorkerMessage(payload.event, payload.data);
                     }
                 });
+                workerIns.worker.on('error', (err) => {
+                    pool === null || pool === void 0 ? void 0 : pool.emitWorkerMessage('uncaughtException', err);
+                });
             };
             pool.workers.forEach(workerIns => {
                 handlerWorker(workerIns);
@@ -224,11 +227,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                     this.emit('buildStart');
                     yield this.call('runTask', Object.assign({ action: 'dev' }, opts));
                     this.watching = true;
-                    this.emit('buildSuccess');
+                    this.emit('buildEnd');
                 }
                 catch (error) {
                     this.watching = false;
-                    this.emit('buildError', { errors: [error.message] });
                     throw error;
                 }
                 finally {
@@ -243,10 +245,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                     this.pending = true;
                     this.emit('buildStart');
                     yield this.call('activatePkgs', { compilePkgs });
-                    this.emit('buildSuccess');
+                    this.emit('buildEnd');
                 }
                 catch (error) {
-                    this.emit('buildError', { errors: [error.message] });
                     throw error;
                 }
                 finally {
@@ -294,7 +295,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) {
@@ -314,12 +315,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                     yield this.call('runTask', Object.assign({ action: 'dev' }, opts));
                     this.watching = true;
                     (_c = this.pendingTask.resolve) === null || _c === void 0 ? void 0 : _c.forEach(fn => fn());
-                    this.emit('buildSuccess');
+                    this.emit('buildEnd');
                 }
                 catch (error) {
                     this.watching = false;
                     (_d = this.pendingTask.reject) === null || _d === void 0 ? void 0 : _d.forEach(fn => fn(error));
-                    this.emit('buildError', { errors: [error.message] });
                     throw error;
                 }
                 finally {
@@ -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.d.ts

@@ -1,16 +1,13 @@
-declare const workerpool: any;
+declare const workerPool: any;
 declare const createPacker: any;
 declare let globalConfig: any;
 declare let projectPacker: any;
-declare function formatOutputMessages(err: any, stats: any): {
-    errors: any;
-    warnings: any;
-};
+declare function formatOutputError(err: any, stats: any): any;
 declare function sendMessage(data: any): void;
 declare function sendBuildInfoMessage(type: any, message: any): void;
 declare function createProjectPacker(data: any): any;
 declare const handlers: {
-    runWatch: (data: any) => Promise<any>;
+    runWatch: (data: any) => Promise<void>;
     changeCompileOptions(data: any): void;
     activatePkgs: (data: any) => Promise<void>;
     runBuild: (data: any) => Promise<unknown>;

package/dist/compilerImpl.js

@@ -8,23 +8,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const workerpool = require('xhs-mp-workerpool');
+const workerPool = require('xhs-mp-workerpool');
 sendBuildInfoMessage('load-packer', '开始加载编译器');
 const { createPacker } = require('./packs');
 sendBuildInfoMessage('load-packer', '加载编译器完成');
 let globalConfig = {};
 let projectPacker;
-function formatOutputMessages(err, stats) {
+function formatOutputError(err, stats) {
     if (err) {
-        return { errors: [err.message], warnings: [] };
+        return err;
     }
     const json = stats.toJson({ warnings: true, errors: true, all: false });
-    const formattedErrors = json.errors.map(item => item.message);
-    const formattedWarnings = json.warnings.map(item => item.message);
-    const result = { errors: formattedErrors, warnings: formattedWarnings };
-    return result;
+    const formattedErrors = json.errors.map(item => `message: ${item.message}\n`);
+    return new Error(formattedErrors.join('\n'));
 }
-// workerpool 只支持在exec期间发送event
+// workerPool 只支持在exec期间发送event
 // 这里自己实现sendMessage
 function sendMessage(data) {
     const msg = Object.assign(Object.assign({}, data), { customMessage: true });
@@ -100,13 +98,12 @@ const handlers = {
             // 修改文件时构建
             const hasError = err || ((_a = stats === null || stats === void 0 ? void 0 : stats.hasErrors) === null || _a === void 0 ? void 0 : _a.call(stats));
             if (hasError) {
-                sendMessage({
-                    event: 'emitCompileStats',
-                    data: {
-                        stats: formatOutputMessages(err, stats)
-                    }
-                });
-                return;
+                throw formatOutputError(err, stats);
+                // sendMessage({
+                //   event: 'compileErrorWhenFileChange',
+                //   data: formatOutputError(err, stats)
+                // })
+                // return
             }
             sendMessage({
                 event: 'compileFinishWhenFileChange'
@@ -115,10 +112,8 @@ const handlers = {
         console.log('[compiler] it is watching...', err, stats);
         const hasError = err || stats.hasErrors();
         if (hasError) {
-            const error = formatOutputMessages(err, stats);
-            throw error;
+            throw formatOutputError(err, stats);
         }
-        return stats;
     }),
     changeCompileOptions(data) {
         projectPacker === null || projectPacker === void 0 ? void 0 : projectPacker.changeCompileOptions(data);
@@ -132,7 +127,7 @@ const handlers = {
         console.log('run activate finish', err, stats);
         const hasError = err || ((_c = stats === null || stats === void 0 ? void 0 : stats.hasErrors) === null || _c === void 0 ? void 0 : _c.call(stats));
         if (hasError) {
-            throw stats;
+            throw formatOutputError(err, stats);
         }
     }),
     runBuild: data => {
@@ -143,9 +138,8 @@ const handlers = {
                 var _a;
                 const hasError = err || ((_a = stats === null || stats === void 0 ? void 0 : stats.hasErrors) === null || _a === void 0 ? void 0 : _a.call(stats));
                 if (hasError) {
-                    const statsInfo = formatOutputMessages(err, stats);
-                    reject(statsInfo);
-                    return;
+                    const error = formatOutputError(err, stats);
+                    return reject(error);
                 }
                 resolve(null);
             });
@@ -169,4 +163,4 @@ const handlers = {
         globalConfig = null;
     }
 };
-workerpool.worker(handlers);
+workerPool.worker(handlers);

package/dist/compilerManager.js

@@ -54,26 +54,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                 compiler.on('buildStart', data => {
                     this.emit('simulator-compile-start', data);
                 });
+                compiler.on('buildEnd', data => {
+                    this.emit('simulator-compile-end', data);
+                });
                 compiler.on('compileInfo', data => {
                     this.emit('simulator-compile-info', data);
                 });
-                compiler.on('buildSuccess', data => {
-                    this.emit('simulator-compile-success', data);
+                compiler.on('compilePercent', data => {
+                    this.emit('simulator-compile-percent', data);
                 });
-                compiler.on('buildError', data => {
-                    this.emit('simulator-compile-error', data);
+                compiler.on('compileErrorWhenFileChange', error => {
+                    this.emit('simulator-file-change-compile-error', error);
                 });
                 compiler.on('compileFinishWhenFileChange', data => {
                     this.emit('simulator-file-change-compile-finish', data);
                 });
-                compiler.on('compilePercent', data => {
-                    this.emit('simulator-compile-percent', data);
-                });
-                compiler.on('emitCompileStats', data => {
-                    this.emit('simulator-compile-stats', data);
-                });
-                compiler.on('unexpectedExit', data => {
-                    this.emit('simulator-compile-unexpectedExit', data);
+                compiler.on('uncaughtException', err => {
+                    this.emit('simulator-uncaught-exception', err);
                 });
             };
             this.initBuildCompiler = compiler => {
@@ -83,8 +80,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                 compiler.on('compileInfo', data => {
                     this.emit('full-compiler-info', data);
                 });
-                compiler.on('emitCompileStats', data => {
-                    this.emit('full-compile-stats', data);
+                compiler.on('uncaughtException', err => {
+                    this.emit('full-compile-uncaught-exception', err);
                 });
             };
             const { logger, report, projectPath, project } = props;
@@ -167,12 +164,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;
@@ -259,11 +250,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                     }
                 }
                 const config = Object.assign(Object.assign({ compilePkgs, compressCss: false, compressJs: true, enableSourcemap: true, appendSourcemapComment: true, runInServiceSandbox: true, devWriteToDisk: true }, defaultOptions), opts);
-                console.log('[compiler]makePkgsReady', config);
                 try {
-                    this.emit('makePkgsReady-start', { config });
                     yield compiler.makePkgsReady(config);
-                    this.emit('makePkgsReady-end', { config });
                     (_a = this.report) === null || _a === void 0 ? void 0 : _a.call(this, 'compile', {
                         result: 'success',
                         entryType,
@@ -272,7 +260,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                     });
                 }
                 catch (error) {
-                    this.emit('makePkgsReady-error', { config, error });
                     (_b = this.report) === null || _b === void 0 ? void 0 : _b.call(this, 'compile', {
                         result: 'fail',
                         entryType,
@@ -292,14 +279,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                 const defaultOptions = yield this.getUsingPackageType(entryType);
                 const startTime = Date.now();
                 const config = Object.assign(Object.assign({ compilePkgs, compressCss: false, compressJs: true, enableSourcemap: true, appendSourcemapComment: true, runInServiceSandbox: true, devWriteToDisk: true }, defaultOptions), opts);
-                console.log('[compiler]reCompilePkgs', config);
                 try {
-                    this.emit('recompile-pkgs-start', { config });
                     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 });
                     (_b = this.report) === null || _b === void 0 ? void 0 : _b.call(this, 'compile', {
                         result: 'success',
                         entryType,
@@ -308,7 +292,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                     });
                 }
                 catch (error) {
-                    this.emit('recompile-pkgs-error', { config, error });
                     (_c = this.report) === null || _c === void 0 ? void 0 : _c.call(this, 'compile', {
                         result: 'fail',
                         entryType,
@@ -321,40 +304,30 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
         }
         compileProject(config) {
             return __awaiter(this, void 0, void 0, function* () {
-                var _a, _b, _c, _d, _e;
+                var _a, _b, _c, _d;
                 const { entryType } = config;
                 try {
-                    this.emit('compile-project-start');
+                    this.emit('full-compile-project-start');
+                    (_a = this.logger) === null || _a === void 0 ? void 0 : _a.log('Compile project...');
                     const startTime = Date.now();
                     const compiler = this.getCompiler(entryType);
                     this.removeDistDir(entryType);
-                    (_a = (0, sharedFs_1.default)(true)) === null || _a === void 0 ? void 0 : _a.clear();
-                    (_b = this.logger) === null || _b === void 0 ? void 0 : _b.log('Compile project...');
                     yield compiler.build(config);
-                    (_c = this.logger) === null || _c === void 0 ? void 0 : _c.log('Compile project done...');
-                    this.emit('compile-project-end');
-                    (_d = this.report) === null || _d === void 0 ? void 0 : _d.call(this, 'compile', {
+                    (_b = this.logger) === null || _b === void 0 ? void 0 : _b.log('Compile project done...');
+                    this.emit('full-compile-project-end');
+                    (_c = this.report) === null || _c === void 0 ? void 0 : _c.call(this, 'compile', {
                         result: 'success',
                         entryType,
                         config: JSON.stringify(config),
                         duration: Date.now() - startTime
                     });
                 }
-                catch (stats) {
-                    let errors = [];
-                    if (stats.errors) {
-                        errors = stats.errors;
-                    }
-                    else if (stats instanceof Error) {
-                        errors = [stats.message];
-                    }
-                    this.emit('compile-project-error', { config, errors });
-                    const error = new Error(errors.join('\n\n'));
-                    (_e = this.report) === null || _e === void 0 ? void 0 : _e.call(this, 'compile', {
+                catch (error) {
+                    (_d = this.report) === null || _d === void 0 ? void 0 : _d.call(this, 'compile', {
                         result: 'fail',
                         entryType,
                         config: JSON.stringify(config),
-                        reason: error === null || error === void 0 ? void 0 : error.message
+                        reason: error.message
                     });
                     throw error;
                 }

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",
+  "version": "2.0.10",
   "description": "xhs mp command tool.",
   "preferGlobal": true,
   "category": "esm",
@@ -87,19 +87,19 @@
     "webpack-bundle-analyzer": "^4.4.0",
     "webpack-chain": "^6.5.1",
     "webpack-sources": "^3.2.2",
-    "xhs-mp-workerpool": "^9.1.3",
-    "xhs-mp-ml-loader": "2.0.8",
-    "xhs-mp-compiler-utils": "2.0.8",
-    "xhs-mp-pack": "2.0.8",
-    "xhs-mp-project": "2.0.8",
-    "xhs-mp-shared": "2.0.8",
-    "xhs-mp-shared-fs": "2.0.8",
-    "xhs-mp-sjs-loader": "2.0.8",
-    "xhs-mp-sketch-loader": "2.0.8",
+    "xhs-mp-workerpool": "^9.2.0",
+    "xhs-mp-ml-loader": "2.0.10",
+    "xhs-mp-compiler-utils": "2.0.10",
+    "xhs-mp-pack": "2.0.10",
+    "xhs-mp-project": "2.0.10",
+    "xhs-mp-shared": "2.0.10",
+    "xhs-mp-shared-fs": "2.0.10",
+    "xhs-mp-sjs-loader": "2.0.10",
+    "xhs-mp-sketch-loader": "2.0.10",
     "yauzl": "^2.10.0"
   },
   "peerDependencies": {
-    "xhs-mp-ml-parser": "2.0.8"
+    "xhs-mp-ml-parser": "2.0.10"
   },
   "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"
+    "xhs-mp-ml-parser": "2.0.10"
   },
   "scripts": {
     "version": "formula changelog && git add .",