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

package/dist/plugins/style.js

@@ -1,83 +1,171 @@
-"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) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
+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 });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+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.inlineStyle = void 0;
-// ref: https://github.com/hyrious/esbuild-plugin-style/blob/main/index.ts
-const esbuild_1 = __importDefault(require("@umijs/bundler-utils/compiled/esbuild"));
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-// https://github.com/evanw/esbuild/issues/20#issuecomment-802269745
-function inlineStyle({ minify = true, charset = 'utf8', } = {}) {
-    return {
-        name: 'style',
-        setup({ onResolve, onLoad }) {
-            const cwd = process.cwd();
-            const opt = {
-                logLevel: 'silent',
-                bundle: true,
-                write: false,
-                charset,
-                minify,
-            };
-            onResolve({ filter: /\.css$/, namespace: 'file' }, (args) => {
-                const absPath = path_1.default.join(args.resolveDir, args.path);
-                const relPath = path_1.default.relative(cwd, absPath);
-                const resolved = fs_1.default.existsSync(absPath) ? relPath : args.path;
-                return { path: resolved, namespace: 'style-stub' };
-            });
-            onResolve({ filter: /\.css$/, namespace: 'style-stub' }, (args) => {
-                return { path: args.path, namespace: 'style-content' };
-            });
-            onResolve({ filter: /^__style_helper__$/, namespace: 'style-stub' }, (args) => ({
-                path: args.path,
-                namespace: 'style-helper',
-                sideEffects: false,
-            }));
-            onLoad({ filter: /.*/, namespace: 'style-helper' }, () => __awaiter(this, void 0, void 0, function* () {
-                return ({
-                    contents: `
-          export function injectStyle(text) {
-            if (typeof document !== 'undefined') {
-              var style = document.createElement('style')
-              var node = document.createTextNode(text)
-              style.appendChild(node)
-              document.head.appendChild(style)
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __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 || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/plugins/style.ts
+var style_exports = {};
+__export(style_exports, {
+  style: () => style
+});
+module.exports = __toCommonJS(style_exports);
+var import_esbuild = __toESM(require("@umijs/bundler-utils/compiled/esbuild"));
+var import_utils = require("@umijs/utils");
+var import_fs = __toESM(require("fs"));
+var import_path = __toESM(require("path"));
+var import_postcssProcess = require("../utils/postcssProcess");
+function style({
+  minify = true,
+  charset = "utf8",
+  inlineStyle,
+  config
+} = {}) {
+  return {
+    name: "style",
+    setup({ onResolve, onLoad }) {
+      const cwd = process.cwd();
+      const opt = {
+        logLevel: "silent",
+        bundle: true,
+        write: false,
+        charset,
+        minify,
+        loader: {
+          // images
+          ".svg": "dataurl",
+          ".png": "dataurl",
+          ".jpg": "dataurl",
+          ".jpeg": "dataurl",
+          ".gif": "dataurl",
+          ".ico": "dataurl",
+          ".webp": "dataurl",
+          // font
+          ".ttf": "dataurl",
+          ".otf": "dataurl",
+          ".woff": "dataurl",
+          ".woff2": "dataurl",
+          ".eot": "dataurl"
+        }
+      };
+      onResolve({ filter: /\.css$/, namespace: "file" }, (args) => {
+        const absPath = import_path.default.resolve(
+          cwd,
+          import_path.default.relative(cwd, args.resolveDir),
+          args.path
+        );
+        const resolved = import_fs.default.existsSync(absPath) ? absPath : import_utils.resolve.sync(`${args.path}`, {
+          basedir: args.resolveDir
+        });
+        return { path: resolved, namespace: inlineStyle ? "style-stub" : "" };
+      });
+      if (inlineStyle) {
+        onResolve({ filter: /\.css$/, namespace: "style-stub" }, (args) => {
+          return { path: args.path, namespace: "style-content" };
+        });
+        onResolve(
+          { filter: /^__style_helper__$/, namespace: "style-stub" },
+          (args) => ({
+            path: args.path,
+            namespace: "style-helper",
+            sideEffects: false
+          })
+        );
+        onLoad({ filter: /.*/, namespace: "style-helper" }, async () => ({
+          contents: `
+            export function injectStyle(text) {
+              if (typeof document !== 'undefined') {
+                var style = document.createElement('style')
+                var node = document.createTextNode(text)
+                style.appendChild(node)
+                document.head.appendChild(style)
+              }
             }
-          }
-        `,
-                });
-            }));
-            onLoad({ filter: /.*/, namespace: 'style-stub' }, (args) => __awaiter(this, void 0, void 0, function* () {
-                return ({
-                    contents: `
-          import { injectStyle } from "__style_helper__"
-          import css from ${JSON.stringify(args.path)}
-          injectStyle(css)
-        `,
-                });
-            }));
-            onLoad({ filter: /.*/, namespace: 'style-content' }, (args) => __awaiter(this, void 0, void 0, function* () {
-                const options = Object.assign({ entryPoints: [args.path] }, opt);
-                const { errors, warnings, outputFiles } = yield esbuild_1.default.build(options);
-                return {
-                    errors,
-                    warnings,
-                    contents: outputFiles[0].text,
-                    loader: 'text',
-                };
-            }));
+          `
+        }));
+        onLoad({ filter: /.*/, namespace: "style-stub" }, async (args) => ({
+          contents: `
+            import { injectStyle } from "__style_helper__"
+            import css from ${JSON.stringify(args.path)}
+            injectStyle(css)
+          `
+        }));
+      }
+      onLoad(
+        {
+          filter: inlineStyle ? /.*/ : /\.css$/,
+          namespace: inlineStyle ? "style-content" : "file"
         },
-    };
+        async (args) => {
+          const options = { entryPoints: [args.path], ...opt };
+          const { errors, warnings, outputFiles } = await import_esbuild.default.build(
+            options
+          );
+          if (errors.length > 0) {
+            return {
+              errors,
+              warnings,
+              contents: outputFiles[0].text,
+              loader: "text"
+            };
+          }
+          const dir = import_path.default.dirname(args.path);
+          try {
+            const result = await (0, import_postcssProcess.postcssProcess)(
+              config,
+              outputFiles[0].text,
+              args.path
+            );
+            return {
+              errors,
+              warnings,
+              contents: result.css,
+              loader: inlineStyle ? "text" : "css"
+            };
+          } catch (error) {
+            return {
+              errors: [
+                {
+                  text: error.message,
+                  location: {
+                    namespace: "file",
+                    file: error.filename,
+                    line: error.line,
+                    column: error.column
+                  }
+                }
+              ],
+              resolveDir: dir
+            };
+          }
+        }
+      );
+    }
+  };
 }
