xhs-mp-compiler-cli 1.9.2 → 1.9.4

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/apm.d.ts

@@ -12,7 +12,9 @@ declare class Reporter implements FeatureReporter.IReporter {
     reportMlWebComponent(value: string): void;
     reportJSONComponent(name: FeatureReporter.JSONComponent): void;
     reportStyleIsolation(value: string): void;
-    reportJSONApp(name: FeatureReporter.JSONApp): void;
+    reportAppJSON(name: FeatureReporter.AppExtJSON): void;
+    reportExtJSON(name: FeatureReporter.AppExtJSON): void;
+    reportDevelopMode(name: FeatureReporter.DevelopMode): void;
 }
 export declare function createReporter(project: Project, option: ICompileAndZipOptions): Reporter | undefined;
 export {};

package/dist/utils/apm.js

@@ -13,13 +13,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "path", "xhs-mp-utils", "fs-extra"], factory);
+        define(["require", "exports", "path", "lodash", "xhs-mp-utils", "fs-extra"], factory);
     }
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.createReporter = createReporter;
     const path_1 = __importDefault(require("path"));
+    const lodash_1 = require("lodash");
     const xhs_mp_utils_1 = require("xhs-mp-utils");
     const fs_extra_1 = require("fs-extra");
     const pkg = require('../../package.json');
@@ -91,13 +92,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                 value,
             });
         }
-        reportJSONApp(name) {
+        reportAppJSON(name) {
             var _a, _b;
             (_b = (_a = this.apm) === null || _a === void 0 ? void 0 : _a.report) === null || _b === void 0 ? void 0 : _b.call(_a, APMKEY, {
                 type: xhs_mp_utils_1.FeatureReporter.MODULE.appJSON,
                 name,
             });
         }
+        reportExtJSON(name) {
+            var _a, _b;
+            (_b = (_a = this.apm) === null || _a === void 0 ? void 0 : _a.report) === null || _b === void 0 ? void 0 : _b.call(_a, APMKEY, {
+                type: xhs_mp_utils_1.FeatureReporter.MODULE.extJSON,
+                name,
+            });
+        }
+        reportDevelopMode(name) {
+            var _a, _b;
+            (_b = (_a = this.apm) === null || _a === void 0 ? void 0 : _a.report) === null || _b === void 0 ? void 0 : _b.call(_a, APMKEY, {
+                type: xhs_mp_utils_1.FeatureReporter.MODULE.developMode,
+                name,
+            });
+        }
     }
     __decorate([
         onceByParams
@@ -116,19 +131,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     ], Reporter.prototype, "reportStyleIsolation", null);
     __decorate([
         onceByParams
-    ], Reporter.prototype, "reportJSONApp", null);
-    function isObject(t) {
-        return t != null && typeof t === 'object';
-    }
-    function isEmpty(t) {
-        if (Array.isArray(t)) {
-            return t.length === 0;
-        }
-        if (isObject(t)) {
-            return Object.keys(t).length === 0;
-        }
-        return true;
-    }
+    ], Reporter.prototype, "reportAppJSON", null);
+    __decorate([
+        onceByParams
+    ], Reporter.prototype, "reportExtJSON", null);
+    __decorate([
+        onceByParams
+    ], Reporter.prototype, "reportDevelopMode", null);
     function createReporter(project, option) {
         var _a, _b, _c;
         try {
@@ -150,26 +159,26 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                 base_version: ((_c = project.projectJsonContent) === null || _c === void 0 ? void 0 : _c.libVersion) || ''
             });
             const reporter = new Reporter(apm);
