umi 4.0.0-rc.13 → 4.0.0-rc.16

package/dist/cli/cli.js

@@ -1,13 +1,4 @@
 "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.run = void 0;
 const utils_1 = require("@umijs/utils");
@@ -15,44 +6,42 @@ const constants_1 = require("../constants");
 const service_1 = require("../service/service");
 const dev_1 = require("./dev");
 const node_1 = require("./node");
-function run(opts) {
-    return __awaiter(this, void 0, void 0, function* () {
-        (0, node_1.checkVersion)();
-        (0, node_1.checkLocal)();
-        (0, node_1.setNodeTitle)();
-        (0, node_1.setNoDeprecation)();
-        const args = (0, utils_1.yParser)(process.argv.slice(2), {
-            alias: {
-                version: ['v'],
-                help: ['h'],
-            },
-            boolean: ['version'],
-        });
-        const command = args._[0];
-        if ([constants_1.DEV_COMMAND, 'setup'].includes(command)) {
-            process.env.NODE_ENV = 'development';
-        }
-        else if (command === 'build') {
-            process.env.NODE_ENV = 'production';
-        }
-        if (opts === null || opts === void 0 ? void 0 : opts.presets) {
-            process.env.UMI_PRESETS = opts.presets.join(',');
-        }
-        if (command === constants_1.DEV_COMMAND) {
-            (0, dev_1.dev)();
+async function run(opts) {
+    (0, node_1.checkVersion)();
+    (0, node_1.checkLocal)();
+    (0, node_1.setNodeTitle)();
+    (0, node_1.setNoDeprecation)();
+    const args = (0, utils_1.yParser)(process.argv.slice(2), {
+        alias: {
+            version: ['v'],
+            help: ['h'],
+        },
+        boolean: ['version'],
+    });
+    const command = args._[0];
+    if ([constants_1.DEV_COMMAND, 'setup'].includes(command)) {
+        process.env.NODE_ENV = 'development';
+    }
+    else if (command === 'build') {
+        process.env.NODE_ENV = 'production';
+    }
+    if (opts === null || opts === void 0 ? void 0 : opts.presets) {
+        process.env.UMI_PRESETS = opts.presets.join(',');
+    }
+    if (command === constants_1.DEV_COMMAND) {
+        (0, dev_1.dev)();
+    }
+    else {
+        try {
+            await new service_1.Service().run2({
+                name: args._[0],
+                args,
+            });
         }
-        else {
-            try {
-                yield new service_1.Service().run2({
-                    name: args._[0],
-                    args,
-                });
-            }
-            catch (e) {
-                utils_1.logger.error(e);
-                process.exit(1);
-            }
+        catch (e) {
+            utils_1.logger.error(e);
+            process.exit(1);
         }
-    });
+    }
 }
 exports.run = run;

package/dist/cli/forkedDev.js

@@ -1,13 +1,4 @@
 "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");
@@ -15,11 +6,11 @@ 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* () {
+(async () => {
     try {
         const args = (0, utils_1.yParser)(process.argv.slice(2));
         const service = new service_1.Service();
-        yield service.run2({
+        await service.run2({
             name: constants_1.DEV_COMMAND,
             args,
         });
@@ -48,4 +39,4 @@ const node_1 = require("./node");
         utils_1.logger.error(e);
         process.exit(1);
     }
-}))();
+})();

package/dist/client/plugin.js

@@ -1,13 +1,4 @@
 "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.PluginManager = exports.ApplyPluginsType = void 0;
 const utils_1 = require("./utils");
@@ -61,17 +52,17 @@ class PluginManager {
         switch (type) {
             case ApplyPluginsType.modify:
                 if (async) {
-                    return hooks.reduce((memo, hook) => __awaiter(this, void 0, void 0, function* () {
+                    return hooks.reduce(async (memo, hook) => {
                         (0, utils_1.assert)(typeof hook === 'function' ||
                             typeof hook === 'object' ||
                             (0, utils_1.isPromiseLike)(hook), `applyPlugins failed, all hooks for key ${key} must be function, plain object or Promise.`);
                         if ((0, utils_1.isPromiseLike)(memo)) {
-                            memo = yield memo;
+                            memo = await memo;
                         }
                         if (typeof hook === 'function') {
                             const ret = hook(memo, args);
                             if ((0, utils_1.isPromiseLike)(ret)) {
-                                return yield ret;
+                                return await ret;
                             }
                             else {
                                 return ret;
@@ -79,11 +70,11 @@ class PluginManager {
                         }
                         else {
                             if ((0, utils_1.isPromiseLike)(hook)) {
-                                hook = yield hook;
+                                hook = await hook;
                             }
-                            return Object.assign(Object.assign({}, memo), hook);
+                            return { ...memo, ...hook };
                         }
-                    }), (0, utils_1.isPromiseLike)(initialValue)
+                    }, (0, utils_1.isPromiseLike)(initialValue)
                         ? initialValue
                         : Promise.resolve(initialValue));
                 }
@@ -95,20 +86,20 @@ class PluginManager {
                         }
                         else {
                             // TODO: deepmerge?
-                            return Object.assign(Object.assign({}, memo), hook);
+                            return { ...memo, ...hook };
                         }
                     }, initialValue);
                 }
             case ApplyPluginsType.event:
-                return (() => __awaiter(this, void 0, void 0, function* () {
+                return (async () => {
                     for (const hook of hooks) {
                         (0, utils_1.assert)(typeof hook === 'function', `applyPlugins failed, all hooks for key ${key} must be function.`);
                         const ret = hook(args);
                         if (async && (0, utils_1.isPromiseLike)(ret)) {
-                            yield ret;
+                            await ret;
                         }
                     }
-                }))();
+                })();
             case ApplyPluginsType.compose:
                 return () => {
                     return (0, utils_1.compose)({

package/dist/pluginUtils.d.ts

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

package/dist/pluginUtils.js

@@ -10,6 +10,18 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     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);
 };
@@ -17,9 +29,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.express = exports.httpProxyMiddleware = void 0;
+exports.express = exports.httpProxyMiddleware = exports.createServerRoutes = void 0;
 const express_1 = __importDefault(require("@umijs/bundler-utils/compiled/express"));
 exports.express = express_1.default;
-const http_proxy_middleware_1 = __importDefault(require("@umijs/bundler-webpack/compiled/http-proxy-middleware"));
-exports.httpProxyMiddleware = http_proxy_middleware_1.default;
+const httpProxyMiddleware = __importStar(require("@umijs/bundler-webpack/compiled/http-proxy-middleware"));
+exports.httpProxyMiddleware = httpProxyMiddleware;
+var server_1 = require("@umijs/server");
+Object.defineProperty(exports, "createServerRoutes", { enumerable: true, get: function () { return server_1.createServerRoutes; } });
 __exportStar(require("@umijs/utils"), exports);

package/dist/service/service.js

@@ -1,13 +1,4 @@
 "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");
@@ -19,24 +10,30 @@ 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: [
+        super({
+            ...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 }));
+            ].filter(Boolean),
         });
     }
