xhs-mp-compiler-cli 2.0.5 → 2.0.6

package/dist/compiler.d.ts

@@ -31,11 +31,14 @@ export declare abstract class AbstractCompiler extends EventEmitter {
     protected workerType: IWorkerType;
     private compilerOpts;
     protected logger: any;
-    protected pool: any;
+    protected _pool: any;
     constructor(opts: ICompilerOption, args: ICompilerArgs);
+    get pool(): any;
+    set pool(val: any);
     static prepareDevPool(): void;
     static createPool(workerType: any, poolOpts?: {}, processArgs?: {}): any;
     static createProcessOps: (processArgs: any) => any;
+    abstract makePoolReady(args?: any): any;
     close(): void;
     kill(): void;
     call: (method: any, data: any, options?: any) => any;
@@ -46,6 +49,7 @@ export declare class MPPackDevCompiler extends AbstractCompiler {
     private readyPkgs;
     private watching;
     constructor(props: any, args: any);
+    makePoolReady(): void;
     reset(): void;
     doCompilePkgs(opts: ICheckOptions): Promise<unknown>;
     private compilePkgsAndWatch;
@@ -58,12 +62,14 @@ export declare class WebPackDevCompiler extends AbstractCompiler {
     private watching;
     private pendingTask?;
     constructor(props: any, args: any);
+    makePoolReady(args: any): void;
     makePkgsReady(opts: any): Promise<unknown>;
     reCompilePkgs(opts: any): Promise<void>;
 }
 export declare class BuildCompiler extends AbstractCompiler {
     cps: any;
     constructor(props: any, args: any);
+    makePoolReady(args: any): void;
     build(option: ICheckOptions): Promise<any>;
 }
 export declare function getProjectCompilerClass(compilerType: any): typeof MPPackDevCompiler | typeof WebPackDevCompiler | typeof BuildCompiler;

package/dist/compiler.js

@@ -41,6 +41,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
             this.logger = args.logger || console;
             this.workerType = args.workerType || 'process';
         }
+        get pool() {
+            if (!this._pool) {
+                this.makePoolReady();
+            }
+            return this._pool;
+        }
+        set pool(val) {
+            this._pool = val;
+        }
         static prepareDevPool() {
             preparedDevPool = AbstractCompiler.createPool('web', {
                 minWorkers: 1,
@@ -134,16 +143,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
             this.watching = false;
             this.workerType = (args === null || args === void 0 ? void 0 : args.workerType) || 'web';
             this.inspectPort = 9227;
+            this.makePoolReady();
+        }
+        makePoolReady() {
             if (preparedDevPool) {
-                this.pool = preparedDevPool;
+                this._pool = preparedDevPool;
             }
             else {
-                this.pool = AbstractCompiler.createPool(this.workerType, {
+                this._pool = AbstractCompiler.createPool(this.workerType, {
                     minWorkers: 1,
                     maxWorkers: 1 // dev最多只有一个，不用多个，不然无法复用首次watch初始化的compiler
                 });
             }
-            this.pool.emitWorkerMessage = this.emit.bind(this);
+            this._pool.emitWorkerMessage = this.emit.bind(this);
         }
         reset() {
             this.pendingPkgs = {};
@@ -196,7 +208,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                 catch (error) {
                     todoPkgs.forEach(pkg => {
                         var _a, _b;
-                        (_b = (_a = this.pendingPkgs[pkg].reject) === null || _a === void 0 ? void 0 : _a.forEach) === null || _b === void 0 ? void 0 : _b.call(_a, fn => fn());
+                        (_b = (_a = this.pendingPkgs[pkg].reject) === null || _a === void 0 ? void 0 : _a.forEach) === null || _b === void 0 ? void 0 : _b.call(_a, fn => fn(error));
                         delete this.pendingPkgs[pkg];
                     });
                 }
@@ -217,6 +229,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                 catch (error) {
                     this.watching = false;
                     this.emit('buildError', { errors: [error.message] });
+                    throw error;
                 }
                 finally {
                     this.pending = false;
@@ -234,6 +247,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                 }
                 catch (error) {
                     this.emit('buildError', { errors: [error.message] });
+                    throw error;
                 }
                 finally {
                     this.pending = false;
@@ -266,6 +280,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
             this.watching = false;
             this.workerType = (args === null || args === void 0 ? void 0 : args.workerType) || 'web';
             this.inspectPort = 9230;
+            this.makePoolReady(args);
+        }
+        makePoolReady(args) {
             if (preparedDevPool) {
                 this.pool = preparedDevPool;
             }
@@ -301,9 +318,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                 }
                 catch (error) {
                     this.watching = false;
-                    (_d = this.pendingTask.reject) === null || _d === void 0 ? void 0 : _d.forEach(fn => fn());
-                    this.kill();
+                    (_d = this.pendingTask.reject) === null || _d === void 0 ? void 0 : _d.forEach(fn => fn(error));
                     this.emit('buildError', { errors: [error.message] });
+                    throw error;
                 }
                 finally {
                     this.pendingTask = undefined;
@@ -323,6 +340,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                 }
                 catch (error) {
                     this.emit('buildError', { errors: [error.message] });
+                    throw error;
                 }
             });
         }
@@ -334,6 +352,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
             this.cps = [];
             this.workerType = (args === null || args === void 0 ? void 0 : args.workerType) || 'process';
             this.inspectPort = 9228;
+            this.makePoolReady(args);
+        }
+        makePoolReady(args) {
             this.pool = AbstractCompiler.createPool(this.workerType, {
                 minWorkers: 1
             }, args);

package/dist/compilerImpl.js

@@ -9,9 +9,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 const workerpool = require('xhs-mp-workerpool');
-sendBuildInfoMessage('load-packer', '开始加载compiler');
+sendBuildInfoMessage('load-packer', '开始加载编译器');
 const { createPacker } = require('./packs');
-sendBuildInfoMessage('load-packer', '加载compiler完成');
+sendBuildInfoMessage('load-packer', '加载编译器完成');
 let globalConfig = {};
 let projectPacker;
 function formatOutputMessages(err, stats) {

package/dist/compilerManager.js

@@ -310,7 +310,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                         result: 'fail',
                         entryType,
                         config: JSON.stringify(config),
-                        reason: error.message
+                        reason: error === null || error === void 0 ? void 0 : error.message
                     });
                     throw error;
                 }
@@ -351,7 +351,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                         result: 'fail',
                         entryType,
                         config: JSON.stringify(config),
-                        reason: error.message
+                        reason: error === null || error === void 0 ? void 0 : error.message
                     });
                     throw error;
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xhs-mp-compiler-cli",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "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.5",
-    "xhs-mp-compiler-utils": "2.0.5",
-    "xhs-mp-pack": "2.0.5",
-    "xhs-mp-project": "2.0.5",
-    "xhs-mp-shared": "2.0.5",
-    "xhs-mp-shared-fs": "2.0.5",
-    "xhs-mp-sjs-loader": "2.0.5",
-    "xhs-mp-sketch-loader": "2.0.5",
+    "xhs-mp-ml-loader": "2.0.6",
+    "xhs-mp-compiler-utils": "2.0.6",
+    "xhs-mp-pack": "2.0.6",
+    "xhs-mp-project": "2.0.6",
+    "xhs-mp-shared": "2.0.6",
+    "xhs-mp-shared-fs": "2.0.6",
+    "xhs-mp-sjs-loader": "2.0.6",
+    "xhs-mp-sketch-loader": "2.0.6",
     "yauzl": "^2.10.0"
   },
   "peerDependencies": {
-    "xhs-mp-ml-parser": "2.0.5"
+    "xhs-mp-ml-parser": "2.0.6"
   },
   "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.5"
+    "xhs-mp-ml-parser": "2.0.6"
   },
   "scripts": {
     "version": "formula changelog && git add .",