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

package/dist/service/service.js

@@ -1,42 +1,71 @@
-"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());
-    });
+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.Service = void 0;
-const core_1 = require("@umijs/core");
-const fs_1 = require("fs");
-const path_1 = require("path");
-const constants_1 = require("../constants");
-const cwd_1 = require("./cwd");
-class Service extends core_1.Service {
-    constructor(opts) {
-        process.env.UMI_DIR = (0, path_1.dirname)(require.resolve('../../package'));
-        const cwd = (0, cwd_1.getCwd)();
-        super(Object.assign(Object.assign({}, opts), { env: process.env.NODE_ENV, cwd, defaultConfigFiles: constants_1.DEFAULT_CONFIG_FILES, frameworkName: constants_1.FRAMEWORK_NAME, presets: [require.resolve('@umijs/preset-umi'), ...((opts === null || opts === void 0 ? void 0 : opts.presets) || [])], plugins: [
-                (0, fs_1.existsSync)((0, path_1.join)(cwd, 'plugin.ts')) && (0, path_1.join)(cwd, 'plugin.ts'),
-                (0, fs_1.existsSync)((0, path_1.join)(cwd, 'plugin.js')) && (0, path_1.join)(cwd, 'plugin.js'),
-            ].filter(Boolean) }));
-    }
-    run2(opts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let name = opts.name;
-            if ((opts === null || opts === void 0 ? void 0 : opts.args.version) || name === 'v') {
-                name = 'version';
-            }
-            else if ((opts === null || opts === void 0 ? void 0 : opts.args.help) || !name || name === 'h') {
-                name = 'help';
-            }
-            // TODO
-            // initWebpack
-            return yield this.run(Object.assign(Object.assign({}, opts), { name }));
-        });
+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(
+  // 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/service/service.ts
+var service_exports = {};
+__export(service_exports, {
+  Service: () => Service
+});
+module.exports = __toCommonJS(service_exports);
+var import_core = require("@umijs/core");
+var import_fs = require("fs");
+var import_path = require("path");
+var import_constants = require("../constants");
+var import_cwd = require("./cwd");
+var Service = class extends import_core.Service {
+  constructor(opts) {
+    process.env.UMI_DIR = (0, import_path.dirname)(require.resolve("../../package"));
+    const cwd = (0, import_cwd.getCwd)();
+    require("./requireHook");
+    super({
+      ...opts,
+      env: process.env.NODE_ENV,
+      cwd,
+      defaultConfigFiles: (opts == null ? void 0 : opts.defaultConfigFiles) || import_constants.DEFAULT_CONFIG_FILES,
+      frameworkName: (opts == null ? void 0 : opts.frameworkName) || import_constants.FRAMEWORK_NAME,
+      presets: [require.resolve("@umijs/preset-umi"), ...(opts == null ? void 0 : opts.presets) || []],
+      plugins: [
+        (0, import_fs.existsSync)((0, import_path.join)(cwd, "plugin.ts")) && (0, import_path.join)(cwd, "plugin.ts"),
+        (0, import_fs.existsSync)((0, import_path.join)(cwd, "plugin.js")) && (0, import_path.join)(cwd, "plugin.js")
+      ].filter(Boolean)
+    });
+  }
+  async run2(opts) {
+    let name = opts.name;
+    if ((opts == null ? void 0 : opts.args.version) || name === "v") {
+      name = "version";
+    } else if ((opts == null ? void 0 : opts.args.help) || !name || name === "h") {
+      name = "help";
     }
-}
-exports.Service = Service;
+    return await this.run({ ...opts, name });
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  Service
+});

package/dist/test-setup.d.ts

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

package/dist/test-setup.js

@@ -0,0 +1,3 @@
+// src/test-setup.ts
+var import_plugin = require("@@/core/plugin");
+(0, import_plugin.createPluginManager)();

package/dist/test.d.ts