+    async run2(opts) {
+        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 await this.run({ ...opts, name });
+    }
 }
 exports.Service = Service;

package/dist/test.js

@@ -13,15 +13,6 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
 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");
@@ -35,28 +26,26 @@ function getAliasPathWithKey(alias, key) {
     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 },
-            });
+async function configUmiAlias(config) {
+    if (!service) {
+        service = new service_1.Service();
+        await 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;
         }
-        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;
-            }
+        else {
+            config.moduleNameMapper[`^${key}$`] = aliasPath;
         }
-        return config;
-    });
+    }
+    return config;
 }
 exports.configUmiAlias = configUmiAlias;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "umi",
-  "version": "4.0.0-rc.13",
+  "version": "4.0.0-rc.16",
   "description": "umi",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/umi#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -32,19 +32,20 @@
   "scripts": {
     "build": "pnpm tsc",
     "build:client": "pnpm tsc --project ./tsconfig.client.json",
-    "build:deps": "pnpm esno ../../scripts/bundleDeps.ts",
+    "build:deps": "umi-scripts bundleDeps",
     "dev": "pnpm build -- --watch",
-    "test": "jest -c ../../jest.turbo.config.ts"
+    "test": "umi-scripts jest-turbo"
   },
   "dependencies": {
-    "@umijs/bundler-utils": "4.0.0-rc.13",
-    "@umijs/bundler-webpack": "4.0.0-rc.13",
-    "@umijs/core": "4.0.0-rc.13",
-    "@umijs/lint": "4.0.0-rc.13",
-    "@umijs/preset-umi": "4.0.0-rc.13",
-    "@umijs/renderer-react": "4.0.0-rc.13",
-    "@umijs/test": "4.0.0-rc.13",
-    "@umijs/utils": "4.0.0-rc.13",
+    "@umijs/bundler-utils": "4.0.0-rc.16",
+    "@umijs/bundler-webpack": "4.0.0-rc.16",
+    "@umijs/core": "4.0.0-rc.16",
+    "@umijs/lint": "4.0.0-rc.16",
+    "@umijs/preset-umi": "4.0.0-rc.16",
+    "@umijs/renderer-react": "4.0.0-rc.16",
+    "@umijs/server": "4.0.0-rc.16",
+    "@umijs/test": "4.0.0-rc.16",
+    "@umijs/utils": "4.0.0-rc.16",
     "prettier-plugin-organize-imports": "^2.3.4",
     "prettier-plugin-packagejson": "^2.2.17"
   },