umi 3.5.17 → 4.0.0-beta.1

package/dist/index.d.ts

@@ -1,2 +1,3 @@
-export = ex;
-import ex = require("./lib/cjs");
+import { IServicePluginAPI, PluginAPI } from '@umijs/core';
+export declare type IApi = PluginAPI & IServicePluginAPI;
+export * from './service/service';

package/dist/index.js

@@ -0,0 +1,13 @@
+"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 __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("./service/service"), exports);

package/dist/service/cwd.d.ts

@@ -0,0 +1 @@
+export declare function getCwd(): string;

package/dist/service/cwd.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCwd = void 0;
+const path_1 = 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;
+}
+exports.getCwd = getCwd;

package/dist/service/service.d.ts

@@ -0,0 +1,8 @@
+import { Service as CoreService } from '@umijs/core';
+export declare class Service extends CoreService {
+    constructor(opts?: any);
+    run2(opts: {
+        name: string;
+        args?: any;
+    }): Promise<void>;
+}

package/dist/service/service.js

@@ -0,0 +1,45 @@
+"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 });
+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-built-in'),
+                ...((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 }));
+        });
+    }
+}
+exports.Service = Service;

package/index.d.ts

@@ -0,0 +1,3 @@
+export type { IApi } from '@umijs/preset-built-in';
+export * from '@umijs/renderer-react';
+export * from './dist/index';

package/index.esm.js

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

package/package.json

@@ -1,46 +1,40 @@
 {
   "name": "umi",
-  "version": "3.5.17",
+  "version": "4.0.0-beta.1",
   "description": "umi",
-  "main": "index.js",
-  "types": "types.d.ts",
+  "main": "dist/index.js",
+  "module": "index.esm.js",
+  "types": "index.d.ts",
   "files": [
-    "lib",
     "dist",
-    "types.d.ts",
-    "bin"
+    "index.d.ts",
+    "index.esm.js",
+    "client"
   ],
-  "sideEffects": false,
+  "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"
+    "url": "https://github.com/umijs/umi-next"
   },
-  "keywords": [
-    "umi"
-  ],
   "authors": [
     "chencheng <sorrycc@gmail.com> (https://github.com/sorrycc)"
   ],
   "license": "MIT",
-  "bugs": "http://github.com/umijs/umi/issues",
-  "homepage": "https://github.com/umijs/umi/tree/master/packages/umi#readme",
+  "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/bundler-webpack": "3.5.17",
-    "@umijs/core": "3.5.17",
-    "@umijs/deps": "3.5.17",
-    "@umijs/preset-built-in": "3.5.17",
-    "@umijs/runtime": "3.5.17",
-    "@umijs/types": "3.5.17",
-    "@umijs/utils": "3.5.17",
-    "react": "16.x",
-    "react-dom": "16.x",
+    "@umijs/core": "4.0.0-beta.1",
+    "@umijs/preset-built-in": "4.0.0-beta.1",
+    "@umijs/renderer-react": "4.0.0-beta.1",
+    "@umijs/utils": "4.0.0-beta.1",
     "v8-compile-cache": "2.3.0"
-  },
-  "bin": {
-    "umi": "bin/umi.js"
-  },
-  "module": "dist/index.esm.js"
+  }
 }

package/bin/umi.js

@@ -1,15 +0,0 @@
-#!/usr/bin/env node
-
-require('v8-compile-cache');
-
-const resolveCwd = require('@umijs/deps/compiled/resolve-cwd');
-
-const { name, bin } = require('../package.json');
-const localCLI = resolveCwd.silent(`${name}/${bin['umi']}`);
-if (!process.env.USE_GLOBAL_UMI && localCLI && localCLI !== __filename) {
-  const debug = require('@umijs/utils').createDebug('umi:cli');
-  debug('Using local install of umi');
-  require(localCLI);
-} else {
-  require('../lib/cli');
-}

package/dist/index.esm.js

@@ -1,2 +0,0 @@
-export * from '@@/core/umiExports';
-export { ApplyPluginsType, Link, MemoryRouter, NavLink, Plugin, Prompt, Redirect, Route, Router, StaticRouter, Switch, __RouterContext, createBrowserHistory, createHashHistory, createMemoryHistory, dynamic, isBrowser, matchPath, useHistory, useLocation, useParams, useRouteMatch, withRouter } from '@umijs/runtime';

package/dist/src/ServiceWithBuiltIn.d.ts

@@ -1,5 +0,0 @@
-import { IServiceOpts, Service as CoreService } from '@umijs/core';
-declare class Service extends CoreService {
-    constructor(opts: IServiceOpts);
-}
-export { Service };

package/dist/src/cjs.d.ts

@@ -1,8 +0,0 @@
-import * as utils from '@umijs/utils';
-import { defineConfig } from './defineConfig';
-import { Service } from './ServiceWithBuiltIn';
-export * from '@umijs/runtime';
-export * from '@umijs/types';
-export { utils };
-export { Service };
-export { defineConfig };

