xhs-mp-compiler-cli 1.9.1 → 1.9.3

package/dist/compiler.js

@@ -57,10 +57,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
             const pool = xhs_mp_workerpool_1.default.pool(__dirname + '/compilerImpl.js', Object.assign({ workerType: workerType, workerThreadOpts,
                 forkOpts,
                 workerOpts }, poolOpts));
+            let messageBuffers = [];
             const handlerWorker = workerIns => {
                 workerIns.worker.on('message', payload => {
                     if (payload === null || payload === void 0 ? void 0 : payload.customMessage) {
-                        pool.emitWorkerMessage(payload.event, payload.data);
+                        if (!pool.emitWorkerMessage) {
+                            messageBuffers.push(payload);
+                            return;
+                        }
+                        if (messageBuffers.length) {
+                            messageBuffers.forEach(payload => {
+                                pool === null || pool === void 0 ? void 0 : pool.emitWorkerMessage(payload.event, payload.data);
+                            });
+                            messageBuffers = [];
+                        }
+                        pool === null || pool === void 0 ? void 0 : pool.emitWorkerMessage(payload.event, payload.data);
                     }
                 });
             };

package/dist/compilerImpl.d.ts

@@ -1,5 +1,5 @@
-declare const createPacker: any;
 declare const workerpool: any;
