@umijs/preset-umi 4.0.0-beta.16 → 4.0.0-beta.17

package/dist/commands/dev/dev.js

@@ -56,7 +56,7 @@ umi dev
 PORT=8888 umi dev
 `,
         fn() {
-            var _a;
+            var _a, _b;
             return __awaiter(this, void 0, void 0, function* () {
                 const enableVite = api.args.vite;
                 // clear tmp except cache
@@ -102,9 +102,10 @@ PORT=8888 umi dev
                     key: 'addTmpGenerateWatcherPaths',
                     initialValue: [
                         absPagesPath,
+                        !api.config.routes && ((_a = api.config.conventionRoutes) === null || _a === void 0 ? void 0 : _a.base),
                         (0, path_1.join)(absSrcPath, 'layouts'),
                         ...(0, watch_1.expandJSPaths)((0, path_1.join)(absSrcPath, 'app')),
-                    ],
+                    ].filter(Boolean),
                 });
                 utils_1.lodash.uniq(watcherPaths.map(utils_1.winPath)).forEach((p) => {
                     (0, watch_1.watch)({
@@ -238,7 +239,7 @@ PORT=8888 umi dev
                             key: 'onDevCompileDone',
                             args: opts,
                         });
-                    }, mfsuWithESBuild: (_a = api.config.mfsu) === null || _a === void 0 ? void 0 : _a.esbuild, cache: {
+                    }, mfsuWithESBuild: (_b = api.config.mfsu) === null || _b === void 0 ? void 0 : _b.esbuild, cache: {
                         buildDependencies: [
                             api.pkgPath,
                             api.service.configManager.mainConfigFile || '',

package/dist/commands/generate/prettier.js

@@ -8,8 +8,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@umijs/core");
+const utils_1 = require("@umijs/utils");
+const assert_1 = __importDefault(require("assert"));
 const fs_1 = require("fs");
 const path_1 = require("path");
 exports.default = (api) => {
@@ -23,9 +28,36 @@ exports.default = (api) => {
             // 存在 .prettierrc，不开启
             return !(0, fs_1.existsSync)((0, path_1.join)(api.paths.cwd, '.prettierrc'));
         },
-        fn: (options) => __awaiter(void 0, void 0, void 0, function* () {
-            // TODO
-            console.log(options);
+        fn: () => __awaiter(void 0, void 0, void 0, function* () {
+            // 1、修改 package.json，加上 prettier 和插件
+            api.pkg.devDependencies = Object.assign(Object.assign({}, api.pkg.devDependencies), { prettier: '^2', 'prettier-plugin-organize-imports': '^2', 'prettier-plugin-packagejson': '^2' });
+            (0, fs_1.writeFileSync)(api.pkgPath, JSON.stringify(api.pkg, null, 2));
+            utils_1.logger.info('Write package.json');
+            // 2、添加 .prettierrc 和 .prettierignore
+            (0, fs_1.writeFileSync)((0, path_1.join)(api.cwd, '.prettierrc'), `
+{
+  "printWidth": 80,
+  "singleQuote": true,
+  "trailingComma": "all",
+  "proseWrap": "never",
+  "overrides": [{ "files": ".prettierrc", "options": { "parser": "json" } }],
+  "plugins": ["prettier-plugin-organize-imports", "prettier-plugin-packagejson"]
+}
+`.trimLeft());
+            utils_1.logger.info('Write .prettierrc');
+            (0, fs_1.writeFileSync)((0, path_1.join)(api.cwd, '.prettierignore'), `
+node_modules
+.umi
+.umi-production
+`.trimLeft());
+            utils_1.logger.info('Write .prettierignore');
+            // 3、执行 npm install
+            const npmClient = api.userConfig.npmClient;
+            (0, assert_1.default)(npmClient, `npmClient is required in your config.`);
+            (0, utils_1.installWithNpmClient)({
+                npmClient,
+            });
+            utils_1.logger.info(`Install dependencies with ${npmClient}`);
         }),
     });
 };

package/dist/features/appData/appData.js

@@ -14,6 +14,7 @@ const utils_1 = require("@umijs/utils");
 const fs_1 = require("fs");
 const path_1 = require("path");
 const watch_1 = require("../../commands/dev/watch");
+const scan_1 = require("../../libs/scan");
 const routes_1 = require("../tmpFiles/routes");
 exports.default = (api) => {
     api.modifyAppData((memo) => __awaiter(void 0, void 0, void 0, function* () {
@@ -29,6 +30,7 @@ exports.default = (api) => {
             version: require((0, path_1.join)(api.config.alias.react, 'package.json')).version,
         };
         memo.appJS = yield getAppJsInfo();
+        memo.vite = api.args.vite ? {} : undefined;
         return memo;
     }));
     // Execute earliest, so that other onGenerateFiles can get it
@@ -43,6 +45,31 @@ exports.default = (api) => {
         },
         stage: Number.NEGATIVE_INFINITY,
     });
+    // used in esmi and vite
+    api.register({
+        key: 'updateAppDataDeps',
+        fn() {
+            return __awaiter(this, void 0, void 0, function* () {
+                const resolver = (0, scan_1.createResolver)({
+                    alias: api.config.alias,
+                });
+                api.appData.deps = yield (0, scan_1.scan)({
+                    entry: (0, path_1.join)(api.paths.absTmpPath, 'umi.ts'),
+                    externals: api.config.externals,
+                    resolver,
+                });
+                // FIXME: force include react & react-dom
+                if (api.appData.deps['react']) {
+                    api.appData.deps['react'].version = api.appData.react.version;
+                }
+                api.appData.deps['react-dom'] = {
+                    version: api.appData.react.version,
+                    matches: ['react-dom'],
+                    subpaths: [],
+                };
+            });
+        },
+    });
     function getAppJsInfo() {
         return __awaiter(this, void 0, void 0, function* () {
             for (const path of (0, watch_1.expandJSPaths)((0, path_1.join)(api.paths.absSrcPath, 'app'))) {

package/dist/features/configPlugins/configPlugins.js

@@ -36,6 +36,9 @@ exports.default = (api) => {
         mountElementId: 'root',
         base: '/',
         history: { type: 'browser' },
+        targets: {
+            chrome: 87,
+        },
     };
     const bundleSchemas = (0, schema_1.getSchemas)();
     const extraSchemas = (0, schema_2.getSchemas)();

package/dist/features/configPlugins/schema.js

@@ -5,6 +5,10 @@ const utils_1 = require("@umijs/utils");
 function getSchemas() {
     return {
         base: (Joi) => Joi.string(),
+        conventionRoutes: (Joi) => Joi.object({
+            exclude: Joi.array().items(Joi.any()),
+            base: Joi.string(),
+        }),
         favicon: (Joi) => Joi.string(),
         headScripts: (Joi) => Joi.array(),
         history: (Joi) => Joi.object({

package/dist/features/esmi/esmi.js

@@ -140,20 +140,12 @@ exports.default = (api) => {
         return __awaiter(this, void 0, void 0, function* () {
             // scan and module graph
             // TODO: module graph
-            api.appData.deps = yield (0, scan_1.scan)({
-                entry: (0, path_1.join)(api.paths.absTmpPath, 'umi.ts'),
-                externals: api.config.externals,
-                resolver,
+            yield api.applyPlugins({
+                key: 'updateAppDataDeps',
+                type: api.ApplyPluginsType.event,
             });
             // skip umi by default
             delete api.appData.deps['umi'];
-            // FIXME: force include react & react-dom
-            api.appData.deps['react'].version = api.appData.react.version;
-            api.appData.deps['react-dom'] = {
-                version: api.appData.react.version,
-                matches: ['react-dom'],
-                subpaths: [],
-            };
             const data = generatePkgData(api);
             const deps = data.pkgInfo.exports.reduce((r, exp) => r.concat(exp.deps.map((dep) => dep.name)), []);
             const hasNewDep = deps.some((i) => !importmap.imports[i]);

package/dist/features/mock/getMockData.js

@@ -13,6 +13,10 @@ function getMockData(opts) {
         implementor: esbuild_1.default,
     });
     utils_1.register.clearFiles();
+    function normalizeMockFile(file) {
+        const cwd = opts.cwd.endsWith('/') ? opts.cwd : `${opts.cwd}/`;
+        return utils_1.chalk.yellow(file.replace(cwd, ''));
+    }
     const ret = [constants_1.MOCK_FILE_GLOB, ...(opts.mockConfig.include || [])]
         .reduce((memo, pattern) => {
         memo.push(...utils_1.glob.sync(pattern, { cwd: opts.cwd, ignore: ['**/*.d.ts'] }));
@@ -32,7 +36,7 @@ function getMockData(opts) {
                 utils_1.lodash.isPlainObject(mock.handler) ||
                 typeof mock.handler === 'function', `Mock handler must be function or array or object, but got ${typeof mock.handler} for ${mock.method} in ${mock.file}`);
             if (memo[id]) {
-                utils_1.logger.warn(`${id} is duplicated in ${mockFile} and ${memo[id].file}`);
+                utils_1.logger.warn(`${id} is duplicated in ${normalizeMockFile(mockFile)} and ${normalizeMockFile(memo[id].file)}`);
             }
             memo[id] = mock;
         }

package/dist/features/polyfill/polyfill.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const core_1 = require("@umijs/bundler-utils/compiled/babel/core");
 const path_1 = require("path");
 exports.default = (api) => {
     api.describe({
@@ -16,28 +17,39 @@ exports.default = (api) => {
         },
     });
     api.onGenerateFiles(() => {
-        var _a;
+        var _a, _b;
+        const coreJsImports = ((_a = api.config.polyfill) === null || _a === void 0 ? void 0 : _a.imports)
+            ? (_b = api.config.polyfill) === null || _b === void 0 ? void 0 : _b.imports.map((item) => `import '${item}';`).join('\n')
+            : `import 'core-js';`;
+        const { code } = (0, core_1.transform)(`
+${coreJsImports}
+import 'regenerator-runtime/runtime';
+export {};
+`, {
+            filename: 'polyfill.ts',
+            presets: [
+                [
+                    require.resolve('@umijs/bundler-utils/compiled/babel/preset-env'),
+                    {
+                        useBuiltIns: 'entry',
+                        corejs: '3',
+                        modules: false,
+                        targets: api.config.targets,
+                    },
+                ],
+            ],
+            plugins: [
+                require.resolve('@umijs/babel-preset-umi/dist/plugins/lockCoreJS'),
+            ],
+        });
         api.writeTmpFile({
             path: 'core/polyfill.ts',
             noPluginDir: true,
-            tpl: `
-{{#imports}}
-import '{{{ . }}}';
-{{/imports}}
-{{^imports}}
-import 'core-js';
-{{/imports}}
-import 'regenerator-runtime/runtime';
-export {};
-      `,
-            context: {
-                imports: ((_a = api.config.polyfill) === null || _a === void 0 ? void 0 : _a.imports) || [],
-            },
+            content: code,
         });
     });
     api.addPolyfillImports(() => [{ source: `./core/polyfill` }]);
     api.modifyConfig((memo) => {
-        memo.alias['core-js'] = (0, path_1.dirname)(require.resolve('core-js/package'));
         memo.alias['regenerator-runtime'] = (0, path_1.dirname)(require.resolve('regenerator-runtime/package'));
         return memo;
     });

package/dist/features/tmpFiles/routes.js

@@ -16,6 +16,7 @@ const fs_1 = require("fs");
 const path_1 = require("path");
 // get route config
 function getRoutes(opts) {
+    var _a, _b, _c;
     return __awaiter(this, void 0, void 0, function* () {
         let routes = null;
         if (opts.api.config.routes) {
@@ -25,10 +26,19 @@ function getRoutes(opts) {
         }
         else {
             routes = (0, core_1.getConventionRoutes)({
-                base: opts.api.paths.absPagesPath,
+                base: ((_a = opts.api.config.conventionRoutes) === null || _a === void 0 ? void 0 : _a.base) || opts.api.paths.absPagesPath,
+                exclude: (_b = opts.api.config.conventionRoutes) === null || _b === void 0 ? void 0 : _b.exclude,
                 prefix: '',
             });
         }
+        for (const id of Object.keys(routes)) {
+            // TODO: cache for performance
+            const file = (0, path_1.isAbsolute)(routes[id].file)
+                ? routes[id].file
+                : (0, path_1.join)(((_c = opts.api.config.conventionRoutes) === null || _c === void 0 ? void 0 : _c.base) || opts.api.paths.absPagesPath, routes[id].file);
+            routes[id].__content = (0, fs_1.readFileSync)(file, 'utf-8');
+        }
+        // layout routes
         const absLayoutPath = (0, path_1.join)(opts.api.paths.absSrcPath, 'layouts/index.tsx');
         const layouts = yield opts.api.applyPlugins({
             key: 'addLayouts',
@@ -52,6 +62,15 @@ function getRoutes(opts) {
                 test: layout.test,
             });
         }
+        // patch routes
+        for (const id of Object.keys(routes)) {
+            yield opts.api.applyPlugins({
+                key: 'onPatchRoute',
+                args: {
+                    route: routes[id],
+                },
+            });
+        }
         routes = yield opts.api.applyPlugins({
             key: 'modifyRoutes',
             initialValue: routes,

package/dist/features/tmpFiles/tmpFiles.js

@@ -26,6 +26,7 @@ exports.default = (api) => {
         },
     });
     api.onGenerateFiles((opts) => __awaiter(void 0, void 0, void 0, function* () {
+        var _a;
         const rendererPath = yield api.applyPlugins({
             key: 'modifyRendererPath',
             initialValue: (0, path_1.dirname)(require.resolve('@umijs/renderer-react/package.json')),
@@ -85,13 +86,22 @@ export default function EmptyRoute() {
         }
         const hasSrc = api.appData.hasSrcDir;
         // @/pages/
-        const prefix = hasSrc ? '../../../src/pages/' : '../../pages/';
+        const pages = (0, path_1.basename)(((_a = api.config.conventionRoutes) === null || _a === void 0 ? void 0 : _a.base) || api.paths.absPagesPath);
+        const prefix = hasSrc ? `../../../src/${pages}/` : `../../${pages}/`;
+        const clonedRoutes = utils_1.lodash.cloneDeep(routes);
+        for (const id of Object.keys(clonedRoutes)) {
+            for (const key of Object.keys(clonedRoutes[id])) {
+                if (key.startsWith('__')) {
+                    delete clonedRoutes[id][key];
+                }
+            }
+        }
         api.writeTmpFile({
             noPluginDir: true,
             path: 'core/route.tsx',
             tplPath: (0, path_1.join)(constants_1.TEMPLATES_DIR, 'route.tpl'),
             context: {
-                routes: JSON.stringify(routes),
+                routes: JSON.stringify(clonedRoutes),
                 routeComponents: yield (0, routes_1.getRouteComponents)({ routes, prefix }),
             },
         });

package/dist/features/vite/vite.d.ts

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

package/dist/features/vite/vite.js

@@ -0,0 +1,34 @@
+"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.default = (api) => {
+    // scan deps into api.appData by default for vite mode
+    api.register({
+        key: 'onBeforeCompiler',
+        stage: Number.POSITIVE_INFINITY,
+        fn() {
+            return __awaiter(this, void 0, void 0, function* () {
+                yield api.applyPlugins({
+                    key: 'updateAppDataDeps',
+                    type: api.ApplyPluginsType.event,
+                });
+            });
+        },
+    });
+    // include extra monorepo package deps for vite pre-bundle
+    api.modifyViteConfig((memo) => {
+        var _a, _b;
+        memo.optimizeDeps = Object.assign(Object.assign({}, (memo.optimizeDeps || {})), { include: (_b = (_a = memo.optimizeDeps) === null || _a === void 0 ? void 0 : _a.include) === null || _b === void 0 ? void 0 : _b.concat(Object.values(api.appData.deps)
+                .map(({ matches }) => matches[0])
+                .filter((item) => (item === null || item === void 0 ? void 0 : item.startsWith('@fs')) && !(item === null || item === void 0 ? void 0 : item.includes('node_modules')))) });
+        return memo;
+    });
+};

package/dist/index.js

@@ -17,6 +17,7 @@ exports.default = () => {
             require.resolve('./features/tmpFiles/tmpFiles'),
             require.resolve('./features/transform/transform'),
             require.resolve('./features/lowImport/lowImport'),
+            require.resolve('./features/vite/vite'),
             // commands
             require.resolve('./commands/build'),
             require.resolve('./commands/config/config'),

package/dist/libs/scan.js

@@ -13,6 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.scan = exports.createResolver = exports.getContent = exports.scanContent = void 0;
+const bundler_utils_1 = require("@umijs/bundler-utils");
 const es_module_lexer_1 = require("@umijs/bundler-utils/compiled/es-module-lexer");
 const esbuild_1 = require("@umijs/bundler-utils/compiled/esbuild");
 const utils_1 = require("@umijs/utils");
@@ -31,7 +32,22 @@ function scanContent(opts) {
     return __awaiter(this, void 0, void 0, function* () {
         yield es_module_lexer_1.init;
         const [imports] = (0, es_module_lexer_1.parse)(opts.content);
-        const deps = imports.map((imp) => {
+        const deps = imports
+            .filter(
+        // exclude all type-only deps
+        (imp) => {
+            const stmt = opts.content.slice(imp.ss, imp.se);
+            return (
+            // skip dynamicImport
+            imp.d > -1 ||
+                // import a from or import a,
+                /^import\s+[a-zA-Z_$][\w_$]*(\s+from|\s*,)/.test(stmt) ||
+                // export a from or export *
+                /^export\s+([a-zA-Z_$][\w_$]*\s+from|\*)/.test(stmt) ||
+                // { a, type b } or { type a, b }
+                /(?<!type\s+){(\s*(?!type)[a-zA-Z_$]|.*,\s*(?!type)[a-zA-Z_$])/.test(stmt));
+        })
+            .map((imp) => {
             let importType = ImportType.import;
             if (imp.d > -1)
                 importType = ImportType.dynamicImport;
@@ -94,13 +110,12 @@ function scan(opts) {
             cache.set(depPath, deps);
             for (const dep of deps) {
                 const resolved = yield opts.resolver.resolve((0, path_1.dirname)(depPath), dep.url);
-                if (resolved.includes('node_modules') ||
-                    resolved.includes('umi-next/packages')) {
+                if ((0, bundler_utils_1.isDepPath)(resolved)) {
                     const pkgPath = utils_1.pkgUp.sync({ cwd: resolved });
                     (0, assert_1.default)(pkgPath, `package.json for found for ${resolved}`);
                     const pkg = require(pkgPath);
                     const entryResolved = yield opts.resolver
-                        .resolve((0, path_1.dirname)(pkgPath), pkg.name)
+                        .resolve((0, path_1.dirname)(pkgPath), '.')
                         // alias may resolve error (eg: dva from @umijs/plugins)
                         // fallback to null for mark it as subpath usage
                         .catch(() => null);

package/dist/registerMethods.js

@@ -14,7 +14,7 @@ exports.default = (api) => {
         'onGenerateFiles',
         'onBeforeCompiler',
         'onBuildComplete',
-        // 'onPatchRoute',
+        'onPatchRoute',
         // 'onPatchRouteBefore',
         // 'onPatchRoutes',
         // 'onPatchRoutesBefore',

package/dist/types.d.ts

@@ -101,6 +101,9 @@ export declare type IApi = PluginAPI & IServicePluginAPI & {
         stats: any;
         time: number;
     }>;
+    onPatchRoute: IEvent<{
+        route: IRoute;
+    }>;
     addEntryImports: IAdd<null, IEntryImport[]>;
     addEntryImportsAhead: IAdd<null, IEntryImport[]>;
     addEntryCodeAhead: IAdd<null, string[]>;

package/dist/utils/transformIEAR.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IEAR_REG_EXP = void 0;
+const bundler_utils_1 = require("@umijs/bundler-utils");
 const utils_1 = require("@umijs/utils");
 const path_1 = require("path");
 /**
@@ -88,7 +89,7 @@ function transformIEAR({ content, path }, api) {
             // prepend ./ for same or sub level imports
             /^(?!\.\.\/)/, './');
         }
-        else if (absPath.includes('node_modules')) {
+        else if ((0, bundler_utils_1.isDepPath)(absPath)) {
             // transform node_modules absolute imports
             // why @fs
             // 由于我们临时文件下大量绝对路径的引用，而绝对路径的引用不会被 Vite 预编译

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-umi",
-  "version": "4.0.0-beta.16",
+  "version": "4.0.0-beta.17",
   "description": "@umijs/preset-umi",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/preset-umi#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -24,15 +24,15 @@
   },
   "dependencies": {
     "@types/multer": "1.4.7",
-    "@umijs/ast": "4.0.0-beta.16",
-    "@umijs/babel-preset-umi": "4.0.0-beta.16",
-    "@umijs/bundler-utils": "4.0.0-beta.16",
-    "@umijs/bundler-vite": "4.0.0-beta.16",
-    "@umijs/bundler-webpack": "4.0.0-beta.16",
-    "@umijs/core": "4.0.0-beta.16",
-    "@umijs/renderer-react": "4.0.0-beta.16",
-    "@umijs/server": "4.0.0-beta.16",
-    "@umijs/utils": "4.0.0-beta.16",
+    "@umijs/ast": "4.0.0-beta.17",
+    "@umijs/babel-preset-umi": "4.0.0-beta.17",
+    "@umijs/bundler-utils": "4.0.0-beta.17",
+    "@umijs/bundler-vite": "4.0.0-beta.17",
+    "@umijs/bundler-webpack": "4.0.0-beta.17",
+    "@umijs/core": "4.0.0-beta.17",
+    "@umijs/renderer-react": "4.0.0-beta.17",
+    "@umijs/server": "4.0.0-beta.17",
+    "@umijs/utils": "4.0.0-beta.17",
     "core-js": "3.19.2",
     "current-script-polyfill": "1.0.0",
     "enhanced-resolve": "5.8.3",