xhs-mp-compiler-cli 2.0.12 → 2.0.14

package/dist/compilerManager.d.ts

@@ -8,7 +8,7 @@ interface ILibFeatures {
     supportV2?: boolean;
     supportVDom?: boolean;
 }
-export type IArchType = 'v0' | 'v1' | 'v2';
+export type IArchType = 'v1' | 'v2';
 export type IZipResult = {
     type: IArchType;
     zipPath: string;
@@ -90,6 +90,5 @@ export declare class ProjectCompilerManager extends EventEmitter {
     closeCompiler(entryType?: string): void;
     killCompiler(entryType?: string): void;
     killAll(): void;
-    private zipWithFullPackage;
     private zipWithSubPackage;
 }

package/dist/compilerManager.js

@@ -386,7 +386,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                     let entryZips = [];
                     if (entryType === constant_config_1.COMPILE_ENTRY.preview) {
                         entryZips = [
-                            this.zipWithFullPackage(opts, subPackages, 'v0'),
                             this.zipWithSubPackage(opts, subPackages, 'v1'),
                             // 小程序模式有v2包
                             buildConfig.enableV2 && this.zipWithSubPackage(opts, subPackages, 'v2')
@@ -394,7 +393,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                     }
                     else if (entryType === constant_config_1.COMPILE_ENTRY.upload) {
                         entryZips = [
-                            this.zipWithFullPackage(opts, subPackages, 'v0', true),
                             this.zipWithSubPackage(opts, subPackages, 'v1', true),
                             // 小程序模式有v2包
                             enableV2 && this.zipWithSubPackage(opts, subPackages, 'v2', true)
@@ -434,52 +432,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
             });
             this.compilerImplMap = {};
         }
-        /* 使用v0的入口，zip整包 */
-        zipWithFullPackage(opts_1) {
-            return __awaiter(this, arguments, void 0, function* (opts, subPackages = [], type, excludeSourcemap) {
-                const { upload_app_id, can_upload_ext_json, pkgInfo, entryType } = opts;
-                const buildDir = this.getDistDir(entryType);
-                const appendFile = [];
-                const appendBuffer = [];
-                appendFile.push(this.project.projectJsonPath); // zip添加project.config.json
-                /* 是否需要上传ext.json */
-                if (can_upload_ext_json && fs_extra_1.default.existsSync(this.project.extJsonPath)) {
-                    appendFile.push(this.project.extJsonPath);
-                }
-                if (pkgInfo) {
-                    /* 是否需要额外添加pkgInfo.json信息 */
-                    const content = { version: pkgInfo.version };
-                    const contentStr = JSON.stringify(content);
-                    appendBuffer.push({
-                        name: 'pkgInfo.json',
-                        buffer: Buffer.from(contentStr, 'utf-8')
-                    });
-                }
-                let ignore = [];
-                if (excludeSourcemap) {
-                    ignore = ['**/*.map'];
-                }
-                const tasks = [];
-                const baseZipConfig = {
-                    inputDir: path_1.default.resolve(buildDir, !subPackages.length ? 'v1' : 'v0' // 如果没有开启分包，则把v1包当作v0包
-                    ), // 输入的路径
-                    type,
-                    prefix: upload_app_id,
-                    meta: {
-                        root: ''
-                    }
-                };
-                tasks.push((0, project_1.zipFactory)(Object.assign(Object.assign({}, baseZipConfig), { pattern: '**/*', ignore,
-                    appendFile,
-                    appendBuffer, outputDir: path_1.default.resolve(buildDir, `${type}-full-pack.zip`) // 输出的路径
-                 })));
-                if (excludeSourcemap) {
-                    tasks.push((0, project_1.zipFactory)(Object.assign(Object.assign({}, baseZipConfig), { pattern: '**/*.map', ignore: [], appendFile: [], appendBuffer: [], outputDir: path_1.default.resolve(buildDir, `${type}-full-pack-sourcemap.zip`) // 输出的路径
-                     })));
-                }
-                return Promise.all(tasks);
-            });
-        }
         /* 使用v1的入口。zip主包和分包 */
         zipWithSubPackage(opts, subPackages, type, excludeSourcemap) {
             return __awaiter(this, void 0, void 0, function* () {

package/dist/presets/configs/minigame/assets/assetsEntryPlugin.d.ts

@@ -5,6 +5,5 @@ declare class MpEntryPlugin {
     constructor(options: IPresetOptions);
     apply(compiler: ICompiler): void;
     getAppJson(appJSON: any): Record<string, RawSource>;
-    getLegacyAppJSON(appJSON: any): RawSource;
 }
 export default MpEntryPlugin;

package/dist/presets/configs/minigame/assets/assetsEntryPlugin.js

@@ -29,15 +29,13 @@
                     const { appJSON } = this.options.project;
                     if (assets) {
                         Object.assign(assets, this.getAppJson((0, lodash_1.cloneDeep)(appJSON)));
-                        // 兼容服务端，始终创建 v0/app.json
-                        assets['v0/app.json'] = this.getLegacyAppJSON((0, lodash_1.cloneDeep)(appJSON));
                     }
                 });
             });
         }
         getAppJson(appJSON) {
             const assets = {};
-            const appJsonSource = new packs_1.RawSource(JSON.stringify(xhs_mp_project_1.utils.pureAppJSON(appJSON)));
+            const appJsonSource = new packs_1.RawSource(JSON.stringify(xhs_mp_project_1.utils.formatGameAppJSON(appJSON)));
             assets['v1/app.json'] = appJsonSource;
             for (const subpackage of appJSON.subPackages) {
                 if (subpackage.independent) {
@@ -46,11 +44,6 @@
             }
             return assets;
         }
-        getLegacyAppJSON(appJSON) {
-            // 兼容的整包，将 subPackages 合并到 pages 内
-            appJSON = xhs_mp_project_1.utils.pureAppJSON(appJSON, 'v0');
-            return new packs_1.RawSource(JSON.stringify(appJSON));
-        }
     }
     exports.default = MpEntryPlugin;
 });