package/dist/src/cli.d.ts

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

package/dist/src/defineConfig.d.ts

@@ -1,3 +0,0 @@
-import { IConfigFromPlugins } from '@@/core/pluginConfig';
-import { IConfig } from '@umijs/types';
-export declare function defineConfig(config: IConfigFromPlugins | IConfig): IConfigFromPlugins | IConfig;

package/dist/src/defineConfig.test.d.ts

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

package/dist/src/forkedDev.d.ts

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

package/dist/src/index.d.ts

@@ -1,3 +0,0 @@
-export * from '@@/core/umiExports';
-export { ApplyPluginsType, createBrowserHistory, createHashHistory, createMemoryHistory, dynamic, isBrowser, Link, matchPath, MemoryRouter, NavLink, Plugin, Prompt, Redirect, Route, Router, StaticRouter, Switch, useHistory, useLocation, useParams, useRouteMatch, withRouter, __RouterContext, } from '@umijs/runtime';
-export type { MemoryHistory } from '@umijs/runtime';

package/dist/src/initWebpack.d.ts

@@ -1,2 +0,0 @@
-declare const _default: () => void;
-export default _default;

package/dist/src/plugins/umiAlias.d.ts

@@ -1,3 +0,0 @@
-import { IApi } from '@umijs/types';
-declare const _default: (api: IApi) => void;
-export default _default;

package/dist/src/plugins/umiAlias.test.d.ts

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

package/dist/src/utils/fork.d.ts

@@ -1,6 +0,0 @@
-/// <reference types="node" />
-interface IOpts {
-    scriptPath: string;
-}
-export default function start({ scriptPath }: IOpts): import("child_process").ChildProcess;
-export {};

package/dist/src/utils/getCwd.d.ts

@@ -1,2 +0,0 @@
-declare const _default: () => string;
-export default _default;

package/dist/src/utils/getCwd.test.d.ts

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

package/dist/src/utils/getPkg.d.ts

@@ -1,2 +0,0 @@
-declare const _default: (dir: string) => any;
-export default _default;

package/dist/src/utils/getPkg.test.d.ts

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

package/index.js

@@ -1,6 +0,0 @@
-let ex = require('./lib/cjs');
-try {
-  const umiExports = require('@@/core/umiExports');
-  ex = Object.assign(ex, umiExports);
-} catch (e) {}
-module.exports = ex;

package/lib/ServiceWithBuiltIn.d.ts

@@ -1,5 +0,0 @@
-import { IServiceOpts, Service as CoreService } from '@umijs/core';
-declare class Service extends CoreService {
-    constructor(opts: IServiceOpts);
-}
-export { Service };

package/lib/ServiceWithBuiltIn.js

@@ -1,58 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.Service = void 0;
-
-function _react() {
-  const data = _interopRequireDefault(require("react"));
-
-  _react = function _react() {
-    return data;
-  };
-
-  return data;
-}
-
-function _core() {
-  const data = require("@umijs/core");
-
-  _core = function _core() {
-    return data;
-  };
-
-  return data;
-}
-
-function _path() {
-  const data = require("path");
-
-  _path = function _path() {
-    return data;
-  };
-
-  return data;
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-class Service extends _core().Service {
-  constructor(opts) {
-    process.env.UMI_VERSION = require('../package').version;
-    process.env.UMI_DIR = (0, _path().dirname)(require.resolve('../package'));
-    super(_objectSpread(_objectSpread({}, opts), {}, {
-      presets: [require.resolve('@umijs/preset-built-in'), ...(opts.presets || [])],
-      plugins: [require.resolve('./plugins/umiAlias'), ...(opts.plugins || [])]
-    }));
-  }
-
-}
-
-exports.Service = Service;

package/lib/cjs.d.ts

@@ -1,8 +0,0 @@
-import * as utils from '@umijs/utils';
-import { defineConfig } from './defineConfig';
-import { Service } from './ServiceWithBuiltIn';
-export * from '@umijs/runtime';
-export * from '@umijs/types';
-export { utils };
-export { Service };
-export { defineConfig };

package/lib/cjs.js

@@ -1,88 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-var _exportNames = {
-  utils: true,
-  defineConfig: true,
-  Service: true
-};
-Object.defineProperty(exports, "defineConfig", {
-  enumerable: true,
-  get: function get() {
-    return _defineConfig.defineConfig;
-  }
-});
-Object.defineProperty(exports, "Service", {
-  enumerable: true,
-  get: function get() {
-    return _ServiceWithBuiltIn.Service;
-  }
-});
-exports.utils = void 0;
-
-function _react() {
-  const data = _interopRequireDefault(require("react"));
-
-  _react = function _react() {
-    return data;
-  };
-
-  return data;
-}
-
-function utils() {
-  const data = _interopRequireWildcard(require("@umijs/utils"));
-
-  utils = function utils() {
-    return data;
-  };
-
-  return data;
-}
-
-Object.defineProperty(exports, "utils", {
-  enumerable: true,
-  get: function get() {
-    return utils();
-  }
-});
-
-var _defineConfig = require("./defineConfig");
-
-var _ServiceWithBuiltIn = require("./ServiceWithBuiltIn");
-
-var _runtime = require("@umijs/runtime");
-
-Object.keys(_runtime).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _runtime[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _runtime[key];
-    }
-  });
-});
-
-var _types = require("@umijs/types");
-
-Object.keys(_types).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _types[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _types[key];
-    }
-  });
-});
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/cli.js

