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

package/dist/packs/index.d.ts

@@ -1,8 +1,8 @@
 import { Compilation, RawSource, CopyPatterns, Config, ConcatSource, MPPackSetting } from 'xhs-mp-pack';
-import { Configuration, WebpackError, library, LoaderContext } from 'webpack';
+import { Configuration, WebpackError, library, LoaderContext, EntryOptionPlugin, EntryPlugin } from 'webpack';
 import type { Project } from 'xhs-mp-project';
 import { IStart } from '../types';
-import { FeatureReporter } from 'xhs-mp-utils';
+import { FeatureReporter } from 'xhs-mp-shared';
 export type ICompilation = any;
 export type ICompiler = any;
 export type ILoaderContext = LoaderContext<any> & {
@@ -12,5 +12,5 @@ export type ILoaderContext = LoaderContext<any> & {
         reporter: FeatureReporter.IReporter;
     };
 };
-export { Compilation, RawSource, ConcatSource, CopyPatterns, Config, Configuration, WebpackError, library, LoaderContext };
-export declare function createCompiler(startConfig: IStart): ICompiler;
+export { Compilation, RawSource, ConcatSource, CopyPatterns, Config, Configuration, WebpackError, library, LoaderContext, EntryOptionPlugin, EntryPlugin };
+export declare function createPacker(startConfig: IStart): ICompiler;

package/dist/packs/index.js

@@ -1,31 +1,39 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createCompiler = exports.library = exports.WebpackError = exports.Config = exports.CopyPatterns = exports.ConcatSource = exports.RawSource = exports.Compilation = void 0;
-/**
- * 抹平差异：抹平webpack和mp-pack的差异
- * 统一收口，所有对webpack和mp-pack的调用都走这个出口，不可用直接调用
- */
-const webpack_1 = require("./webpack");
-const mp_pack_1 = require("./mp-pack");
-const xhs_mp_pack_1 = require("xhs-mp-pack");
-Object.defineProperty(exports, "Compilation", { enumerable: true, get: function () { return xhs_mp_pack_1.Compilation; } });
-Object.defineProperty(exports, "RawSource", { enumerable: true, get: function () { return xhs_mp_pack_1.RawSource; } });
-Object.defineProperty(exports, "CopyPatterns", { enumerable: true, get: function () { return xhs_mp_pack_1.CopyPatterns; } });
-Object.defineProperty(exports, "Config", { enumerable: true, get: function () { return xhs_mp_pack_1.Config; } });
-Object.defineProperty(exports, "ConcatSource", { enumerable: true, get: function () { return xhs_mp_pack_1.ConcatSource; } });
-const webpack_2 = require("webpack");
-Object.defineProperty(exports, "WebpackError", { enumerable: true, get: function () { return webpack_2.WebpackError; } });
-Object.defineProperty(exports, "library", { enumerable: true, get: function () { return webpack_2.library; } });
-const const_1 = __importDefault(require("../utils/const"));
-const { PACK_MODE } = const_1.default;
-function createCompiler(startConfig) {
-    const { packMode = PACK_MODE.MPPACK } = startConfig;
-    if (packMode === PACK_MODE.WEBPACK) {
-        return (0, webpack_1.createCompiler)(startConfig);
+(function (factory) {
+    if (typeof module === "object" && typeof module.exports === "object") {
+        var v = factory(require, exports);
+        if (v !== undefined) module.exports = v;
     }
-    return (0, mp_pack_1.createCompiler)(startConfig);
-}
-exports.createCompiler = createCompiler;
+    else if (typeof define === "function" && define.amd) {
+        define(["require", "exports", "./webpack", "./mp-pack", "xhs-mp-pack", "webpack", "../config/constant.config"], factory);
+    }
+})(function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.EntryPlugin = exports.EntryOptionPlugin = exports.library = exports.WebpackError = exports.Config = exports.CopyPatterns = exports.ConcatSource = exports.RawSource = exports.Compilation = void 0;
+    exports.createPacker = createPacker;
+    /**
+     * 抹平差异：抹平webpack和mp-pack的差异
+     * 统一收口，所有对webpack和mp-pack的调用都走这个出口，不可用直接调用
+     */
+    const webpack_1 = require("./webpack");
+    const mp_pack_1 = require("./mp-pack");
+    const xhs_mp_pack_1 = require("xhs-mp-pack");
+    Object.defineProperty(exports, "Compilation", { enumerable: true, get: function () { return xhs_mp_pack_1.Compilation; } });
+    Object.defineProperty(exports, "RawSource", { enumerable: true, get: function () { return xhs_mp_pack_1.RawSource; } });
+    Object.defineProperty(exports, "CopyPatterns", { enumerable: true, get: function () { return xhs_mp_pack_1.CopyPatterns; } });
+    Object.defineProperty(exports, "Config", { enumerable: true, get: function () { return xhs_mp_pack_1.Config; } });
+    Object.defineProperty(exports, "ConcatSource", { enumerable: true, get: function () { return xhs_mp_pack_1.ConcatSource; } });
+    const webpack_2 = require("webpack");
+    Object.defineProperty(exports, "WebpackError", { enumerable: true, get: function () { return webpack_2.WebpackError; } });
+    Object.defineProperty(exports, "library", { enumerable: true, get: function () { return webpack_2.library; } });
+    Object.defineProperty(exports, "EntryOptionPlugin", { enumerable: true, get: function () { return webpack_2.EntryOptionPlugin; } });
+    Object.defineProperty(exports, "EntryPlugin", { enumerable: true, get: function () { return webpack_2.EntryPlugin; } });
+    const constant_config_1 = require("../config/constant.config");
+    function createPacker(startConfig) {
+        const { packMode = constant_config_1.PACK_MODE.MPPACK } = startConfig;
+        if (packMode === constant_config_1.PACK_MODE.WEBPACK) {
+            return (0, webpack_1.createPacker)(startConfig);
+        }
+        return (0, mp_pack_1.createCompiler)(startConfig);
+    }
+});

