umi 4.0.0-beta.9 → 4.0.0-canary-20240513.3

package/dist/cli/fork.js

@@ -1,40 +1,90 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const child_process_1 = require("child_process");
-const usedPorts = [];
+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/cli/fork.ts
+var fork_exports = {};
+__export(fork_exports, {
+  default: () => start
+});
+module.exports = __toCommonJS(fork_exports);
+var import_child_process = require("child_process");
+var import_utils = require("@umijs/utils");
+var usedPorts = [];
 function start({ scriptPath }) {
-    const execArgv = process.execArgv.slice(0);
-    const inspectArgvIndex = execArgv.findIndex((argv) => argv.includes('--inspect-brk'));
-    if (inspectArgvIndex > -1) {
-        const inspectArgv = execArgv[inspectArgvIndex];
-        execArgv.splice(inspectArgvIndex, 1, inspectArgv.replace(/--inspect-brk=(.*)/, (_match, s1) => {
-            let port;
-            try {
-                port = parseInt(s1) + 1;
-            }
-            catch (e) {
-                port = 9230; // node default inspect port plus 1.
-            }
-            if (usedPorts.includes(port)) {
-                port += 1;
-            }
-            usedPorts.push(port);
-            return `--inspect-brk=${port}`;
-        }));
+  const execArgv = process.execArgv.slice(0);
+  const inspectArgvIndex = execArgv.findIndex(
+    (argv) => argv.includes("--inspect-brk")
+  );
+  if (inspectArgvIndex > -1) {
+    const inspectArgv = execArgv[inspectArgvIndex];
+    execArgv.splice(
+      inspectArgvIndex,
+      1,
+      inspectArgv.replace(/--inspect-brk=(.*)/, (_match, s1) => {
+        let port;
+        try {
+          port = parseInt(s1) + 1;
+        } catch (e) {
+          port = 9230;
+        }
+        if (usedPorts.includes(port)) {
+          port += 1;
+        }
+        usedPorts.push(port);
+        return `--inspect-brk=${port}`;
+      })
+    );
+  }
+  const child = (0, import_child_process.fork)(scriptPath, process.argv.slice(2), { execArgv });
+  child.on("message", (data) => {
+    var _a;
+    const { type, payload } = data || {};
+    if (type === "RESTART") {
+      child.kill();
+      if (payload == null ? void 0 : payload.port) {
+        utilPortValid(payload.port, 20, () => {
+          process.env.PORT = payload.port;
+          start({ scriptPath });
+        });
+      } else {
+        start({ scriptPath });
+      }
     }
-    const child = (0, child_process_1.fork)(scriptPath, process.argv.slice(2), { execArgv });
-    child.on('message', (data) => {
-        var _a;
-        const { type, payload } = data || {};
-        if (type === 'RESTART') {
-            child.kill();
-            if (payload === null || payload === void 0 ? void 0 : payload.port) {
-                process.env.PORT = payload.port;
-            }
-            start({ scriptPath });
+    (_a = process.send) == null ? void 0 : _a.call(process, data);
+  });
+  return child;
+}
+function utilPortValid(port, totalTry, callback) {
+  import_utils.portfinder.getPort({ startPort: port }, (err, findPort) => {
+    if (err)
+      callback(err);
+    else {
+      if (findPort === port) {
+        callback();
+      } else {
+        if (totalTry > 0) {
+          setTimeout(() => {
+            utilPortValid(port, totalTry - 1, callback);
+          }, 100);
+        } else {
+          callback(new Error(`Port ${port} is occupied`));
         }
-        (_a = process.send) === null || _a === void 0 ? void 0 : _a.call(process, data);
-    });
-    return child;
+      }
+    }
+  });
 }
-exports.default = start;

package/dist/cli/forkedDev.js

@@ -1,51 +1,36 @@
-"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());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("@umijs/utils");
-const constants_1 = require("../constants");
-const service_1 = require("../service/service");
-const node_1 = require("./node");
-(0, node_1.setNodeTitle)(`${constants_1.FRAMEWORK_NAME}-dev`);
-(0, node_1.setNoDeprecation)();
-(() => __awaiter(void 0, void 0, void 0, function* () {
-    try {
-        const args = (0, utils_1.yParser)(process.argv.slice(2));
-        const service = new service_1.Service();
-        yield service.run2({
-            name: constants_1.DEV_COMMAND,
-            args,
-        });
-        let closed = false;
-        // kill(2) Ctrl-C
-        process.once('SIGINT', () => onSignal('SIGINT'));
-        // kill(3) Ctrl-\
-        process.once('SIGQUIT', () => onSignal('SIGQUIT'));
-        // kill(15) default
-        process.once('SIGTERM', () => onSignal('SIGTERM'));
-        function onSignal(signal) {
-            if (closed)
-                return;
-            closed = true;
-            // 退出时触发插件中的 onExit 事件
-            service.applyPlugins({
-                key: 'onExit',
-                args: {
-                    signal,
-                },
-            });
-            process.exit(0);
+// src/cli/forkedDev.ts
+var import_utils = require("@umijs/utils");
+var import_constants = require("../constants");
+var import_service = require("../service/service");
+(0, import_utils.setNodeTitle)(`${import_constants.FRAMEWORK_NAME}-dev`);
+(0, import_utils.setNoDeprecation)();
+(async () => {
+  try {
+    let onSignal = function(signal) {
+      if (closed)
+        return;
+      closed = true;
+      service.applyPlugins({
+        key: "onExit",
+        args: {
+          signal
         }
-    }
-    catch (e) {
-        utils_1.logger.error(e);
-        process.exit(1);
-    }
-}))();
+      });
+      process.exit(0);
+    };
+    const args = (0, import_utils.yParser)(process.argv.slice(2));
+    const service = new import_service.Service();
+    await service.run2({
+      name: import_constants.DEV_COMMAND,
+      args
+    });
+    let closed = false;
+    process.once("SIGINT", () => onSignal("SIGINT"));
+    process.once("SIGQUIT", () => onSignal("SIGQUIT"));
+    process.once("SIGTERM", () => onSignal("SIGTERM"));
+  } catch (e) {
+    import_utils.logger.fatal(e);
+    import_utils.printHelp.exit();
+    process.exit(1);
+  }
+})();

package/dist/constants.d.ts

@@ -1,5 +1,5 @@
 export declare const MIN_NODE_VERSION = 14;
-export declare const EXCLUDE_NODE_VERSION = 15;
 export declare const DEV_COMMAND = "dev";
+export declare const FRAMEWORK_NAME: string;
 export declare const DEFAULT_CONFIG_FILES: string[];
-export declare const FRAMEWORK_NAME = "umi";
+export declare const RUNTIME_TYPE_FILE_NAME = "runtimeConfig.d.ts";

package/dist/constants.js

@@ -1,13 +1,46 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FRAMEWORK_NAME = exports.DEFAULT_CONFIG_FILES = exports.DEV_COMMAND = exports.EXCLUDE_NODE_VERSION = exports.MIN_NODE_VERSION = void 0;
-exports.MIN_NODE_VERSION = 14;
-exports.EXCLUDE_NODE_VERSION = 15;
-exports.DEV_COMMAND = 'dev';
-exports.DEFAULT_CONFIG_FILES = [
-    '.umirc.ts',
-    '.umirc.js',
-    'config/config.ts',
-    'config/config.js',
+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/constants.ts
+var constants_exports = {};
+__export(constants_exports, {
+  DEFAULT_CONFIG_FILES: () => DEFAULT_CONFIG_FILES,
+  DEV_COMMAND: () => DEV_COMMAND,
+  FRAMEWORK_NAME: () => FRAMEWORK_NAME,
+  MIN_NODE_VERSION: () => MIN_NODE_VERSION,
+  RUNTIME_TYPE_FILE_NAME: () => RUNTIME_TYPE_FILE_NAME
+});
+module.exports = __toCommonJS(constants_exports);
+var MIN_NODE_VERSION = 14;
+var DEV_COMMAND = "dev";
+var FRAMEWORK_NAME = process.env.FRAMEWORK_NAME || "umi";
+var DEFAULT_CONFIG_FILES = [
+  `.${FRAMEWORK_NAME}rc.ts`,
+  `.${FRAMEWORK_NAME}rc.js`,
+  "config/config.ts",
+  "config/config.js"
 ];
-exports.FRAMEWORK_NAME = 'umi';
+var RUNTIME_TYPE_FILE_NAME = "runtimeConfig.d.ts";
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  DEFAULT_CONFIG_FILES,
+  DEV_COMMAND,
+  FRAMEWORK_NAME,
+  MIN_NODE_VERSION,
+  RUNTIME_TYPE_FILE_NAME
+});

package/dist/defineConfig.d.ts

@@ -0,0 +1,10 @@
+import { IConfigFromPlugins } from '@@/core/pluginConfig';
+import type { IConfig } from '@umijs/preset-umi';
+declare type ConfigType = IConfigFromPlugins & IConfig;
+/**
+ * 通过方法的方式配置umi，能带来更好的 typescript 体验
+ * @param  {ConfigType} config
+ * @returns ConfigType
+ */
+export declare function defineConfig(config: ConfigType): ConfigType;
+export {};

package/dist/defineConfig.js

@@ -0,0 +1,31 @@
+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/defineConfig.ts
+var defineConfig_exports = {};
+__export(defineConfig_exports, {
+  defineConfig: () => defineConfig
+});
+module.exports = __toCommonJS(defineConfig_exports);
+function defineConfig(config) {
+  return config;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  defineConfig
+});

package/dist/defineMock.d.ts

@@ -0,0 +1,8 @@
+import type { RequestHandler } from '@umijs/bundler-webpack/compiled/express';
+declare type MockDeclare = string | number | null | undefined | boolean | Record<string, any> | RequestHandler;
+export declare function defineMock(mockData: {
+    [key: string]: MockDeclare;
+}): {
+    [key: string]: MockDeclare;
+};
+export {};

package/dist/defineMock.js

@@ -0,0 +1,31 @@
+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/defineMock.ts
+var defineMock_exports = {};
+__export(defineMock_exports, {
+  defineMock: () => defineMock
+});
+module.exports = __toCommonJS(defineMock_exports);
+function defineMock(mockData) {
+  return mockData;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  defineMock
+});

