@umijs/core 4.0.0-rc.8 → 4.0.0-rc.9

package/dist/service/generatePlugin.js

@@ -48,9 +48,9 @@ umi generate
                 }
                 else {
                     const getEnableGenerators = (generators) => __awaiter(this, void 0, void 0, function* () {
+                        var _b, _c;
                         const questions = [];
-                        Object.keys(generators).forEach((key) => __awaiter(this, void 0, void 0, function* () {
-                            var _b, _c;
+                        for (const key of Object.keys(generators)) {
                             if (generators[key].type === generator_1.GeneratorType.generate) {
                                 questions.push({
                                     title: `${generators[key].name} -- ${generators[key].description}` ||
@@ -70,7 +70,7 @@ umi generate
                                     });
                                 }
                             }
-                        }));
+                        }
                         return questions;
                     });
                     const questions = yield getEnableGenerators(api.service.generators);

package/dist/service/generator.d.ts

@@ -1,4 +1,4 @@
-import { prompts } from '@umijs/utils';
+import { generateFile } from '@umijs/utils';
 import { Plugin } from './plugin';
 export declare enum GeneratorType {
     generate = "generate",
@@ -17,14 +17,7 @@ export interface IGeneratorOpts {
     fn: {
         (opts: {
             args: any;
-            generateFile: {
-                (opts: {
-                    path: string;
-                    target: string;
-                    data?: any;
-                    questions?: prompts.PromptObject[];
-                }): Promise<void>;
-            };
+            generateFile: typeof generateFile;
             updatePackageJSON: {
                 (opts: {
                     opts: object;

package/dist/service/plugin.js

@@ -38,6 +38,7 @@ class Plugin {
         this.apply = () => {
             utils_1.register.register({
                 implementor: esbuild_1.default,
+                exts: ['.ts', '.mjs'],
             });
             utils_1.register.clearFiles();
             let ret;
@@ -47,10 +48,9 @@ class Plugin {
             catch (e) {
                 throw new Error(`Register ${this.type} ${this.path} failed, since ${e.message}`);
             }
-            for (const file of utils_1.register.getFiles()) {
-                delete require.cache[file];
+            finally {
+                utils_1.register.restore();
             }
-            utils_1.register.restore();
             // use the default member for es modules
             return ret.__esModule ? ret.default : ret;
         };

package/dist/service/service.js

@@ -25,7 +25,6 @@ const env_1 = require("./env");
 const path_2 = require("./path");
 const plugin_1 = require("./plugin");
 const pluginAPI_1 = require("./pluginAPI");
-const utils_2 = require("./utils");
 class Service {
     constructor(opts) {
         this.appData = {};
@@ -167,11 +166,13 @@ class Service {
             }
             this.pkg = pkg;
             this.pkgPath = pkgPath || (0, path_1.join)(this.cwd, 'package.json');
+            const prefix = this.opts.frameworkName || constants_1.DEFAULT_FRAMEWORK_NAME;
             // get user config
             const configManager = new config_1.Config({
                 cwd: this.cwd,
                 env: this.env,
                 defaultConfigFiles: this.opts.defaultConfigFiles,
+                specifiedEnv: process.env[`${prefix}_ENV`.toUpperCase()],
             });
             this.configManager = configManager;
             this.userConfig = configManager.getUserConfig().config;
@@ -183,7 +184,7 @@ class Service {
                 plugins: [require.resolve('./generatePlugin')].concat(this.opts.plugins || []),
                 presets: [require.resolve('./servicePlugin')].concat(this.opts.presets || []),
                 userConfig: this.userConfig,
-                prefix: this.opts.frameworkName || constants_1.DEFAULT_FRAMEWORK_NAME,
+                prefix,
             });
             // register presets and plugins
             this.stage = types_1.ServiceStage.initPresets;
@@ -285,10 +286,7 @@ class Service {
             this.stage = types_1.ServiceStage.runCommand;
             const command = this.commands[name];
             (0, assert_1.default)(command, `Invalid command ${name}, it's not registered.`);
-            let ret = command.fn({ args });
-            if ((0, utils_2.isPromise)(ret)) {
-                ret = yield ret;
-            }
+            let ret = yield command.fn({ args });
             this._baconPlugins();
             return ret;
         });
@@ -353,10 +351,7 @@ class Service {
                 },
             });
             let dateStart = new Date();
-            let ret = opts.plugin.apply()(proxyPluginAPI);
-            if ((0, utils_2.isPromise)(ret)) {
-                ret = yield ret;
-            }
+            let ret = yield opts.plugin.apply()(proxyPluginAPI);
             opts.plugin.time.register = new Date().getTime() - dateStart.getTime();
             if (opts.plugin.type === 'plugin') {
                 (0, assert_1.default)(!ret, `plugin should return nothing`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/core",
-  "version": "4.0.0-rc.8",
+  "version": "4.0.0-rc.9",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/core#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
   "repository": {
@@ -21,8 +21,8 @@
     "test": "jest -c ../../jest.turbo.config.ts"
   },
   "dependencies": {
-    "@umijs/bundler-utils": "4.0.0-rc.8",
-    "@umijs/utils": "4.0.0-rc.8"
+    "@umijs/bundler-utils": "4.0.0-rc.9",
+    "@umijs/utils": "4.0.0-rc.9"
   },
   "devDependencies": {
     "@hapi/joi": "17.1.1",