package/dist/packs/mp-pack/index.js

@@ -1,34 +1,42 @@
-"use strict";
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createCompiler = void 0;
-const presets_1 = require("../../presets");
-const path_1 = __importDefault(require("path"));
-const xhs_mp_pack_1 = require("xhs-mp-pack");
-const apm_1 = require("../../utils/apm");
-const const_1 = __importDefault(require("../../utils/const"));
-const { PACK_MODE } = const_1.default;
-const createCompiler = (startConfig) => {
-    // const {action, enableDevServer} = startConfig
-    const mppack = new xhs_mp_pack_1.MPPack(startConfig);
-    const compilerOptions = {
-        project: mppack.project,
-        packSetting: mppack.packSetting,
-        packMode: PACK_MODE.MPPACK,
-        // 注入apm模块
-        reporter: (0, apm_1.createReporter)(mppack.project, startConfig.mpUploadOptions)
+(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", "../../presets", "path", "xhs-mp-pack", "../../utils/apm", "../../config/constant.config"], factory);
+    }
+})(function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.createCompiler = void 0;
+    const presets_1 = require("../../presets");
+    const path_1 = __importDefault(require("path"));
+    const xhs_mp_pack_1 = require("xhs-mp-pack");
+    const apm_1 = require("../../utils/apm");
+    const constant_config_1 = require("../../config/constant.config");
+    const createCompiler = (startConfig) => {
+        const mppack = new xhs_mp_pack_1.MPPack(startConfig);
+        const compilerOptions = {
+            project: mppack.project,
+            packSetting: mppack.packSetting,
+            packMode: constant_config_1.PACK_MODE.MPPACK,
+            // 注入apm模块
+            reporter: (0, apm_1.createReporter)(mppack.project, startConfig.mpUploadOptions)
+        };
+        const mpPackConfigs = (0, presets_1.createConfigs)(compilerOptions);
+        mpPackConfigs.forEach(config => {
+            var _a, _b, _c, _d;
+            /* 修改在ide里的node_modules的路径 */
+            (_b = (_a = config.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 = config.resolve) === null || _c === void 0 ? void 0 : _c.modules) === null || _d === void 0 ? void 0 : _d.push(path_1.default.resolve(__dirname, '../../'));
+        });
+        mppack.createCompiler(mpPackConfigs);
+        return mppack;
     };
-    const mpPackConfigs = (0, presets_1.createConfigs)(compilerOptions);
-    mpPackConfigs.forEach(config => {
-        var _a, _b, _c, _d;
-        /* 修改在ide里的node_modules的路径 */
-        (_b = (_a = config.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 = config.resolve) === null || _c === void 0 ? void 0 : _c.modules) === null || _d === void 0 ? void 0 : _d.push(path_1.default.resolve(__dirname, '../../'));
-    });
-    mppack.createCompiler(mpPackConfigs);
-    return mppack;
-};
-exports.createCompiler = createCompiler;
+    exports.createCompiler = createCompiler;
+});

