umi 4.0.0-beta.8 → 4.0.0-canary.20220317.1

package/bin/forkedDev.js

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
 
-require('v8-compile-cache');
+// require('v8-compile-cache');
 require('../dist/cli/forkedDev');

package/bin/umi.js

@@ -1,6 +1,25 @@
 #!/usr/bin/env node
 
-require('v8-compile-cache');
+// disable since it's conflicted with typescript cjs + dynamic import
+// require('v8-compile-cache');
+
+// patch console for debug
+// ref: https://remysharp.com/2014/05/23/where-is-that-console-log
+if (process.env.DEBUG_CONSOLE) {
+  ['log', 'warn', 'error'].forEach((method) => {
+    const old = console[method];
+    console[method] = function () {
+      let stack = new Error().stack.split(/\n/);
+      // Chrome includes a single "Error" line, FF doesn't.
+      if (stack[0].indexOf('Error') === 0) {
+        stack = stack.slice(1);
+      }
+      const args = [].slice.apply(arguments).concat([stack[1].trim()]);
+      return old.apply(console, args);
+    };
+  });
+}
+
 require('../dist/cli/cli')
   .run()
   .catch((e) => {

package/dist/cli/cli.d.ts

@@ -3,4 +3,3 @@ interface IOpts {
 }
 export declare function run(opts?: IOpts): Promise<void>;
 export {};
-//# sourceMappingURL=cli.d.ts.map

package/dist/cli/forkedDev.d.ts

@@ -1,2 +1 @@
 export {};
-//# sourceMappingURL=forkedDev.d.ts.map

package/dist/defineConfig.d.ts

@@ -0,0 +1,5 @@
+import { IConfigFromPlugins } from '@@/core/pluginConfig';
+import type { IConfig } from '@umijs/preset-umi';
+declare type ConfigType = IConfigFromPlugins & IConfig;
+export declare function defineConfig(config: ConfigType): ConfigType;
+export {};

package/dist/defineConfig.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.defineConfig = void 0;
+function defineConfig(config) {
+    return config;
+}
+exports.defineConfig = defineConfig;

package/dist/index.d.ts

@@ -1,6 +1,5 @@
 import { IServicePluginAPI, PluginAPI } from '@umijs/core';
-import * as utils from '@umijs/utils';
-export declare type IApi = PluginAPI & IServicePluginAPI;
+export { run } from './cli/cli';
+export { defineConfig } from './defineConfig';
 export * from './service/service';
-export { utils };
-//# sourceMappingURL=index.d.ts.map
+export declare type IApi = PluginAPI & IServicePluginAPI;

package/dist/index.js

@@ -1,28 +1,22 @@
 "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]; } });
+    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 __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 __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);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.utils = void 0;
-const utils = __importStar(require("@umijs/utils"));
-exports.utils = utils;
+exports.defineConfig = exports.run = void 0;
+var cli_1 = require("./cli/cli");
+Object.defineProperty(exports, "run", { enumerable: true, get: function () { return cli_1.run; } });
+var defineConfig_1 = require("./defineConfig");
+Object.defineProperty(exports, "defineConfig", { enumerable: true, get: function () { return defineConfig_1.defineConfig; } });
 __exportStar(require("./service/service"), exports);

package/dist/pluginUtils.d.ts

@@ -0,0 +1 @@
+export * from '@umijs/utils';

package/dist/pluginUtils.js

@@ -0,0 +1,17 @@
+"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);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@umijs/utils"), exports);

package/dist/service/service.d.ts

@@ -6,4 +6,3 @@ export declare class Service extends CoreService {
         args?: any;
     }): Promise<void>;
 }
-//# sourceMappingURL=service.d.ts.map

package/dist/test.d.ts