+declare const createPacker: any;
 declare let globalConfig: any;
 declare let projectPacker: any;
 declare function formatOutputMessages(err: any, stats: any): {
@@ -7,6 +7,7 @@ declare function formatOutputMessages(err: any, stats: any): {
     warnings: 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>;

package/dist/compilerImpl.js

@@ -8,10 +8,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-// console.log('[compiler] load packer start')
-const { createPacker } = require('./packs');
 const workerpool = require('xhs-mp-workerpool');
-// console.log('[compiler] load packer end')
+sendBuildInfoMessage('load-packer', '开始加载compiler');
+const { createPacker } = require('./packs');
+sendBuildInfoMessage('load-packer', '加载compiler完成');
 let globalConfig = {};
 let projectPacker;
 function formatOutputMessages(err, stats) {
@@ -62,6 +62,15 @@ function sendMessage(data) {
         throw new Error('Script must be executed as a worker');
     }
 }
+function sendBuildInfoMessage(type, message) {
+    sendMessage({
+        event: 'compileInfo',
+        data: {
+            type,
+            message
+        }
+    });
+}
 function createProjectPacker(data) {
     if (!projectPacker) {
         projectPacker = createPacker(data);
@@ -84,7 +93,7 @@ const handlers = {
     runWatch: (data) => __awaiter(void 0, void 0, void 0, function* () {
         console.log('[compiler] create compiler');
         createProjectPacker(data);
-        // console.log('[compiler] watch start')
+        sendBuildInfoMessage('run-watch', '执行编译');
         const { err, stats } = (yield projectPacker.watch({
             scene: data.scene
         }, (err, stats) => {
@@ -120,6 +129,7 @@ const handlers = {
         var _a, _b, _c;
         const { compilePkgs } = data;
         console.log('run activate start', compilePkgs);
+        sendBuildInfoMessage('run-activatePkgs', '执行编译');
         const { err, stats } = (yield ((_b = (_a = projectPacker).activatePkgs) === null || _b === void 0 ? void 0 : _b.call(_a, compilePkgs)));
         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));
@@ -130,6 +140,7 @@ const handlers = {
     runBuild: data => {
         return new Promise((resolve, reject) => {
             createProjectPacker(data);
+            sendBuildInfoMessage('run-build', '执行编译');
             projectPacker.build((err, stats) => {
                 var _a;
                 const hasError = err || ((_a = stats === null || stats === void 0 ? void 0 : stats.hasErrors) === null || _a === void 0 ? void 0 : _a.call(stats));

package/dist/config/constant.config.js

@@ -37,14 +37,14 @@
     exports.COMPILE_FULL_PKG = 'xhs-full';
     exports.COMPILE_MAIN_PKG = 'xhs-main';
     exports.COMPILE_SUB_PKG = 'xhs-sub';
-    exports.PROD_BROWSERSLIST = ['ios_saf >= 12', 'chrome >= 83'];
+    exports.PROD_BROWSERSLIST = ['ios_saf >= 10', 'chrome >= 83'];
     exports.DEV_BROWSERSLIST = ['last 2 chrome version'];
     exports.DEV_TARGETS = {
         chrome: '90'
     };
     exports.PROD_TARGETS = {
         chrome: '83',
-        ios: '12'
+        ios: '10'
     };
     exports.ENTRY_CSS_NAME = 'app';
     exports.FULL_PKG = 'xhs-full';

package/dist/index.d.ts

@@ -76,7 +76,6 @@ export declare class ProjectCompiler extends EventEmitter {
     reCompilePkgs(config: ICompilePkgsConfig): Promise<void>;
     compileProject(config: ICompileBuildConfig): Promise<void>;
     compileAndZip(opts: ICompileAndZipOptions): Promise<any>;
-    private zipWithFullPackageWithAppId;
     private zipWithFullPackage;
     private zipWithSubPackage;
     close(entryType?: string): void;

package/dist/index.js

@@ -16,7 +16,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "./config/constant.config", "xhs-mp-project", "events", "fs-extra", "path", "./utils/utils", "./utils/zip", "./utils/project", "./config/dir.config", "./compiler", "./config/constant.config"], factory);
+        define(["require", "exports", "./config/constant.config", "xhs-mp-project", "events", "fs-extra", "path", "./utils/utils", "./utils/project", "./config/dir.config", "./compiler", "./config/constant.config"], factory);
     }
 })(function (require, exports) {
     "use strict";
@@ -29,7 +29,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     const fs_extra_1 = __importDefault(require("fs-extra"));
     const path_1 = __importDefault(require("path"));
     const utils_1 = require("./utils/utils");
-    const zip_1 = require("./utils/zip");
     const project_1 = require("./utils/project");
     const dir_config_1 = require("./config/dir.config");
     const compiler_1 = require("./compiler");
@@ -323,20 +322,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                     }
                     else {
                         // 真机调试
-                        // eslint-disable-next-line no-lonely-if
-                        if (!subPackages.length) {
-                            // 真机调试整包zip内产物文件需要放在appid目录下
-                            entryZips = [this.zipWithFullPackageWithAppId(opts, subPackages, 'v0')];
-                        }
-                        else {
-                            // eslint-disable-next-line no-lonely-if
-                            if (enableV2) {
-                                entryZips = [this.zipWithSubPackage(opts, subPackages, 'v2')];
-                            }
-                            else {
-                                entryZips = [this.zipWithSubPackage(opts, subPackages, 'v1')];
-                            }
-                        }
+                        entryZips = [this.zipWithSubPackage(opts, subPackages, enableV2 ? 'v2' : 'v1')];
                     }
                     const zipTask = yield Promise.all(entryZips.filter(Boolean));
                     const zipResult = zipTask.flat(2);
@@ -352,15 +338,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                 }
             }));
         }
-        zipWithFullPackageWithAppId(opts_1) {
-            return __awaiter(this, arguments, void 0, function* (opts, subPackages = [], type) {
-                const { entryType } = opts;
-                const buildDir = this.getDistDir(entryType);
-                const distFullZip = path_1.default.resolve(buildDir, 'v0-full-pack.zip');
-                const srcDirPath = path_1.default.resolve(buildDir, !subPackages.length ? 'v1' : 'v0'); // 如果没有开启分包，则把v1包当作v0包
-                return (0, zip_1.genZip)(srcDirPath, distFullZip, this.project.projectAppId);
-            });
-        }
         /* 使用v0的入口，zip整包 */
         zipWithFullPackage(opts_1) {
             return __awaiter(this, arguments, void 0, function* (opts, subPackages = [], type) {

package/dist/presets/babel.d.ts

@@ -2,7 +2,6 @@ import { Config } from '../packs';
 import { IPresetOptions } from '../types';
 /**
  * babel 仅关注语法转换，polyfill 在 js-core 中已经内置
- * 目前 polyfill 仅支持到 'ios_saf >= 10', 'chrome >= 83'。语法构建中，会默认支持。
  */
 declare const getBaseConfig: (chain: Config, options: IPresetOptions) => void;
 export default getBaseConfig;

package/dist/presets/babel.js

@@ -13,7 +13,6 @@
     const types_1 = require("../types");
     /**
      * babel 仅关注语法转换，polyfill 在 js-core 中已经内置
-     * 目前 polyfill 仅支持到 'ios_saf >= 10', 'chrome >= 83'。语法构建中，会默认支持。
      */
     const getBaseConfig = (chain, options) => {
         const { packSetting } = options;

package/dist/utils/css.js

@@ -7,20 +7,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "postcss-preset-env", "./postcssRpx2Vw", "./const", "../types"], factory);
+        define(["require", "exports", "postcss-preset-env", "./postcssRpx2Vw", "../types", "../config/constant.config"], factory);
     }
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    // @ts-nocheck
     const postcss_preset_env_1 = __importDefault(require("postcss-preset-env"));
     const postcssRpx2Vw_1 = __importDefault(require("./postcssRpx2Vw"));
-    const const_1 = __importDefault(require("./const"));
     const types_1 = require("../types");
-    const { DEV_BROWSERSLIST, PROD_BROWSERSLIST } = const_1.default;
+    const constant_config_1 = require("../config/constant.config");
     const getCssConfig = (options, presets) => {
         const isDev = options.env === types_1.ENV.development;
-        const browsers = isDev ? DEV_BROWSERSLIST : PROD_BROWSERSLIST;
+        const browsers = isDev ? constant_config_1.DEV_BROWSERSLIST : constant_config_1.PROD_BROWSERSLIST;
         const loaders = {
             'mini-style-loader': {
                 loader: require.resolve('../presets/loaders/mini-style-loader'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xhs-mp-compiler-cli",
-  "version": "1.9.1",
+  "version": "1.9.3",
   "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.1",
-    "xhs-mp-compiler-utils": "1.9.1",
-    "xhs-mp-pack": "1.9.1",
-    "xhs-mp-project": "1.9.1",
-    "xhs-mp-utils": "1.9.1",
-    "xhs-mp-shared-fs": "1.4.1",
-    "xhs-mp-compiler-sjs-loader": "1.9.1",
+    "xhs-mp-compiler-ml-loader": "3.0.3",
+    "xhs-mp-compiler-utils": "1.9.3",
+    "xhs-mp-pack": "1.9.3",
+    "xhs-mp-project": "1.9.3",
+    "xhs-mp-utils": "1.9.3",
+    "xhs-mp-shared-fs": "1.4.3",
+    "xhs-mp-compiler-sjs-loader": "1.9.3",
     "yauzl": "^2.10.0"
   },
   "devDependencies": {

package/dist/utils/const.d.ts

@@ -1,27 +0,0 @@
-declare const CONSTANTS: {
-    PROD_BROWSERSLIST: string[];
-    DEV_BROWSERSLIST: string[];
-    DEV_TARGETS: {
-        chrome: string;
-    };
-    PROD_TARGETS: {
-        chrome: string;
-        ios: string;
-    };
-    ENTRY_CSS_NAME: string;
-    FULL_PKG: string;
-    MAIN_PKG: string;
-    SUB_PKG: string;
-    BUILD_REASON: {
-        INIT: string;
-        FILE_CHANGE: string;
-        ACTIVATE_PKG: string;
-        RECOMPILE: string;
-    };
-    ASSETS_EXTS: string[];
-    PACK_MODE: {
-        MPPACK: string;
-        WEBPACK: string;
-    };
-};
-export default CONSTANTS;

package/dist/utils/const.js

@@ -1,57 +0,0 @@
-(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"], factory);
-    }
-})(function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    const CONSTANTS = {
-        PROD_BROWSERSLIST: ['ios_saf >= 12', 'chrome >= 83'],
-        DEV_BROWSERSLIST: ['last 2 chrome version'],
-        DEV_TARGETS: {
-            chrome: '90',
-        },
-        PROD_TARGETS: {
-            chrome: '83',
-            ios: '12'
-        },
-        ENTRY_CSS_NAME: 'app',
-        FULL_PKG: 'xhs-full',
-        MAIN_PKG: 'xhs-main',
-        SUB_PKG: 'xhs-sub',
-        BUILD_REASON: {
-            INIT: 'INIT',
-            FILE_CHANGE: 'FILE_CHANGE',
-            ACTIVATE_PKG: 'ACTIVATE_PKG',
-            RECOMPILE: 'RECOMPILE',
-        },
-        ASSETS_EXTS: [
-            'png',
-            'jpg',
-            'jpeg',
-            'gif',
-            'svg',
-            'webp',
-            'cer',
-            'mp3',
-            'aac',
-            'm4a',
-            'mp4',
-            'wav',
-            'ogg',
-            'silk',
-            'wasm',
-            'br',
-            'plist',
-        ],
-        PACK_MODE: {
-            MPPACK: 'mp-pack',
-            WEBPACK: 'webpack'
-        }
-    };
-    exports.default = CONSTANTS;
-});