@@ -1,133 +0,0 @@
-"use strict";
-
-function _react() {
-  const data = _interopRequireDefault(require("react"));
-
-  _react = function _react() {
-    return data;
-  };
-
-  return data;
-}
-
-function _utils() {
-  const data = require("@umijs/utils");
-
-  _utils = function _utils() {
-    return data;
-  };
-
-  return data;
-}
-
-function _fs() {
-  const data = require("fs");
-
-  _fs = function _fs() {
-    return data;
-  };
-
-  return data;
-}
-
-function _path() {
-  const data = require("path");
-
-  _path = function _path() {
-    return data;
-  };
-
-  return data;
-}
-
-var _initWebpack = _interopRequireDefault(require("./initWebpack"));
-
-var _ServiceWithBuiltIn = require("./ServiceWithBuiltIn");
-
-var _fork = _interopRequireDefault(require("./utils/fork"));
-
-var _getCwd = _interopRequireDefault(require("./utils/getCwd"));
-
-var _getPkg = _interopRequireDefault(require("./utils/getPkg"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-
-const v = process.version;
-
-if (v && parseInt(v.slice(1)) < 10) {
-  console.log(_utils().chalk.red(`Your node ${v} is not supported by umi, please upgrade to 10 or above.`));
-  process.exit(1);
-} // process.argv: [node, umi.js, command, args]
-
-
-const args = (0, _utils().yParser)(process.argv.slice(2), {
-  alias: {
-    version: ['v'],
-    help: ['h']
-  },
-  boolean: ['version']
-});
-
-if (args.version && !args._[0]) {
-  args._[0] = 'version';
-  const local = (0, _fs().existsSync)((0, _path().join)(__dirname, '../.local')) ? _utils().chalk.cyan('@local') : '';
-  console.log(`umi@${require('../package.json').version}${local}`);
-} else if (!args._[0]) {
-  args._[0] = 'help';
-} // allow parent framework to modify the title
-
-
-if (process.title === 'node') {
-  process.title = 'umi';
-}
-
-_asyncToGenerator(function* () {
-  try {
-    switch (args._[0]) {
-      case 'dev':
-        const child = (0, _fork.default)({
-          scriptPath: require.resolve('./forkedDev')
-        }); // ref:
-        // http://nodejs.cn/api/process/signal_events.html
-        // https://lisk.io/blog/development/why-we-stopped-using-npm-start-child-processes
-
-        process.on('SIGINT', () => {
-          child.kill('SIGINT'); // ref:
-          // https://github.com/umijs/umi/issues/6009
-
-          process.exit(0);
-        });
-        process.on('SIGTERM', () => {
-          child.kill('SIGTERM');
-          process.exit(1);
-        });
-        break;
-
-      default:
-        const name = args._[0];
-
-        if (name === 'build') {
-          process.env.NODE_ENV = 'production';
-        } // Init webpack version determination and require hook for build command
-
-
-        (0, _initWebpack.default)();
-        yield new _ServiceWithBuiltIn.Service({
-          cwd: (0, _getCwd.default)(),
-          pkg: (0, _getPkg.default)(process.cwd())
-        }).run({
-          name,
-          args
-        });
-        break;
-    }
-  } catch (e) {
-    console.error(_utils().chalk.red(e.message));
-    console.error(e.stack);
-    process.exit(1);
-  }
-})();

package/lib/defineConfig.d.ts

@@ -1,4 +0,0 @@
-// @ts-ignore
-import { IConfigFromPlugins } from '@@/core/pluginConfig';
-import { IConfig } from '@umijs/types';
-export declare function defineConfig(config: IConfigFromPlugins | IConfig): IConfigFromPlugins | IConfig;

package/lib/defineConfig.js

@@ -1,23 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.defineConfig = defineConfig;
-
-function _react() {
-  const data = _interopRequireDefault(require("react"));
-
-  _react = function _react() {
-    return data;
-  };
-
-  return data;
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-// IConfig types is prior to IConfigFromPlugins in the same key.
-function defineConfig(config) {
-  return config;
-}