@umijs/bundler-webpack 4.0.0-beta.9 → 4.0.0-canary-20240513.3

package/dist/plugins/EsbuildMinifyFix.js

@@ -0,0 +1,136 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+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;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/plugins/EsbuildMinifyFix.ts
+var EsbuildMinifyFix_exports = {};
+__export(EsbuildMinifyFix_exports, {
+  EsbuildMinifyFix: () => EsbuildMinifyFix
+});
+module.exports = __toCommonJS(EsbuildMinifyFix_exports);
+var import_utils = require("@umijs/utils");
+var import_webpack = require("../../compiled/webpack");
+var JS_FILE_REG = /\.(js|mjs|cjs)$/;
+var EsbuildMinifyFix = class {
+  constructor() {
+    this.name = `EsbuildMinifyFix`;
+  }
+  apply(compiler) {
+    compiler.hooks.compilation.tap(this.name, (compilation) => {
+      compilation.hooks.processAssets.tapPromise(
+        {
+          name: this.name,
+          stage: compiler.webpack.Compilation.PROCESS_ASSETS_STAGE_DEV_TOOLING,
+          additionalAssets: true
+        },
+        (assets) => this.minifyFix(compilation, assets)
+      );
+    });
+  }
+  isIIFE(source) {
+    source = source.trim();
+    if (source.startsWith('(function(){"use strict";')) {
+      return true;
+    }
+    if (source.startsWith("(function(){") && (source.endsWith("})()") || source.endsWith("})();"))) {
+      return true;
+    }
+    return false;
+  }
+  async minifyFix(compilation, assets) {
+    const matchObject = import_webpack.ModuleFilenameHelpers.matchObject.bind(void 0, {
+      include: [JS_FILE_REG]
+    });
+    const assetsForMinify = await Promise.all(
+      Object.keys(assets).filter((name) => {
+        var _a;
+        if (!matchObject(name)) {
+          return false;
+        }
+        const { info } = compilation.getAsset(name) || {};
+        if (!(info == null ? void 0 : info.minimized)) {
+          return false;
+        }
+        if (info == null ? void 0 : info.copied) {
+          return false;
+        }
+        if (info == null ? void 0 : info.EsbuildMinifyFix) {
+          return false;
+        }
+        if (name.endsWith(".worker.js")) {
+          return false;
+        }
+        if ((_a = info == null ? void 0 : info.related) == null ? void 0 : _a.sourceMap) {
+          return false;
+        }
+        return true;
+      }).map(async (name) => {
+        const { info, source } = compilation.getAsset(name);
+        return { name, info, inputSource: source };
+      })
+    );
+    if (assetsForMinify.length === 0) {
+      return;
+    }
+    const { SourceMapSource, RawSource } = import_webpack.sources;
+    for (const asset of assetsForMinify) {
+      const { name, inputSource } = asset;
+      const { source, map } = inputSource.sourceAndMap();
+      const originCode = source.toString();
+      let newCode = originCode;
+      if (!newCode.startsWith('"use strict";(self.') && !newCode.startsWith("(self.webpack") && !this.isIIFE(newCode)) {
+        const bundle = new import_utils.MagicString(newCode);
+        bundle.prepend("!(function(){").append("}());");
+        newCode = bundle.toString();
+        const output = {};
+        if (map) {
+          const bundleMap = bundle.generateMap({
+            source: name,
+            file: `${name}.map`,
+            includeContent: true,
+            hires: true
+          });
+          const originMapAsString = JSON.stringify(map);
+          const mergedMap = (0, import_utils.remapping)(JSON.stringify(bundleMap), (file) => {
+            if (file === name) {
+              return originMapAsString;
+            }
+            return null;
+          });
+          output.source = new SourceMapSource(
+            newCode,
+            name,
+            mergedMap,
+            originCode,
+            map,
+            true
+          );
+        } else {
+          output.source = new RawSource(newCode);
+        }
+        compilation.updateAsset(name, output.source, {
+          ...asset.info,
+          EsbuildMinifyFix: true
+        });
+      }
+    }
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  EsbuildMinifyFix
+});

package/dist/plugins/ProgressPlugin.js