@@ -0,0 +1,119 @@
+import { Config } from '@umijs/test';
+export * from '@umijs/test';
+export declare function getAliasPathWithKey(alias: Record<string, string>, key: string): string;
+export declare function getUmiAlias(): Promise<any>;
+export declare function configUmiAlias(config: Config.InitialOptions): Promise<Partial<{
+    automock: boolean;
+    bail: number | boolean;
+    cache: boolean;
+    cacheDirectory: string;
+    ci: boolean;
+    clearMocks: boolean;
+    changedFilesWithAncestor: boolean;
+    changedSince: string;
+    collectCoverage: boolean;
+    collectCoverageFrom: string[];
+    collectCoverageOnlyFrom: {
+        [key: string]: boolean;
+    };
+    coverageDirectory: string;
+    coveragePathIgnorePatterns: string[];
+    coverageProvider: "babel" | "v8";
+    coverageReporters: Config.CoverageReporters;
+    coverageThreshold: {
+        [path: string]: Config.CoverageThresholdValue;
+        global: Config.CoverageThresholdValue;
+    };
+    dependencyExtractor: string;
+    detectLeaks: boolean;
+    detectOpenHandles: boolean;
+    displayName: string | Config.DisplayName;
+    expand: boolean;
+    extensionsToTreatAsEsm: string[];
+    extraGlobals: string[];
+    filter: string;
+    findRelatedTests: boolean;
+    forceCoverageMatch: string[];
+    forceExit: boolean;
+    json: boolean;
+    globals: Config.ConfigGlobals;
+    globalSetup: string | null | undefined;
+    globalTeardown: string | null | undefined;
+    haste: Config.HasteConfig;
+    injectGlobals: boolean;
+    reporters: (string | Config.ReporterConfig)[];
+    logHeapUsage: boolean;
+    lastCommit: boolean;
+    listTests: boolean;
+    maxConcurrency: number;
+    maxWorkers: string | number;
+    moduleDirectories: string[];
+    moduleFileExtensions: string[];
+    moduleLoader: string;
+    moduleNameMapper: {
+        [key: string]: string | string[];
+    };
+    modulePathIgnorePatterns: string[];
+    modulePaths: string[];
+    name: string;
+    noStackTrace: boolean;
+    notify: boolean;
+    notifyMode: string;
+    onlyChanged: boolean;
+    onlyFailures: boolean;
+    outputFile: string;
+    passWithNoTests: boolean;
+    preprocessorIgnorePatterns: string[];
+    preset: string | null | undefined;
+    prettierPath: string | null | undefined;
+    projects: (string | Config.InitialProjectOptions)[];
+    replname: string | null | undefined;
+    resetMocks: boolean;
+    resetModules: boolean;
+    resolver: string | null | undefined;
+    restoreMocks: boolean;
+    rootDir: string;
+    roots: string[];
+    runner: string;
+    runTestsByPath: boolean;
+    scriptPreprocessor: string;
+    setupFiles: string[];
+    setupTestFrameworkScriptFile: string;
+    setupFilesAfterEnv: string[];
+    silent: boolean;
+    skipFilter: boolean;
+    skipNodeResolution: boolean;
+    slowTestThreshold: number;
+    snapshotResolver: string;
+    snapshotSerializers: string[];
+    snapshotFormat: Config.PrettyFormatOptions;
+    errorOnDeprecated: boolean;
+    testEnvironment: string;
+    testEnvironmentOptions: Record<string, unknown>;
+    testFailureExitCode: string | number;
+    testLocationInResults: boolean;
+    testMatch: string[];
+    testNamePattern: string;
+    testPathDirs: string[];
+    testPathIgnorePatterns: string[];
+    testRegex: string | string[];
+    testResultsProcessor: string;
+    testRunner: string;
+    testSequencer: string;
+    testURL: string;
+    testTimeout: number;
+    timers: "real" | "fake" | "modern" | "legacy";
+    transform: {
+        [regex: string]: string | Config.TransformerConfig;
+    };
+    transformIgnorePatterns: string[];
+    watchPathIgnorePatterns: string[];
+    unmockedModulePathPatterns: string[];
+    updateSnapshot: boolean;
+    useStderr: boolean;
+    verbose?: boolean | undefined;
+    watch: boolean;
+    watchAll: boolean;
+    watchman: boolean;
+    watchPlugins: (string | [string, Record<string, unknown>])[];
+}>>;

package/dist/test.js

