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

package/dist/presets/configs/miniprogram/service/index.js

@@ -1,71 +1,88 @@
-"use strict";
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.presetService = exports.getServiceEntry = void 0;
-const xhs_mp_pack_1 = require("xhs-mp-pack");
-const serviceChunkPlugin_1 = __importDefault(require("./serviceChunkPlugin"));
-const InjectorPlugin_1 = require("../../../plugins/InjectorPlugin");
-const getServiceEntry = options => () => {
-    const entries = {};
-    const { packSetting } = options;
-    if (packSetting.enableV2) {
-        appendV2Entry(options, entries);
+(function (factory) {
+    if (typeof module === "object" && typeof module.exports === "object") {
+        var v = factory(require, exports);
+        if (v !== undefined) module.exports = v;
     }
-    if (packSetting.enableV1) {
-        appendV1Entry(options, entries);
+    else if (typeof define === "function" && define.amd) {
+        define(["require", "exports", "path", "xhs-mp-pack", "./serviceChunkPlugin", "../../../plugins/InjectorPlugin", "../../../plugins/SourceMapDevToolPlugin", "../../../../utils/cache"], factory);
     }
-    return entries;
-};
-exports.getServiceEntry = getServiceEntry;
-const appendV2Entry = (options, entries) => {
-    const { packSetting } = options;
-    const { mainPkg, subPkgs } = packSetting.getCompilePkgsForEntries();
-    if (mainPkg) {
-        entries['v2/service'] = `mp-entry-loader?type=service&pkg=${xhs_mp_pack_1.CONSTANTS.MAIN_PKG}!`;
-    }
-    for (const { root } of subPkgs) {
-        entries[`v2/${root}/service`] = `mp-entry-loader?type=service&pkg=${xhs_mp_pack_1.CONSTANTS.SUB_PKG}&root=${root}!`;
-    }
-};
-const appendV1Entry = (options, entries) => {
-    const { packSetting } = options;
-    const { mainPkg, subPkgs } = packSetting.getCompilePkgsForEntries();
-    if (mainPkg) {
-        entries['v1/service'] = `mp-entry-loader?type=service&pkg=${xhs_mp_pack_1.CONSTANTS.MAIN_PKG}!`;
-    }
-    for (const { root } of subPkgs) {
-        entries[`v1/${root}/service`] = `mp-entry-loader?type=service&pkg=${xhs_mp_pack_1.CONSTANTS.SUB_PKG}&root=${root}!`;
-    }
-};
-const presetService = (chain, options) => {
-    const { packSetting } = options;
-    const { env, distDir, cacheDirectory } = packSetting;
-    chain.merge({
-        output: {
-            path: distDir,
-            globalObject: 'globalThis',
-            libraryTarget: 'umd',
-            uniqueName: 'MpService',
-        },
-        // cache: {
-        //   type: 'filesystem',
-        //   cacheDirectory: path.join(cacheDirectory!, 'service'),
-        // },
-    });
-    chain.plugin('InjectorPlugin').use(InjectorPlugin_1.InjectorPlugin, [options]);
-    chain.plugin('ServiceChunkPlugin').use(serviceChunkPlugin_1.default, [options]);
-    chain.optimization.runtimeChunk({
-        name: 'runtime'
-    });
-    // dev模式下开启懒编译，不能抽离common chunk
-    if (env !== xhs_mp_pack_1.ENV.development) {
-        chain.optimization.splitChunks({
-            chunks: chunk => !chunk.name.startsWith('v0/'),
-            minSize: 0,
-            name: 'service-common'
+})(function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.presetService = exports.getServiceEntry = void 0;
+    const path_1 = __importDefault(require("path"));
+    const xhs_mp_pack_1 = require("xhs-mp-pack");
+    const serviceChunkPlugin_1 = __importDefault(require("./serviceChunkPlugin"));
+    const InjectorPlugin_1 = require("../../../plugins/InjectorPlugin");
+    const SourceMapDevToolPlugin_1 = require("../../../plugins/SourceMapDevToolPlugin");
+    const cache_1 = require("../../../../utils/cache");
+    const getServiceEntry = options => () => {
+        const entries = {};
+        const { packSetting } = options;
+        if (packSetting.enableV2) {
+            appendV2Entry(options, entries);
+        }
+        if (packSetting.enableV1) {
+            appendV1Entry(options, entries);
+        }
+        return entries;
+    };
+    exports.getServiceEntry = getServiceEntry;
+    const appendV2Entry = (options, entries) => {
+        const { packSetting } = options;
+        const { mainPkg, subPkgs } = packSetting.getCompilePkgsForEntries();
+        if (mainPkg) {
+            entries['v2/service'] = `mp-entry-loader?type=service&pkg=${xhs_mp_pack_1.CONSTANTS.MAIN_PKG}!`;
+        }
+        for (const { root } of subPkgs) {
+            entries[`v2/${root}/service`] = `mp-entry-loader?type=service&pkg=${xhs_mp_pack_1.CONSTANTS.SUB_PKG}&root=${root}!`;
+        }
+    };
+    const appendV1Entry = (options, entries) => {
+        const { packSetting } = options;
+        const { mainPkg, subPkgs } = packSetting.getCompilePkgsForEntries();
+        if (mainPkg) {
+            entries['v1/service'] = `mp-entry-loader?type=service&pkg=${xhs_mp_pack_1.CONSTANTS.MAIN_PKG}!`;
+        }
+        for (const { root } of subPkgs) {
+            entries[`v1/${root}/service`] = `mp-entry-loader?type=service&pkg=${xhs_mp_pack_1.CONSTANTS.SUB_PKG}&root=${root}!`;
+        }
+    };
+    const presetService = (chain, options) => {
+        const { packSetting } = options;
+        const { env, distDir, cacheDirectory, enableSourcemap, appendSourcemapComment } = packSetting;
+        const absCacheDirectory = path_1.default.join(cacheDirectory, 'service');
+        chain.merge(Object.assign({ 
+            // target: 'webworker',
+            output: {
+                path: distDir,
+                globalObject: 'globalThis',
+                libraryTarget: 'umd',
+                uniqueName: 'MpService',
+            } }, (0, cache_1.getCacheConfig)(absCacheDirectory, options)));
+        chain.plugin('InjectorPlugin').use(InjectorPlugin_1.InjectorPlugin, [options]);
+        chain.plugin('ServiceChunkPlugin').use(serviceChunkPlugin_1.default, [options]);
+        if (enableSourcemap && !appendSourcemapComment) {
+            const SourceMapDevToolPlugin = (0, SourceMapDevToolPlugin_1.getSourceMapDevtoolPlugin)(options.packMode);
+            chain.plugin('SourceMapDevToolPlugin').use(SourceMapDevToolPlugin, [{
+                    filename: '[file].map',
+                    append: false
+                }]);
+        }
+        chain.optimization.runtimeChunk({
+            name: 'runtime'
         });
-    }
-};
-exports.presetService = presetService;
+        // dev模式下开启懒编译，不能抽离common chunk
+        if (env !== xhs_mp_pack_1.ENV.development) {
+            chain.optimization.splitChunks({
+                chunks: chunk => !chunk.name.startsWith('v0/'),
+                minSize: 0,
+                name: 'service-common'
+            });
+        }
+    };
+    exports.presetService = presetService;
+});

package/dist/presets/configs/miniprogram/service/resolveLimitPlugin.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,59 +7,70 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs_extra_1 = require("fs-extra");
-class XhsResolveLimitPlugin {
-    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, resolver) {
-        resolver
-            .getHook('file')
-            .tapAsync('XhsResolveLimitPlugin', (request, contextResolver, callback) => __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const { project } = this.options;
-            const projectMiniprogramPath = project.projectMiniprogramPath;
-            // @ts-ignore
-            let issuer = ((_a = request.context) === null || _a === void 0 ? void 0 : _a.issuer) || '';
-            let target = request.path || '';
-            if (!issuer ||
-                target.includes('node_modules') ||
-                !issuer.startsWith(projectMiniprogramPath) ||
-                !target.startsWith(projectMiniprogramPath)) {
-                return callback();
-            }
-            issuer = issuer.replace(`${projectMiniprogramPath}/`, '');
-            target = target.replace(new RegExp(projectMiniprogramPath, 'g'), '').replace(/^\/+/g, '');
-            const appJSON = yield (0, fs_extra_1.readJson)(`${projectMiniprogramPath}/app.json`);
-            appJSON.subPackages = appJSON.subPackages || appJSON.subpackages || [];
-            const subPkgs = appJSON.subPackages.map(pkg => pkg.root);
-            // 当 issuer 是分包
-            const issuerSubPkg = subPkgs.find(pkg => issuer.startsWith(pkg));
-            if (issuerSubPkg) {
-                // 允许 target 和 issuer 在同一个分包
-                if (issuer.startsWith(issuerSubPkg) && target.startsWith(issuerSubPkg)) {
+    else if (typeof define === "function" && define.amd) {
+        define(["require", "exports", "fs-extra"], factory);
+    }
+})(function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    const fs_extra_1 = require("fs-extra");
+    class XhsResolveLimitPlugin {
+        constructor(options) {
+            this.options = options;
+        }
+        apply(compiler, resolver) {
+            resolver
+                .getHook('file')
+                .tapAsync('XhsResolveLimitPlugin', (request, contextResolver, callback) => __awaiter(this, void 0, void 0, function* () {
+                var _a;
+                const { project } = this.options;
+                const projectMiniprogramPath = project.projectMiniprogramPath;
+                // @ts-ignore
+                let issuer = ((_a = request.context) === null || _a === void 0 ? void 0 : _a.issuer) || '';
+                let target = request.path || '';
+                if (!issuer ||
+                    target.includes('node_modules') ||
+                    !issuer.startsWith(projectMiniprogramPath) ||
+                    !target.startsWith(projectMiniprogramPath)) {
                     return callback();
                 }
-                // issuer 是分包 target 是主包
-                if (appJSON.pages.some(page => target.startsWith(page))) {
-                    // 当 issuer 是 **独立分包** 时，不能引用主包资源
-                    if (appJSON.subPackages.find(subPkg => subPkg.root === issuerSubPkg).independent) {
-                        return callback(new Error(`${issuer} 在独立分包内，独立分包不可引用主包 ${target} 资源`), request);
+                issuer = issuer.replace(`${projectMiniprogramPath}/`, '');
+                target = target.replace(new RegExp(projectMiniprogramPath, 'g'), '').replace(/^\/+/g, '');
+                const appJSON = yield (0, fs_extra_1.readJson)(`${projectMiniprogramPath}/app.json`);
+                appJSON.subPackages = appJSON.subPackages || appJSON.subpackages || [];
+                const subPkgs = appJSON.subPackages.map(pkg => pkg.root);
+                // 当 issuer 是分包
+                const issuerSubPkg = subPkgs.find(pkg => issuer.startsWith(pkg));
+                if (issuerSubPkg) {
+                    // 允许 target 和 issuer 在同一个分包
+                    if (issuer.startsWith(issuerSubPkg) && target.startsWith(issuerSubPkg)) {
+                        return callback();
+                    }
+                    // issuer 是分包 target 是主包
+                    if (appJSON.pages.some(page => target.startsWith(page))) {
+                        // 当 issuer 是 **独立分包** 时，不能引用主包资源
+                        if (appJSON.subPackages.find(subPkg => subPkg.root === issuerSubPkg).independent) {
+                            return callback(new Error(`${issuer} 在独立分包内，独立分包不可引用主包 ${target} 资源`), request);
+                        }
+                        return callback();
+                    }
+                    // issuer 是分包，target 是分包
+                    if (subPkgs.some(sub => target.startsWith(sub))) {
+                        return callback(new Error(`${issuer} 不能引用 ${target}，因为他们不在同一个分包`), request);
                     }
-                    return callback();
                 }
-                // issuer 是分包，target 是分包
-                if (subPkgs.some(sub => target.startsWith(sub))) {
-                    return callback(new Error(`${issuer} 不能引用 ${target}，因为他们不在同一个分包`), request);
+                // issuer 是主包，此时 target 不能在分包
+                if (subPkgs.some(pkg => target.startsWith(pkg))) {
+                    return callback(new Error(`${issuer} 在主包内，主包不可引用分包资源 ${target}`), request);
                 }
-            }
-            // issuer 是主包，此时 target 不能在分包
-            if (subPkgs.some(pkg => target.startsWith(pkg))) {
-                return callback(new Error(`${issuer} 在主包内，主包不可引用分包资源 ${target}`), request);
-            }
-            return callback();
-        }));
+                return callback();
+            }));
+        }
     }
-}
-exports.default = XhsResolveLimitPlugin;
+    exports.default = XhsResolveLimitPlugin;
+});

package/dist/presets/configs/miniprogram/service/serviceChunkPlugin.js

@@ -1,65 +1,103 @@
-"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 xhs_mp_pack_1 = require("xhs-mp-pack");
-class ServiceChunkPlugin {
-    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) {
-        compiler.hooks.compilation.tap('ServiceChunkPlugin', compilation => {
-            compilation.hooks.processAssets.tap({
-                name: 'ServiceChunkPlugin',
-            }, () => {
-                var _a, _b, _c, _d;
-                const { project, packSetting } = this.options;
-                const serviceSourceV2 = (_a = compilation.getAsset('v2/service.js')) === null || _a === void 0 ? void 0 : _a.source;
-                const serviceSource = (_b = compilation.getAsset('v1/service.js')) === null || _b === void 0 ? void 0 : _b.source;
-                let runtimeCode = (_c = compilation.getAsset('runtime.js')) === null || _c === void 0 ? void 0 : _c.source.source();
-                // 当没有引用相同 js 场景时， commonChunk 将是 undefined
-                const commonSource = ((_d = compilation.getAsset('service-common.js')) === null || _d === void 0 ? void 0 : _d.source) || '';
-                runtimeCode = `
-          if (!globalThis.__XHS_RUNTIME_REGISTERED__) {
+    else if (typeof define === "function" && define.amd) {
+        define(["require", "exports", "path", "xhs-mp-pack", "webpack-sources"], factory);
+    }
+})(function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    const path_1 = __importDefault(require("path"));
+    const xhs_mp_pack_1 = require("xhs-mp-pack");
+    const webpack_sources_1 = require("webpack-sources");
+    function adapteServiceCode(assetName, serviceSource, packSetting) {
+        let result;
+        if (packSetting.runInServiceSandbox) {
+            const { source, map } = serviceSource === null || serviceSource === void 0 ? void 0 : serviceSource.sourceAndMap();
+            const beforeContent = '(function(window,document){';
+            const afterContent = '\n})(undefined,undefined)';
+            const newSource = beforeContent + source + afterContent;
+            result = new webpack_sources_1.SourceMapSource(newSource, // 新的资源内容
+            assetName, // 资源文件名
+            // @ts-ignore
+            map, // 旧的 source map
+            source // 旧的源代码
+            );
+            // @ts-ignore
+        }
+        else {
+            result = serviceSource;
+        }
+        return result;
+    }
+    class ServiceChunkPlugin {
+        constructor(options) {
+            this.options = options;
+        }
+        apply(compiler) {
+            compiler.hooks.compilation.tap('ServiceChunkPlugin', (compilation) => {
+                compilation.hooks.processAssets.tap({
+                    name: 'ServiceChunkPlugin'
+                }, () => {
+                    var _a, _b, _c, _d;
+                    const { project, packSetting } = this.options;
+                    let serviceSourceV2 = (_a = compilation.getAsset('v2/service.js')) === null || _a === void 0 ? void 0 : _a.source;
+                    let serviceSource = (_b = compilation.getAsset('v1/service.js')) === null || _b === void 0 ? void 0 : _b.source;
+                    let runtimeCode = (_c = compilation.getAsset('runtime.js')) === null || _c === void 0 ? void 0 : _c.source.source();
+                    // 当没有引用相同 js 场景时， commonChunk 将是 undefined
+                    const commonSource = ((_d = compilation.getAsset('service-common.js')) === null || _d === void 0 ? void 0 : _d.source) || '';
+                    runtimeCode = `if (!globalThis.__XHS_RUNTIME_REGISTERED__) {
             globalThis.__XHS_RUNTIME_REGISTERED__ = true;
             ${runtimeCode}
           }`;
-                if (packSetting.enableV2 && serviceSourceV2) {
-                    // 注入 v2 service.js
-                    // 主包加入 runtimeChunk、commonChunk
-                    compilation.updateAsset('v2/service.js', new xhs_mp_pack_1.ConcatSource(runtimeCode, commonSource, serviceSourceV2));
-                }
-                // 独立分包加入 runtimeChunk
-                if (packSetting.enableV1 && serviceSource) {
-                    // 主包加入 runtimeChunk、commonChunk
-                    compilation.updateAsset('v1/service.js', new xhs_mp_pack_1.ConcatSource(runtimeCode, commonSource, serviceSource));
-                }
-                this.updateIndependentService(compilation, runtimeCode);
-                compilation.deleteAsset('runtime.js');
-                compilation.deleteAsset('service-common.js');
+                    if (packSetting.enableV2 && serviceSourceV2) {
+                        // 注入 v2 service.js
+                        // 主包加入 runtimeChunk、commonChunk
+                        const assetName = 'v2/service.js';
+                        serviceSourceV2 = adapteServiceCode(assetName, serviceSourceV2, packSetting);
+                        // @ts-ignore
+                        compilation.updateAsset(assetName, new xhs_mp_pack_1.ConcatSource(runtimeCode, commonSource, serviceSourceV2));
+                    }
+                    // 独立分包加入 runtimeChunk
+                    if (packSetting.enableV1 && serviceSource) {
+                        // // 主包加入 runtimeChunk、commonChunk
+                        const assetName = 'v1/service.js';
+                        serviceSource = adapteServiceCode(assetName, serviceSource, packSetting);
+                        // @ts-ignore
+                        compilation.updateAsset(assetName, new xhs_mp_pack_1.ConcatSource(runtimeCode, commonSource, serviceSource));
+                    }
+                    this.updateIndependentService(compilation, runtimeCode);
+                    compilation.deleteAsset('runtime.js');
+                    compilation.deleteAsset('service-common.js');
+                });
             });
-        });
-    }
-    updateIndependentService(compilation, runtimeCode) {
-        const { project, packSetting } = this.options;
-        const usingPackageType = packSetting.usingPackageType;
-        const subPackages = project.getSubPackages();
-        subPackages
-            .filter(sub => sub.independent)
-            .map(sub => path_1.default.join(usingPackageType, sub.root, 'service.js'))
-            .forEach(servicePath => {
-            var _a;
-            const independentServiceSource = (_a = compilation.getAsset(servicePath)) === null || _a === void 0 ? void 0 : _a.source;
-            if (compilation.getAsset(servicePath)) {
-                const subServiceSource = new xhs_mp_pack_1.ConcatSource(runtimeCode, independentServiceSource);
-                compilation.updateAsset(servicePath, subServiceSource);
-                if (packSetting.enableV2 && packSetting.enableV1) {
-                    compilation.updateAsset(servicePath.replace(usingPackageType, 'v1'), subServiceSource);
+        }
+        updateIndependentService(compilation, runtimeCode) {
+            const { project, packSetting } = this.options;
+            const usingPackageType = packSetting.usingPackageType;
+            const subPackages = project.getSubPackages();
+            subPackages
+                .filter(sub => sub.independent)
+                .map(sub => path_1.default.join(usingPackageType, sub.root, 'service.js'))
+                .forEach(servicePath => {
+                var _a;
+                if (compilation.getAsset(servicePath)) {
+                    let independentServiceSource = (_a = compilation.getAsset(servicePath)) === null || _a === void 0 ? void 0 : _a.source;
+                    independentServiceSource = adapteServiceCode(servicePath, independentServiceSource, packSetting);
+                    const subServiceSource = new xhs_mp_pack_1.ConcatSource(runtimeCode, independentServiceSource);
+                    // 写入
+                    compilation.updateAsset(servicePath, subServiceSource);
+                    if (packSetting.enableV2 && packSetting.enableV1) {
+                        compilation.updateAsset(servicePath.replace(usingPackageType, 'v1'), subServiceSource);
+                    }
                 }
-            }
-        });
+            });
+        }
     }
-}
-exports.default = ServiceChunkPlugin;
+    exports.default = ServiceChunkPlugin;
+});