@@ -1,44 +1,69 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const webpack_1 = require("@umijs/bundler-webpack/compiled/webpack");
-const utils_1 = require("@umijs/utils");
-const PLUGIN_NAME = 'ProgressPlugin';
-class UmiProgressPlugin extends webpack_1.ProgressPlugin {
-    constructor(options = {}) {
-        super({ activeModules: true });
-        this.options = options;
-        this.handler = (percent, message, ...details) => {
-            this.updateProgress({ percent, message, details });
-        };
-    }
-    apply(compiler) {
-        compiler.hooks.invalid.tap(PLUGIN_NAME, () => {
-            utils_1.logger.wait('compiling...');
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+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;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/plugins/ProgressPlugin.ts
+var ProgressPlugin_exports = {};
+__export(ProgressPlugin_exports, {
+  default: () => ProgressPlugin_default
+});
+module.exports = __toCommonJS(ProgressPlugin_exports);
+var import_webpack = require("@umijs/bundler-webpack/compiled/webpack");
+var import_utils = require("@umijs/utils");
+var PLUGIN_NAME = "ProgressPlugin";
+var UmiProgressPlugin = class extends import_webpack.ProgressPlugin {
+  constructor(options = {}) {
+    super({ activeModules: true });
+    this.options = options;
+    this.handler = (percent, message, ...details) => {
+      this.updateProgress({ percent, message, details });
+    };
+  }
+  apply(compiler) {
+    const prefix = this.options.name ? `[${this.options.name}]` : "[Webpack]";
+    compiler.hooks.invalid.tap(PLUGIN_NAME, () => {
+      import_utils.logger.wait(`${prefix} Compiling...`);
+    });
+    compiler.hooks.done.tap(PLUGIN_NAME, (stats) => {
+      const { errors, warnings } = stats.toJson({
+        all: false,
+        warnings: true,
+        errors: true,
+        colors: true
+      });
+      const hasErrors = !!(errors == null ? void 0 : errors.length);
+      const hasWarnings = !!(warnings == null ? void 0 : warnings.length);
+      hasWarnings;
+      if (hasErrors) {
+        errors.forEach((error) => {
+          import_utils.logger.error(
+            `${error.moduleName}${error.loc ? `:${error.loc}` : ""}`
+          );
+          console.log(error.message);
         });
-        compiler.hooks.done.tap(PLUGIN_NAME, (stats) => {
-            const { errors, warnings } = stats.toJson({
-                all: false,
-                warnings: true,
-                errors: true,
-                colors: true,
-            });
-            const hasErrors = !!(errors === null || errors === void 0 ? void 0 : errors.length);
-            const hasWarnings = !!(warnings === null || warnings === void 0 ? void 0 : warnings.length);
-            hasWarnings;
-            if (hasErrors) {
-                errors.forEach((error) => {
-                    utils_1.logger.error(`${error.moduleName}${error.loc ? `:${error.loc}` : ''}`);
-                    console.log(error.message);
-                });
-            }
-            else {
-                const prefix = this.options.name ? `${this.options.name} ` : '';
-                utils_1.logger.event(`${prefix}compiled successfully in ${stats.endTime - stats.startTime} ms (${stats.compilation.modules.size} modules)`);
-            }
-        });
-    }
-    updateProgress(opts) {
-        opts;
-    }
-}
-exports.default = UmiProgressPlugin;
+      } else {
+        import_utils.logger.event(
+          `${prefix} Compiled in ${stats.endTime - stats.startTime} ms (${stats.compilation.modules.size} modules)`
+        );
+      }
+    });
+  }
+  updateProgress(opts) {
+    opts;
+  }
+};
+var ProgressPlugin_default = UmiProgressPlugin;

package/dist/plugins/RuntimePublicPathPlugin.d.ts

@@ -0,0 +1,4 @@
+import type { Compiler } from '@umijs/bundler-webpack/compiled/webpack';
+export declare class RuntimePublicPathPlugin {
+    apply(compiler: Compiler): void;
+}

package/dist/plugins/RuntimePublicPathPlugin.js

@@ -0,0 +1,45 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+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;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/plugins/RuntimePublicPathPlugin.ts
+var RuntimePublicPathPlugin_exports = {};
+__export(RuntimePublicPathPlugin_exports, {
+  RuntimePublicPathPlugin: () => RuntimePublicPathPlugin
+});
+module.exports = __toCommonJS(RuntimePublicPathPlugin_exports);
+var PLUGIN_NAME = "RuntimePublicPath";
+var RuntimePublicPathPlugin = class {
+  apply(compiler) {
+    compiler.hooks.make.tap(PLUGIN_NAME, (compilation) => {
+      compilation.hooks.runtimeModule.tap(
+        PLUGIN_NAME,
+        (module2) => {
+          if (module2.constructor.name === "PublicPathRuntimeModule") {
+            if (module2.getGeneratedCode().includes("webpack:///mini-css-extract-plugin"))
+              return;
+            module2._cachedGeneratedCode = `__webpack_require__.p = (typeof globalThis !== 'undefined' ? globalThis : window).publicPath || '/';`;
+          }
+        }
+      );
+    });
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  RuntimePublicPathPlugin
+});

package/dist/plugins/_SamplePlugin.d.ts

@@ -1,4 +1,4 @@
-import { Compiler } from '@umijs/bundler-webpack/compiled/webpack';
+import type { Compiler } from '@umijs/bundler-webpack/compiled/webpack';
 interface IOpts {
 }
 declare class _SamplePlugin {

package/dist/plugins/_SamplePlugin.js

@@ -1,14 +1,37 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const PLUGIN_NAME = 'SamplePlugin';
-class _SamplePlugin {
-    constructor(options = {}) {
-        this.options = options;
-    }
-    apply(compiler) {
-        compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
-            compilation.hooks.chunkHash.tap(PLUGIN_NAME, (_) => { });
-        });
-    }
-}
-exports.default = _SamplePlugin;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+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;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/plugins/_SamplePlugin.ts
+var SamplePlugin_exports = {};
+__export(SamplePlugin_exports, {
+  default: () => SamplePlugin_default
+});
+module.exports = __toCommonJS(SamplePlugin_exports);
+var PLUGIN_NAME = "SamplePlugin";
+var _SamplePlugin = class {
+  constructor(options = {}) {
+    this.options = options;
+  }
+  apply(compiler) {
+    compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
+      compilation.hooks.chunkHash.tap(PLUGIN_NAME, () => {
+      });
+    });
+  }
+};
+var SamplePlugin_default = _SamplePlugin;