package/dist/index.d.ts

@@ -1,5 +1,7 @@
 import { IServicePluginAPI, PluginAPI } from '@umijs/core';
-import * as utils from '@umijs/utils';
-export declare type IApi = PluginAPI & IServicePluginAPI;
+export { run } from './cli/cli';
+export { RUNTIME_TYPE_FILE_NAME } from './constants';
+export { defineConfig } from './defineConfig';
+export { defineMock } from './defineMock';
 export * from './service/service';
-export { utils };
+export declare type IApi = PluginAPI & IServicePluginAPI;

package/dist/index.js

@@ -1,28 +1,41 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
+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 __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 __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.utils = void 0;
-const utils = __importStar(require("@umijs/utils"));
-exports.utils = utils;
-__exportStar(require("./service/service"), exports);
+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, {
+  RUNTIME_TYPE_FILE_NAME: () => import_constants.RUNTIME_TYPE_FILE_NAME,
+  defineConfig: () => import_defineConfig.defineConfig,
+  defineMock: () => import_defineMock.defineMock,
+  run: () => import_cli.run
+});
+module.exports = __toCommonJS(src_exports);
+var import_cli = require("./cli/cli");
+var import_constants = require("./constants");
+var import_defineConfig = require("./defineConfig");
+var import_defineMock = require("./defineMock");
+__reExport(src_exports, require("./service/service"), module.exports);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  RUNTIME_TYPE_FILE_NAME,
+  defineConfig,
+  defineMock,
+  run,
+  ...require("./service/service")
+});

