xhs-mp-compiler-cli 2.0.5 → 2.0.7-beta.0

package/dist/bin/xhs-mp-cli-dev.js

@@ -51,9 +51,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
             console.log(`资源编译：${data.resource}`);
         }
     });
-    projectPacker.watch({
-        scene: 'watch',
-    }, (err, stats) => {
+    projectPacker.watch({}, (err, stats) => {
         console.log(stats.toString({ warnings: true, errors: true, all: false }));
     });
 });

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];
                     });
                 }
@@ -210,13 +222,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                     // }
                     this.pending = true;
                     this.emit('buildStart');
-                    yield this.call('runTask', Object.assign({ scene: 'watch', action: 'dev' }, opts));
+                    yield this.call('runTask', Object.assign({ action: 'dev' }, opts));
                     this.watching = true;
                     this.emit('buildSuccess');
                 }
                 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;
             }
@@ -294,16 +311,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                 };
                 try {
                     this.emit('buildStart');
-                    yield this.call('runTask', Object.assign({ scene: 'watch', action: 'dev' }, opts));
+                    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');
                 }
                 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;
@@ -318,11 +335,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                 }
                 try {
                     this.emit('buildStart');
-                    yield this.call('runTask', Object.assign({ action: 'dev', scene: 'reWatch' }, opts));
+                    yield this.call('runTask', Object.assign({ action: 'dev' }, opts));
                     this.emit('buildSuccess');
                 }
                 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) {
@@ -94,9 +94,7 @@ const handlers = {
         console.log('[compiler] create compiler');
         createProjectPacker(data);
         sendBuildInfoMessage('run-watch', '执行编译');
-        const { err, stats } = (yield projectPacker.watch({
-            scene: data.scene
-        }, (err, stats) => {
+        const { err, stats } = (yield projectPacker.watch({}, (err, stats) => {
             var _a;
             console.log('[compiler] file change...', 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/dist/packs/webpack/webpack.js

@@ -59,9 +59,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                     this.watcher.close(() => { });
                     this.watcher = null;
                 }
-                if (config.scene === 'reWatch') {
-                    this.hadWatch = false;
-                }
+                this.hadWatch = false;
                 this.watcher = this.compiler.watch(Object.assign(Object.assign({}, watchOptions), config), (err, stats) => {
                     if (!this.hadWatch) {
                         this.hadWatch = true;

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

@@ -113,12 +113,13 @@ var __importStar = (this && this.__importStar) || function (mod) {
   `;
     };
     function genServiceLoderScript(project, context, opts) {
+        var _a;
         const { appJSON, projectMiniprogramPath, jsonDependencies } = project;
         const { pkg, root } = opts;
         const modules = [];
-        let name = 'XHS_SERVICE';
+        let moduleName = 'XHS_SERVICE';
         if (pkg === xhs_mp_pack_1.CONSTANTS.SUB_PKG) {
-            name = `XHS_SERVICE_${root}`;
+            moduleName = `XHS_SERVICE_${root}`;
         }
         for (const file of jsonDependencies) {
             context.addDependency(file);
@@ -126,20 +127,22 @@ var __importStar = (this && this.__importStar) || function (mod) {
         const addAppJs = () => {
             if (fs_extra_1.default.existsSync(`${projectMiniprogramPath}/app.js`) ||
                 fs_extra_1.default.existsSync(`${projectMiniprogramPath}/app.ts`)) {
-                modules.unshift(`const loadAppJs = () => require('${(0, xhs_mp_compiler_utils_1.toUnixPath)(`${projectMiniprogramPath}/app`)}');` +
-                    `globalThis['${name}'].default['app'] = globalThis.xhsLazyAppJs ? loadAppJs : loadAppJs()`);
+                const loadAppJs = 'loadAppJs';
+                modules.unshift(`;const ${loadAppJs} = () => require('${(0, xhs_mp_compiler_utils_1.toUnixPath)(`${projectMiniprogramPath}/app`)}')`, `;globalThis['${moduleName}'].default['app'] = globalThis.xhsLazyAppJs ? ${loadAppJs} : ${loadAppJs}()`);
             }
         };
-        const addPage = (page) => {
-            const resourcePath = (0, xhs_mp_compiler_utils_1.toUnixPath)(`${projectMiniprogramPath}/${page.path}`);
-            const content = `;globalThis['${name}'].default['${page.path}'] = () => require('${resourcePath}')`;
+        // 添加 page 或者 component 的 js 资源
+        const addJSResource = (shortPath) => {
+            const resourcePath = (0, xhs_mp_compiler_utils_1.toUnixPath)(`${projectMiniprogramPath}/${shortPath}`);
+            const content = `;globalThis['${moduleName}'].default['${shortPath}'] = () => require('${resourcePath}')`;
             modules.push(content);
         };
         // 主包
         if (pkg === xhs_mp_pack_1.CONSTANTS.MAIN_PKG) {
             addAppJs();
             for (const page of appJSON.pages) {
-                addPage(page);
+                // 注意 经过转换后的 page 全部处理为 { path: string } 对象格式
+                addJSResource(page.path);
             }
         }
         // 分包
@@ -147,30 +150,35 @@ var __importStar = (this && this.__importStar) || function (mod) {
             for (const subPackage of appJSON.subPackages) {
                 if (subPackage.root === root) {
                     for (const page of subPackage.pages) {
-                        addPage(page);
+                        addJSResource(page.path);
                     }
                 }
             }
         }
         Object.keys(appJSON.componentsMap).forEach(compPath => {
-            const resourcePath = (0, xhs_mp_compiler_utils_1.toUnixPath)(`${projectMiniprogramPath}/${compPath}`);
-            const content = `;globalThis['${name}'].default['${compPath}'] = () => require('${resourcePath}')`;
             if (pkg === xhs_mp_pack_1.CONSTANTS.MAIN_PKG) {
                 const subPackageRoots = appJSON.subPackages.map(pkg => pkg.root);
                 if (subPackageRoots.every(root => !compPath.startsWith(`${root}/`))) {
-                    modules.push(content);
+                    addJSResource(compPath);
                 }
             }
             if (pkg === xhs_mp_pack_1.CONSTANTS.SUB_PKG) {
                 if (compPath.startsWith(`${root}/`)) {
-                    modules.push(content);
+                    addJSResource(compPath);
                 }
             }
         });
-        return `;globalThis['__MP_APP_JSON__'] = ${JSON.stringify(appJSON)};
-  ;(globalThis['${name}'] || (globalThis['${name}'] = { default: {} }))
-  ${modules.join('\n  ')}
-`;
+        let injectAppJson = '';
+        if (pkg === xhs_mp_pack_1.CONSTANTS.MAIN_PKG ||
+            (pkg === xhs_mp_pack_1.CONSTANTS.SUB_PKG && ((_a = appJSON.subPackages.find(sub => sub.root === root)) === null || _a === void 0 ? void 0 : _a.independent))) {
+            // 非独立分包加载必须依赖主包先加载，因此没必要进行__MP_APP_JSON__重复注入
+            injectAppJson = `;globalThis['__MP_APP_JSON__'] = ${JSON.stringify(appJSON)}`;
+        }
+        return [
+            injectAppJson,
+            `;(globalThis['${moduleName}'] || (globalThis['${moduleName}'] = { default: {} }))`,
+            ...modules
+        ].filter(Boolean).join('\n');
     }
     function genSketchLoaderScript(project, context, opts) {
         const { projectMiniprogramPath } = project;

package/package.json

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