@@ -0,0 +1,82 @@
+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 __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/test.ts
+var test_exports = {};
+__export(test_exports, {
+  configUmiAlias: () => configUmiAlias,
+  getAliasPathWithKey: () => getAliasPathWithKey,
+  getUmiAlias: () => getUmiAlias
+});
+module.exports = __toCommonJS(test_exports);
+var import_utils = require("@umijs/utils");
+var import_fs = require("fs");
+var import_service = require("./service/service");
+__reExport(test_exports, require("@umijs/test"), module.exports);
+function getAliasPathWithKey(alias, key) {
+  if (alias[key]) {
+    return getAliasPathWithKey(alias, alias[key]);
+  }
+  const aliasKeys = Object.keys(alias);
+  const keyStartedWith = aliasKeys.find(
+    (k) => !k.endsWith("$") && key.startsWith(`${k}/`)
+  );
+  if (keyStartedWith) {
+    const realPath = alias[keyStartedWith];
+    const newKey = realPath + key.slice(keyStartedWith.length);
+    return getAliasPathWithKey(alias, newKey);
+  } else {
+    return key;
+  }
+}
+var service;
+async function getUmiAlias() {
+  if (!service) {
+    service = new import_service.Service();
+    await service.run2({
+      name: "setup",
+      args: { quiet: true }
+    });
+  }
+  return service.config.alias;
+}
+async function configUmiAlias(config) {
+  (0, import_utils.setNoDeprecation)();
+  config.moduleNameMapper || (config.moduleNameMapper = {});
+  const alias = await getUmiAlias();
+  for (const key of Object.keys(alias)) {
+    const aliasPath = getAliasPathWithKey(alias, key);
+    if (key.endsWith("$")) {
+      config.moduleNameMapper[`^${key}`] = aliasPath;
+    } else if ((0, import_fs.existsSync)(aliasPath) && (0, import_fs.statSync)(aliasPath).isDirectory()) {
+      config.moduleNameMapper[`^${key}/(.*)$`] = `${aliasPath}/$1`;
+      config.moduleNameMapper[`^${key}$`] = aliasPath;
+    } else {
+      config.moduleNameMapper[`^${key}$`] = aliasPath;
+    }
+  }
+  return config;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  configUmiAlias,
+  getAliasPathWithKey,
+  getUmiAlias,
+  ...require("@umijs/test")
+});

package/eslint.js

@@ -0,0 +1,7 @@
+try {
+  require.resolve('@umijs/lint/package.json');
+} catch (err) {
+  throw new Error('@umijs/lint is not built-in, please install it manually before run umi lint.');
+}
+
+module.exports = process.env.LEGACY_ESLINT ? require('@umijs/lint/dist/config/eslint/legacy') : require('@umijs/lint/dist/config/eslint');

package/index.d.ts

@@ -1,3 +1,10 @@
-export type { IApi } from '@umijs/preset-umi';
-export * from '@umijs/renderer-react';
-export * from './dist/index';
+// @ts-ignore
+export * from '@@/exports';
+export type {
+  IApi,
+  webpack,
+  IRoute,
+  UmiApiRequest,
+  UmiApiResponse,
+} from '@umijs/preset-umi';
+export * from './dist';

package/package.json

@@ -1,44 +1,62 @@
 {
   "name": "umi",
-  "version": "4.0.0-beta.9",
+  "version": "4.0.0-canary-20240513.3",
   "description": "umi",
-  "homepage": "https://github.com/umijs/umi-next/tree/master/packages/umi#readme",
-  "bugs": "https://github.com/umijs/umi-next/issues",
+  "homepage": "https://github.com/umijs/umi/tree/master/packages/umi#readme",
+  "bugs": "https://github.com/umijs/umi/issues",
   "repository": {
     "type": "git",
-    "url": "https://github.com/umijs/umi-next"
+    "url": "https://github.com/umijs/umi"
   },
   "license": "MIT",
   "main": "dist/index.js",
-  "module": "index.esm.js",
   "types": "index.d.ts",
   "bin": {
     "umi": "bin/umi.js"
   },
   "files": [
+    "bin",
+    "client",
     "dist",
+    "eslint.js",
     "index.d.ts",
     "index.esm.js",
-    "client",
-    "bin"
+    "plugin-utils.d.ts",
+    "plugin-utils.js",
+    "plugin.js",
+    "prettier.js",
+    "stylelint.js",
+    "test-setup.js",
+    "test.d.ts",
+    "test.js"
   ],
-  "scripts": {
-    "build": "pnpm tsc",
-    "build:client": "pnpm tsc --project ./tsconfig.client.json",
-    "build:deps": "pnpm esno ../../scripts/bundleDeps.ts",
-    "dev": "pnpm build -- --watch"
-  },
   "dependencies": {
-    "@umijs/core": "4.0.0-beta.9",
-    "@umijs/preset-umi": "4.0.0-beta.9",
-    "@umijs/renderer-react": "4.0.0-beta.9",
-    "@umijs/utils": "4.0.0-beta.9",
-    "v8-compile-cache": "2.3.0"
+    "@babel/runtime": "7.23.6",
+    "prettier-plugin-organize-imports": "^3.2.2",
+    "prettier-plugin-packagejson": "2.4.3",
+    "@umijs/bundler-utils": "4.0.0-canary-20240513.3",
+    "@umijs/core": "4.0.0-canary-20240513.3",
+    "@umijs/renderer-react": "4.0.0-canary-20240513.3",
+    "@umijs/bundler-webpack": "4.0.0-canary-20240513.3",
+    "@umijs/preset-umi": "4.0.0-canary-20240513.3",
+    "@umijs/server": "4.0.0-canary-20240513.3",
+    "@umijs/test": "4.0.0-canary-20240513.3",
+    "@umijs/utils": "4.0.0-canary-20240513.3",
+    "@umijs/lint": "4.0.0-canary-20240513.3"
+  },
+  "engines": {
+    "node": ">=14"
   },
   "publishConfig": {
     "access": "public"
   },
   "authors": [
     "chencheng <sorrycc@gmail.com> (https://github.com/sorrycc)"
-  ]
-}
+  ],
+  "scripts": {
+    "build": "umi-scripts father build",
+    "build:deps": "umi-scripts bundleDeps",
+    "dev": "umi-scripts father dev",
+    "test": "umi-scripts jest-turbo"
+  }
+}

