@umijs/preset-umi 4.0.0 → 4.0.3

package/dist/commands/dev/dev.js

@@ -16,6 +16,12 @@ const printMemoryUsage_1 = require("./printMemoryUsage");
 const watch_1 = require("./watch");
 const bundlerWebpack = (0, lazyImportFromCurrentPkg_1.lazyImportFromCurrentPkg)('@umijs/bundler-webpack');
 const bundlerVite = (0, lazyImportFromCurrentPkg_1.lazyImportFromCurrentPkg)('@umijs/bundler-vite');
+const MFSU_EAGER_DEFAULT_INCLUDE = [
+    'react',
+    'react-error-overlay',
+    'react/jsx-dev-runtime',
+    '@umijs/utils/compiled/strip-ansi',
+];
 exports.default = (api) => {
     api.describe({
         enableBy() {
@@ -32,7 +38,7 @@ umi dev
 PORT=8888 umi dev
 `,
         async fn() {
-            var _a, _b;
+            var _a, _b, _c, _d, _e;
             utils_1.logger.info(utils_1.chalk.cyan.bold(`Umi v${api.appData.umi.version}`));
             const enableVite = !!api.config.vite;
             // clear tmp
@@ -199,6 +205,17 @@ PORT=8888 umi dev
                 });
             };
             const debouncedPrintMemoryUsage = utils_1.lodash.debounce(printMemoryUsage_1.printMemoryUsage, 5000);
+            let srcCodeCache;
+            if (((_b = api.config.mfsu) === null || _b === void 0 ? void 0 : _b.strategy) === 'eager') {
+                srcCodeCache = new utils_1.AutoUpdateSrcCodeCache({
+                    cwd: api.paths.absSrcPath,
+                    cachePath: (0, path_1.join)(api.paths.absNodeModulesPath, '.cache', 'mfsu', 'v4'),
+                });
+                await srcCodeCache.init();
+                (0, watch_1.addUnWatch)(() => {
+                    srcCodeCache.unwatch();
+                });
+            }
             const opts = {
                 config: api.config,
                 cwd: api.cwd,
@@ -241,13 +258,19 @@ PORT=8888 umi dev
                         ...opts,
                     };
                 },
-                mfsuWithESBuild: (_b = api.config.mfsu) === null || _b === void 0 ? void 0 : _b.esbuild,
+                mfsuWithESBuild: (_c = api.config.mfsu) === null || _c === void 0 ? void 0 : _c.esbuild,
+                mfsuStrategy: (_d = api.config.mfsu) === null || _d === void 0 ? void 0 : _d.strategy,
                 cache: {
                     buildDependencies: [
                         api.pkgPath,
                         api.service.configManager.mainConfigFile || '',
                     ].filter(Boolean),
                 },
+                srcCodeCache,
+                mfsuInclude: utils_1.lodash.union([
+                    ...MFSU_EAGER_DEFAULT_INCLUDE,
+                    ...(((_e = api.config.mfsu) === null || _e === void 0 ? void 0 : _e.include) || []),
+                ]),
             };
             if (enableVite) {
                 await bundlerVite.dev(opts);

package/dist/commands/generators/jest.js

@@ -37,11 +37,18 @@ exports.default = (api) => {
             const packageToInstall = res.willUseTLR
                 ? {
                     ...basicDeps,
-                    '@testing-library/react': '^12',
+                    '@testing-library/react': '^13',
+                    '@testing-library/jest-dom': '^5.16.4',
+                    '@types/testing-library__jest-dom': '^5.14.5',
                 }
                 : basicDeps;
             h.addDevDeps(packageToInstall);
             h.addScript('test', 'jest');
+            if (res.willUseTLR) {
+                (0, fs_1.writeFileSync)((0, path_1.join)(api.cwd, 'jest-setup.ts'), `import '@testing-library/jest-dom';
+          `.trimLeft());
+                utils_1.logger.info('Write jest-setup.ts');
+            }
             const importSource = api.appData.umi.importSource;
             (0, fs_1.writeFileSync)((0, path_1.join)(api.cwd, 'jest.config.ts'), `
 import { Config, configUmiAlias, createConfig } from '${importSource}/test';
@@ -51,6 +58,7 @@ export default async () => {
     ...createConfig({
       target: 'browser',
     }),
+    ${res.willUseTLR ? `setupFilesAfterEnv: ['<rootDir>/jest-setup.ts'],` : ''}
     // if you require some es-module npm package, please uncomment below line and insert your package name
     // transformIgnorePatterns: ['node_modules/(?!.*(lodash-es|your-es-pkg-name)/)']
   })) as Config.InitialOptions;

package/dist/commands/generators/tsconfig.js

@@ -25,24 +25,9 @@ exports.default = (api) => {
             });
             (0, fs_1.writeFileSync)((0, path_1.join)(api.cwd, 'tsconfig.json'), `
 {
-  "compilerOptions": {
-    "target": "esnext",
-    "module": "esnext",
-    "moduleResolution": "node",
-    "importHelpers": true,
-    "jsx": "react",
-    "esModuleInterop": true,
-    "sourceMap": true,
-    "baseUrl": ".",
-    "strict": true,
-    "paths": {
-      "@/*": ["*"],
-      "@@/*": [".umi/*"]
-    },
-    "allowSyntheticDefaultImports": true
-  }
+  "extends": "./${api.appData.hasSrcDir ? 'src/' : ''}.umi/tsconfig.json"
 }
-`.trimLeft());
+`.trimStart());
             utils_1.logger.info('Write tsconfig.json');
             h.installDeps();
         },

package/dist/commands/lint.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("@umijs/utils");
 exports.default = (api) => {
     api.registerCommand({
         name: 'lint',
@@ -18,17 +19,21 @@ umi lint --stylelint-only
 umi lint --fix
 `,
         fn: async function () {
+            // re-parse cli args to process boolean flags, for get the lint-staged args
+            const args = (0, utils_1.yParser)(process.argv.slice(3), {
+                boolean: ['fix', 'eslint-only', 'stylelint-only'],
+            });
             try {
                 require.resolve('@umijs/lint/package.json');
             }
             catch (err) {
                 throw new Error('@umijs/lint is not built-in, please install it manually before run umi lint.');
             }
-            if (api.args._.length === 0) {
-                api.args._.unshift('{src,test}/**/*.{js,jsx,ts,tsx,less,css}');
+            if (args._.length === 0) {
+                args._.unshift('{src,test}/**/*.{js,jsx,ts,tsx,less,css}');
             }
             // lazy require for CLI performance
-            require('@umijs/lint').default({ cwd: api.cwd }, api.args);
+            require('@umijs/lint').default({ cwd: api.cwd }, args);
         },
     });
 };

