@umijs/bundler-esbuild 4.0.5 → 4.0.8

package/dist/plugins/nodeGlobalsPolyfill.js

@@ -1,14 +1,38 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.nodeGlobalsPolyfill = 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);
+
+// nodeGlobalsPolyfill.ts
+var nodeGlobalsPolyfill_exports = {};
+__export(nodeGlobalsPolyfill_exports, {
+  nodeGlobalsPolyfill: () => nodeGlobalsPolyfill
+});
+module.exports = __toCommonJS(nodeGlobalsPolyfill_exports);
 function nodeGlobalsPolyfill() {
-    return {
-        name: 'node-globals-polyfill',
-        setup({ initialOptions, onResolve, onLoad }) {
-            onResolve;
-            onLoad;
-            initialOptions.inject || (initialOptions.inject = []);
-        },
-    };
+  return {
+    name: "node-globals-polyfill",
+    setup({ initialOptions, onResolve, onLoad }) {
+      onResolve;
+      onLoad;
+      initialOptions.inject || (initialOptions.inject = []);
+    }
+  };
 }
-exports.nodeGlobalsPolyfill = nodeGlobalsPolyfill;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  nodeGlobalsPolyfill
+});

package/dist/plugins/style.js

@@ -1,54 +1,88 @@
-"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 __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;
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.style = 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 utils_1 = require("@umijs/utils");
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const postcssProcess_1 = require("../utils/postcssProcess");
-// https://github.com/evanw/esbuild/issues/20#issuecomment-802269745
-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: {
-                    '.svg': 'dataurl',
-                    // file ?
-                    '.ttf': 'dataurl',
-                },
-            };
-            onResolve({ filter: /\.css$/, namespace: 'file' }, (args) => {
-                const absPath = path_1.default.resolve(cwd, path_1.default.relative(cwd, args.resolveDir), args.path);
-                // 通过 resolve 往上找，依赖不一定在 node_modules，可能被提到根目录，并且没有 link
-                const resolved = fs_1.default.existsSync(absPath)
-                    ? absPath
-                    : utils_1.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: `
+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(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// 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: {
+          ".svg": "dataurl",
+          ".ttf": "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')
@@ -57,58 +91,60 @@ function style({ minify = true, charset = 'utf8', inlineStyle, config, } = {}) {
                 document.head.appendChild(style)
               }
             }
-          `,
-                }));
-                onLoad({ filter: /.*/, namespace: 'style-stub' }, async (args) => ({
-                    contents: `
+          `
+        }));
+        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 esbuild_1.default.build(options);
-                if (errors.length > 0) {
-                    return {
-                        errors,
-                        warnings,
-                        contents: outputFiles[0].text,
-                        loader: 'text',
-                    };
+          `
+        }));
+      }
+      onLoad({
+        filter: inlineStyle ? /.*/ : /\.css$/,
+        namespace: inlineStyle ? "style-content" : "file"
+      }, async (args) => {
+        const options = __spreadValues({ 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
                 }
-                const dir = path_1.default.dirname(args.path);
-                try {
-                    const result = await (0, postcssProcess_1.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,
-                    };
-                }
-            });
-        },
-    };
+              }
+            ],
+            resolveDir: dir
+          };
+        }
+      });
+    }
+  };
 }
-exports.style = style;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  style
+});

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);
+
+// 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.js

@@ -1,11 +1,33 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBrowserlist = void 0;
-// refer: https://github.com/umijs/umi/blob/867e0c196296efbbdb95203cca35db2fa639808b/packages/bundler-webpack/src/utils/browsersList.ts#L5
+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);
+
+// 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]}`;
-        }));
+  return targets.browsers || Object.keys(targets).map((key) => {
+    return `${key} >= ${targets[key] === true ? "0" : targets[key]}`;
+  });
 }
-exports.getBrowserlist = getBrowserlist;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getBrowserlist
+});

package/dist/utils/postcssProcess.js

@@ -1,25 +1,62 @@
-"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 __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;
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.postcssProcess = void 0;
-const postcss_1 = __importDefault(require("postcss"));
-const getBrowserlist_1 = require("./getBrowserlist");
+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(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// 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, postcss_1.default)([
-        require('postcss-flexbugs-fixes'),
-        require('postcss-preset-env')({
-            browsers: (0, getBrowserlist_1.getBrowserlist)((config === null || config === void 0 ? void 0 : config.targets) || {}),
-            autoprefixer: {
-                flexbox: 'no-2009',
-                ...config === null || config === void 0 ? void 0 : config.autoprefixer,
-            },
-            stage: 3,
-        }),
-    ].concat((config === null || config === void 0 ? void 0 : config.extraPostCSSPlugins) || [])).process(css, {
-        from: path,
-        to: 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: __spreadValues({
+        flexbox: "no-2009"
+      }, config == null ? void 0 : config.autoprefixer),
+      stage: 3
+    })
+  ].concat((config == null ? void 0 : config.extraPostCSSPlugins) || [])).process(css, {
+    from: path,
+    to: path
+  });
 }
-exports.postcssProcess = postcssProcess;
+// 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);
+
+// 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,6 +1,6 @@
 {
   "name": "@umijs/bundler-esbuild",
-  "version": "4.0.5",
+  "version": "4.0.8",
   "description": "@umijs/bundler-esbuild",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/bundler-esbuild#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -18,14 +18,14 @@
     "dist"
   ],
   "scripts": {
-    "build": "pnpm tsc",
+    "build": "pnpm father build",
     "build:deps": "umi-scripts bundleDeps",
-    "dev": "pnpm build --watch",
+    "dev": "pnpm father dev",
     "test": "umi-scripts jest-turbo"
   },
   "dependencies": {
-    "@umijs/bundler-utils": "4.0.5",
-    "@umijs/utils": "4.0.5",
+    "@umijs/bundler-utils": "4.0.8",
+    "@umijs/utils": "4.0.8",
     "enhanced-resolve": "5.9.3",
     "postcss": "^8.4.13",
     "postcss-flexbugs-fixes": "5.0.2",