@@ -0,0 +1,117 @@
+import { Config } from '@umijs/test';
+export * from '@umijs/test';
+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,62 @@
+"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 __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 });
+exports.configUmiAlias = void 0;
+const fs_1 = require("fs");
+const service_1 = require("./service/service");
+__exportStar(require("@umijs/test"), exports);
+function getAliasPathWithKey(alias, key) {
+    const thePath = alias[key];
+    if (alias[thePath]) {
+        return getAliasPathWithKey(alias, thePath);
+    }
+    return thePath;
+}
+let service;
+function configUmiAlias(config) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (!service) {
+            service = new service_1.Service();
+            yield service.run2({
+                name: 'setup',
+                args: { quiet: true },
+            });
+        }
+        config.moduleNameMapper || (config.moduleNameMapper = {});
+        const { alias } = service.config;
+        for (const key of Object.keys(alias)) {
+            const aliasPath = getAliasPathWithKey(alias, key);
+            if ((0, fs_1.existsSync)(aliasPath) && (0, fs_1.statSync)(aliasPath).isDirectory()) {
+                config.moduleNameMapper[`^${key}/(.*)$`] = `${aliasPath}/$1`;
+                config.moduleNameMapper[`^${key}$`] = aliasPath;
+            }
+            else {
+                config.moduleNameMapper[`^${key}$`] = aliasPath;
+            }
+        }
+        return config;
+    });
+}
+exports.configUmiAlias = configUmiAlias;

package/index.d.ts

@@ -1,3 +1,9 @@
-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 } from '@umijs/preset-umi';
+export type {
+  IRoute,
+  UmiApiRequest,
+  UmiApiResponse,
+} from '@umijs/preset-umi/src/types';
+export * from './dist';

package/package.json

@@ -1,44 +1,48 @@
 {
   "name": "umi",
-  "version": "4.0.0-beta.8",
+  "version": "4.0.0-canary.20220317.1",
   "description": "umi",
+  "homepage": "https://github.com/umijs/umi-next/tree/master/packages/umi#readme",
+  "bugs": "https://github.com/umijs/umi-next/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/umijs/umi-next"
+  },
+  "license": "MIT",
   "main": "dist/index.js",
-  "module": "index.esm.js",
   "types": "index.d.ts",
+  "bin": {
+    "umi": "bin/umi.js"
+  },
   "files": [
     "dist",
     "index.d.ts",
     "index.esm.js",
     "client",
-    "bin"
+    "bin",
+    "plugin.js",
+    "plugin-utils.d.ts",
+    "plugin-utils.js",
+    "test.d.ts",
+    "test.js"
   ],
-  "bin": {
-    "umi": "bin/umi.js"
-  },
   "scripts": {
     "build": "pnpm tsc",
     "build:client": "pnpm tsc --project ./tsconfig.client.json",
     "build:deps": "pnpm esno ../../scripts/bundleDeps.ts",
     "dev": "pnpm build -- --watch"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/umijs/umi-next"
+  "dependencies": {
+    "@umijs/core": "4.0.0-canary.20220317.1",
+    "@umijs/preset-umi": "4.0.0-canary.20220317.1",
+    "@umijs/renderer-react": "4.0.0-canary.20220317.1",
+    "@umijs/test": "4.0.0-canary.20220317.1",
+    "@umijs/utils": "4.0.0-canary.20220317.1"
   },
-  "authors": [
-    "chencheng <sorrycc@gmail.com> (https://github.com/sorrycc)"
-  ],
-  "license": "MIT",
-  "bugs": "https://github.com/umijs/umi-next/issues",
-  "homepage": "https://github.com/umijs/umi-next/tree/master/packages/umi#readme",
   "publishConfig": {
     "access": "public"
   },
-  "dependencies": {
-    "@umijs/core": "4.0.0-beta.8",
-    "@umijs/preset-umi": "4.0.0-beta.8",
-    "@umijs/renderer-react": "4.0.0-beta.8",
-    "@umijs/utils": "4.0.0-beta.8",
-    "v8-compile-cache": "2.3.0"
-  }
+  "authors": [
+    "chencheng <sorrycc@gmail.com> (https://github.com/sorrycc)"
+  ]
 }

package/plugin-utils.d.ts

@@ -0,0 +1 @@
+export type * 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/test.d.ts

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

package/test.js

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

package/dist/cli/cli.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../src/cli/cli.ts"],"names":[],"mappings":"AAWA,UAAU,KAAK;IACb,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,wBAAsB,GAAG,CAAC,IAAI,CAAC,EAAE,KAAK,iBAmCrC"}

