@umijs/bundler-webpack 4.0.6 → 4.0.9

package/dist/dev.js

@@ -1,137 +1,178 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.dev = exports.stripUndefined = void 0;
-const mfsu_1 = require("@umijs/mfsu");
-const utils_1 = require("@umijs/utils");
-const fs_1 = require("fs");
-const path_1 = require("path");
-const webpack_1 = __importDefault(require("../compiled/webpack"));
-const config_1 = require("./config/config");
-const constants_1 = require("./constants");
-const server_1 = require("./server/server");
-const types_1 = require("./types");
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// dev.ts
+var dev_exports = {};
+__export(dev_exports, {
+  dev: () => dev,
+  stripUndefined: () => stripUndefined
+});
+module.exports = __toCommonJS(dev_exports);
+var import_mfsu = require("@umijs/mfsu");
+var import_utils = require("@umijs/utils");
+var import_fs = require("fs");
+var import_path = require("path");
+var import_webpack = __toESM(require("../compiled/webpack"));
+var import_config = require("./config/config");
+var import_constants = require("./constants");
+var import_server = require("./server/server");
+var import_types = require("./types");
 function stripUndefined(obj) {
-    Object.keys(obj).forEach((key) => {
-        if (obj[key] === undefined) {
-            delete obj[key];
-        }
-    });
-    return obj;
+  Object.keys(obj).forEach((key) => {
+    if (obj[key] === void 0) {
+      delete obj[key];
+    }
+  });
+  return obj;
 }