-exports.inlineStyle = inlineStyle;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  style
+});

package/dist/plugins/watchRebuild.d.ts

@@ -0,0 +1,4 @@
+import type { BuildFailure, BuildResult, Plugin } from '@umijs/bundler-utils/compiled/esbuild';
+export declare function esbuildWatchRebuildPlugin(options: {
+    onRebuild: (error: BuildFailure | null, result: BuildResult | null) => void;
+}): Plugin;

package/dist/plugins/watchRebuild.js

@@ -0,0 +1,67 @@
+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/watchRebuild.ts
+var watchRebuild_exports = {};
+__export(watchRebuild_exports, {
+  esbuildWatchRebuildPlugin: () => esbuildWatchRebuildPlugin
+});
+module.exports = __toCommonJS(watchRebuild_exports);
+function failureErrorWithLog(text, errors, warnings) {
+  let limit = 5;
+  let summary = errors.length < 1 ? "" : ` with ${errors.length} error${errors.length < 2 ? "" : "s"}:` + errors.slice(0, limit + 1).map((e, i) => {
+    if (i === limit)
+      return "\n...";
+    if (!e.location)
+      return `
+error: ${e.text}`;
+    let { file, line, column } = e.location;
+    let pluginText = e.pluginName ? `[plugin: ${e.pluginName}] ` : "";
+    return `
+${file}:${line}:${column}: ERROR: ${pluginText}${e.text}`;
+  }).join("");
+  let error = new Error(`${text}${summary}`);
+  error.errors = errors;
+  error.warnings = warnings;
+  return error;
+}
+function esbuildWatchRebuildPlugin(options) {
+  return {
+    name: "watch-rebuild-plugin",
+    setup(build) {
+      let count = 0;
+      build.onEnd((result) => {
+        if (count++ === 0) {
+          return;
+        }
+        if (result.errors.length > 0) {
+          options.onRebuild(
+            failureErrorWithLog("Build failed", result.errors, result.warnings),
+            null
+          );
+          return;
+        }
+        options.onRebuild(null, result);
+      });
+    }
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  esbuildWatchRebuildPlugin
+});