package/dist/pluginUtils.d.ts

@@ -0,0 +1,5 @@
+import express from '@umijs/bundler-utils/compiled/express';
+import * as httpProxyMiddleware from '@umijs/bundler-utils/compiled/http-proxy-middleware';
+export { createServerRoutes } from '@umijs/server';
+export * from '@umijs/utils';
+export { httpProxyMiddleware, express };

package/dist/pluginUtils.js

@@ -0,0 +1,48 @@
+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 __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+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/pluginUtils.ts
+var pluginUtils_exports = {};
+__export(pluginUtils_exports, {
+  createServerRoutes: () => import_server.createServerRoutes,
+  express: () => import_express.default,
+  httpProxyMiddleware: () => httpProxyMiddleware
+});
+module.exports = __toCommonJS(pluginUtils_exports);
+var import_express = __toESM(require("@umijs/bundler-utils/compiled/express"));
+var httpProxyMiddleware = __toESM(require("@umijs/bundler-utils/compiled/http-proxy-middleware"));
+var import_server = require("@umijs/server");
+__reExport(pluginUtils_exports, require("@umijs/utils"), module.exports);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createServerRoutes,
+  express,
+  httpProxyMiddleware,
+  ...require("@umijs/utils")
+});

package/dist/service/cwd.js

@@ -1,13 +1,37 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCwd = void 0;
-const path_1 = require("path");
+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/service/cwd.ts
+var cwd_exports = {};
+__export(cwd_exports, {
+  getCwd: () => getCwd
+});
+module.exports = __toCommonJS(cwd_exports);
+var import_path = require("path");
 function getCwd() {
-    const cwd = process.cwd();
-    const appRoot = process.env.APP_ROOT;
-    if (appRoot) {
-        return (0, path_1.isAbsolute)(appRoot) ? appRoot : (0, path_1.join)(cwd, appRoot);
-    }
-    return cwd;
+  const cwd = process.cwd();
+  const appRoot = process.env.APP_ROOT;
+  if (appRoot) {
+    return (0, import_path.isAbsolute)(appRoot) ? appRoot : (0, import_path.join)(cwd, appRoot);
+  }
+  return cwd;
 }
-exports.getCwd = getCwd;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getCwd
+});

package/dist/service/requireHook.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/service/requireHook.js

@@ -0,0 +1,14 @@
+// src/service/requireHook.ts
+var import_path = require("path");
+var hookPropertyMap = /* @__PURE__ */ new Map([
+  ["umi", (0, import_path.join)(__dirname, "../index.js")],
+  ["umi/plugin-utils", (0, import_path.join)(__dirname, "../../plugin-utils.js")]
+]);
+var mod = require("module");
+var resolveFilename = mod._resolveFilename;
+mod._resolveFilename = function(request, parent, isMain, options) {
+  const hookResolved = hookPropertyMap.get(request);
+  if (hookResolved)
+    request = hookResolved;
+  return resolveFilename.call(mod, request, parent, isMain, options);
+};