-            function reportJSON() {
-                var _a, _b, _c, _d;
+            function reportAppJSON() {
+                var _a, _b, _c, _d, _e;
                 // 分包
-                if ((_a = project.getSubPackages()) === null || _a === void 0 ? void 0 : _a.length) {
-                    reporter.reportJSONApp(xhs_mp_utils_1.FeatureReporter.JSONApp.subPackages);
+                if (!(0, lodash_1.isEmpty)(((_a = project.appJsonContent) === null || _a === void 0 ? void 0 : _a.subPackages) || ((_b = project.appJsonContent) === null || _b === void 0 ? void 0 : _b.subpackages))) {
+                    reporter.reportAppJSON(xhs_mp_utils_1.FeatureReporter.AppExtJSON.subPackages);
                 }
                 // tabbar
-                if (!isEmpty((_b = project.appJSON) === null || _b === void 0 ? void 0 : _b.tabBar)) {
-                    reporter.reportJSONApp(xhs_mp_utils_1.FeatureReporter.JSONApp.tabBar);
+                if (!(0, lodash_1.isEmpty)((_c = project.appJsonContent) === null || _c === void 0 ? void 0 : _c.tabBar)) {
+                    reporter.reportAppJSON(xhs_mp_utils_1.FeatureReporter.AppExtJSON.tabBar);
                 }
                 // 按需注入
-                if ((_c = project.appJSON) === null || _c === void 0 ? void 0 : _c.lazyCodeLoading) {
-                    reporter.reportJSONApp(xhs_mp_utils_1.FeatureReporter.JSONApp.lazyCodeLoading);
+                if ((_d = project.appJsonContent) === null || _d === void 0 ? void 0 : _d.lazyCodeLoading) {
+                    reporter.reportAppJSON(xhs_mp_utils_1.FeatureReporter.AppExtJSON.lazyCodeLoading);
                 }
                 // 预载
-                if (!isEmpty((_d = project.appJSON) === null || _d === void 0 ? void 0 : _d.preloadRule)) {
-                    reporter.reportJSONApp(xhs_mp_utils_1.FeatureReporter.JSONApp.preloadRule);
+                if (!(0, lodash_1.isEmpty)((_e = project.appJsonContent) === null || _e === void 0 ? void 0 : _e.preloadRule)) {
+                    reporter.reportAppJSON(xhs_mp_utils_1.FeatureReporter.AppExtJSON.preloadRule);
                 }
                 const componentsMap = project.getComponentsMap();
-                if (!isEmpty(componentsMap)) {
+                if (!(0, lodash_1.isEmpty)(componentsMap)) {
                     // debug(componentsMap)
                     for (let key in componentsMap) {
                         const style = componentsMap[key].styleIsolation;
@@ -179,13 +188,42 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                         }
                         // 占位组件
                         const componentPlaceholder = componentsMap[key].componentPlaceholder;
-                        if (!isEmpty(componentPlaceholder)) {
+                        if (!(0, lodash_1.isEmpty)(componentPlaceholder)) {
                             reporter.reportJSONComponent(xhs_mp_utils_1.FeatureReporter.JSONComponent.componentPlaceholder);
                         }
                     }
                 }
             }
-            reportJSON();
+            function reportExtJSON() {
+                var _a, _b, _c, _d, _e, _f, _g, _h;
+                if ((0, lodash_1.isEmpty)(project.extJsonContent) || !((_a = project.extJsonContent) === null || _a === void 0 ? void 0 : _a.extEnable)) {
+                    return;
+                }
+                // pages
+                if (!(0, lodash_1.isEmpty)((_b = project.extJsonContent) === null || _b === void 0 ? void 0 : _b.pages)) {
+                    reporter.reportExtJSON(xhs_mp_utils_1.FeatureReporter.AppExtJSON.pages);
+                }
+                // 分包
+                if (!(0, lodash_1.isEmpty)(((_c = project.extJsonContent) === null || _c === void 0 ? void 0 : _c.subPackages) || ((_d = project.extJsonContent) === null || _d === void 0 ? void 0 : _d.subpackages))) {
+                    reporter.reportExtJSON(xhs_mp_utils_1.FeatureReporter.AppExtJSON.subPackages);
+                }
+                // tabbar
+                if (!(0, lodash_1.isEmpty)((_e = project.extJsonContent) === null || _e === void 0 ? void 0 : _e.tabBar)) {
+                    reporter.reportExtJSON(xhs_mp_utils_1.FeatureReporter.AppExtJSON.tabBar);
+                }
+                // extPages
+                if (!(0, lodash_1.isEmpty)((_f = project.extJsonContent) === null || _f === void 0 ? void 0 : _f.extPages)) {
+                    reporter.reportExtJSON(xhs_mp_utils_1.FeatureReporter.AppExtJSON.extPages);
+                }
+                if ((_g = project.extJsonContent) === null || _g === void 0 ? void 0 : _g.extEnable) {
+                    // 开发模式
+                    reporter.reportDevelopMode(((_h = project.extJsonContent) === null || _h === void 0 ? void 0 : _h.directCommit)
+                        ? xhs_mp_utils_1.FeatureReporter.DevelopMode.customDevelopment
+                        : xhs_mp_utils_1.FeatureReporter.DevelopMode.templateDevelopment);
+                }
+            }
+            reportAppJSON();
+            reportExtJSON();
             // 统计taro版本
             const vendor = path_1.default.join(project.miniprogramDir, 'vendors.js.LICENSE.txt');
             const taro = path_1.default.join(project.miniprogramDir, 'taro.js');

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.2",
+  "version": "1.9.4",
   "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.2",
-    "xhs-mp-compiler-utils": "1.9.2",
-    "xhs-mp-pack": "1.9.2",
-    "xhs-mp-project": "1.9.2",
-    "xhs-mp-utils": "1.9.2",
-    "xhs-mp-shared-fs": "1.4.2",
-    "xhs-mp-compiler-sjs-loader": "1.9.2",
+    "xhs-mp-compiler-ml-loader": "3.0.4",
+    "xhs-mp-compiler-utils": "1.9.4",
+    "xhs-mp-pack": "1.9.4",
+    "xhs-mp-project": "1.9.4",
+    "xhs-mp-utils": "1.9.4",
+    "xhs-mp-shared-fs": "1.4.4",
+    "xhs-mp-compiler-sjs-loader": "1.9.4",
     "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;
-});