package/dist/types.d.ts

@@ -1,4 +1,5 @@
-import { TransformOptions } from '@umijs/bundler-utils/compiled/esbuild';
+import { BuildOptions, TransformOptions } from '@umijs/bundler-utils/compiled/esbuild';
+import type { Plugin } from '@umijs/bundler-vite/compiled/vite';
 export declare enum Env {
     development = "development",
     production = "production"
@@ -11,9 +12,11 @@ export interface ICopy {
     from: string;
     to: string;
 }
-export declare type IBabelPlugin = string | [string, {
+export declare type IBabelPlugin = Function | string | [string, {
     [key: string]: any;
-}];
+}] | [string, {
+    [key: string]: any;
+}, string];
 export interface IConfig {
     alias?: Record<string, string>;
     autoCSSModules?: boolean;
@@ -29,6 +32,9 @@ export interface IConfig {
     hash?: boolean;
     inlineLimit?: number;
     manifest?: boolean;
+    normalCSSLoaderModules?: {
+        [key: string]: any;
+    };
     jsMinifier?: JSMinifier | boolean;
     jsMinifierOptions?: {
         [key: string]: any;
@@ -48,5 +54,7 @@ export interface IConfig {
     targets?: {
         [key: string]: any;
     };
+    loader?: BuildOptions['loader'];
+    modifyConfig?: (config: BuildOptions) => void | Promise<void>;
     [key: string]: any;
 }

package/dist/types.js

@@ -1,13 +1,40 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.JSMinifier = exports.Env = void 0;
-var Env;
-(function (Env) {
-    Env["development"] = "development";
-    Env["production"] = "production";
-})(Env = exports.Env || (exports.Env = {}));
-var JSMinifier;
-(function (JSMinifier) {
-    JSMinifier["terser"] = "terser";
-    JSMinifier["esbuild"] = "esbuild";
-})(JSMinifier = exports.JSMinifier || (exports.JSMinifier = {}));
+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/types.ts
+var types_exports = {};
+__export(types_exports, {
+  Env: () => Env,
+  JSMinifier: () => JSMinifier
+});
+module.exports = __toCommonJS(types_exports);
+var Env = /* @__PURE__ */ ((Env2) => {
+  Env2["development"] = "development";
+  Env2["production"] = "production";
+  return Env2;
+})(Env || {});
+var JSMinifier = /* @__PURE__ */ ((JSMinifier2) => {
+  JSMinifier2["terser"] = "terser";
+  JSMinifier2["esbuild"] = "esbuild";
+  return JSMinifier2;
+})(JSMinifier || {});
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  Env,
+  JSMinifier
+});

package/dist/utils/getBrowserlist.d.ts

@@ -0,0 +1 @@
+export declare function getBrowserlist(targets: Record<string, string | boolean>): string | true | string[];

package/dist/utils/getBrowserlist.js

@@ -0,0 +1,33 @@
+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/utils/getBrowserlist.ts
+var getBrowserlist_exports = {};
+__export(getBrowserlist_exports, {
+  getBrowserlist: () => getBrowserlist
+});
+module.exports = __toCommonJS(getBrowserlist_exports);
+function getBrowserlist(targets) {
+  return targets.browsers || Object.keys(targets).map((key) => {
+    return `${key} >= ${targets[key] === true ? "0" : targets[key]}`;
+  });
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getBrowserlist
+});

package/dist/utils/postcssProcess.d.ts

@@ -0,0 +1,2 @@
+import { IConfig } from '../types';
+export declare function postcssProcess(config: IConfig, css: string, path: string): Promise<import("postcss").Result>;

package/dist/utils/postcssProcess.js

@@ -0,0 +1,58 @@
+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 });
+};
+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(
+  // 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 || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/utils/postcssProcess.ts
+var postcssProcess_exports = {};
+__export(postcssProcess_exports, {
+  postcssProcess: () => postcssProcess
+});
+module.exports = __toCommonJS(postcssProcess_exports);
+var import_postcss = __toESM(require("postcss"));
+var import_getBrowserlist = require("./getBrowserlist");
+async function postcssProcess(config, css, path) {
+  return await (0, import_postcss.default)(
+    [
+      require("postcss-flexbugs-fixes"),
+      require("postcss-preset-env")({
+        browsers: (0, import_getBrowserlist.getBrowserlist)((config == null ? void 0 : config.targets) || {}),
+        autoprefixer: {
+          flexbox: "no-2009",
+          ...config == null ? void 0 : config.autoprefixer
+        },
+        stage: 3
+      })
+    ].concat((config == null ? void 0 : config.extraPostCSSPlugins) || [])
+  ).process(css, {
+    from: path,
+    to: path
+  });
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  postcssProcess
+});