package/dist/cli/dev.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/cli/dev.ts"],"names":[],"mappings":"AAEA,wBAAgB,GAAG,SAiBlB"}

package/dist/cli/fork.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"fork.d.ts","sourceRoot":"","sources":["../../src/cli/fork.ts"],"names":[],"mappings":";AAIA,UAAU,KAAK;IACb,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,CAAC,OAAO,UAAU,KAAK,CAAC,EAAE,UAAU,EAAE,EAAE,KAAK,wCA0ClD"}

package/dist/cli/forkedDev.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"forkedDev.d.ts","sourceRoot":"","sources":["../../src/cli/forkedDev.ts"],"names":[],"mappings":""}

package/dist/cli/node.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../src/cli/node.ts"],"names":[],"mappings":"AAOA,wBAAgB,YAAY,SAQ3B;AAED,wBAAgB,UAAU,SAIzB;AAED,wBAAgB,YAAY,CAAC,IAAI,CAAC,EAAE,MAAM,QAIzC;AAED,wBAAgB,gBAAgB,SAK/B"}

package/dist/client/plugin.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../src/client/plugin.ts"],"names":[],"mappings":"AAEA,oBAAY,gBAAgB;IAC1B,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,KAAK,UAAU;CAChB;AAED,UAAU,OAAO;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC5B;AAED,qBAAa,aAAa;IACxB,IAAI,EAAE;QAAE,SAAS,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IAC9B,KAAK,EAAE;QACL,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAM;gBACK,IAAI,EAAE;QAAE,SAAS,EAAE,MAAM,EAAE,CAAA;KAAE;IAIzC,QAAQ,CAAC,MAAM,EAAE,OAAO;IAcxB,QAAQ,CAAC,UAAU,EAAE,MAAM;IAqB3B,YAAY,CAAC,EACX,GAAG,EACH,IAAI,EACJ,YAAY,EACZ,IAAI,EACJ,KAAK,GACN,EAAE;QACD,GAAG,EAAE,MAAM,CAAC;QACZ,IAAI,EAAE,gBAAgB,CAAC;QACvB,YAAY,CAAC,EAAE,GAAG,CAAC;QACnB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,KAAK,CAAC,EAAE,OAAO,CAAC;KACjB;IA4ED,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;QAAE,SAAS,EAAE,MAAM,EAAE,CAAC;QAAC,OAAO,EAAE,OAAO,EAAE,CAAA;KAAE;CAShE"}

package/dist/client/utils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/client/utils.ts"],"names":[],"mappings":"AAAA,wBAAgB,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,QAErD;AAED,wBAAgB,OAAO,CAAC,EACtB,GAAG,EACH,IAAI,GACL,EAAE;IACD,GAAG,EAAE,CAAC,QAAQ,GAAG,GAAG,CAAC,EAAE,CAAC;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,OAMA;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,WAErC"}

package/dist/constants.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,gBAAgB,KAAK,CAAC;AACnC,eAAO,MAAM,oBAAoB,KAAK,CAAC;AACvC,eAAO,MAAM,WAAW,QAAQ,CAAC;AACjC,eAAO,MAAM,oBAAoB,UAKhC,CAAC;AACF,eAAO,MAAM,cAAc,QAAQ,CAAC"}

package/dist/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAEtC,oBAAY,IAAI,GAAG,SAAS,GAAG,iBAAiB,CAAC;AACjD,cAAc,mBAAmB,CAAC;AAClC,OAAO,EAAE,KAAK,EAAE,CAAC"}

package/dist/service/cwd.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"cwd.d.ts","sourceRoot":"","sources":["../../src/service/cwd.ts"],"names":[],"mappings":"AAEA,wBAAgB,MAAM,WAOrB"}

package/dist/service/service.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/service/service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,aAAa,CAAC;AAMrD,qBAAa,OAAQ,SAAQ,WAAW;gBAC1B,IAAI,CAAC,EAAE,GAAG;IAiBhB,IAAI,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,GAAG,CAAA;KAAE;CAa9C"}

package/index.esm.js

@@ -1,2 +0,0 @@
-export { Link, Outlet } from '@umijs/renderer-react';
-export { PluginManager } from './client/client/plugin';