package/plugin-utils.d.ts

@@ -0,0 +1 @@
+export * from './dist/pluginUtils';

package/plugin-utils.js

@@ -0,0 +1 @@
+module.exports = require('./dist/pluginUtils');

package/plugin.js

@@ -0,0 +1 @@
+export { getPluginManager } from '@@/core/plugin';

package/prettier.js

@@ -0,0 +1,13 @@
+module.exports = {
+  printWidth: 80,
+  singleQuote: true,
+  trailingComma: 'all',
+  proseWrap: 'never',
+  endOfLine: 'lf',
+  overrides: [{ files: '.prettierrc', options: { parser: 'json' } }],
+  plugins: [
+    require.resolve('prettier-plugin-packagejson'),
+    require.resolve('prettier-plugin-organize-imports'),
+  ],
+  pluginSearchDirs: false,
+};

package/stylelint.js

@@ -0,0 +1,7 @@
+try {
+  require.resolve('@umijs/lint/package.json');
+} catch (err) {
+  throw new Error('@umijs/lint is not built-in, please install it manually before run umi lint.');
+}
+
+module.exports = require('@umijs/lint/dist/config/stylelint');

package/test-setup.js

@@ -0,0 +1 @@
+require('./dist/test-setup');

package/test.d.ts

@@ -0,0 +1 @@
+export * from './dist/test';

package/test.js

@@ -0,0 +1 @@
+module.exports = require('./dist/test');

package/dist/cli/node.d.ts

@@ -1,4 +0,0 @@
-export declare function checkVersion(): void;
-export declare function checkLocal(): void;
-export declare function setNodeTitle(name?: string): void;
-export declare function setNoDeprecation(): void;

package/dist/cli/node.js

@@ -1,32 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.setNoDeprecation = exports.setNodeTitle = exports.checkLocal = exports.checkVersion = void 0;
-const utils_1 = require("@umijs/utils");
-const constants_1 = require("../constants");
-function checkVersion() {
-    const v = parseInt(process.version.slice(1));
-    if (v < constants_1.MIN_NODE_VERSION || v === constants_1.EXCLUDE_NODE_VERSION) {
-        utils_1.logger.error(`Your node version ${v} is not supported, please upgrade to ${constants_1.MIN_NODE_VERSION} or above except ${constants_1.EXCLUDE_NODE_VERSION}.`);
-        process.exit(1);
-    }
-}
-exports.checkVersion = checkVersion;
-function checkLocal() {
-    if (__filename.includes(`packages/${constants_1.FRAMEWORK_NAME}`)) {
-        utils_1.logger.info('@local');
-    }
-}
-exports.checkLocal = checkLocal;
-function setNodeTitle(name) {
-    if (process.title === 'node') {
-        process.title = name || constants_1.FRAMEWORK_NAME;
-    }
-}
-exports.setNodeTitle = setNodeTitle;
-function setNoDeprecation() {
-    // Use magic to suppress node deprecation warnings
-    // See: https://github.com/nodejs/node/blob/master/lib/internal/process/warning.js#L77
-    // @ts-ignore
-    process.noDeprecation = '1';
-}
-exports.setNoDeprecation = setNoDeprecation;

package/dist/client/plugin.d.ts

@@ -1,34 +0,0 @@
-export declare enum ApplyPluginsType {
-    compose = "compose",
-    modify = "modify",
-    event = "event"
-}
-interface IPlugin {
-    path?: string;
-    apply: Record<string, any>;
-}
-export declare class PluginManager {
-    opts: {
-        validKeys: string[];
-    };
-    hooks: {
-        [key: string]: any;
-    };
-    constructor(opts: {
-        validKeys: string[];
-    });
-    register(plugin: IPlugin): void;
-    getHooks(keyWithDot: string): any;
-    applyPlugins({ key, type, initialValue, args, async, }: {
-        key: string;
-        type: ApplyPluginsType;
-        initialValue?: any;
-        args?: object;
-        async?: boolean;
-    }): any;
-    static create(opts: {
-        validKeys: string[];
-        plugins: IPlugin[];
-    }): PluginManager;
-}
-export {};