xhs-mp-compiler-cli 2.0.0-beta.3 → 2.0.0

package/dist/presets/index.js

@@ -1,95 +1,105 @@
-"use strict";
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createConfigs = void 0;
-const xhs_mp_pack_1 = require("xhs-mp-pack");
-const path_1 = __importDefault(require("path"));
-const common_1 = __importDefault(require("./common"));
-const babel_1 = __importDefault(require("./babel"));
-const prod_1 = __importDefault(require("./prod"));
-const assets_1 = require("./configs/miniprogram/assets");
-const service_1 = require("./configs/miniprogram/service");
-const render_1 = require("./configs/miniprogram/render");
-const assets_2 = require("./configs/minigame/assets");
-const service_2 = require("./configs/minigame/service");
-/**
- * 小程序编译配置
- */
-const createMPConfigs = (options) => {
-    const { packSetting } = options;
-    const { env } = packSetting;
-    const assetsChain = new xhs_mp_pack_1.Config();
-    const serviceChain = new xhs_mp_pack_1.Config();
-    const renderChain = new xhs_mp_pack_1.Config();
-    const assetsPresets = [assets_1.presetAssets, common_1.default];
-    const servicePresets = [service_1.presetService, common_1.default, babel_1.default];
-    const renderPresets = [render_1.presetRender, common_1.default, babel_1.default];
-    if (env === xhs_mp_pack_1.ENV.production) {
-        assetsPresets.push(prod_1.default);
-        servicePresets.push(prod_1.default);
-        renderPresets.push(prod_1.default);
+(function (factory) {
+    if (typeof module === "object" && typeof module.exports === "object") {
+        var v = factory(require, exports);
+        if (v !== undefined) module.exports = v;
     }
-    assetsPresets.forEach(preset => preset(assetsChain, Object.assign(Object.assign({}, options), { otherSetting: { noJs: true } })));
-    servicePresets.forEach(preset => preset(serviceChain, options));
-    renderPresets.forEach(preset => preset(renderChain, options));
-    const assetsConfig = assetsChain.toConfig();
-    const serviceConfig = serviceChain.toConfig();
-    const renderConfig = renderChain.toConfig();
-    assetsConfig.entry = (0, assets_1.getAssetsEntry)(options);
-    serviceConfig.entry = (0, service_1.getServiceEntry)(options);
-    renderConfig.entry = (0, render_1.getRenderEntry)(options);
-    let configs = [renderConfig, serviceConfig, assetsConfig];
-    configs = configs.map(options => {
-        var _a, _b, _c, _d;
-        // 查找ide根目录下的node_modules
-        (_b = (_a = options.resolve) === null || _a === void 0 ? void 0 : _a.modules) === null || _b === void 0 ? void 0 : _b.push(path_1.default.resolve(__dirname, '../../../../../'));
-        // cli的node_modules路径
-        (_d = (_c = options.resolve) === null || _c === void 0 ? void 0 : _c.modules) === null || _d === void 0 ? void 0 : _d.push(path_1.default.resolve(__dirname, '../../../../'));
-        return options;
-    });
-    return configs;
-};
-/**
- * 小游戏编译配置
- */
-const createMGConfigs = (options) => {
-    const { packSetting } = options;
-    const { env } = packSetting;
-    const assetsChain = new xhs_mp_pack_1.Config();
-    const serviceChain = new xhs_mp_pack_1.Config();
-    const assetsPresets = [assets_2.presetAssets, common_1.default];
-    const servicePresets = [service_2.presetService, common_1.default, babel_1.default];
-    if (env === xhs_mp_pack_1.ENV.production) {
-        assetsPresets.push(prod_1.default);
-        servicePresets.push(prod_1.default);
-    }
-    assetsPresets.forEach(preset => preset(assetsChain, Object.assign(Object.assign({}, options), { otherSetting: { noJs: true } })));
-    servicePresets.forEach(preset => preset(serviceChain, options));
-    const assetsConfig = assetsChain.toConfig();
-    const serviceConfig = serviceChain.toConfig();
-    assetsConfig.entry = {};
-    serviceConfig.entry = {};
-    let configs = [serviceConfig, assetsConfig];
-    configs = configs.map(options => {
-        var _a, _b, _c, _d;
-        // 查找ide根目录下的node_modules
-        (_b = (_a = options.resolve) === null || _a === void 0 ? void 0 : _a.modules) === null || _b === void 0 ? void 0 : _b.push(path_1.default.resolve(__dirname, '../../../../../'));
-        // cli的node_modules路径
-        (_d = (_c = options.resolve) === null || _c === void 0 ? void 0 : _c.modules) === null || _d === void 0 ? void 0 : _d.push(path_1.default.resolve(__dirname, '../../../../'));
-        return options;
-    });
-    return configs;
-};
-// 获取编译配置
-const createConfigs = (options) => {
-    const { project } = options;
-    if (project.appMode === 'miniprogram') {
-        return createMPConfigs(options);
+    else if (typeof define === "function" && define.amd) {
+        define(["require", "exports", "xhs-mp-pack", "path", "./common", "./babel", "./prod", "./configs/miniprogram/assets", "./configs/miniprogram/service", "./configs/miniprogram/render", "./configs/minigame/assets", "./configs/minigame/service"], factory);
     }
-    else {
-        return createMGConfigs(options);
-    }
-};
-exports.createConfigs = createConfigs;
+})(function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.createConfigs = void 0;
+    const xhs_mp_pack_1 = require("xhs-mp-pack");
+    const path_1 = __importDefault(require("path"));
+    const common_1 = __importDefault(require("./common"));
+    const babel_1 = __importDefault(require("./babel"));
+    const prod_1 = __importDefault(require("./prod"));
+    const assets_1 = require("./configs/miniprogram/assets");
+    const service_1 = require("./configs/miniprogram/service");
+    const render_1 = require("./configs/miniprogram/render");
+    const assets_2 = require("./configs/minigame/assets");
+    const service_2 = require("./configs/minigame/service");
+    /**
+     * 小程序编译配置
+     */
+    const createMPConfigs = (options) => {
+        const { packSetting } = options;
+        const { env } = packSetting;
+        const assetsChain = new xhs_mp_pack_1.Config();
+        const serviceChain = new xhs_mp_pack_1.Config();
+        const renderChain = new xhs_mp_pack_1.Config();
+        const assetsPresets = [assets_1.presetAssets, common_1.default];
+        const servicePresets = [service_1.presetService, common_1.default, babel_1.default];
+        const renderPresets = [render_1.presetRender, common_1.default, babel_1.default];
+        if (env === xhs_mp_pack_1.ENV.production) {
+            assetsPresets.push(prod_1.default);
+            servicePresets.push(prod_1.default);
+            renderPresets.push(prod_1.default);
+        }
+        assetsPresets.forEach(preset => preset(assetsChain, Object.assign(Object.assign({}, options), { otherSetting: { noJs: true } })));
+        servicePresets.forEach(preset => preset(serviceChain, options));
+        renderPresets.forEach(preset => preset(renderChain, options));
+        const assetsConfig = assetsChain.toConfig();
+        const serviceConfig = serviceChain.toConfig();
+        const renderConfig = renderChain.toConfig();
+        assetsConfig.entry = (0, assets_1.getAssetsEntry)(options);
+        serviceConfig.entry = (0, service_1.getServiceEntry)(options);
+        renderConfig.entry = (0, render_1.getRenderEntry)(options);
+        let configs = [renderConfig, serviceConfig, assetsConfig];
+        configs = configs.map(options => {
+            var _a, _b, _c, _d;
+            // 查找ide根目录下的node_modules
+            (_b = (_a = options.resolve) === null || _a === void 0 ? void 0 : _a.modules) === null || _b === void 0 ? void 0 : _b.push(path_1.default.resolve(__dirname, '../../../../../'));
+            // cli的node_modules路径
+            (_d = (_c = options.resolve) === null || _c === void 0 ? void 0 : _c.modules) === null || _d === void 0 ? void 0 : _d.push(path_1.default.resolve(__dirname, '../../../../'));
+            return options;
+        });
+        return configs;
+    };
+    /**
+     * 小游戏编译配置
+     */
+    const createMGConfigs = (options) => {
+        const { packSetting } = options;
+        const { env } = packSetting;
+        const assetsChain = new xhs_mp_pack_1.Config();
+        const serviceChain = new xhs_mp_pack_1.Config();
+        const assetsPresets = [assets_2.presetAssets, common_1.default];
+        const servicePresets = [service_2.presetService, common_1.default, babel_1.default];
+        if (env === xhs_mp_pack_1.ENV.production) {
+            assetsPresets.push(prod_1.default);
+            servicePresets.push(prod_1.default);
+        }
+        assetsPresets.forEach(preset => preset(assetsChain, Object.assign(Object.assign({}, options), { otherSetting: { noJs: true } })));
+        servicePresets.forEach(preset => preset(serviceChain, options));
+        const assetsConfig = assetsChain.toConfig();
+        const serviceConfig = serviceChain.toConfig();
+        assetsConfig.entry = {};
+        serviceConfig.entry = {};
+        let configs = [serviceConfig, assetsConfig];
+        configs = configs.map(options => {
+            var _a, _b, _c, _d;
+            // 查找ide根目录下的node_modules
+            (_b = (_a = options.resolve) === null || _a === void 0 ? void 0 : _a.modules) === null || _b === void 0 ? void 0 : _b.push(path_1.default.resolve(__dirname, '../../../../../'));
+            // cli的node_modules路径
+            (_d = (_c = options.resolve) === null || _c === void 0 ? void 0 : _c.modules) === null || _d === void 0 ? void 0 : _d.push(path_1.default.resolve(__dirname, '../../../../'));
+            return options;
+        });
+        return configs;
+    };
+    // 获取编译配置
+    const createConfigs = (options) => {
+        const { project } = options;
+        if (project.appMode === 'miniprogram') {
+            return createMPConfigs(options);
+        }
+        else {
+            return createMGConfigs(options);
+        }
+    };
+    exports.createConfigs = createConfigs;
+});

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

@@ -1,27 +1,37 @@
-"use strict";
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const common_1 = require("../../utils/common");
-const xhs_mp_project_1 = require("xhs-mp-project");
-function entryLoader() {
-    // @ts-ignore
-    const { appJSON, projectPath } = this._compiler.project;
-    const { entry } = this.getOptions();
-    const addAppJs = () => {
-        const absolutePath = (0, common_1.unixJoin)(projectPath, entry);
-        if (fs_extra_1.default.existsSync(`${absolutePath}.js`)) {
-            return `require('${absolutePath}.js')`;
-        }
-        if (fs_extra_1.default.existsSync(`${absolutePath}.ts`)) {
-            return `require('${absolutePath}.ts')`;
-        }
-        throw new Error(`${absolutePath}.(js|ts) 不存在`);
-    };
-    return `
+(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", "fs-extra", "../../utils/common", "xhs-mp-project"], factory);
+    }
+})(function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    const fs_extra_1 = __importDefault(require("fs-extra"));
+    const common_1 = require("../../utils/common");
+    const xhs_mp_project_1 = require("xhs-mp-project");
+    function entryLoader() {
+        // @ts-ignore
+        const { appJSON, projectPath } = this._compiler.project;
+        const { entry } = this.getOptions();
+        const addAppJs = () => {
+            const absolutePath = (0, common_1.unixJoin)(projectPath, entry);
+            if (fs_extra_1.default.existsSync(`${absolutePath}.js`)) {
+                return `require('${absolutePath}.js')`;
+            }
+            if (fs_extra_1.default.existsSync(`${absolutePath}.ts`)) {
+                return `require('${absolutePath}.ts')`;
+            }
+            throw new Error(`${absolutePath}.(js|ts) 不存在`);
+        };
+        return `
   ;globalThis['__MP_APP_JSON__'] = ${JSON.stringify(xhs_mp_project_1.utils.pureAppJSON(appJSON))};
   ${addAppJs()}`;
-}
-module.exports = entryLoader;
+    }
+    module.exports = entryLoader;
+});

package/dist/presets/loaders/mini-style-loader.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,62 +10,87 @@ 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 });
-const packs_1 = require("../../packs");
-const cssnano_1 = __importDefault(require("cssnano"));
-const common_1 = require("../../utils/common");
-const CSS_MINIMIZER_OPTIONS = {
-    preset: ['default', { normalizeUrl: false, calc: false }]
-};
-const minify = (source, name) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b;
-    const postcssOptions = {
-        to: name,
-        from: name
-    };
-    try {
-        const result = yield cssnano_1.default.process(source, postcssOptions, CSS_MINIMIZER_OPTIONS);
-        return {
-            code: result.css,
-            warnings: (_b = (_a = result.warnings()) === null || _a === void 0 ? void 0 : _a.map) === null || _b === void 0 ? void 0 : _b.call(_a, i => i.toString())
-        };
+(function (factory) {
+    if (typeof module === "object" && typeof module.exports === "object") {
+        var v = factory(require, exports);
+        if (v !== undefined) module.exports = v;
     }
-    catch (error) {
-        return {
-            code: source
-        };
+    else if (typeof define === "function" && define.amd) {
+        define(["require", "exports", "../../packs", "cssnano", "../../utils/common"], factory);
     }
-});
-function miniStyleLoader(source) {
-    var _a;
-    const callback = this.async();
-    const { resourcePath } = this;
-    // const {miniprogramDir, enableVDom, enableV1, enableV2, independent} = this.getOptions() as any
-    const { project, packSetting, independent } = this.getOptions();
-    const { miniprogramDir } = project;
-    const { enableVDom, enableV1, enableV2 } = packSetting;
-    const shortPath = (0, common_1.getShortPath)(miniprogramDir, resourcePath).replace(/\.wxss$/, '.css');
-    source = (_a = source === null || source === void 0 ? void 0 : source.trim) === null || _a === void 0 ? void 0 : _a.call(source);
-    function result(code) {
-        if (!code) {
-            return `export default void 0;`;
+})(function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    const packs_1 = require("../../packs");
+    const cssnano_1 = __importDefault(require("cssnano"));
+    const common_1 = require("../../utils/common");
+    const CSS_MINIMIZER_OPTIONS = {
+        preset: ['default', { normalizeUrl: false, calc: false }]
+    };
+    const minify = (source, name) => __awaiter(void 0, void 0, void 0, function* () {
+        var _a, _b;
+        const postcssOptions = {
+            to: name,
+            from: name
+        };
+        try {
+            const result = yield cssnano_1.default.process(source, postcssOptions, CSS_MINIMIZER_OPTIONS);
+            return {
+                code: result.css,
+                warnings: (_b = (_a = result.warnings()) === null || _a === void 0 ? void 0 : _a.map) === null || _b === void 0 ? void 0 : _b.call(_a, i => i.toString())
+            };
         }
-        // 判断浏览器环境，注入css添加逻辑
-        return new packs_1.RawSource(`globalThis.__XHS_IS_WEBVIEW && globalThis.__XHS_APPEND_CSS(${JSON.stringify(code)});` +
-            `export default ${JSON.stringify(shortPath)};`).source();
-    }
-    // 压缩css
-    minify(source, shortPath)
-        .then(({ code, warnings }) => {
-        // vdom架构下emit出一份css文件
-        if ((independent || enableVDom) && code) {
-            enableV1 && this.emitFile(`v1/${shortPath}`, code);
-            enableV2 && this.emitFile(`v2/${shortPath}`, code);
+        catch (error) {
+            return {
+                code: source
+            };
         }
-        callback(null, result(code));
-    })
-        .catch(error => {
-        callback(error);
     });
-}
-module.exports = miniStyleLoader;
+    function miniStyleLoader(source) {
+        var _a;
+        const callback = this.async();
+        const { resourcePath } = this;
+        const { project, packSetting, independentFile } = this.getOptions();
+        const { miniprogramDir } = project;
+        const { enableVDom, enableV1, enableV2 } = packSetting;
+        const shortPath = (0, common_1.getShortPath)(miniprogramDir, resourcePath).replace(/\.wxss$/, '.css');
+        source = (_a = source === null || source === void 0 ? void 0 : source.trim) === null || _a === void 0 ? void 0 : _a.call(source);
+        const emitFiles = (code) => {
+            // vdom架构下emit出一份css文件
+            if ((independentFile || enableVDom) && code) {
+                enableV1 && this.emitFile(`v1/${shortPath}`, code);
+                enableV2 && this.emitFile(`v2/${shortPath}`, code);
+            }
+        };
+        const result = (code) => {
+            if (!code) {
+                return `export default void 0;`;
+            }
+            // 判断浏览器环境，注入css添加逻辑
+            if (enableVDom) {
+                return new packs_1.RawSource(`globalThis.__XHS_ADD_LINK(${JSON.stringify(shortPath)});` +
+                    `export default ${JSON.stringify(shortPath)};`).source();
+            }
+            else {
+                return new packs_1.RawSource(`globalThis.__XHS_ADD_STYLE(${JSON.stringify(code)}, ${JSON.stringify(shortPath)});` +
+                    `export default ${JSON.stringify(shortPath)};`).source();
+            }
+        };
+        if (packSetting.compressCss) {
+            // 压缩css
+            minify(source, shortPath)
+                .then(({ code, warnings }) => {
+                emitFiles(code);
+                callback(null, result(code));
+            })
+                .catch(error => {
+                callback(error);
+            });
+        }
+        else {
+            emitFiles(source);
+            callback(null, result(source));
+        }
+    }
+    module.exports = miniStyleLoader;
+});