package/dist/packs/webpack/dev-server/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,54 +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 });
-const path_1 = __importDefault(require("path"));
-const webpack_1 = __importDefault(require("webpack"));
-const ensurePort_1 = __importDefault(require("./lib/ensurePort"));
-const openBrowser_1 = __importDefault(require("./lib/openBrowser"));
-const presets_1 = require("../../../presets");
-const devServer = (config) => __awaiter(void 0, void 0, void 0, function* () {
-    const { packSetting } = config;
-    const { distDir } = packSetting;
-    const webpackConfigs = (0, presets_1.createConfigs)(config);
-    const compiler = (0, webpack_1.default)(webpackConfigs);
-    const host = 'localhost';
-    const devServerConfig = {
-        open: false,
-        historyApiFallback: true,
-        port: 1388,
-        hot: false,
-        static: [
-            // emulator entry 地址
-            path_1.default.resolve('node_modules/@xhs/mp-simulator/dist'),
-            path_1.default.resolve('node_modules/@xhs/mp-js-core/dist'),
-            ...JSON.parse(process.env.XHS_MP_LIB || '[]'), // 自定义地址
-            distDir,
-        ],
-        client: {
-            logging: 'error',
-            overlay: false,
-            progress: false,
-        },
-        // firewall: false,
-        headers: {
-            'Access-Control-Allow-Origin': '*',
-        },
-    };
-    // 检查端口是否被占用，若占用会修改 devServerConfig.port
-    yield (0, ensurePort_1.default)(devServerConfig);
-    const Server = require('webpack-dev-server');
-    const server = new Server(compiler, Object.assign(Object.assign({}, devServerConfig), { open: false }));
-    server.listen(devServerConfig.port, host, () => { });
-    let isBrowserOpened = false;
-    compiler.hooks.done.tap('xhs-mp-cli', stats => {
-        if (stats.hasErrors()) {
-            return;
-        }
-        if (devServerConfig.open && !isBrowserOpened) {
-            isBrowserOpened = true;
-            (0, openBrowser_1.default)(host, devServerConfig.port);
-        }
+(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", "./lib/ensurePort", "./lib/openBrowser", "../../../presets"], factory);
+    }
+})(function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    const path_1 = __importDefault(require("path"));
+    const ensurePort_1 = __importDefault(require("./lib/ensurePort"));
+    const openBrowser_1 = __importDefault(require("./lib/openBrowser"));
+    const presets_1 = require("../../../presets");
+    const devServer = (config) => __awaiter(void 0, void 0, void 0, function* () {
+        const { packSetting } = config;
+        // @ts-ignore
+        const { distDir } = packSetting;
+        const webpackConfigs = (0, presets_1.createConfigs)(config);
+        const webpack = require('webpack');
+        const compiler = webpack(webpackConfigs);
+        const host = 'localhost';
+        const devServerConfig = {
+            open: false,
+            historyApiFallback: true,
+            port: 1388,
+            hot: false,
+            static: [
+                // emulator entry 地址
+                path_1.default.resolve('node_modules/@xhs/mp-simulator/dist'),
+                path_1.default.resolve('node_modules/@xhs/mp-js-core/dist'),
+                ...JSON.parse(process.env.XHS_MP_LIB || '[]'), // 自定义地址
+                distDir,
+            ],
+            client: {
+                logging: 'error',
+                overlay: false,
+                progress: false,
+            },
+            // firewall: false,
+            headers: {
+                'Access-Control-Allow-Origin': '*',
+            },
+        };
+        // 检查端口是否被占用，若占用会修改 devServerConfig.port
+        yield (0, ensurePort_1.default)(devServerConfig);
+        const Server = require('webpack-dev-server');
+        const server = new Server(compiler, Object.assign(Object.assign({}, devServerConfig), { open: false }));
+        server.listen(devServerConfig.port, host, () => { });
+        let isBrowserOpened = false;
+        compiler.hooks.done.tap('xhs-mp-cli', stats => {
+            if (stats.hasErrors()) {
+                return;
+            }
+            if (devServerConfig.open && !isBrowserOpened) {
+                isBrowserOpened = true;
+                (0, openBrowser_1.default)(host, devServerConfig.port);
+            }
+        });
     });
+    exports.default = devServer;
 });
-exports.default = devServer;

package/dist/packs/webpack/dev-server/lib/ensurePort.js

@@ -1,32 +1,42 @@
-"use strict";
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-nocheck
-const net_1 = __importDefault(require("net"));
-const ensurePort = (devServerConfig) => new Promise(res => {
-    const checkPort = () => {
-        const server = net_1.default.createServer().listen(devServerConfig.port, devServerConfig.client.host);
-        server.on('listening', () => {
-            server.close();
-            res(1);
-        });
-        server.on('error', err => {
+(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", "net"], factory);
+    }
+})(function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    // @ts-nocheck
+    const net_1 = __importDefault(require("net"));
+    const ensurePort = (devServerConfig) => new Promise(res => {
+        const checkPort = () => {
+            const server = net_1.default.createServer().listen(devServerConfig.port, devServerConfig.client.host);
+            server.on('listening', () => {
+                server.close();
+                res(1);
+            });
+            server.on('error', err => {
+                if (err.code === 'EADDRINUSE') {
+                    devServerConfig.port += 1;
+                    checkPort(devServerConfig);
+                }
+            });
+        };
+        try {
+            checkPort();
+        }
+        catch (err) {
             if (err.code === 'EADDRINUSE') {
                 devServerConfig.port += 1;
                 checkPort(devServerConfig);
             }
-        });
-    };
-    try {
-        checkPort();
-    }
-    catch (err) {
-        if (err.code === 'EADDRINUSE') {
-            devServerConfig.port += 1;
-            checkPort(devServerConfig);
         }
-    }
+    });
+    exports.default = ensurePort;
 });
-exports.default = ensurePort;

package/dist/packs/webpack/dev-server/lib/openBrowser.js

@@ -1,23 +1,33 @@
-"use strict";
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-const child_process_1 = require("child_process");
-const open_1 = __importDefault(require("open"));
-// eslint-disable-next-line consistent-return
-const openBrowser = (host, port) => {
-    const url = `http://${host}:${port}`;
-    try {
-        (0, child_process_1.execSync)(`osascript ${__dirname}/openChrome.applescript ${encodeURI(url)}`, {
-            stdio: 'ignore',
-        });
-        return true;
+(function (factory) {
+    if (typeof module === "object" && typeof module.exports === "object") {
+        var v = factory(require, exports);
+        if (v !== undefined) module.exports = v;
     }
-    catch (error) {
-        // Ignore errors.
+    else if (typeof define === "function" && define.amd) {
+        define(["require", "exports", "child_process", "open"], factory);
     }
-    // fallback to normal open
-    (0, open_1.default)(url);
-};
-exports.default = openBrowser;
+})(function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    const child_process_1 = require("child_process");
+    const open_1 = __importDefault(require("open"));
+    // eslint-disable-next-line consistent-return
+    const openBrowser = (host, port) => {
+        const url = `http://${host}:${port}`;
+        try {
+            (0, child_process_1.execSync)(`osascript ${__dirname}/openChrome.applescript ${encodeURI(url)}`, {
+                stdio: 'ignore',
+            });
+            return true;
+        }
+        catch (error) {
+            // Ignore errors.
+        }
+        // fallback to normal open
+        (0, open_1.default)(url);
+    };
+    exports.default = openBrowser;
+});

package/dist/packs/webpack/index.d.ts

@@ -1,3 +1,3 @@
 import { IStart } from '../../types';
 import { WebPack } from './webpack';
-export declare const createCompiler: (startConfig: IStart) => Promise<void> | WebPack;
+export declare const createPacker: (startConfig: IStart) => WebPack;

package/dist/packs/webpack/index.js

@@ -1,99 +1,108 @@
-"use strict";
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createCompiler = void 0;
-const path_1 = __importDefault(require("path"));
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const dev_server_1 = __importDefault(require("./dev-server"));
-const projectConfig_1 = require("../../utils/projectConfig");
-const common_1 = require("../../utils/common");
-const types_1 = require("../../types");
-const presets_1 = require("../../presets");
-const xhs_mp_project_1 = require("xhs-mp-project");
-const xhs_mp_pack_1 = require("xhs-mp-pack");
-const webpack_1 = require("./webpack");
-const apm_1 = require("../../utils/apm");
-const const_1 = __importDefault(require("../../utils/const"));
-const { PACK_MODE } = const_1.default;
-// 防御编程
-const handleVersion = (startConfig) => {
-    let { action, enableV1 = true, enableV2 = false, enableVDom = false } = startConfig;
-    // 正式环境必须有v1 并且不允许并行编译
-    if (action === 'build') {
-        enableV1 = true;
+(function (factory) {
+    if (typeof module === "object" && typeof module.exports === "object") {
+        var v = factory(require, exports);
+        if (v !== undefined) module.exports = v;
     }
-    if (!enableV1 && !enableV2) {
-        enableV1 = true;
-        enableV2 = false;
+    else if (typeof define === "function" && define.amd) {
+        define(["require", "exports", "path", "fs-extra", "../../utils/projectConfig", "../../utils/common", "../../presets", "xhs-mp-project", "xhs-mp-pack", "./webpack", "../../utils/apm", "../../config/constant.config"], factory);
     }
-    return {
-        enableV1,
-        enableV2,
-        enableVDom
+})(function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.createPacker = void 0;
+    const path_1 = __importDefault(require("path"));
+    const fs_extra_1 = __importDefault(require("fs-extra"));
+    const projectConfig_1 = require("../../utils/projectConfig");
+    const common_1 = require("../../utils/common");
+    const presets_1 = require("../../presets");
+    const xhs_mp_project_1 = require("xhs-mp-project");
+    const xhs_mp_pack_1 = require("xhs-mp-pack");
+    const webpack_1 = require("./webpack");
+    const apm_1 = require("../../utils/apm");
+    const constant_config_1 = require("../../config/constant.config");
+    // 防御编程
+    const handleVersion = (startConfig) => {
+        let { action, enableV1 = true, enableV2 = false, enableVDom = false } = startConfig;
+        // 正式环境必须有v1 并且不允许并行编译
+        if (action === 'build') {
+            enableV1 = true;
+        }
+        if (!enableV1 && !enableV2) {
+            enableV1 = true;
+            enableV2 = false;
+        }
+        return {
+            enableV1,
+            enableV2,
+            enableVDom
+        };
     };
-};
-const formatCompilerConfig = startConfig => {
-    const { projectPath, action, tsConfigPath, platform, extJsonPath, compressJs = false, enableSourcemap = false, mpUploadOptions = false } = startConfig;
-    const { enableV1, enableV2, enableVDom } = handleVersion(startConfig);
-    const distDir = startConfig.distDir || path_1.default.join(process.cwd(), 'dist');
-    process.env.__platform = platform;
-    try {
-        if (fs_extra_1.default.existsSync(distDir)) {
-            // eslint-disable-line
-            fs_extra_1.default.rmSync(distDir, { recursive: true });
+    const formatCompilerConfig = startConfig => {
+        const { projectPath, action, tsConfigPath, platform, compressCss = true, compressJs = true, enableSourcemap = true, appendSourcemapComment = true, runInServiceSandbox = false, mpUploadOptions = false } = startConfig;
+        const { enableV1, enableV2, enableVDom } = handleVersion(startConfig);
+        const distDir = startConfig.distDir || path_1.default.join(process.cwd(), 'dist');
+        process.env.__platform = platform;
+        try {
+            if (fs_extra_1.default.existsSync(distDir)) {
+                // eslint-disable-line
+                fs_extra_1.default.rmSync(distDir, { recursive: true });
+            }
         }
-    }
-    catch (error) {
-        // noop
-    }
-    const projectJson = (0, projectConfig_1.getProjectConfig)(projectPath);
-    let miniprogramDir = path_1.default.join(projectPath, projectJson.miniprogramRoot || '');
-    miniprogramDir = miniprogramDir.endsWith('/') ? miniprogramDir.slice(0, -1) : miniprogramDir;
-    const config = {
-        projectPath: (0, common_1.toUnixPath)(projectPath),
-        miniprogramDir: (0, common_1.toUnixPath)(miniprogramDir).replace(/\/+$/, ''),
-        extJsonPath,
-        distDir,
-        action,
-        env: action === 'dev' ? types_1.ENV.development : types_1.ENV.production,
-        tsConfigPath: tsConfigPath || (0, common_1.getTsConfigPath)(projectPath),
-        cacheDirectory: startConfig.cacheDirectory,
-        compressJs,
-        enableSourcemap,
-        enableV1,
-        enableV2,
-        enableVDom,
-        mpUploadOptions,
+        catch (error) {
+            // noop
+        }
+        const projectJson = (0, projectConfig_1.getProjectConfig)(projectPath);
+        let miniprogramDir = path_1.default.join(projectPath, projectJson.miniprogramRoot || '');
+        miniprogramDir = miniprogramDir.endsWith('/') ? miniprogramDir.slice(0, -1) : miniprogramDir;
+        const config = {
+            projectPath: (0, common_1.toUnixPath)(projectPath),
+            miniprogramDir: (0, common_1.toUnixPath)(miniprogramDir).replace(/\/+$/, ''),
+            distDir,
+            action,
+            tsConfigPath: tsConfigPath || (0, common_1.getTsConfigPath)(projectPath),
+            cacheDirectory: startConfig.cacheDirectory,
+            compressCss,
+            compressJs,
+            enableSourcemap,
+            appendSourcemapComment,
+            runInServiceSandbox,
+            enableV1,
+            enableV2,
+            enableVDom,
+            mpUploadOptions,
+        };
+        return config;
     };
-    return config;
-};
-const createCompiler = (startConfig) => {
-    const { projectPath, action, enableDevServer, callback } = startConfig;
-    startConfig = formatCompilerConfig(startConfig);
-    const project = new xhs_mp_project_1.Project({
-        projectPath,
-    });
-    const mppackSetting = new xhs_mp_pack_1.MPPackSetting(project, startConfig);
-    const compilerOptions = {
-        project: project,
-        packSetting: mppackSetting,
-        packMode: PACK_MODE.WEBPACK,
-        // 注入apm模块
-        reporter: (0, apm_1.createReporter)(project, startConfig.mpUploadOptions)
+    const createPacker = (startConfig) => {
+        const { projectPath } = startConfig;
+        startConfig = formatCompilerConfig(startConfig);
+        const project = new xhs_mp_project_1.Project({
+            projectPath,
+        });
+        const mppackSetting = new xhs_mp_pack_1.MPPackSetting(project, startConfig);
+        const compilerOptions = {
+            project: project,
+            packSetting: mppackSetting,
+            packMode: constant_config_1.PACK_MODE.WEBPACK,
+            // 注入apm模块
+            reporter: (0, apm_1.createReporter)(project, startConfig.mpUploadOptions)
+        };
+        const webpackConfig = (0, presets_1.createConfigs)(compilerOptions);
+        webpackConfig.forEach(config => {
+            var _a, _b, _c, _d;
+            /* 修改在ide里的node_modules的路径 */
+            (_b = (_a = config.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 = config.resolve) === null || _c === void 0 ? void 0 : _c.modules) === null || _d === void 0 ? void 0 : _d.push(path_1.default.resolve(__dirname, '../../../'));
+        });
+        // if (action === 'dev' && enableDevServer) {
+        //   const webpackDevServer = require('./dev-server').default
+        //   return webpackDevServer(compilerOptions)
+        // }
+        return new webpack_1.WebPack(webpackConfig, compilerOptions);
     };
-    const webpackConfig = (0, presets_1.createConfigs)(compilerOptions);
-    webpackConfig.forEach(config => {
-        var _a, _b, _c, _d;
-        /* 修改在ide里的node_modules的路径 */
-        (_b = (_a = config.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 = config.resolve) === null || _c === void 0 ? void 0 : _c.modules) === null || _d === void 0 ? void 0 : _d.push(path_1.default.resolve(__dirname, '../../../'));
-    });
-    if (action === 'dev' && enableDevServer) {
-        return (0, dev_server_1.default)(compilerOptions);
-    }
-    return new webpack_1.WebPack(webpackConfig, compilerOptions);
-};
-exports.createCompiler = createCompiler;
+    exports.createPacker = createPacker;
+});

package/dist/packs/webpack/webpack.d.ts

@@ -10,7 +10,8 @@ export declare class WebPack extends AbstractMPPack {
     packSetting: MPPackSetting;
     hadWatch: boolean;
     constructor(configs: any, options: IPresetOptions);
-    handleProgress: (progress: any) => void;
+    handleProgress: (percentage: any, status: any, info: any) => void;
+    handleBuildInfo: (info: any) => void;
     get hooks(): any;
     watch(config: any, callback?: any): Promise<unknown>;
     changeCompileOptions(config: any): void;