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

package/dist/commands/build.js

@@ -110,7 +110,7 @@ umi build --clean
                 const { vite } = api.args;
                 const markupArgs = yield (0, getMarkupArgs_1.getMarkupArgs)({ api });
                 // @ts-ignore
-                const markup = yield (0, server_1.getMarkup)(Object.assign(Object.assign({}, markupArgs), { scripts: ['/umi.js'].concat(markupArgs.scripts), esmScript: !!opts.config.esm || vite, path: '/' }));
+                const markup = yield (0, server_1.getMarkup)(Object.assign(Object.assign({}, markupArgs), { styles: ['/umi.css'].concat(markupArgs.styles), scripts: ['/umi.js'].concat(markupArgs.scripts), esmScript: !!opts.config.esm || vite, path: '/' }));
                 (0, fs_1.writeFileSync)((0, path_1.join)(api.paths.absOutputPath, 'index.html'), markup, 'utf-8');
                 utils_1.logger.event('build index.html');
                 // print size

package/dist/commands/dev/createRouteMiddleware.js

@@ -28,11 +28,11 @@ function createRouteMiddleware(opts) {
             // add noshim attr for skip importmap shim logic for this modules
             { content: viteRefreshScript, noshim: '' },
             { src: '/@vite/client', noshim: '' },
-            '/.umi/umi.ts',
+            opts.api.appData.hasSrcDir ? '/src/.umi/umi.ts' : '/.umi/umi.ts',
         ];
         const markupArgs = yield (0, getMarkupArgs_1.getMarkupArgs)(opts);
         // @ts-ignore
-        const requestHandler = yield (0, server_1.createRequestHandler)(Object.assign(Object.assign({}, markupArgs), { scripts: (vite ? viteScripts : ['/umi.js']).concat(markupArgs.scripts), esmScript: vite }));
+        const requestHandler = yield (0, server_1.createRequestHandler)(Object.assign(Object.assign({}, markupArgs), { styles: ['/umi.css'].concat(markupArgs.styles), scripts: (vite ? viteScripts : ['/umi.js']).concat(markupArgs.scripts), esmScript: vite }));
         requestHandler(req, res, next);
     });
 }

package/dist/commands/dev/dev.js

@@ -238,7 +238,12 @@ PORT=8888 umi dev
                             key: 'onDevCompileDone',
                             args: opts,
                         });
-                    }, mfsuWithESBuild: (_a = api.config.mfsu) === null || _a === void 0 ? void 0 : _a.esbuild });
+                    }, mfsuWithESBuild: (_a = api.config.mfsu) === null || _a === void 0 ? void 0 : _a.esbuild, cache: {
+                        buildDependencies: [
+                            api.pkgPath,
+                            api.service.configManager.mainConfigFile || '',
+                        ].filter(Boolean),
+                    } });
                 if (enableVite) {
                     yield bundlerVite.dev(opts);
                 }

package/dist/commands/dev/getMarkupArgs.js

