@umijs/bundler-esbuild 4.0.42 → 4.0.43

package/dist/build.js

@@ -16,7 +16,10 @@ var __copyProps = (to, from, except, desc) => {
   }
   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 __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);
 
 // src/build.ts

package/dist/cli.js

@@ -12,7 +12,10 @@ var __copyProps = (to, from, except, desc) => {
   }
   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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 
 // src/cli.ts
 var import_esbuild = __toESM(require("@umijs/bundler-utils/compiled/esbuild"));

package/dist/plugins/alias.js

@@ -16,7 +16,10 @@ var __copyProps = (to, from, except, desc) => {
   }
   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 __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);
 
 // src/plugins/alias.ts
@@ -35,7 +38,11 @@ var resolver = import_enhanced_resolve.default.create({
 });
 async function resolve(context, path) {
   return new Promise((resolve2, reject) => {
-    resolver(context, path, (err, result) => err ? reject(err) : resolve2(result));
+    resolver(
+      context,
+      path,
+      (err, result) => err ? reject(err) : resolve2(result)
+    );
   });
 }
 var alias_default = (options = {}) => {
@@ -52,7 +59,10 @@ var alias_default = (options = {}) => {
           filter = new RegExp(`^${key}$`);
         }
         onResolve({ filter }, async (args) => {
-          const path = await resolve(args.importer, args.path.replace(filter, value));
+          const path = await resolve(
+            args.importer,
+            args.path.replace(filter, value)
+          );
           return {
             path
           };
@@ -60,7 +70,10 @@ var alias_default = (options = {}) => {
         if (!key.endsWith("/") && (0, import_fs.existsSync)(value) && (0, import_fs.statSync)(value).isDirectory()) {
           const filter2 = new RegExp(`^${addSlashAffix(key)}`);
           onResolve({ filter: filter2 }, async (args) => {
-            const path = await resolve(args.importer, args.path.replace(filter2, addSlashAffix(value)));
+            const path = await resolve(
+              args.importer,
+              args.path.replace(filter2, addSlashAffix(value))
+            );
             return {
               path
             };

package/dist/plugins/less-plugin-alias/index.js

@@ -50,7 +50,10 @@ var LessAliasPlugin = class {
       if (!matchedEntry) {
         return filename;
       }
-      const resolvedPath = filename.replace(matchedEntry.find, matchedEntry.replacement);
+      const resolvedPath = filename.replace(
+        matchedEntry.find,
+        matchedEntry.replacement
+      );
       return resolvedPath;
     }
     class AliasePlugin extends less.FileManager {
@@ -62,7 +65,9 @@ var LessAliasPlugin = class {
           import_utils.logger.error(error);
         }
         if (!resolved) {
-          const error = new Error(`[less-plugin-alias]: '${filename}' not found.`);
+          const error = new Error(
+            `[less-plugin-alias]: '${filename}' not found.`
+          );
           import_utils.logger.error(error);
           throw error;
         }
@@ -76,11 +81,18 @@ var LessAliasPlugin = class {
           import_utils.logger.error(error);
         }
         if (!resolved) {
-          const error = new Error(`[less-plugin-alias]: '${filename}' not found.`);
+          const error = new Error(
+            `[less-plugin-alias]: '${filename}' not found.`
+          );
           import_utils.logger.error(error);
           throw error;
         }
-        return super.loadFileSync(resolved, currentDirectory, options, enviroment);
+        return super.loadFileSync(
+          resolved,
+          currentDirectory,
+          options,
+          enviroment
+        );
       }
     }
     pluginManager.addFileManager(new AliasePlugin());

package/dist/plugins/less-plugin-alias/utils.js

@@ -28,7 +28,10 @@ function hoistAlias(alias) {
     newAlias.splice(index, 1);
     for (let i = 0; i < newAlias.length; i++) {
       if (newAlias[i].find.test(replacement)) {
-        replacement = replacement.replace(newAlias[i].find, newAlias[i].replacement);
+        replacement = replacement.replace(
+          newAlias[i].find,
+          newAlias[i].replacement
+        );
         return getFinalReplacement(newAlias, replacement, i);
       }
     }

package/dist/plugins/less.js

@@ -16,7 +16,10 @@ var __copyProps = (to, from, except, desc) => {
   }
   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 __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);
 
 // src/plugins/less.ts
@@ -50,7 +53,11 @@ var resolver = import_enhanced_resolve.default.create({
 });
 async function resolve(context, path2) {
   return new Promise((resolve2, reject) => {
-    resolver(context, path2, (err, result) => err ? reject(err) : resolve2(result));
+    resolver(
+      context,
+      path2,
+      (err, result) => err ? reject(err) : resolve2(result)
+    );
   });
 }
 var aliasLessImports = async (ctx, alias, importer) => {
@@ -89,7 +96,11 @@ var less_default = (options = {}) => {
         let filePath = args.path;
         let isMatchedAlias = false;
         if (!!alias) {
-          const aliasMatchPath = await aliasLessImportPath(filePath, alias, args.path);
+          const aliasMatchPath = await aliasLessImportPath(
+            filePath,
+            alias,
+            args.path
+          );
           if (aliasMatchPath) {
             isMatchedAlias = true;
             filePath = aliasMatchPath;
@@ -100,7 +111,11 @@ var less_default = (options = {}) => {
           if (isImportFromDeps) {
             filePath = await resolve(process.cwd(), filePath);
           } else {
-            filePath = import_path.default.resolve(process.cwd(), import_path.default.relative(process.cwd(), args.resolveDir), args.path);
+            filePath = import_path.default.resolve(
+              process.cwd(),
+              import_path.default.relative(process.cwd(), args.resolveDir),
+              args.path
+            );
           }
         }
         return {
@@ -112,11 +127,14 @@ var less_default = (options = {}) => {
         onResolve({ filter: /\.less$/, namespace: "less-file" }, (args) => {
           return { path: args.path, namespace: "less-content" };
         });
-        onResolve({ filter: /^__style_helper__$/, namespace: "less-file" }, (args) => ({
-          path: args.path,
-          namespace: "style-helper",
-          sideEffects: false
-        }));
+        onResolve(
+          { filter: /^__style_helper__$/, namespace: "less-file" },
+          (args) => ({
+            path: args.path,
+            namespace: "style-helper",
+            sideEffects: false
+          })
+        );
         onLoad({ filter: /.*/, namespace: "less-file" }, async (args) => ({
           contents: `
             import { injectStyle } from "__style_helper__"
@@ -126,48 +144,55 @@ var less_default = (options = {}) => {
           `
         }));
       }
-      onLoad({ filter: /\.less$/, namespace: inlineStyle ? "less-content" : "file" }, async (args) => {
-        let content = await import_fs.promises.readFile(args.path, "utf-8");
-        if (!!alias) {
-          content = await aliasLessImports(content, alias, args.path);
-        }
-        const dir = import_path.default.dirname(args.path);
-        const filename = import_path.default.basename(args.path);
-        try {
-          const result = await import_less.default.render(content, {
-            plugins: [
-              new import_less_plugin_alias.default({
-                alias: alias || {}
-              })
-            ],
-            filename,
-            rootpath: dir,
-            ...lessOptions,
-            paths: [...lessOptions.paths || [], dir]
-          });
-          const postcssrResult = await (0, import_postcssProcess.postcssProcess)(config, result.css, args.path);
-          return {
-            contents: postcssrResult.css,
-            loader: inlineStyle ? "text" : "css",
-            resolveDir: dir
-          };
-        } catch (error) {
-          return {
-            errors: [
-              {
-                text: error.message,
-                location: {
-                  namespace: "file",
-                  file: error.filename,
-                  line: error.line,
-                  column: error.column
+      onLoad(
+        { filter: /\.less$/, namespace: inlineStyle ? "less-content" : "file" },
+        async (args) => {
+          let content = await import_fs.promises.readFile(args.path, "utf-8");
+          if (!!alias) {
+            content = await aliasLessImports(content, alias, args.path);
+          }
+          const dir = import_path.default.dirname(args.path);
+          const filename = import_path.default.basename(args.path);
+          try {
+            const result = await import_less.default.render(content, {
+              plugins: [
+                new import_less_plugin_alias.default({
+                  alias: alias || {}
+                })
+              ],
+              filename,
+              rootpath: dir,
+              ...lessOptions,
+              paths: [...lessOptions.paths || [], dir]
+            });
+            const postcssrResult = await (0, import_postcssProcess.postcssProcess)(
+              config,
+              result.css,
+              args.path
+            );
+            return {
+              contents: postcssrResult.css,
+              loader: inlineStyle ? "text" : "css",
+              resolveDir: dir
+            };
+          } catch (error) {
+            return {
+              errors: [
+                {
+                  text: error.message,
+                  location: {
+                    namespace: "file",
+                    file: error.filename,
+                    line: error.line,
+                    column: error.column
+                  }
                 }
-              }
-            ],
-            resolveDir: dir
-          };
+              ],
+              resolveDir: dir
+            };
+          }
         }
-      });
+      );
     }
   };
 };

package/dist/plugins/style.js

@@ -16,7 +16,10 @@ var __copyProps = (to, from, except, desc) => {
   }
   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 __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);
 
 // src/plugins/style.ts
@@ -62,7 +65,11 @@ function style({
         }
       };
       onResolve({ filter: /\.css$/, namespace: "file" }, (args) => {
-        const absPath = import_path.default.resolve(cwd, import_path.default.relative(cwd, args.resolveDir), args.path);
+        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
         });
@@ -72,11 +79,14 @@ function style({
         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
-        }));
+        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) {
@@ -97,46 +107,55 @@ function style({
           `
         }));
       }
-      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
+      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
-          };
+              ],
+              resolveDir: dir
+            };
+          }
         }
-      });
+      );
     }
   };
 }

package/dist/utils/postcssProcess.js

@@ -16,7 +16,10 @@ var __copyProps = (to, from, except, desc) => {
   }
   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 __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);
 
 // src/utils/postcssProcess.ts
@@ -28,17 +31,19 @@ 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, {
+  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
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-esbuild",
-  "version": "4.0.42",
+  "version": "4.0.43",
   "description": "@umijs/bundler-esbuild",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/bundler-esbuild#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -24,10 +24,10 @@
     "test": "umi-scripts jest-turbo"
   },
   "dependencies": {
-    "@umijs/bundler-utils": "4.0.42",
-    "@umijs/utils": "4.0.42",
+    "@umijs/bundler-utils": "4.0.43",
+    "@umijs/utils": "4.0.43",
     "enhanced-resolve": "5.9.3",
-    "postcss": "^8.4.13",
+    "postcss": "^8.4.21",
     "postcss-flexbugs-fixes": "5.0.2",
     "postcss-preset-env": "7.5.0"
   },