xhs-mp-compiler-cli 2.0.30 → 2.0.31-beta.1

package/dist/compilerManager.d.ts

@@ -87,6 +87,7 @@ export declare class ProjectCompilerManager extends EventEmitter {
     reCompilePkgs(opts: ICompilePkgsConfig): Promise<void>;
     compileProject(config: ICompileProjectConfig): Promise<void>;
     compileAndZip(opts: ICompileAndZipOptions): Promise<IZipResult[]>;
+    checkMiniWidgetSize(zipResult: IZipResult[], resolve: any, reject: any): any;
     closeCompiler(entryType?: string): void;
     killCompiler(entryType?: string): void;
     killAll(): void;

package/dist/compilerManager.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/project", "./config/dir.config", "./compiler", "./sharedFs"], factory);
+        define(["require", "exports", "./config/constant.config", "xhs-mp-project", "events", "fs-extra", "path", "./utils/utils", "./utils/project", "./utils/file", "./config/dir.config", "./compiler", "./sharedFs"], factory);
     }
 })(function (require, exports) {
     "use strict";
@@ -30,6 +30,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     const path_1 = __importDefault(require("path"));
     const utils_1 = require("./utils/utils");
     const project_1 = require("./utils/project");
+    const file_1 = require("./utils/file");
     const dir_config_1 = require("./config/dir.config");
     const compiler_1 = require("./compiler");
     Object.defineProperty(exports, "prepareDevPool", { enumerable: true, get: function () { return compiler_1.prepareDevPool; } });
@@ -337,11 +338,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                     const appJsonContent = this.project.appJsonContent;
                     const settings = this.project.settings || {};
                     let subPackages = appJsonContent.subPackages || appJsonContent.subpackages || [];
-                    const formatGameAppJSON = this.project.formatGameAppJSON;
-                    subPackages =
-                        this.project.appMode === constant_config_1.MiniMode.miniprogram
-                            ? subPackages
-                            : formatGameAppJSON(subPackages);
+                    if (this.project.appMode === constant_config_1.MiniMode.minigame) {
+                        subPackages = this.project.formatGameAppJSON(subPackages);
+                    }
                     const { enableV1, enableV2, enableVDom } = yield this.getUsingPackageType(entryType);
                     let compressJs = false;
                     let compressCss = false;
@@ -372,7 +371,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                         runInServiceSandbox,
                         enableV1,
                         enableV2,
-                        enableVDom, mpUploadOptions: this.project.appMode === constant_config_1.MiniMode.miniprogram && opts }, opts);
+                        enableVDom, mpUploadOptions: this.project.appMode !== constant_config_1.MiniMode.minigame && opts }, opts);
                     // 编译
                     this.emit('compile-and-zip-status', { status: 'build-start' });
                     yield this.compileProject(buildConfig);
@@ -401,6 +400,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                     const zipTask = yield Promise.all(entryZips.filter(Boolean));
                     const zipResult = zipTask.flat(2);
                     this.emit('compile-and-zip-status', { status: 'zip-done' });
+                    // 小组件压缩包体积校验
+                    if (this.project.appMode === constant_config_1.MiniMode.miniwidget) {
+                        return this.checkMiniWidgetSize(zipResult, resolve, reject);
+                    }
                     resolve(zipResult);
                 }
                 catch (error) {
@@ -408,6 +411,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                 }
             }));
         }