package/dist/presets/configs/miniprogram/assets/assetsEntryPlugin.d.ts

@@ -6,7 +6,6 @@ declare class XhsAssetsPlugin {
     constructor(options: IPresetOptions);
     apply(compiler: ICompiler): void;
     emitAppJson(compilation: any, appJSON: any): void;
-    emitLegacyAppJSON(compilation: any, legacyAppJSON: any): void;
     emitJson(compilation: any, path: string, json: RawSource): void;
 }
 export default XhsAssetsPlugin;

package/dist/presets/configs/miniprogram/assets/assetsEntryPlugin.js

@@ -28,13 +28,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         apply(compiler) {
             compiler.hooks.compilation.tap('XhsMpAssetsPlugin', compilation => {
                 const { project, packSetting } = this.options;
-                const { appJSON, legacyAppJSON } = project;
+                const { appJSON } = project;
                 const usingPackageType = packSetting.usingPackageType;
                 //   app.json
                 if (compilation) {
                     this.emitAppJson(compilation, JSON.parse(JSON.stringify(appJSON)));
-                    // 兼容服务端，始终创建 v0/app.json
-                    this.emitLegacyAppJSON(compilation, legacyAppJSON);
                 }
                 // app.css 复用
                 compilation.hooks.processAssets.tap({
@@ -128,9 +126,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                 }
             });
         }
-        emitLegacyAppJSON(compilation, legacyAppJSON) {
-            this.emitJson(compilation, 'v0/app.json', new packs_1.RawSource(JSON.stringify(legacyAppJSON)));
-        }
         emitJson(compilation, path, json) {
             compilation.emitAsset(path, json);
         }

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

@@ -30,7 +30,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
             throw new Error(`${absolutePath}.(js|ts) 不存在`);
         };
         return `
-  ;globalThis['__MP_APP_JSON__'] = ${JSON.stringify(xhs_mp_project_1.utils.pureAppJSON(appJSON))};
+  ;globalThis['__MP_APP_JSON__'] = ${JSON.stringify(xhs_mp_project_1.utils.formatGameAppJSON(appJSON))};
   ${addAppJs()}`;
     }
     module.exports = entryLoader;

package/dist/utils/project.d.ts

@@ -4,7 +4,7 @@ export interface IZipFactory {
     pattern?: string;
     prefix: string;
     inputDir: string;
-    type: "v0" | "v1" | "v2";
+    type: "v1" | "v2";
     appendFile?: string[];
     appendBuffer?: {
         buffer: Buffer;
@@ -20,7 +20,7 @@ export declare const checkSubPackagesLegality: ({ appJsonContent, rootPath, dist
     distDir: string;
 }) => Promise<any[]>;
 export declare const zipFactory: ({ outputDir, ignore, prefix, pattern, inputDir, type, appendFile, appendBuffer, meta, }: IZipFactory) => Promise<{
-    type: "v0" | "v1" | "v2";
+    type: "v1" | "v2";
     zipPath: string;
     zipSize: number;
     root: string;

package/package.json

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