package/dist/requireHook.js

@@ -1,31 +1,48 @@
-"use strict";
-// MIT: copy from https://github.com/vercel/next.js/blob/canary/packages/next/build/webpack/require-hook.ts
-// sync injects a hook for webpack and webpack/... requires to use the internal ncc webpack version
-// this is in order for userland plugins to attach to the same webpack instance as umi
-// the individual compiled modules are as defined for the compilation in bundles/webpack/packages/*
-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 __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 });
-// @ts-ignore
-const deepImports_json_1 = __importDefault(require("@umijs/bundler-webpack/compiled/webpack/deepImports.json"));
-const hookPropertyMap = new Map([
-    ['webpack', '@umijs/bundler-webpack/compiled/webpack'],
-    ['webpack/package', '@umijs/bundler-webpack/compiled/webpack/package'],
-    ['webpack/package.json', '@umijs/bundler-webpack/compiled/webpack/package'],
-    ['webpack/lib/webpack', '@umijs/bundler-webpack/compiled/webpack'],
-    ['webpack/lib/webpack.js', '@umijs/bundler-webpack/compiled/webpack'],
+var __toESM = (mod2, isNodeMode, target) => (target = mod2 != null ? __create(__getProtoOf(mod2)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod2 || !mod2.__esModule ? __defProp(target, "default", { value: mod2, enumerable: true }) : target,
+  mod2
+));
+
+// src/requireHook.ts
+var import_deepImports = __toESM(require("@umijs/bundler-webpack/compiled/webpack/deepImports.json"));
+var import_path = require("path");
+var PKG_ROOT = (0, import_path.join)(__dirname, "../");
+var resolve = (p) => (0, import_path.join)(PKG_ROOT, p);
+var hookPropertyMap = /* @__PURE__ */ new Map([
+  ["webpack", resolve("compiled/webpack")],
+  ["webpack/package", resolve("compiled/webpack/package")],
+  ["webpack/package.json", resolve("compiled/webpack/package")],
+  ["webpack/lib/webpack", resolve("compiled/webpack")],
+  ["webpack/lib/webpack.js", resolve("compiled/webpack")]
 ]);
-deepImports_json_1.default.forEach((item) => {
-    const name = item.split('/').unshift();
-    hookPropertyMap.set(item, `@umijs/bundler-webpack/compiled/webpack/${name}`);
-    hookPropertyMap.set(`${item}.js`, `@umijs/bundler-webpack/compiled/webpack/${name}`);
+import_deepImports.default.forEach((item) => {
+  const name = item.split("/").pop();
+  hookPropertyMap.set(item, resolve(`compiled/webpack/${name}`));
+  hookPropertyMap.set(`${item}.js`, resolve(`compiled/webpack/${name}`));
 });
-const mod = require('module');
-const resolveFilename = mod._resolveFilename;
-mod._resolveFilename = function (request, parent, isMain, options) {
-    const hookResolved = hookPropertyMap.get(request);
-    if (hookResolved)
-        request = hookResolved;
-    return resolveFilename.call(mod, request, parent, isMain, options);
+var mod = require("module");
+var resolveFilename = mod._resolveFilename;
+mod._resolveFilename = function(request, parent, isMain, options) {
+  const hookResolved = hookPropertyMap.get(request);
+  if (hookResolved)
+    request = hookResolved;
+  return resolveFilename.call(mod, request, parent, isMain, options);
 };

package/dist/schema.d.ts

@@ -1,3 +1,4 @@
-/// <reference types="hapi__joi" />
-import type { Root } from '@hapi/joi';
-export declare function getSchemas(): Record<string, (Joi: Root) => any>;
+import type { z } from '@umijs/utils/compiled/zod';
+export declare function getSchemas(): Record<string, (arg: {
+    zod: typeof z;
+}) => any>;