@umijs/bundler-utils 4.0.8 → 4.0.11

package/dist/https.js

@@ -19,7 +19,7 @@ var __copyProps = (to, from, except, desc) => {
 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);
 
-// https.ts
+// src/https.ts
 var https_exports = {};
 __export(https_exports, {
   createHttpsServer: () => createHttpsServer,
@@ -35,8 +35,15 @@ var defaultHttpsHosts = [
   "127.0.0.1"
 ];
 async function resolveHttpsConfig(httpsConfig) {
+  let { key, cert, hosts } = httpsConfig;
+  if (key && cert) {
+    return {
+      key,
+      cert
+    };
+  }
   try {
-    await import_utils.execa.execa("mkcert", ["--version"]);
+    await import_utils.execa.execa("mkcert", ["-help"]);
   } catch (e) {
     import_utils.logger.error("[HTTPS] The mkcert has not been installed.");
     import_utils.logger.info("[HTTPS] Please follow the guide to install manually.");
@@ -58,12 +65,9 @@ async function resolveHttpsConfig(httpsConfig) {
     }
     throw new Error(`[HTTPS] mkcert not found.`);
   }
-  let { key, cert, hosts } = httpsConfig;
   hosts = hosts || defaultHttpsHosts;
-  if (!key || !cert) {
-    key = (0, import_path.join)(__dirname, "umi.key.pem");
-    cert = (0, import_path.join)(__dirname, "umi.pem");
-  }
+  key = (0, import_path.join)(__dirname, "umi.key.pem");
+  cert = (0, import_path.join)(__dirname, "umi.pem");
   if (!(0, import_fs.existsSync)(key) || !(0, import_fs.existsSync)(cert)) {
     import_utils.logger.wait("[HTTPS] Generating cert and key files...");
     await import_utils.execa.execa("mkcert", [

package/dist/index.js

@@ -17,7 +17,7 @@ var __copyProps = (to, from, except, desc) => {
 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
+// src/index.ts
 var src_exports = {};
 __export(src_exports, {
   isDepPath: () => isDepPath,
@@ -25,6 +25,7 @@ __export(src_exports, {
   parseModuleSync: () => parseModuleSync
 });
 module.exports = __toCommonJS(src_exports);
+var import_code_frame = require("@umijs/bundler-utils/compiled/babel/code-frame");
 var import_es_module_lexer = require("@umijs/bundler-utils/compiled/es-module-lexer");
 var import_esbuild = require("@umijs/bundler-utils/compiled/esbuild");
 var import_utils = require("@umijs/utils");
@@ -38,10 +39,15 @@ async function parseModule(opts) {
 function parseModuleSync(opts) {
   let content = opts.content;
   if (opts.path.endsWith(".tsx") || opts.path.endsWith(".jsx")) {
-    content = (0, import_esbuild.transformSync)(content, {
-      loader: (0, import_path.extname)(opts.path).slice(1),
-      format: "esm"
-    }).code;
+    try {
+      content = (0, import_esbuild.transformSync)(content, {
+        loader: (0, import_path.extname)(opts.path).slice(1),
+        format: "esm"
+      }).code;
+    } catch (e) {
+      prettyPrintEsBuildErrors(e.errors, opts);
+      throw Error(`transform ${opts.path} failed`);
+    }
   }
   return (0, import_es_module_lexer.parse)(content);
 }
@@ -49,6 +55,26 @@ function isDepPath(path) {
   const umiMonorepoPaths = ["umi/packages/", "umi-next/packages/"];
   return path.includes("node_modules") || umiMonorepoPaths.some((p) => (0, import_utils.winPath)(path).includes(p));
 }
+function prettyPrintEsBuildErrors(errors = [], opts) {
+  var _a, _b;
+  for (const error of errors) {
+    if (((_a = error.location) == null ? void 0 : _a.line) && ((_b = error.location) == null ? void 0 : _b.column)) {
+      const message = (0, import_code_frame.codeFrameColumns)(opts.content, {
+        start: {
+          line: error.location.line,
+          column: error.location.column
+        }
+      }, {
+        message: error.text,
+        highlightCode: true
+      });
+      console.log(`
+${opts.path}:
+${message}
+`);
+    }
+  }
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   isDepPath,

package/dist/types.js

@@ -12,6 +12,6 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// types.ts
+// src/types.ts
 var types_exports = {};
 module.exports = __toCommonJS(types_exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-utils",
-  "version": "4.0.8",
+  "version": "4.0.11",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/bundler-utils#readme",
   "bugs": "https://github.com/umijs/umi/issues",
   "repository": {
@@ -15,39 +15,40 @@
     "compiled"
   ],
   "scripts": {
-    "build": "pnpm father build",
+    "build": "umi-scripts father build",
     "build:deps": "umi-scripts bundleDeps",
-    "dev": "pnpm father dev"
+    "dev": "umi-scripts father dev"
   },
   "dependencies": {
-    "@umijs/utils": "4.0.8",
-    "esbuild": "0.14.36",
+    "@umijs/utils": "4.0.11",
+    "esbuild": "0.14.49",
     "regenerate-unicode-properties": "10.0.1",
     "spdy": "^4.0.2"
   },
   "devDependencies": {
-    "@babel/code-frame": "7.16.7",
-    "@babel/core": "7.17.9",
-    "@babel/generator": "7.17.9",
-    "@babel/helper-module-imports": "7.16.7",
-    "@babel/parser": "7.17.9",
-    "@babel/plugin-proposal-decorators": "7.17.9",
-    "@babel/plugin-proposal-do-expressions": "7.16.7",
-    "@babel/plugin-proposal-export-default-from": "7.16.7",
-    "@babel/plugin-proposal-export-namespace-from": "7.16.7",
-    "@babel/plugin-proposal-function-bind": "7.16.7",
-    "@babel/plugin-proposal-partial-application": "7.16.7",
-    "@babel/plugin-proposal-pipeline-operator": "7.17.6",
-    "@babel/plugin-proposal-record-and-tuple": "7.16.7",
-    "@babel/plugin-transform-runtime": "7.17.0",
-    "@babel/preset-env": "7.16.11",
-    "@babel/preset-react": "7.16.7",
-    "@babel/preset-typescript": "7.16.7",
-    "@babel/register": "7.17.7",
-    "@babel/template": "7.16.7",
-    "@babel/traverse": "7.17.9",
-    "@babel/types": "7.17.0",
+    "@babel/code-frame": "7.18.6",
+    "@babel/core": "7.18.9",
+    "@babel/generator": "7.18.9",
+    "@babel/helper-module-imports": "7.18.6",
+    "@babel/parser": "7.18.9",
+    "@babel/plugin-proposal-decorators": "7.18.9",
+    "@babel/plugin-proposal-do-expressions": "7.18.6",
+    "@babel/plugin-proposal-export-default-from": "7.18.9",
+    "@babel/plugin-proposal-export-namespace-from": "7.18.9",
+    "@babel/plugin-proposal-function-bind": "7.18.9",
+    "@babel/plugin-proposal-partial-application": "7.18.9",
+    "@babel/plugin-proposal-pipeline-operator": "7.18.9",
+    "@babel/plugin-proposal-record-and-tuple": "7.18.6",
+    "@babel/plugin-transform-runtime": "7.18.9",
+    "@babel/preset-env": "7.18.9",
+    "@babel/preset-react": "7.18.6",
+    "@babel/preset-typescript": "7.18.6",
+    "@babel/register": "7.18.9",
+    "@babel/template": "7.18.6",
+    "@babel/traverse": "7.18.9",
+    "@babel/types": "7.18.9",
     "@types/babel__code-frame": "7.0.3",
+    "@types/babel__core": "7.1.19",
     "@types/babel__generator": "7.6.4",
     "@types/babel__parser": "7.1.1",
     "@types/babel__template": "7.4.1",
@@ -83,7 +84,8 @@
       "es-module-lexer": "$$LOCAL",
       "express": "$$LOCAL",
       "less": "$$LOCAL",
-      "tapable": "$$LOCAL"
+      "tapable": "$$LOCAL",
+      "regenerate": "regenerate"
     },
     "noMinify": [
       "./bundles/babel/bundle"