package/dist/commands/preview.js

@@ -52,10 +52,11 @@ umi preview --port [port]
                         app.use(key, (0, http_proxy_middleware_1.createProxyMiddleware)(key, {
                             ...proxy[key],
                             // Add x-real-url in response header
-                            onProxyRes(proxyRes, req) {
-                                var _a;
+                            onProxyRes(proxyRes, req, res) {
+                                var _a, _b;
                                 proxyRes.headers['x-real-url'] =
                                     ((_a = new URL(req.url || '', target)) === null || _a === void 0 ? void 0 : _a.href) || '';
+                                (_b = proxyConfig.onProxyRes) === null || _b === void 0 ? void 0 : _b.call(proxyConfig, proxyRes, req, res);
                             },
                         }));
                     }

package/dist/features/configPlugins/schema.d.ts

@@ -1,2 +1,2 @@
-import type { Root } from '@umijs/core/compiled/@hapi/joi';
+import type { Root } from '@umijs/utils/compiled/@hapi/joi';
 export declare function getSchemas(): Record<string, (Joi: Root) => any>;

package/dist/features/configPlugins/schema.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSchemas = void 0;
+// sort-object-keys
 const utils_1 = require("@umijs/utils");
 function getSchemas() {
     return {

package/dist/features/ssr/ssr.js

@@ -4,7 +4,6 @@ const types_1 = require("@umijs/core/dist/types");
 const utils_1 = require("@umijs/utils");
 const fs_1 = require("fs");
 const path_1 = require("path");
-const builder_1 = require("./builder/builder");
 const utils_2 = require("./utils");
 exports.default = (api) => {
     api.describe({
@@ -52,7 +51,8 @@ export { React };
         });
     });
     api.onBeforeCompiler(async () => {
-        await (0, builder_1.build)({
+        const { build } = (0, utils_1.importLazy)(require.resolve('./builder/builder'));
+        await build({
             api,
             watch: api.env === 'development',
         });

package/dist/features/tmpFiles/configTypes.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const joi_1 = __importDefault(require("@umijs/core/compiled/@hapi/joi"));
+const joi_1 = __importDefault(require("@umijs/utils/compiled/@hapi/joi"));
 // @ts-ignore
 const joi2types_1 = __importDefault(require("../../../compiled/joi2types"));
 exports.default = (api) => {

package/dist/features/tmpFiles/routes.d.ts

@@ -4,7 +4,7 @@ export declare function getApiRoutes(opts: {
 }): Promise<any>;
 export declare function getRoutes(opts: {
     api: IApi;
-}): Promise<any>;
+}): Promise<Record<string, any>>;
 export declare function getRouteComponents(opts: {
     routes: Record<string, any>;
     prefix: string;

package/dist/features/tmpFiles/routes.js

@@ -50,7 +50,7 @@ async function getRoutes(opts) {
                     basedir: opts.api.paths.absPagesPath,
                     extensions: ['.js', '.jsx', '.tsx', '.ts', '.vue'],
                 }));
-                component = component.replace(`${opts.api.paths.absSrcPath}/`, '@/');
+                component = component.replace((0, utils_1.winPath)(`${opts.api.paths.absSrcPath}/`), '@/');
                 return component;
             },
         });
@@ -86,7 +86,7 @@ async function getRoutes(opts) {
             }
             const isJSFile = /.[jt]sx?$/.test(file);
             routes[id].__content = (0, fs_1.readFileSync)(file, 'utf-8');
-            routes[id].__absFile = file;
+            routes[id].__absFile = (0, utils_1.winPath)(file);
             routes[id].__isJSFile = isJSFile;
             if (opts.api.config.ssr || opts.api.config.clientLoader) {
                 routes[id].__exports =
@@ -112,6 +112,8 @@ async function getRoutes(opts) {
     const absLayoutPath = (0, utils_1.tryPaths)([
         (0, path_1.join)(opts.api.paths.absSrcPath, 'layouts/index.tsx'),
         (0, path_1.join)(opts.api.paths.absSrcPath, 'layouts/index.vue'),
+        (0, path_1.join)(opts.api.paths.absSrcPath, 'layouts/index.jsx'),
+        (0, path_1.join)(opts.api.paths.absSrcPath, 'layouts/index.js'),
     ]);
     const layouts = (await opts.api.applyPlugins({
         key: 'addLayouts',
@@ -119,11 +121,14 @@ async function getRoutes(opts) {
             absLayoutPath && {
                 id: '@@/global-layout',
                 file: (0, utils_1.winPath)(absLayoutPath),
+                test(route) {
+                    return route.layout !== false;
+                },
             },
         ].filter(Boolean),
     })).map((layout) => {
         // prune local path prefix, avoid mix in outputs
-        layout.file = layout.file.replace(new RegExp(`^${absSrcPath}`), '@');
+        layout.file = layout.file.replace(new RegExp(`^${(0, utils_1.winPath)(absSrcPath)}`), '@');
         return layout;
     });
     for (const layout of layouts) {
@@ -135,6 +140,7 @@ async function getRoutes(opts) {
                 file: layout.file,
                 parentId: undefined,
                 absPath: '/',
+                isLayout: true,
             },
             routes,
             test: layout.test,
@@ -159,7 +165,7 @@ exports.getRoutes = getRoutes;
 async function getRouteComponents(opts) {
     const imports = Object.keys(opts.routes)
         .map((key) => {
-        const useSuspense = true; // opts.api.appData.react.version.startsWith('18.');
+        const useSuspense = opts.api.appData.framework === 'react' ? true : false; // opts.api.appData.react.version.startsWith('18.');
         const route = opts.routes[key];
         if (!route.file) {
             return useSuspense
@@ -174,7 +180,11 @@ async function getRouteComponents(opts) {
         // component: (() => () => <h1>foo</h1>)()
         if (route.file.startsWith('(')) {
             return useSuspense
-                ? `'${key}': React.lazy(() => Promise.resolve(${route.file})),`
+                ? // Compatible with none default route exports
+                    // e.g. https://github.com/umijs/umi/blob/0d40a07bf28b0760096cbe2f22da4d639645b937/packages/plugins/src/qiankun/master.ts#L55
+                    `'${key}': React.lazy(
+              () => Promise.resolve(${route.file}).then(e => e?.default ? e : ({ default: e }))
+            ),`
                 : `'${key}': () => Promise.resolve(${route.file}),`;
         }
         const path = (0, path_1.isAbsolute)(route.file) || route.file.startsWith('@/')

package/dist/features/tmpFiles/tmpFiles.js

@@ -51,8 +51,6 @@ exports.default = (api) => {
                     strict: true,
                     resolveJsonModule: true,
                     allowSyntheticDefaultImports: true,
-                    // Enforce using `import type` instead of `import` for types
-                    importsNotUsedAsValues: 'error',
                     // Supported by vue only
                     ...(api.appData.framework === 'vue'
                         ? {
@@ -267,6 +265,7 @@ declare module '*.txt' {
             noPluginDir: true,
             path: 'core/EmptyRoute.tsx',
             content: `
+import React from 'react';
 import { Outlet } from 'umi';
 export default function EmptyRoute() {
   return <Outlet />;
@@ -302,6 +301,7 @@ export default function EmptyRoute() {
             path: 'core/route.tsx',
             tplPath: (0, path_1.join)(constants_1.TEMPLATES_DIR, 'route.tpl'),
             context: {
+                isReact: api.appData.framework === 'react',
                 isClientLoaderEnabled: !!api.config.clientLoader,
                 routes: JSON.stringify(clonedRoutes)
                     // "clientLoaders['foo']" > clientLoaders['foo']
@@ -379,14 +379,17 @@ export default function EmptyRoute() {
             });
         }
         // history.ts
-        api.writeTmpFile({
-            noPluginDir: true,
-            path: 'core/history.ts',
-            tplPath: (0, path_1.join)(constants_1.TEMPLATES_DIR, 'history.tpl'),
-            context: {
-                rendererPath,
-            },
-        });
+        // only react generates because the preset-vue override causes vite hot updates to fail
+        if (api.appData.framework === 'react') {
+            api.writeTmpFile({
+                noPluginDir: true,
+                path: 'core/history.ts',
+                tplPath: (0, path_1.join)(constants_1.TEMPLATES_DIR, 'history.tpl'),
+                context: {
+                    rendererPath,
+                },
+            });
+        }
     });
     function checkMembers(opts) {
         const conflicts = utils_1.lodash.intersection(opts.exportMembers, opts.members);

package/dist/registerMethods.js

@@ -83,17 +83,19 @@ exports.default = (api) => {
                 (0, assert_1.default)(utils_1.lodash.isPlainObject(opts.context), `opts.context must be plain object.`);
                 content = utils_1.Mustache.render(tpl, opts.context);
             }
+            // Only js files generate comments
+            const isJsFile = /\.(t|j)sx?$/.test(absPath);
             content = [
                 (0, isTypeScriptFile_1.isTypeScriptFile)(opts.path) && `// @ts-nocheck`,
-                '// This file is generated by Umi automatically',
-                '// DO NOT CHANGE IT MANUALLY!',
+                isJsFile && '// This file is generated by Umi automatically',
+                isJsFile && '// DO NOT CHANGE IT MANUALLY!',
                 content.trim(),
                 '',
             ]
                 .filter((text) => text !== false)
                 .join('\n');
             // transform imports for all javascript-like files only vite mode enable
-            if (api.appData.vite && /\.(t|j)sx?$/.test(absPath)) {
+            if (api.appData.vite && isJsFile) {
                 content = (0, transformIEAR_1.default)({ content, path: absPath }, api);
             }
             if (!(0, fs_1.existsSync)(absPath)) {

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@umijs/preset-umi",
-  "version": "4.0.0",
+  "version": "4.0.3",
   "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",
+  "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme",
+  "bugs": "https://github.com/umijs/umi/issues",
   "repository": {
     "type": "git",
-    "url": "https://github.com/umijs/umi-next"
+    "url": "https://github.com/umijs/umi"
   },
   "license": "MIT",
   "main": "dist/index.js",
@@ -21,20 +21,20 @@
   "scripts": {
     "build": "pnpm tsc",
     "build:deps": "umi-scripts bundleDeps",
-    "dev": "pnpm build -- --watch",
+    "dev": "pnpm build --watch",
     "test": "umi-scripts jest-turbo"
   },
   "dependencies": {
     "@types/multer": "1.4.7",
-    "@umijs/ast": "4.0.0",
-    "@umijs/babel-preset-umi": "4.0.0",
-    "@umijs/bundler-utils": "4.0.0",
-    "@umijs/bundler-vite": "4.0.0",
-    "@umijs/bundler-webpack": "4.0.0",
-    "@umijs/core": "4.0.0",
-    "@umijs/renderer-react": "4.0.0",
-    "@umijs/server": "4.0.0",
-    "@umijs/utils": "4.0.0",
+    "@umijs/ast": "4.0.3",
+    "@umijs/babel-preset-umi": "4.0.3",
+    "@umijs/bundler-utils": "4.0.3",
+    "@umijs/bundler-vite": "4.0.3",
+    "@umijs/bundler-webpack": "4.0.3",
+    "@umijs/core": "4.0.3",
+    "@umijs/renderer-react": "4.0.3",
+    "@umijs/server": "4.0.3",
+    "@umijs/utils": "4.0.3",
     "core-js": "3.22.4",
     "current-script-polyfill": "1.0.0",
     "enhanced-resolve": "5.9.3",

package/templates/generate/api.ts.tpl

@@ -1,4 +1,4 @@
-import { UmiApiRequest, UmiApiResponse } from "umi";
+import type { UmiApiRequest, UmiApiResponse } from "umi";
 
 export default async function (req: UmiApiRequest, res: UmiApiResponse) {
   switch (req.method) {

package/templates/route.tpl

@@ -1,7 +1,9 @@
 {{#isClientLoaderEnabled}}
 import clientLoaders from './loaders.js';
 {{/isClientLoaderEnabled}}
+{{#isReact}}
 import React from 'react';
+{{/isReact}}
 
 export async function getRoutes() {
   return {