xhs-mp-compiler-cli 2.0.0-beta.4 → 2.0.1

package/dist/packs/webpack/webpack.js

@@ -1,4 +1,3 @@
-"use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -8,72 +7,91 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WebPack = void 0;
-const xhs_mp_pack_1 = require("xhs-mp-pack");
-const webpack_1 = require("webpack");
-const watchOptions = {
-    aggregateTimeout: 300,
-    poll: false,
-    ignored: ['**/node_modules', 'project.config.json', 'project.private.config.json']
-};
-// 对webpack进行一层包装，和mp-pack对齐
-class WebPack extends xhs_mp_pack_1.AbstractMPPack {
-    constructor(configs, options) {
-        super();
-        this.callbacks = [];
-        this.compiler = null;
-        this.watcher = null;
-        this.hadWatch = false;
-        this.handleProgress = progress => {
-            this.emit('progress', progress);
-        };
-        this.project = options.project;
-        this.packSetting = options.packSetting;
-        this.compiler = (0, webpack_1.webpack)(configs);
-        new webpack_1.ProgressPlugin(this.handleProgress).apply(this.compiler);
+(function (factory) {
+    if (typeof module === "object" && typeof module.exports === "object") {
+        var v = factory(require, exports);
+        if (v !== undefined) module.exports = v;
     }
-    get hooks() {
-        return this.compiler.hooks;
+    else if (typeof define === "function" && define.amd) {
+        define(["require", "exports", "xhs-mp-pack", "webpack"], factory);
     }
-    watch(config, callback) {
-        return new Promise(resolve => {
-            if (this.watcher) {
-                this.watcher.close(() => { });
-                this.watcher = null;
-            }
-            if (config.scene === 'reWatch') {
-                this.hadWatch = false;
-            }
-            this.watcher = this.compiler.watch(Object.assign(Object.assign({}, watchOptions), config), (err, stats) => {
-                if (!this.hadWatch) {
-                    this.hadWatch = true;
-                    resolve({
-                        err, stats
-                    });
+})(function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.WebPack = void 0;
+    const xhs_mp_pack_1 = require("xhs-mp-pack");
+    const webpack_1 = require("webpack");
+    const watchOptions = {
+        aggregateTimeout: 300,
+        poll: false,
+        ignored: ['**/node_modules', 'project.config.json', 'project.private.config.json']
+    };
+    // 对webpack进行一层包装，和mp-pack对齐
+    class WebPack extends xhs_mp_pack_1.AbstractMPPack {
+        constructor(configs, options) {
+            super();
+            this.callbacks = [];
+            this.compiler = null;
+            this.watcher = null;
+            this.hadWatch = false;
+            this.handleProgress = (percentage, status, info) => {
+                this.emit('progress', {
+                    percentage,
+                    status,
+                    info
+                });
+            };
+            this.handleBuildInfo = (info) => {
+                this.emit('buildInfo', info);
+            };
+            this.project = options.project;
+            this.packSetting = options.packSetting;
+            this.compiler = (0, webpack_1.webpack)(configs);
+            new webpack_1.ProgressPlugin(this.handleProgress).apply(this.compiler);
+            new xhs_mp_pack_1.BuildInfoPlugin({ handler: this.handleBuildInfo }).apply(this.compiler);
+        }
+        get hooks() {
+            return this.compiler.hooks;
+        }
+        watch(config, callback) {
+            return new Promise(resolve => {
+                if (this.watcher) {
+                    this.watcher.close(() => { });
+                    this.watcher = null;
                 }
-                else {
-                    callback === null || callback === void 0 ? void 0 : callback(err, stats);
+                if (config.scene === 'reWatch') {
+                    this.hadWatch = false;
                 }
+                this.watcher = this.compiler.watch(Object.assign(Object.assign({}, watchOptions), config), (err, stats) => {
+                    if (!this.hadWatch) {
+                        this.hadWatch = true;
+                        resolve({
+                            err, stats
+                        });
+                    }
+                    else {
+                        callback === null || callback === void 0 ? void 0 : callback(err, stats);
+                    }
+                });
             });
-        });
-    }
-    changeCompileOptions(config) {
-        // 空实现
-    }
-    activatePkgs(compilePkgs) {
-        // 空实现
-    }
-    reCompilePkgs(config, callback) {
-        return __awaiter(this, void 0, void 0, function* () {
+        }
+        changeCompileOptions(config) {
             // 空实现
-        });
-    }
-    build(callback) {
-        this.compiler.run(callback);
-    }
-    close(callback) {
-        this.compiler.close(callback);
+        }
+        activatePkgs(compilePkgs) {
+            // 空实现
+        }
+        reCompilePkgs(config, callback) {
+            return __awaiter(this, void 0, void 0, function* () {
+                // 空实现
+            });
+        }
+        build(callback) {
+            this.compiler.run(callback);
+        }
+        close(callback) {
+            this.compiler.close(callback);
+        }
     }
-}
-exports.WebPack = WebPack;
+    exports.WebPack = WebPack;
+});

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

@@ -1,59 +1,65 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const const_1 = __importDefault(require("../utils/const"));
-const types_1 = require("../types");
-/**
- * babel 仅关注语法转换，polyfill 在 js-core 中已经内置
- * 目前 polyfill 仅支持到 'ios_saf >= 10', 'chrome >= 83'。语法构建中，会默认支持。
- */
-const getBaseConfig = (chain, options) => {
-    const { packSetting } = options;
-    const { env, tsConfigPath } = packSetting;
-    const swcTargets = env === types_1.ENV.development ? const_1.default.DEV_TARGETS : const_1.default.PROD_TARGETS;
-    chain.module
-        .rule('js')
-        .test(/\.js$/)
-        .exclude.add(/node_modules/)
-        .end()
-        .use('js-loader')
-        .loader(require.resolve('swc-loader'))
-        .options({
-        jsc: { externalHelpers: true },
-        env: {
-            targets: swcTargets,
-            coreJS: 3
-        }
-    });
-    chain.module
-        .rule('ts')
-        .test(/\.ts$/)
-        .exclude.add(/node_modules/)
-        .end()
-        .use('ts-loader')
-        .loader(require.resolve('swc-loader'))
-        .options({
-        jsc: {
-            externalHelpers: true,
-            parser: { syntax: 'typescript' }
-        },
-        env: {
-            targets: swcTargets,
-            coreJS: 3
-        }
-    });
-    if (tsConfigPath) {
-        chain.resolve.extensions.add('.ts');
-        chain.plugin('ts-checker').use(require.resolve('fork-ts-checker-webpack-plugin'), [
-            {
-                async: true,
-                typescript: {
-                    configFile: tsConfigPath
-                }
-            }
-        ]);
+(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", "../config/constant.config", "../types"], factory);
     }
-};
-exports.default = getBaseConfig;
+})(function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    const constant_config_1 = require("../config/constant.config");
+    const types_1 = require("../types");
+    /**
+     * babel 仅关注语法转换，polyfill 在 js-core 中已经内置
+     */
+    const getBaseConfig = (chain, options) => {
+        const { packSetting } = options;
+        const { env, tsConfigPath } = packSetting;
+        const swcTargets = env === types_1.ENV.development ? constant_config_1.DEV_TARGETS : constant_config_1.PROD_TARGETS;
+        chain.module
+            .rule('js')
+            .test(/\.js$/)
+            .exclude.add(/node_modules/)
+            .end()
+            .use('js-loader')
+            .loader(require.resolve('swc-loader'))
+            .options({
+            jsc: { externalHelpers: true },
+            env: {
+                targets: swcTargets,
+                coreJS: 3
+            }
+        });
+        chain.module
+            .rule('ts')
+            .test(/\.ts$/)
+            .exclude.add(/node_modules/)
+            .end()
+            .use('ts-loader')
+            .loader(require.resolve('swc-loader'))
+            .options({
+            jsc: {
+                externalHelpers: true,
+                parser: { syntax: 'typescript' }
+            },
+            env: {
+                targets: swcTargets,
+                coreJS: 3
+            }
+        });
+        if (tsConfigPath) {
+            chain.resolve.extensions.add('.ts');
+            chain.plugin('ts-checker').use(require.resolve('fork-ts-checker-webpack-plugin'), [
+                {
+                    async: true,
+                    typescript: {
+                        configFile: tsConfigPath
+                    }
+                }
+            ]);
+        }
+    };
+    exports.default = getBaseConfig;
+});

package/dist/presets/common.js

@@ -1,48 +1,45 @@
-"use strict";
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-const path_1 = __importDefault(require("path"));
-const presetCommon = (chain, options) => {
-    const { packSetting, project } = options;
-    const { env, watch, enableSourcemap, cacheDirectory } = packSetting;
-    chain.merge({
-        stats: 'errors-only',
-        output: {
-            pathinfo: false,
-        },
-        resolve: {
-            roots: [project.miniprogramDir],
-            extensions: ['.js'],
-            modules: [
-                path_1.default.join(project.projectPath, 'node_modules'),
-                project.projectPath,
-                path_1.default.join(__dirname, '../../node_modules/')
-            ],
-        },
-        resolveLoader: {
-            modules: [path_1.default.join(__dirname, './loaders')],
-            extensions: ['.js', '.ts'],
-        },
-    });
-    chain.watch(!!watch);
-    chain.mode('development');
-    chain.devtool(enableSourcemap ? 'source-map' : false);
-    // @ts-ignore
-    chain.target(['web', 'es5']);
-    // chain.cache(
-    //   env === ENV.production
-    //     ? false
-    //     : {
-    //         type: 'filesystem',
-    //         cacheDirectory:
-    //           cacheDirectory || path.join(__dirname, '../../node_modules/.cache'),
-    //         version: project.miniprogramDir,
-    //         buildDependencies: {
-    //           config: [path.join(project.miniprogramDir, 'app.json')],
-    //         },
-    //       },
-    // )
-};
-exports.default = presetCommon;
+(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", "path"], factory);
+    }
+})(function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    const path_1 = __importDefault(require("path"));
+    const presetCommon = (chain, options) => {
+        const { packSetting, project } = options;
+        const { action, enableSourcemap } = packSetting;
+        chain.merge({
+            stats: 'errors-only',
+            output: {
+                pathinfo: false,
+            },
+            resolve: {
+                roots: [project.miniprogramDir],
+                extensions: ['.js'],
+                modules: [
+                    path_1.default.join(project.projectPath, 'node_modules'),
+                    project.projectPath,
+                    path_1.default.join(__dirname, '../../node_modules/')
+                ],
+            },
+            resolveLoader: {
+                modules: [path_1.default.join(__dirname, './loaders')],
+                extensions: ['.js', '.ts'],
+            },
+        });
+        chain.watch(action === 'dev');
+        chain.mode('development');
+        chain.devtool(enableSourcemap ? 'source-map' : false);
+        // @ts-ignore
+        chain.target(['web', 'es5']);
+    };
+    exports.default = presetCommon;
+});

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

@@ -1,46 +1,56 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const packs_1 = require("../../../../packs");
-const lodash_1 = require("lodash");
-const common_1 = require("../../../../utils/common");
-const xhs_mp_project_1 = require("xhs-mp-project");
-class MpEntryPlugin {
-    constructor(options) {
-        this.options = options;
+(function (factory) {
+    if (typeof module === "object" && typeof module.exports === "object") {
+        var v = factory(require, exports);
+        if (v !== undefined) module.exports = v;
     }
-    apply(compiler) {
-        // 在资源优化阶段处理app.json
-        compiler.hooks.compilation.tap(MpEntryPlugin.name, compilation => {
-            // @ts-ignore
-            compilation.hooks.processAssets.tap({
-                name: MpEntryPlugin.name,
-                stage: packs_1.Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE_COMPATIBILITY, // see below for more stages
-            }, (assets) => {
+    else if (typeof define === "function" && define.amd) {
+        define(["require", "exports", "../../../../packs", "lodash", "../../../../utils/common", "xhs-mp-project"], factory);
+    }
+})(function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    const packs_1 = require("../../../../packs");
+    const lodash_1 = require("lodash");
+    const common_1 = require("../../../../utils/common");
+    const xhs_mp_project_1 = require("xhs-mp-project");
+    class MpEntryPlugin {
+        constructor(options) {
+            this.options = options;
+        }
+        apply(compiler) {
+            // 在资源优化阶段处理app.json
+            compiler.hooks.compilation.tap(MpEntryPlugin.name, compilation => {
                 // @ts-ignore
-                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));
-                }
+                compilation.hooks.processAssets.tap({
+                    name: MpEntryPlugin.name,
+                    stage: packs_1.Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE_COMPATIBILITY, // see below for more stages
+                }, (assets) => {
+                    // @ts-ignore
+                    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)));
-        assets['v1/app.json'] = appJsonSource;
-        for (const subpackage of appJSON.subPackages) {
-            if (subpackage.independent) {
-                assets[(0, common_1.unixJoin)("v1", subpackage.dirname, "app.json")] = appJsonSource;
+        }
+        getAppJson(appJSON) {
+            const assets = {};
+            const appJsonSource = new packs_1.RawSource(JSON.stringify(xhs_mp_project_1.utils.pureAppJSON(appJSON)));
+            assets['v1/app.json'] = appJsonSource;
+            for (const subpackage of appJSON.subPackages) {
+                if (subpackage.independent) {
+                    assets[(0, common_1.unixJoin)("v1", subpackage.dirname, "app.json")] = appJsonSource;
+                }
             }
+            return assets;
+        }
+        getLegacyAppJSON(appJSON) {
+            // 兼容的整包，将 subPackages 合并到 pages 内
+            appJSON = xhs_mp_project_1.utils.pureAppJSON(appJSON, 'v0');
+            return new packs_1.RawSource(JSON.stringify(appJSON));
         }
-        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;
+    exports.default = MpEntryPlugin;
+});

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

@@ -1,4 +1,3 @@
-"use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -11,55 +10,66 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.presetAssets = void 0;
-const path_1 = __importDefault(require("path"));
-const assetsEntryPlugin_1 = __importDefault(require("./assetsEntryPlugin"));
-const copy_webpack_plugin_1 = __importDefault(require("copy-webpack-plugin"));
-const const_1 = __importDefault(require("../../../../utils/const"));
-const InjectorPlugin_1 = require("../../../plugins/InjectorPlugin");
-const ASSETS_EXTS = const_1.default.ASSETS_EXTS
-    .map(i => `.${i}`);
-const presetAssets = (chain, options) => {
-    const { packSetting, project } = options;
-    const { distDir } = packSetting;
-    chain.merge({
-        output: {
-            path: distDir,
-        },
-    });
-    const projectJsons = [
-        'game.json',
-        'package.json',
-        'package-lock.json',
-        'pkgInfo.json',
-        'project.config.json',
-        'project.private.config.json',
-    ].map(i => path_1.default.resolve(project.projectPath, i));
-    const copyPatterns = [
-        {
-            noErrorOnMissing: true,
-            from: `${project.projectPath}/**/*`,
-            filter: (resourcePath) => __awaiter(void 0, void 0, void 0, function* () {
-                if (resourcePath.includes('node_modules')) {
+(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", "path", "./assetsEntryPlugin", "copy-webpack-plugin", "../../../../config/constant.config", "../../../plugins/InjectorPlugin", "../../../../utils/cache"], factory);
+    }
+})(function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.presetAssets = void 0;
+    const path_1 = __importDefault(require("path"));
+    const assetsEntryPlugin_1 = __importDefault(require("./assetsEntryPlugin"));
+    const copy_webpack_plugin_1 = __importDefault(require("copy-webpack-plugin"));
+    const constant_config_1 = require("../../../../config/constant.config");
+    const InjectorPlugin_1 = require("../../../plugins/InjectorPlugin");
+    const cache_1 = require("../../../../utils/cache");
+    let FIXED_ASSETS_EXTS = constant_config_1.ASSETS_EXTS
+        .map(i => `.${i}`);
+    const presetAssets = (chain, options) => {
+        const { packSetting, project } = options;
+        const { distDir, cacheDirectory } = packSetting;
+        const absCacheDirectory = path_1.default.join(cacheDirectory, 'assets');
+        chain.merge(Object.assign(Object.assign({}, (0, cache_1.getCacheConfig)(absCacheDirectory, options)), { output: {
+                path: distDir,
+            } }));
+        const projectJsons = [
+            'game.json',
+            'package.json',
+            'package-lock.json',
+            'pkgInfo.json',
+            'project.config.json',
+            'project.private.config.json',
+        ].map(i => path_1.default.resolve(project.projectPath, i));
+        const copyPatterns = [
+            {
+                noErrorOnMissing: true,
+                from: `${project.projectPath}/**/*`,
+                filter: (resourcePath) => __awaiter(void 0, void 0, void 0, function* () {
+                    if (resourcePath.includes('node_modules')) {
+                        return false;
+                    }
+                    const extname = path_1.default.extname(resourcePath);
+                    if (FIXED_ASSETS_EXTS.includes(extname)) {
+                        return true;
+                    }
+                    if (extname === '.json' && !projectJsons.includes(resourcePath)) {
+                        return true;
+                    }
                     return false;
-                }
-                const extname = path_1.default.extname(resourcePath);
-                if (ASSETS_EXTS.includes(extname)) {
-                    return true;
-                }
-                if (extname === '.json' && !projectJsons.includes(resourcePath)) {
-                    return true;
-                }
-                return false;
-            }),
-            to: 'v1',
-            context: project.projectPath,
-            globOptions: { gitignore: true },
-        },
-    ];
-    chain.plugin('InjectorPlugin').use(InjectorPlugin_1.InjectorPlugin, [options]);
-    chain.plugin('CopyPlugin').use(copy_webpack_plugin_1.default, [{ patterns: copyPatterns }]);
-    chain.plugin('AssetsEntryPlugin').use(assetsEntryPlugin_1.default, [options]);
-};
-exports.presetAssets = presetAssets;
+                }),
+                to: 'v1',
+                context: project.projectPath,
+                globOptions: { gitignore: true },
+            },
+        ];
+        chain.plugin('InjectorPlugin').use(InjectorPlugin_1.InjectorPlugin, [options]);
+        chain.plugin('CopyPlugin').use(copy_webpack_plugin_1.default, [{ patterns: copyPatterns }]);
+        chain.plugin('AssetsEntryPlugin').use(assetsEntryPlugin_1.default, [options]);
+    };
+    exports.presetAssets = presetAssets;
+});