@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMarkupArgs = void 0;
 const cheerio_1 = __importDefault(require("@umijs/utils/compiled/cheerio"));
 function getMarkupArgs(opts) {
+    var _a;
     return __awaiter(this, void 0, void 0, function* () {
         const headScripts = yield opts.api.applyPlugins({
             key: 'addHTMLHeadScripts',
@@ -42,7 +43,7 @@ function getMarkupArgs(opts) {
         });
         return {
             mountElementId: opts.api.config.mountElementId,
-            base: opts.api.config.base,
+            base: ((_a = opts.api.config.history) === null || _a === void 0 ? void 0 : _a.type) === 'browser' ? opts.api.config.base : '/',
             routes: opts.api.appData.routes,
             favicon,
             headScripts,

package/dist/features/configPlugins/configPlugins.js

@@ -16,8 +16,7 @@ function resolveProjectDep(opts) {
 exports.default = (api) => {
     const configDefaults = {
         alias: {
-            umi: process.env.UMI_DIR,
-            '@umijs/renderer-react': (0, path_1.dirname)(require.resolve('@umijs/renderer-react/package.json')),
+            umi: '@@/exports',
             react: resolveProjectDep({
                 pkg: api.pkg,
                 cwd: api.cwd,
@@ -36,6 +35,7 @@ exports.default = (api) => {
         publicPath: '/',
         mountElementId: 'root',
         base: '/',
+        history: { type: 'browser' },
     };
     const bundleSchemas = (0, schema_1.getSchemas)();
     const extraSchemas = (0, schema_2.getSchemas)();

package/dist/features/configPlugins/schema.js

@@ -5,14 +5,20 @@ const utils_1 = require("@umijs/utils");
 function getSchemas() {
     return {
         base: (Joi) => Joi.string(),
-        plugins: (Joi) => Joi.array().items(Joi.string()),
-        publicPath: (Joi) => Joi.string().regex(/\/$/).error(new Error('publicPath must end with /')),
         favicon: (Joi) => Joi.string(),
-        headScripts: (Joi) => Joi.array().items(Joi.alternatives(Joi.string())),
-        scripts: (Joi) => Joi.array().items(Joi.alternatives(Joi.string())),
+        headScripts: (Joi) => Joi.array(),
+        history: (Joi) => Joi.object({
+            type: Joi.string().valid('browser', 'hash', 'memory'),
+        }),
+        links: (Joi) => Joi.array(),
+        metas: (Joi) => Joi.array(),
         mountElementId: (Joi) => Joi.string(),
         npmClient: (Joi) => Joi.string().valid(utils_1.NpmClientEnum.pnpm, utils_1.NpmClientEnum.tnpm, utils_1.NpmClientEnum.cnpm, utils_1.NpmClientEnum.yarn, utils_1.NpmClientEnum.npm),
+        plugins: (Joi) => Joi.array().items(Joi.string()),
+        publicPath: (Joi) => Joi.string().regex(/\/$/).error(new Error('publicPath must end with /')),
         routes: (Joi) => Joi.array().items(Joi.object()),
+        scripts: (Joi) => Joi.array(),
+        styles: (Joi) => Joi.array(),
     };
 }
 exports.getSchemas = getSchemas;

package/dist/features/esmi/Service.js

@@ -101,6 +101,7 @@ class ESMIService {
             });
             // get the build ticket id
             const ticketId = yield this.build(data);
+            utils_1.logger.info(`ticketId: ${ticketId}`);
             // continue to the next request after 2s
             const next = () => new Promise((resolve) => setTimeout(() => resolve(deferrer()), 2000));
             const deferrer = () => {

package/dist/features/esmi/esbuildPlugins/requireToImport.d.ts

@@ -0,0 +1,8 @@
+import { Plugin } from '@umijs/bundler-utils/compiled/esbuild';
+import type { DepOptimizationOptions } from 'vite';
+/**
+ * transform require call to import
+ */
+export default function requireToImportPlugin({ exclude, }: {
+    exclude: NonNullable<DepOptimizationOptions['exclude']>;
+}): Plugin;

package/dist/features/esmi/esbuildPlugins/requireToImport.js

@@ -0,0 +1,61 @@
+"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 lodash_1 = require("@umijs/utils/compiled/lodash");
+/**
+ * transform require call to import
+ */
+function requireToImportPlugin({ exclude, }) {
+    const regSafeExclude = exclude.map((e) => e.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'));
+    const requireRegExp = new RegExp(`^(${regSafeExclude.join('|')})$`);
+    return {
+        name: 'preset-umi:esmi-require-to-import',
+        setup(build) {
+            // handler require calls for external deps
+            build.onResolve({
+                filter: requireRegExp,
+            }, (args) => __awaiter(this, void 0, void 0, function* () {
+                if (args.kind === 'require-call') {
+                    return {
+                        path: args.path,
+                        namespace: 'esmi-require-to-import',
+                        pluginData: {
+                            resolveDir: args.resolveDir,
+                        },
+                    };
+                }
+            }));
+            // replace load content
+            build.onLoad({
+                filter: /.*/,
+                namespace: 'esmi-require-to-import',
+            }, (args) => {
+                const { resolveDir } = args.pluginData || {};
+                const packageName = args.path;
+                const starSpecifier = `${(0, lodash_1.camelCase)(packageName)}Star`;
+                const defaultSpecifier = `${(0, lodash_1.camelCase)(packageName)}Default`;
+                return {
+                    resolveDir,
+                    contents: [
+                        `import * as ${starSpecifier} from '${packageName}';`,
+                        '',
+                        `const ${defaultSpecifier} = ${starSpecifier}.default ? ${starSpecifier}.default : ${starSpecifier};`,
+                        '',
+                        `export default ${defaultSpecifier};`,
+                        `export * from '${packageName}';`,
+                        '',
+                    ].join('\n'),
+                };
+            });
+        },
+    };
+}
+exports.default = requireToImportPlugin;

package/dist/features/esmi/esbuildPlugins/topLevelExternal.d.ts

@@ -0,0 +1,13 @@
+import { Plugin } from '@umijs/bundler-utils/compiled/esbuild';
+import type { DepOptimizationOptions } from 'vite';
+import type { createResolver } from '../../../libs/scan';
+/**
+ * only external top level import, exclude sub-path imports for esmi
+ * example:
+ *   - import from 'antd' will be externalized
+ *   - import from 'antd/dist/antd.less' will not be externalized
+ */
+export default function topLevelExternal({ exclude, resolver, }: {
+    exclude: NonNullable<DepOptimizationOptions['exclude']>;
+    resolver: ReturnType<typeof createResolver>;
+}): Plugin;

package/dist/features/esmi/esbuildPlugins/topLevelExternal.js

@@ -0,0 +1,37 @@
+"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 });
+/**
+ * only external top level import, exclude sub-path imports for esmi
+ * example:
+ *   - import from 'antd' will be externalized
+ *   - import from 'antd/dist/antd.less' will not be externalized
+ */
+function topLevelExternal({ exclude, resolver, }) {
+    const regSafeExclude = exclude.map((e) => e.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'));
+    const subImportRegExp = new RegExp(`^(${regSafeExclude.join('|')})/`);
+    const extRegExp = /\.((?<!d)\.ts|jsx?|tsx)$/;
+    return {
+        name: 'preset-umi:esmi-top-level-external',
+        setup(build) {
+            build.onResolve({
+                filter: subImportRegExp,
+            }, (args) => __awaiter(this, void 0, void 0, function* () {
+                const resolved = yield resolver.resolve(args.resolveDir, args.path);
+                // only process javascript-like files
+                if (extRegExp.test(resolved)) {
+                    return { path: resolved };
+                }
+            }));
+        },
+    };
+}
+exports.default = topLevelExternal;

package/dist/features/esmi/esmi.js

@@ -16,8 +16,11 @@ const es_module_lexer_1 = require("@umijs/bundler-utils/compiled/es-module-lexer
 const magic_string_1 = __importDefault(require("magic-string"));
 const path_1 = require("path");
 const scan_1 = require("../../libs/scan");
+const requireToImport_1 = __importDefault(require("./esbuildPlugins/requireToImport"));
+const topLevelExternal_1 = __importDefault(require("./esbuildPlugins/topLevelExternal"));
 const Service_1 = __importDefault(require("./Service"));
 let importmap = { imports: {}, scopes: {} };
+let importmatches = {};
 /**
  * esmi vite plugin
  */
@@ -25,13 +28,36 @@ function esmi(opts) {
     return {
         name: 'preset-umi:esmi',
         configResolved(config) {
+            var _a, _b;
+            var _c, _d;
             const { include, exclude } = config.optimizeDeps;
+            (_a = (_c = config.optimizeDeps).include) !== null && _a !== void 0 ? _a : (_c.include = []);
             // do not pre-compile deps which will be loaded by importmap (for top-level deps)
             if (include === null || include === void 0 ? void 0 : include.length) {
-                config.optimizeDeps.include = include.filter((item) => !importmap.imports[item]);
+                config.optimizeDeps.include = include.filter((item) => !importmatches[item] && !importmap.imports[item]);
             }
-            // exclude pre-compile deps which within importmap by default (for nested deps)
-            config.optimizeDeps.exclude = (exclude || []).concat(Object.keys(importmap.imports).filter((item) => exclude === null || exclude === void 0 ? void 0 : exclude.includes(item)));
+            // exclude pre-compile deps
+            config.optimizeDeps.exclude = [
+                ...new Set([
+                    // deps from user config
+                    ...(exclude || []),
+                    // deps from local scan
+                    ...Object.keys(importmatches),
+                    // deps from esmi analyze result
+                    ...Object.keys(importmap.imports),
+                ]),
+            ];
+            // apply esbuild plugins
+            (_b = (_d = config.optimizeDeps).esbuildOptions) !== null && _b !== void 0 ? _b : (_d.esbuildOptions = {});
+            config.optimizeDeps.esbuildOptions.plugins = [
+                // transform require call to import
+                (0, requireToImport_1.default)({ exclude: config.optimizeDeps.exclude }),
+                // make sure vite only external top-level npm imports, and resolve sub-path npm imports
+                (0, topLevelExternal_1.default)({
+                    exclude: config.optimizeDeps.exclude,
+                    resolver: opts.resolver,
+                }),
+            ].concat(config.optimizeDeps.esbuildOptions.plugins || []);
         },
         transform(source) {
             try {
@@ -42,9 +68,17 @@ function esmi(opts) {
                 imports.forEach((item) => {
                     const { n: specifier, s: start, e: end } = item;
                     // replace npm package to CDN url for matched imports
-                    if (specifier && importmap.imports[specifier]) {
-                        s !== null && s !== void 0 ? s : (s = new magic_string_1.default(source));
-                        s.overwrite(start, end, importmap.imports[specifier]);
+                    if (specifier) {
+                        const replacement = 
+                        // search from local scan matches first (for alias)
+                        (importmatches[specifier] &&
+                            importmap.imports[importmatches[specifier]]) ||
+                            // search from esmi analyze result
+                            importmap.imports[specifier];
+                        if (replacement) {
+                            s !== null && s !== void 0 ? s : (s = new magic_string_1.default(source));
+                            s.overwrite(start, end, replacement);
+                        }
                     }
                 });
                 return (s === null || s === void 0 ? void 0 : s.toString()) || source;
@@ -78,7 +112,11 @@ function generatePkgData(api) {
                     name: 'default',
                     path: 'es/index.js',
                     from: '',
-                    deps: Object.entries(api.appData.deps).map(([name, version]) => ({
+                    deps: Object.entries(api.appData.deps)
+                        // only compile entry imports
+                        .filter(([_, { matches }]) => matches.length)
+                        // convert to esmi config
+                        .map(([name, { version }]) => ({
                         name,
                         version,
                         usedMap: {
@@ -110,15 +148,29 @@ exports.default = (api) => {
             // skip umi by default
             delete api.appData.deps['umi'];
             // FIXME: force include react & react-dom
-            api.appData.deps['react'] = api.appData.react.version;
-            api.appData.deps['react-dom'] = api.appData.react.version;
+            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]);
             // update importmap from esm if there has new import
             if (hasNewDep) {
-                // TODO: add local cache and restore
                 importmap = (_a = (yield service.getImportmap(data))) === null || _a === void 0 ? void 0 : _a.importMap;
+                // update matches map to dep name
+                importmatches = Object.keys(api.appData.deps).reduce((r, dep) => {
+                    // filter subpath imports
+                    if (!api.appData.deps[dep].subpaths.length) {
+                        // map all matches to dep name
+                        api.appData.deps[dep].matches.forEach((m) => {
+                            r[m] = dep;
+                        });
+                    }
+                    return r;
+                }, {});
                 // because we will replaced package name to CDN url in vite plugin
                 // so we must append scope rules for the CDN url like the import specifier
                 // example:
@@ -194,6 +246,7 @@ exports.default = (api) => {
                     yield refreshImportMap();
                     // TODO: refresh page when importmap changed
                 }),
+                resolver,
             }));
             return memo;
         });

package/dist/features/mock/getMockData.d.ts

@@ -6,4 +6,8 @@ export interface IMock {
 }
 export declare function getMockData(opts: {
     cwd: string;
+    mockConfig: {
+        exclude?: string[];
+        include?: string[];
+    };
 }): Record<string, IMock>;

package/dist/features/mock/getMockData.js

@@ -13,12 +13,16 @@ function getMockData(opts) {
         implementor: esbuild_1.default,
     });
     utils_1.register.clearFiles();
-    const ret = utils_1.glob
-        .sync(constants_1.MOCK_FILE_GLOB, { cwd: opts.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'] }));
+        return memo;
+    }, [])
         .reduce((memo, file) => {
         const mockFile = `${opts.cwd}/${file}`;
         const m = require(mockFile);
-        const obj = m.default;
+        // Cannot convert undefined or null to object
+        const obj = (m === null || m === void 0 ? void 0 : m.default) || {};
         for (const key of Object.keys(obj)) {
             const mock = getMock({ key, obj });
             mock.file = mockFile;
@@ -28,7 +32,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]) {
-                throw new Error(`${id} is duplicated in ${mockFile} and ${memo[id].file}`);
+                utils_1.logger.warn(`${id} is duplicated in ${mockFile} and ${memo[id].file}`);
             }
             memo[id] = mock;
         }
@@ -47,7 +51,7 @@ function getMock(opts) {
     return { method, path, handler };
 }
 function parseKey(key) {
-    const spliced = key.split(' ');
+    const spliced = key.split(/\s+/);
     const len = spliced.length;
     if (len === 1) {
         return { method: constants_1.DEFAULT_METHOD, path: key };
@@ -56,6 +60,7 @@ function parseKey(key) {
         const [method, path] = spliced;
         const upperCaseMethod = method.toUpperCase();
         (0, assert_1.default)(constants_1.VALID_METHODS.includes(upperCaseMethod), `method ${method} is not supported`);
+        (0, assert_1.default)(path, `${key}, path is undefined`);
         return { method: upperCaseMethod, path };
     }
 }

package/dist/features/mock/mock.js

@@ -21,6 +21,7 @@ function default_1(api) {
                     exclude: Joi.array()
                         .items(Joi.string())
                         .description('exclude files not parse mock'),
+                    include: Joi.array().items(Joi.string()),
                 });
             },
         },
@@ -37,12 +38,18 @@ function default_1(api) {
             path: `${api.cwd}/mock`,
             addToUnWatches: true,
             onChange: () => {
-                context.mockData = (0, getMockData_1.getMockData)({ cwd: api.cwd });
+                context.mockData = (0, getMockData_1.getMockData)({
+                    cwd: api.cwd,
+                    mockConfig: api.config.mock || {},
+                });
             },
         });
     });
     api.addBeforeMiddlewares(() => __awaiter(this, void 0, void 0, function* () {
-        context.mockData = (0, getMockData_1.getMockData)({ cwd: api.cwd });
+        context.mockData = (0, getMockData_1.getMockData)({
+            cwd: api.cwd,
+            mockConfig: api.config.mock || {},
+        });
         return [
             (0, createMockMiddleware_1.createMockMiddleware)({
                 context,

package/dist/features/polyfill/polyfill.js

@@ -1,14 +1,44 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = require("path");
 exports.default = (api) => {
-    api.addPolyfillImports(() => {
+    api.describe({
+        key: 'polyfill',
+        config: {
+            schema(Joi) {
+                return Joi.object().keys({
+                    imports: Joi.array().items(Joi.string()).required().unique(),
+                });
+            },
+        },
+        enableBy: () => {
+            return process.env.BABEL_POLYFILL !== 'none';
+        },
+    });
+    api.onGenerateFiles(() => {
         var _a;
-        return api.config.publicPath === 'auto' && ((_a = api.config.targets) === null || _a === void 0 ? void 0 : _a.ie)
-            ? [
-                {
-                    source: require.resolve('current-script-polyfill'),
-                },
-            ]
-            : [];
+        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) || [],
+            },
+        });
+    });
+    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/polyfill/publicPathPolyfill.d.ts

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

package/dist/features/polyfill/publicPathPolyfill.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = (api) => {
+    api.addPolyfillImports(() => {
+        var _a;
+        return api.config.publicPath === 'auto' && ((_a = api.config.targets) === null || _a === void 0 ? void 0 : _a.ie)
+            ? [
+                {
+                    source: require.resolve('current-script-polyfill'),
+                },
+            ]
+            : [];
+    });
+};

package/dist/features/tmpFiles/routes.js

@@ -49,6 +49,7 @@ function getRoutes(opts) {
                     parentId: undefined,
                 },
                 routes,
+                test: layout.test,
             });
         }
         routes = yield opts.api.applyPlugins({
@@ -64,8 +65,9 @@ function getRouteComponents(opts) {
         const imports = Object.keys(opts.routes)
             .map((key) => {
             const route = opts.routes[key];
-            if (!route.file)
-                return `// ${key}: no file to import`;
+            if (!route.file) {
+                return `'${key}': () => import('./EmptyRoute'),`;
+            }
             // e.g.
             // component: () => <h1>foo</h1>
             // component: (() => () => <h1>foo</h1>)()

package/dist/features/tmpFiles/tmpFiles.js

@@ -9,6 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const bundler_utils_1 = require("@umijs/bundler-utils");
 const utils_1 = require("@umijs/utils");
 const fs_1 = require("fs");
 const path_1 = require("path");
@@ -25,6 +26,10 @@ exports.default = (api) => {
         },
     });
     api.onGenerateFiles((opts) => __awaiter(void 0, void 0, void 0, function* () {
+        const rendererPath = yield api.applyPlugins({
+            key: 'modifyRendererPath',
+            initialValue: (0, path_1.dirname)(require.resolve('@umijs/renderer-react/package.json')),
+        });
         // umi.ts
         api.writeTmpFile({
             noPluginDir: true,
@@ -32,10 +37,7 @@ exports.default = (api) => {
             tplPath: (0, path_1.join)(constants_1.TEMPLATES_DIR, 'umi.tpl'),
             context: {
                 mountElementId: api.config.mountElementId,
-                rendererPath: yield api.applyPlugins({
-                    key: 'modifyRendererPath',
-                    initialValue: '@umijs/renderer-react',
-                }),
+                rendererPath,
                 entryCode: (yield api.applyPlugins({
                     key: 'addEntryCode',
                     initialValue: [],
@@ -57,8 +59,20 @@ exports.default = (api) => {
                     initialValue: [],
                 })).join('\n'),
                 basename: api.config.base,
+                historyType: api.config.history.type,
             },
         });
+        // EmptyRoutes.tsx
+        api.writeTmpFile({
+            noPluginDir: true,
+            path: 'core/EmptyRoute.tsx',
+            content: `
+import { Outlet } from 'umi';
+export default function EmptyRoute() {
+  return <Outlet />;
+}
+      `,
+        });
         // route.ts
         let routes;
         if (opts.isFirstTime) {
@@ -126,5 +140,73 @@ exports.default = (api) => {
                 validKeys: validKeys,
             },
         });
+        // history.ts
+        api.writeTmpFile({
+            noPluginDir: true,
+            path: 'core/history.ts',
+            tplPath: (0, path_1.join)(constants_1.TEMPLATES_DIR, 'history.tpl'),
+            context: {
+                rendererPath,
+            },
+        });
     }));
+    function getExports(opts) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const content = (0, fs_1.readFileSync)(opts.path, 'utf-8');
+            const [_, exports] = yield (0, bundler_utils_1.parseModule)({ content, path: opts.path });
+            return exports || [];
+        });
+    }
+    // Generate @@/exports.ts
+    api.register({
+        key: 'onGenerateFiles',
+        fn: () => __awaiter(void 0, void 0, void 0, function* () {
+            const exports = [];
+            // @umijs/renderer-react
+            exports.push('// @umijs/renderer-react');
+            const rendererReactPath = (0, path_1.dirname)(require.resolve('@umijs/renderer-react/package.json'));
+            exports.push(`export { ${(yield getExports({
+                path: (0, path_1.join)(rendererReactPath, 'dist/index.js'),
+            })).join(', ')} } from '${rendererReactPath}';`);
+            // umi/client/client/plugin
+            exports.push('// umi/client/client/plugin');
+            const umiDir = process.env.UMI_DIR;
+            const umiPluginPath = (0, path_1.join)(umiDir, 'client/client/plugin.js');
+            exports.push(`export { ${(yield getExports({
+                path: umiPluginPath,
+            })).join(', ')} } from '${umiPluginPath}';`);
+            // @@/core/history.ts
+            exports.push(`export { history, createHistory } from './core/history';`);
+            // plugins
+            exports.push('// plugins');
+            const plugins = (0, fs_1.readdirSync)(api.paths.absTmpPath).filter((file) => {
+                if (file.startsWith('plugin-') &&
+                    ((0, fs_1.existsSync)((0, path_1.join)(api.paths.absTmpPath, file, 'index.ts')) ||
+                        (0, fs_1.existsSync)((0, path_1.join)(api.paths.absTmpPath, file, 'index.tsx')))) {
+                    return true;
+                }
+            });
+            for (const plugin of plugins) {
+                let file;
+                if ((0, fs_1.existsSync)((0, path_1.join)(api.paths.absTmpPath, plugin, 'index.ts'))) {
+                    file = (0, path_1.join)(api.paths.absTmpPath, plugin, 'index.ts');
+                }
+                if ((0, fs_1.existsSync)((0, path_1.join)(api.paths.absTmpPath, plugin, 'index.tsx'))) {
+                    file = (0, path_1.join)(api.paths.absTmpPath, plugin, 'index.tsx');
+                }
+                const pluginExports = yield getExports({
+                    path: file,
+                });
+                if (pluginExports.length) {
+                    exports.push(`export { ${pluginExports.join(', ')} } from '${(0, path_1.join)(api.paths.absTmpPath, plugin)}';`);
+                }
+            }
+            api.writeTmpFile({
+                noPluginDir: true,
+                path: 'exports.ts',
+                content: exports.join('\n'),
+            });
+        }),
+        stage: Infinity,
+    });
 };

package/dist/index.js

@@ -13,6 +13,7 @@ exports.default = () => {
             require.resolve('./features/favicon/favicon'),
             require.resolve('./features/mock/mock'),
             require.resolve('./features/polyfill/polyfill'),
+            require.resolve('./features/polyfill/publicPathPolyfill'),
             require.resolve('./features/tmpFiles/tmpFiles'),
             require.resolve('./features/transform/transform'),
             require.resolve('./features/lowImport/lowImport'),

package/dist/libs/scan.d.ts

@@ -24,5 +24,9 @@ export declare function scan(opts: {
     entry: string;
     externals: any;
     resolver: any;
-}): Promise<Record<string, string>>;
+}): Promise<Record<string, {
+    version: string;
+    matches: string[];
+    subpaths: string[];
+}>>;
 export {};

package/dist/libs/scan.js

@@ -79,6 +79,7 @@ function createResolver(opts) {
 }
 exports.createResolver = createResolver;
 function scan(opts) {
+    var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
         const cache = new Map();
         const queueDeps = [opts.entry];
@@ -98,7 +99,45 @@ function scan(opts) {
                     const pkgPath = utils_1.pkgUp.sync({ cwd: resolved });
                     (0, assert_1.default)(pkgPath, `package.json for found for ${resolved}`);
                     const pkg = require(pkgPath);
-                    ret[pkg.name] = pkg.version;
+                    const entryResolved = yield opts.resolver
+                        .resolve((0, path_1.dirname)(pkgPath), pkg.name)
+                        // alias may resolve error (eg: dva from @umijs/plugins)
+                        // fallback to null for mark it as subpath usage
+                        .catch(() => null);
+                    const isSubpath = entryResolved !== resolved;
+                    ret[pkg.name] = {
+                        version: pkg.version,
+                        // collect entry matches
+                        matches: [
+                            // avoid duplicate
+                            ...new Set([
+                                ...(((_a = ret[pkg.name]) === null || _a === void 0 ? void 0 : _a.matches) || []),
+                                // only collect non-subpath matches
+                                ...(!isSubpath
+                                    ? [
+                                        // match origin path from source code
+                                        dep.url,
+                                        // match resolved absolute path
+                                        resolved,
+                                        // match no ext name path
+                                        resolved.replace(/\/\.[^\.]+$/, ''),
+                                        // match parent dir for index module
+                                        ...(/\/index[^\/]+$/.test(resolved)
+                                            ? [(0, path_1.dirname)(resolved)]
+                                            : []),
+                                    ]
+                                    : []),
+                            ]),
+                        ],
+                        // collect subpath matches
+                        subpaths: [
+                            // avoid duplicate
+                            ...new Set([
+                                ...(((_b = ret[pkg.name]) === null || _b === void 0 ? void 0 : _b.subpaths) || []),
+                                ...(isSubpath ? [dep.url] : []),
+                            ]),
+                        ],
+                    };
                 }
                 else if (['.ts', '.tsx', '.js', '.jsx', '.mjs'].includes((0, path_1.extname)(resolved))) {
                     queueDeps.push(resolved);

package/dist/registerMethods.js

@@ -7,8 +7,8 @@ const utils_1 = require("@umijs/utils");
 const assert_1 = __importDefault(require("assert"));
 const fs_1 = require("fs");
 const path_1 = require("path");
-const transformIEAR_1 = __importDefault(require("./utils/transformIEAR"));
 const isTypeScriptFile_1 = require("./utils/isTypeScriptFile");
+const transformIEAR_1 = __importDefault(require("./utils/transformIEAR"));
 exports.default = (api) => {
     [
         'onGenerateFiles',

package/dist/utils/transformIEAR.js

@@ -84,10 +84,14 @@ function transformIEAR({ content, path }, api) {
     return content.replace(exports.IEAR_REG_EXP, (_, prefix, quote, absPath) => {
         if (absPath.startsWith(api.paths.absTmpPath)) {
             // transform .umi absolute imports
-            absPath = (0, utils_1.winPath)((0, path_1.relative)((0, path_1.dirname)(path), absPath));
+            absPath = (0, utils_1.winPath)((0, path_1.relative)((0, path_1.dirname)(path), absPath)).replace(
+            // prepend ./ for same or sub level imports
+            /^(?!\.\.\/)/, './');
         }
         else if (absPath.includes('node_modules')) {
             // transform node_modules absolute imports
+            // why @fs
+            // 由于我们临时文件下大量绝对路径的引用，而绝对路径的引用不会被 Vite 预编译
             absPath = `@fs${absPath}`;
         }
         return `${prefix}${quote}${absPath}${quote}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-umi",
-  "version": "4.0.0-beta.15",
+  "version": "4.0.0-beta.16",
   "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,21 +24,22 @@
   },
   "dependencies": {
     "@types/multer": "1.4.7",
-    "@umijs/ast": "4.0.0-beta.15",
-    "@umijs/babel-preset-umi": "4.0.0-beta.15",
-    "@umijs/bundler-utils": "4.0.0-beta.15",
-    "@umijs/bundler-vite": "4.0.0-beta.15",
-    "@umijs/bundler-webpack": "4.0.0-beta.15",
-    "@umijs/core": "4.0.0-beta.15",
-    "@umijs/renderer-react": "4.0.0-beta.15",
-    "@umijs/server": "4.0.0-beta.15",
-    "@umijs/utils": "4.0.0-beta.15",
+    "@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",
+    "core-js": "3.19.2",
     "current-script-polyfill": "1.0.0",
     "enhanced-resolve": "5.8.3",
     "magic-string": "0.25.7",
     "path-to-regexp": "1.7.0",
-    "react": "18.0.0-rc.0",
-    "react-dom": "18.0.0-rc.0",
+    "react": "17.0.2",
+    "react-dom": "17.0.2",
     "react-router": "6.1.1",
     "react-router-dom": "6.1.1"
   },

package/templates/history.tpl

@@ -0,0 +1,15 @@
+import { createHashHistory, createMemoryHistory, createBrowserHistory, History } from '{{{ rendererPath }}}';
+
+let history: History;
+export function createHistory(opts: any) {
+  if (opts.type === 'hash') {
+    history = createHashHistory();
+  } else if (opts.type === 'memory') {
+    history = createMemoryHistory();
+  } else {
+    history = createBrowserHistory();
+  }
+  return history;
+}
+
+export { history };

package/templates/umi.tpl

@@ -3,6 +3,7 @@
 import { renderClient } from '{{{ rendererPath }}}';
 import { getRoutes } from './core/route';
 import { createPluginManager } from './core/plugin';
+import { createHistory } from './core/history';
 import { ApplyPluginsType, PluginManager } from 'umi';
 {{{ imports }}}
 
@@ -24,6 +25,9 @@ async function render() {
     routeComponents,
     pluginManager,
     rootElement: document.getElementById('{{{ mountElementId }}}'),
+    history: createHistory({
+      type: '{{{ historyType }}}',
+    }),
 {{#basename}}
     basename: '{{{ basename }}}',
 {{/basename}}