+        checkMiniWidgetSize(zipResult, resolve, reject) {
+            if (this.project.appMode !== constant_config_1.MiniMode.miniwidget)
+                return;
+            const MINIWIDGET_MAX_SIZE = 2 * 1024 * 1024; // 2MB
+            for (const element of zipResult) {
+                if (element.zipSize > MINIWIDGET_MAX_SIZE) {
+                    const error = new Error(`包体积过大，请检查代码，当前包体积大小 ${(0, file_1.fileSize)(element.zipSize)} 超过 ${(0, file_1.fileSize)(MINIWIDGET_MAX_SIZE)} 上限，请删除无用代码以及无用媒体资源`);
+                    error.stack = '';
+                    return reject(error);
+                }
+            }
+            return resolve(zipResult);
+        }
         closeCompiler(entryType = constant_config_1.COMPILE_ENTRY.simulator) {
             const compiler = this.compilerImplMap[entryType];
             if (compiler) {

package/dist/config/constant.config.d.ts

@@ -20,6 +20,7 @@ export declare const COMPILE_ENTRY: {
 export declare const MiniMode: {
     miniprogram: string;
     minigame: string;
+    miniwidget: string;
 };
 export declare const PKG_ROOT_SEP = "_XHSPKG_";
 export declare const COMPILE_FULL_PKG = "xhs-full";

package/dist/config/constant.config.js

@@ -31,7 +31,8 @@
     };
     exports.MiniMode = {
         miniprogram: 'miniprogram',
-        minigame: 'minigame'
+        minigame: 'minigame',
+        miniwidget: 'miniwidget'
     };
     exports.PKG_ROOT_SEP = '_XHSPKG_';
     exports.COMPILE_FULL_PKG = 'xhs-full';

package/dist/presets/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", "xhs-mp-pack", "./common", "./dev", "./prod", "./configs/miniprogram/assets", "./configs/miniprogram/service", "./configs/miniprogram/render", "./configs/minigame/assets", "./configs/minigame/service"], factory);
+        define(["require", "exports", "xhs-mp-pack", "./common", "./dev", "./prod", "./configs/miniprogram/assets", "./configs/miniprogram/service", "./configs/miniprogram/render", "./configs/minigame/assets", "./configs/minigame/service", "../config/constant.config"], factory);
     }
 })(function (require, exports) {
     "use strict";
@@ -22,6 +22,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     const render_1 = require("./configs/miniprogram/render");
     const assets_2 = require("./configs/minigame/assets");
     const service_2 = require("./configs/minigame/service");
+    const constant_config_1 = require("../config/constant.config");
     /**
      * 小程序编译配置
      */
@@ -84,11 +85,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     // 获取编译配置
     const createConfigs = (options) => {
         const { project } = options;
-        if (project.appMode === 'miniprogram') {
-            return createMPConfigs(options);
+        if (project.appMode === constant_config_1.MiniMode.minigame) {
+            return createMGConfigs(options);
         }
         else {
-            return createMGConfigs(options);
+            return createMPConfigs(options);
         }
     };
     exports.createConfigs = createConfigs;

package/dist/presets/prod.js

@@ -40,7 +40,7 @@
                     },
                 ];
             };
-            if (project.appMode === 'miniprogram') {
+            if (project.appMode !== constant_config_1.MiniMode.minigame) {
                 chain.module
                     .rule('js')
                     .test(/\.js$/)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xhs-mp-compiler-cli",
-  "version": "2.0.30",
+  "version": "2.0.31-beta.1",
   "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.2.0",
-    "xhs-mp-ml-loader": "2.0.30",
-    "xhs-mp-compiler-utils": "2.0.30",
-    "xhs-mp-pack": "2.0.30",
-    "xhs-mp-project": "2.0.30",
-    "xhs-mp-shared": "2.0.30",
-    "xhs-mp-shared-fs": "2.0.30",
-    "xhs-mp-sjs-loader": "2.0.30",
-    "xhs-mp-sketch-loader": "2.0.30",
+    "xhs-mp-ml-loader": "2.0.31-beta.1",
+    "xhs-mp-compiler-utils": "2.0.31-beta.1",
+    "xhs-mp-pack": "2.0.31-beta.1",
+    "xhs-mp-project": "2.0.31-beta.1",
+    "xhs-mp-shared": "2.0.31-beta.1",
+    "xhs-mp-shared-fs": "2.0.31-beta.1",
+    "xhs-mp-sjs-loader": "2.0.31-beta.1",
+    "xhs-mp-sketch-loader": "2.0.31-beta.1",
     "yauzl": "^2.10.0"
   },
   "peerDependencies": {
-    "xhs-mp-ml-parser": "2.0.30"
+    "xhs-mp-ml-parser": "2.0.31-beta.1"
   },
   "devDependencies": {
     "@types/babel__generator": "7.6.3",
@@ -122,7 +122,7 @@
     "@types/node": "14",
     "typescript": "5.1.6",
     "webpack-dev-server": "4.0.0-beta.3",
-    "xhs-mp-ml-parser": "2.0.30"
+    "xhs-mp-ml-parser": "2.0.31-beta.1"
   },
   "scripts": {
     "version": "formula changelog && git add .",