-exports.stripUndefined = stripUndefined;
 async function dev(opts) {
-    var _a, _b, _c, _d, _e, _f;
-    var _g;
-    const enableMFSU = opts.config.mfsu !== false;
-    let mfsu = null;
-    if (enableMFSU) {
-        if (opts.config.srcTranspiler === types_1.Transpiler.swc) {
-            utils_1.logger.warn(`Swc currently not supported for use with mfsu, recommended you use srcTranspiler: 'esbuild' in dev.`);
-        }
-        mfsu = new mfsu_1.MFSU({
-            strategy: opts.mfsuStrategy,
-            include: opts.mfsuInclude || [],
-            srcCodeCache: opts.srcCodeCache,
-            implementor: webpack_1.default,
-            buildDepWithESBuild: (_a = opts.config.mfsu) === null || _a === void 0 ? void 0 : _a.esbuild,
-            depBuildConfig: {
-                extraPostCSSPlugins: ((_b = opts.config) === null || _b === void 0 ? void 0 : _b.extraPostCSSPlugins) || [],
-            },
-            mfName: (_c = opts.config.mfsu) === null || _c === void 0 ? void 0 : _c.mfName,
-            runtimePublicPath: opts.config.runtimePublicPath,
-            tmpBase: ((_d = opts.config.mfsu) === null || _d === void 0 ? void 0 : _d.cacheDirectory) ||
-                (0, path_1.join)(opts.rootDir || opts.cwd, 'node_modules/.cache/mfsu'),
-            onMFSUProgress: opts.onMFSUProgress,
-            getCacheDependency() {
-                return stripUndefined({
-                    version: require('../package.json').version,
-                    mfsu: opts.config.mfsu,
-                    alias: opts.config.alias,
-                    externals: opts.config.externals,
-                    theme: opts.config.theme,
-                    runtimePublicPath: opts.config.runtimePublicPath,
-                    publicPath: opts.config.publicPath,
-                });
-            },
-        });
+  var _a, _b, _c, _d, _e, _f, _g, _h;
+  const cacheDirectoryPath = (0, import_path.resolve)(opts.rootDir || opts.cwd, opts.config.cacheDirectoryPath || "node_modules/.cache");
+  const enableMFSU = opts.config.mfsu !== false;
+  let mfsu = null;
+  if (enableMFSU) {
+    if (opts.config.srcTranspiler === import_types.Transpiler.swc) {
+      import_utils.logger.warn(`Swc currently not supported for use with mfsu, recommended you use srcTranspiler: 'esbuild' in dev.`);
     }
-    const webpackConfig = await (0, config_1.getConfig)({
-        cwd: opts.cwd,
-        rootDir: opts.rootDir,
-        env: types_1.Env.development,
-        entry: opts.entry,
-        userConfig: opts.config,
-        babelPreset: opts.babelPreset,
-        extraBabelPlugins: [
-            ...(opts.beforeBabelPlugins || []),
-            ...((mfsu === null || mfsu === void 0 ? void 0 : mfsu.getBabelPlugins()) || []),
-            ...(opts.extraBabelPlugins || []),
-        ],
-        extraBabelPresets: [
-            ...(opts.beforeBabelPresets || []),
-            ...(opts.extraBabelPresets || []),
-        ],
-        extraBabelIncludes: opts.config.extraBabelIncludes,
-        extraEsbuildLoaderHandler: (mfsu === null || mfsu === void 0 ? void 0 : mfsu.getEsbuildLoaderHandler()) || [],
-        chainWebpack: opts.chainWebpack,
-        modifyWebpackConfig: opts.modifyWebpackConfig,
-        hmr: process.env.HMR !== 'none',
-        analyze: process.env.ANALYZE,
-        cache: opts.cache,
-    });
-    const depConfig = await (0, config_1.getConfig)({
-        cwd: opts.cwd,
-        rootDir: opts.rootDir,
-        env: types_1.Env.development,
-        entry: opts.entry,
-        userConfig: opts.config,
-        hash: true,
-        staticPathPrefix: mfsu_1.MF_DEP_PREFIX,
-        name: constants_1.MFSU_NAME,
-        chainWebpack: (_e = opts.config.mfsu) === null || _e === void 0 ? void 0 : _e.chainWebpack,
-        cache: {
-            buildDependencies: (_f = opts.cache) === null || _f === void 0 ? void 0 : _f.buildDependencies,
-            cacheDirectory: (0, path_1.join)(opts.rootDir || opts.cwd, 'node_modules', '.cache', 'mfsu-deps'),
-        },
-    });
-    (_g = webpackConfig.resolve).alias || (_g.alias = {});
-    // TODO: REMOVE ME
-    ['@umijs/utils/compiled/strip-ansi', 'react-error-overlay'].forEach((dep) => {
-        // @ts-ignore
-        webpackConfig.resolve.alias[dep] = require.resolve(dep);
+    mfsu = new import_mfsu.MFSU({
+      strategy: opts.mfsuStrategy,
+      include: opts.mfsuInclude || [],
+      srcCodeCache: opts.srcCodeCache,
+      implementor: import_webpack.default,
+      buildDepWithESBuild: (_a = opts.config.mfsu) == null ? void 0 : _a.esbuild,
+      depBuildConfig: {
+        extraPostCSSPlugins: ((_b = opts.config) == null ? void 0 : _b.extraPostCSSPlugins) || []
+      },
+      mfName: (_c = opts.config.mfsu) == null ? void 0 : _c.mfName,
+      runtimePublicPath: opts.config.runtimePublicPath,
+      tmpBase: ((_d = opts.config.mfsu) == null ? void 0 : _d.cacheDirectory) || (0, import_path.join)(cacheDirectoryPath, "mfsu"),
+      onMFSUProgress: opts.onMFSUProgress,
+      unMatchLibs: (_e = opts.config.mfsu) == null ? void 0 : _e.exclude,
+      getCacheDependency() {
+        return stripUndefined({
+          version: require("../package.json").version,
+          mfsu: opts.config.mfsu,
+          alias: opts.config.alias,
+          externals: opts.config.externals,
+          theme: opts.config.theme,
+          runtimePublicPath: opts.config.runtimePublicPath,
+          publicPath: opts.config.publicPath
+        });
+      }
     });
-    await (mfsu === null || mfsu === void 0 ? void 0 : mfsu.setWebpackConfig({
-        config: webpackConfig,
-        depConfig: depConfig,
-    }));
-    if (mfsu &&
-        webpackConfig.cache &&
-        typeof webpackConfig.cache === 'object' &&
-        webpackConfig.cache.type === 'filesystem') {
-        const webpackCachePath = (0, path_1.join)(webpackConfig.cache.cacheDirectory, `default-development`, 'index.pack');
-        const mfsuCacheExists = (0, fs_1.existsSync)(mfsu.getCacheFilePath());
-        const webpackCacheExists = (0, fs_1.existsSync)(webpackCachePath);
-        if (webpackCacheExists && !mfsuCacheExists) {
-            utils_1.logger.warn(`Invalidate webpack cache since mfsu cache is missing`);
-            utils_1.rimraf.sync(webpackConfig.cache.cacheDirectory);
-        }
+  }
+  const webpackConfig = await (0, import_config.getConfig)({
+    cwd: opts.cwd,
+    rootDir: opts.rootDir,
+    env: import_types.Env.development,
+    entry: opts.entry,
+    userConfig: opts.config,
+    babelPreset: opts.babelPreset,
+    extraBabelPlugins: [
+      ...opts.beforeBabelPlugins || [],
+      ...(mfsu == null ? void 0 : mfsu.getBabelPlugins()) || [],
+      ...opts.extraBabelPlugins || []
+    ],
+    extraBabelPresets: [
+      ...opts.beforeBabelPresets || [],
+      ...opts.extraBabelPresets || []
+    ],
+    extraBabelIncludes: opts.config.extraBabelIncludes,
+    extraEsbuildLoaderHandler: (mfsu == null ? void 0 : mfsu.getEsbuildLoaderHandler()) || [],
+    chainWebpack: opts.chainWebpack,
+    modifyWebpackConfig: opts.modifyWebpackConfig,
+    hmr: process.env.HMR !== "none",
+    analyze: process.env.ANALYZE,
+    cache: opts.cache ? __spreadProps(__spreadValues({}, opts.cache), {
+      cacheDirectory: (0, import_path.join)(cacheDirectoryPath, "bundler-webpack")
+    }) : void 0,
+    pkg: opts.pkg
+  });
+  const depConfig = await (0, import_config.getConfig)({
+    cwd: opts.cwd,
+    rootDir: opts.rootDir,
+    env: import_types.Env.development,
+    entry: opts.entry,
+    userConfig: opts.config,
+    hash: true,
+    staticPathPrefix: import_mfsu.MF_DEP_PREFIX,
+    name: import_constants.MFSU_NAME,
+    chainWebpack: (_f = opts.config.mfsu) == null ? void 0 : _f.chainWebpack,
+    cache: {
+      buildDependencies: (_g = opts.cache) == null ? void 0 : _g.buildDependencies,
+      cacheDirectory: (0, import_path.join)(cacheDirectoryPath, "mfsu-deps")
+    },
+    pkg: opts.pkg
+  });
+  (_h = webpackConfig.resolve).alias || (_h.alias = {});
+  ["@umijs/utils/compiled/strip-ansi", "react-error-overlay"].forEach((dep) => {
+    webpackConfig.resolve.alias[dep] = require.resolve(dep);
+  });
+  await (mfsu == null ? void 0 : mfsu.setWebpackConfig({
+    config: webpackConfig,
+    depConfig
+  }));
+  if (mfsu && webpackConfig.cache && typeof webpackConfig.cache === "object" && webpackConfig.cache.type === "filesystem") {
+    const webpackCachePath = (0, import_path.join)(webpackConfig.cache.cacheDirectory, `default-development`, "index.pack");
+    const mfsuCacheExists = (0, import_fs.existsSync)(mfsu.getCacheFilePath());
+    const webpackCacheExists = (0, import_fs.existsSync)(webpackCachePath);
+    if (webpackCacheExists && !mfsuCacheExists) {
+      import_utils.logger.warn(`Invalidate webpack cache since mfsu cache is missing`);
+      import_utils.rimraf.sync(webpackConfig.cache.cacheDirectory);
     }
-    await (0, server_1.createServer)({
-        webpackConfig,
-        userConfig: opts.config,
-        cwd: opts.cwd,
-        beforeMiddlewares: [
-            ...((mfsu === null || mfsu === void 0 ? void 0 : mfsu.getMiddlewares()) || []),
-            ...(opts.beforeMiddlewares || []),
-        ],
-        port: opts.port,
-        host: opts.host,
-        afterMiddlewares: [...(opts.afterMiddlewares || [])],
-        onDevCompileDone: opts.onDevCompileDone,
-        onProgress: opts.onProgress,
-    });
+  }
+  await (0, import_server.createServer)({
+    webpackConfig,
+    userConfig: opts.config,
+    cwd: opts.cwd,
+    beforeMiddlewares: [
+      ...(mfsu == null ? void 0 : mfsu.getMiddlewares()) || [],
+      ...opts.beforeMiddlewares || []
+    ],
+    port: opts.port,
+    host: opts.host,
+    afterMiddlewares: [...opts.afterMiddlewares || []],
+    onDevCompileDone: opts.onDevCompileDone,
+    onProgress: opts.onProgress
+  });
 }
-exports.dev = dev;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  dev,
+  stripUndefined
+});

package/dist/index.js

@@ -1,21 +1,23 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-require("./requireHook");
-__exportStar(require("./build"), exports);
-__exportStar(require("./config/config"), exports);
-__exportStar(require("./dev"), exports);
-__exportStar(require("./schema"), exports);
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// index.ts
+var src_exports = {};
+module.exports = __toCommonJS(src_exports);
+var import_requireHook = require("./requireHook");
+__reExport(src_exports, require("./build"), module.exports);
+__reExport(src_exports, require("./config/config"), module.exports);
+__reExport(src_exports, require("./dev"), module.exports);
+__reExport(src_exports, require("./schema"), module.exports);

package/dist/loader/svgr.js

@@ -1,58 +1,77 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-// MIT: https://github.com/gregberge/svgr/blob/main/packages/webpack/src/index.ts
-// TODO: prebuild @svgr/core @svgr/plugin-jsx @svgr/plugin-svgo
-const core_1 = require("@svgr/core");
-// @ts-ignore
-const plugin_jsx_1 = __importDefault(require("@svgr/plugin-jsx"));
-// @ts-ignore
-const plugin_svgo_1 = __importDefault(require("@svgr/plugin-svgo"));
-const esbuild_1 = require("@umijs/bundler-utils/compiled/esbuild");
-const path_1 = require("path");
-const util_1 = require("util");
-const tranformSvg = (0, util_1.callbackify)(async (contents, options, state) => {
-    const jsCode = await (0, core_1.transform)(contents, options, state);
-    const result = await (0, esbuild_1.transform)(jsCode, {
-        loader: 'tsx',
-        target: 'es2015',
-    });
-    if (!(result === null || result === void 0 ? void 0 : result.code)) {
-        throw new Error(`Error while transforming using Esbuild`);
-    }
-    return result.code;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// svgr.ts
+var svgr_exports = {};
+__export(svgr_exports, {
+  default: () => svgr_default
+});
+module.exports = __toCommonJS(svgr_exports);
+var import_core = require("@svgr/core");
+var import_plugin_jsx = __toESM(require("@svgr/plugin-jsx"));
+var import_plugin_svgo = __toESM(require("@svgr/plugin-svgo"));
+var import_esbuild = require("@umijs/bundler-utils/compiled/esbuild");
+var import_path = require("path");
+var import_util = require("util");
+var tranformSvg = (0, import_util.callbackify)(async (contents, options, state) => {
+  const jsCode = await (0, import_core.transform)(contents, options, state);
+  const result = await (0, import_esbuild.transform)(jsCode, {
+    loader: "tsx",
+    target: "es2015"
+  });
+  if (!(result == null ? void 0 : result.code)) {
+    throw new Error(`Error while transforming using Esbuild`);
+  }
+  return result.code;
 });
 function svgrLoader(contents) {
-    this.cacheable && this.cacheable();
-    const callback = this.async();
-    const options = this.getOptions();
-    const previousExport = (() => {
-        if (contents.startsWith('export '))
-            return contents;
-        const exportMatches = contents.match(/^module.exports\s*=\s*(.*)/);
-        return exportMatches ? `export default ${exportMatches[1]}` : null;
-    })();
-    const state = {
-        caller: {
-            name: 'svgr-loader',
-            previousExport,
-            defaultPlugins: [plugin_svgo_1.default, plugin_jsx_1.default],
-        },
-        filePath: (0, path_1.normalize)(this.resourcePath),
-    };
-    if (!previousExport) {
-        tranformSvg(contents, options, state, callback);
-    }
-    else {
-        this.fs.readFile(this.resourcePath, (err, result) => {
-            if (err) {
-                callback(err);
-                return;
-            }
-            tranformSvg(String(result), options, state, callback);
-        });
-    }
+  this.cacheable && this.cacheable();
+  const callback = this.async();
+  const options = this.getOptions();
+  const previousExport = (() => {
+    if (contents.startsWith("export "))
+      return contents;
+    const exportMatches = contents.match(/^module.exports\s*=\s*(.*)/);
+    return exportMatches ? `export default ${exportMatches[1]}` : null;
+  })();
+  const state = {
+    caller: {
+      name: "svgr-loader",
+      previousExport,
+      defaultPlugins: [import_plugin_svgo.default, import_plugin_jsx.default]
+    },
+    filePath: (0, import_path.normalize)(this.resourcePath)
+  };
+  if (!previousExport) {
+    tranformSvg(contents, options, state, callback);
+  } else {
+    this.fs.readFile(this.resourcePath, (err, result) => {
+      if (err) {
+        callback(err);
+        return;
+      }
+      tranformSvg(String(result), options, state, callback);
+    });
+  }
 }
-exports.default = svgrLoader;
+var svgr_default = svgrLoader;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});