package/dist/utils/sortByAffix.js

@@ -1,16 +1,40 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.sortByAffix = void 0;
+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/utils/sortByAffix.ts
+var sortByAffix_exports = {};
+__export(sortByAffix_exports, {
+  sortByAffix: () => sortByAffix
+});
+module.exports = __toCommonJS(sortByAffix_exports);
 function sortByAffix(opts) {
-    return opts.arr.sort((a, b) => {
-        if (a.endsWith(opts.affix) && b.endsWith(opts.affix))
-            return 0;
-        if (a.endsWith(opts.affix))
-            return -1;
-        if (b.endsWith(opts.affix))
-            return 1;
-        else
-            return 0;
-    });
+  return opts.arr.sort((a, b) => {
+    if (a.endsWith(opts.affix) && b.endsWith(opts.affix))
+      return 0;
+    if (a.endsWith(opts.affix))
+      return -1;
+    if (b.endsWith(opts.affix))
+      return 1;
+    else
+      return 0;
+  });
 }
-exports.sortByAffix = sortByAffix;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  sortByAffix
+});

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@umijs/bundler-esbuild",
-  "version": "4.0.0-beta.9",
+  "version": "4.0.0-canary-20240513.3",
   "description": "@umijs/bundler-esbuild",
-  "homepage": "https://github.com/umijs/umi-next/tree/master/packages/bundler-esbuild#readme",
-  "bugs": "https://github.com/umijs/umi-next/issues",
+  "homepage": "https://github.com/umijs/umi/tree/master/packages/bundler-esbuild#readme",
+  "bugs": "https://github.com/umijs/umi/issues",
   "repository": {
     "type": "git",
-    "url": "https://github.com/umijs/umi-next"
+    "url": "https://github.com/umijs/umi"
   },
   "license": "MIT",
   "main": "dist/index.js",
@@ -17,24 +17,27 @@
   "files": [
     "dist"
   ],
-  "scripts": {
-    "build": "pnpm tsc",
-    "build:deps": "pnpm esno ../../scripts/bundleDeps.ts",
-    "dev": "pnpm build -- --watch"
-  },
   "dependencies": {
-    "@umijs/bundler-utils": "4.0.0-beta.9",
-    "@umijs/utils": "4.0.0-beta.9",
-    "enhanced-resolve": "5.8.3",
-    "less": "4.1.2"
+    "enhanced-resolve": "5.9.3",
+    "postcss": "^8.4.21",
+    "postcss-flexbugs-fixes": "5.0.2",
+    "postcss-preset-env": "7.5.0",
+    "@umijs/bundler-utils": "4.0.0-canary-20240513.3",
+    "@umijs/utils": "4.0.0-canary-20240513.3"
   },
   "devDependencies": {
-    "@types/less": "^3.0.3"
+    "@alitajs/postcss-plugin-px2rem": "^0.0.1"
   },
   "publishConfig": {
     "access": "public"
   },
   "authors": [
     "chencheng <sorrycc@gmail.com> (https://github.com/sorrycc)"
-  ]
-}
+  ],
+  "scripts": {
+    "build": "umi-scripts father build",
+    "build:deps": "umi-scripts bundleDeps",
+    "dev": "umi-scripts father dev",
+    "test": "umi-scripts jest-turbo"
+  }
+}