@umijs/bundler-utils 4.0.7 → 4.0.10

package/dist/https.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import { RequestListener } from 'http';
 import { HttpsServerOptions } from './types';
 export type { Server as SpdyServer } from 'spdy';

package/dist/https.js

@@ -1,75 +1,99 @@
-"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 __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 });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createHttpsServer = exports.resolveHttpsConfig = void 0;
-const utils_1 = require("@umijs/utils");
-const fs_1 = require("fs");
-const path_1 = require("path");
-const spdy_1 = __importDefault(require("spdy"));
-const defaultHttpsHosts = [
-    'localhost',
-    '127.0.0.1',
+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);
+
+// src/https.ts
+var https_exports = {};
+__export(https_exports, {
+  createHttpsServer: () => createHttpsServer,
+  resolveHttpsConfig: () => resolveHttpsConfig
+});
+module.exports = __toCommonJS(https_exports);
+var import_utils = require("@umijs/utils");
+var import_fs = require("fs");
+var import_path = require("path");
+var import_spdy = __toESM(require("spdy"));
+var defaultHttpsHosts = [
+  "localhost",
+  "127.0.0.1"
 ];
-// vite mode requires a key cert
 async function resolveHttpsConfig(httpsConfig) {
-    // Check if mkcert is installed
-    try {
-        await utils_1.execa.execa('mkcert', ['--version']);
-    }
-    catch (e) {
-        utils_1.logger.error('[HTTPS] The mkcert has not been installed.');
-        utils_1.logger.info('[HTTPS] Please follow the guide to install manually.');
-        switch (process.platform) {
-            case 'darwin':
-                console.log(utils_1.chalk.green('$ brew install mkcert'));
-                console.log(utils_1.chalk.gray('# If you use firefox, please install nss.'));
-                console.log(utils_1.chalk.green('$ brew install nss'));
-                console.log(utils_1.chalk.green('$ mkcert -install'));
-                break;
-            case 'win32':
-                console.log(utils_1.chalk.green('Checkout https://github.com/FiloSottile/mkcert#windows'));
-                break;
-            case 'linux':
-                console.log(utils_1.chalk.green('Checkout https://github.com/FiloSottile/mkcert#linux'));
-                break;
-            default:
-                break;
-        }
-        throw new Error(`[HTTPS] mkcert not found.`);
-    }
-    let { key, cert, hosts } = httpsConfig;
-    hosts = hosts || defaultHttpsHosts;
-    if (!key || !cert) {
-        key = (0, path_1.join)(__dirname, 'umi.key.pem');
-        cert = (0, path_1.join)(__dirname, 'umi.pem');
-    }
-    // Generate cert and key files if they are not exist.
-    if (!(0, fs_1.existsSync)(key) || !(0, fs_1.existsSync)(cert)) {
-        utils_1.logger.wait('[HTTPS] Generating cert and key files...');
-        await utils_1.execa.execa('mkcert', [
-            '-cert-file',
-            cert,
-            '-key-file',
-            key,
-            ...hosts,
-        ]);
-    }
+  let { key, cert, hosts } = httpsConfig;
+  if (key && cert) {
     return {
-        key,
-        cert,
+      key,
+      cert
     };
+  }
+  try {
+    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.");
+    switch (process.platform) {
+      case "darwin":
+        console.log(import_utils.chalk.green("$ brew install mkcert"));
+        console.log(import_utils.chalk.gray("# If you use firefox, please install nss."));
+        console.log(import_utils.chalk.green("$ brew install nss"));
+        console.log(import_utils.chalk.green("$ mkcert -install"));
+        break;
+      case "win32":
+        console.log(import_utils.chalk.green("Checkout https://github.com/FiloSottile/mkcert#windows"));
+        break;
+      case "linux":
+        console.log(import_utils.chalk.green("Checkout https://github.com/FiloSottile/mkcert#linux"));
+        break;
+      default:
+        break;
+    }
+    throw new Error(`[HTTPS] mkcert not found.`);
+  }
+  hosts = hosts || defaultHttpsHosts;
+  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", [
+      "-cert-file",
+      cert,
+      "-key-file",
+      key,
+      ...hosts
+    ]);
+  }
+  return {
+    key,
+    cert
+  };
 }
-exports.resolveHttpsConfig = resolveHttpsConfig;
 async function createHttpsServer(app, httpsConfig) {
-    utils_1.logger.wait('[HTTPS] Starting service in https mode...');
-    const { key, cert } = await resolveHttpsConfig(httpsConfig);
-    // Create server
-    const http2Service = spdy_1.default.createServer({
-        key: (0, fs_1.readFileSync)(key, 'utf-8'),
-        cert: (0, fs_1.readFileSync)(cert, 'utf-8'),
-    }, app);
-    return http2Service;
+  import_utils.logger.wait("[HTTPS] Starting service in https mode...");
+  const { key, cert } = await resolveHttpsConfig(httpsConfig);
+  const http2Service = import_spdy.default.createServer({
+    key: (0, import_fs.readFileSync)(key, "utf-8"),
+    cert: (0, import_fs.readFileSync)(cert, "utf-8")
+  }, app);
+  return http2Service;
 }
-exports.createHttpsServer = createHttpsServer;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createHttpsServer,
+  resolveHttpsConfig
+});

package/dist/index.js

@@ -1,45 +1,83 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+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;
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isDepPath = exports.parseModuleSync = exports.parseModule = void 0;
-const es_module_lexer_1 = require("@umijs/bundler-utils/compiled/es-module-lexer");
-const esbuild_1 = require("@umijs/bundler-utils/compiled/esbuild");
-const utils_1 = require("@umijs/utils");
-const path_1 = require("path");
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/index.ts
+var src_exports = {};
+__export(src_exports, {
+  isDepPath: () => isDepPath,
+  parseModule: () => parseModule,
+  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");
+var import_path = require("path");
+__reExport(src_exports, require("./https"), module.exports);
+__reExport(src_exports, require("./types"), module.exports);
 async function parseModule(opts) {
-    await es_module_lexer_1.init;
-    return parseModuleSync(opts);
+  await import_es_module_lexer.init;
+  return parseModuleSync(opts);
 }
-exports.parseModule = parseModule;
 function parseModuleSync(opts) {
-    let content = opts.content;
-    if (opts.path.endsWith('.tsx') || opts.path.endsWith('.jsx')) {
-        content = (0, esbuild_1.transformSync)(content, {
-            loader: (0, path_1.extname)(opts.path).slice(1),
-            format: 'esm',
-        }).code;
+  let content = opts.content;
+  if (opts.path.endsWith(".tsx") || opts.path.endsWith(".jsx")) {
+    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, es_module_lexer_1.parse)(content);
+  }
+  return (0, import_es_module_lexer.parse)(content);
 }
-exports.parseModuleSync = parseModuleSync;
 function isDepPath(path) {
-    const umiMonorepoPaths = ['umi/packages/', 'umi-next/packages/'];
-    return (path.includes('node_modules') ||
-        umiMonorepoPaths.some((p) => (0, utils_1.winPath)(path).includes(p)));
+  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}
+`);
+    }
+  }
 }
-exports.isDepPath = isDepPath;
-__exportStar(require("./https"), exports);
-__exportStar(require("./types"), exports);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  isDepPath,
+  parseModule,
+  parseModuleSync
+});

package/dist/types.js

@@ -1,2 +1,17 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+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;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// 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.7",
+  "version": "4.0.10",
   "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 tsc",
+    "build": "umi-scripts father build",
     "build:deps": "umi-scripts bundleDeps",
-    "dev": "pnpm build --watch"
+    "dev": "umi-scripts father dev"
   },
   "dependencies": {
-    "@umijs/utils": "4.0.7",
-    "esbuild": "0.14.36",
+    "@umijs/utils": "4.0.10",
+    "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"