@umijs/preset-umi 4.0.0-beta.13 → 4.0.0-beta.14

package/dist/commands/dev/getMarkupArgs.d.ts

@@ -2,6 +2,8 @@ import { IApi } from '../../types';
 export declare function getMarkupArgs(opts: {
     api: IApi;
 }): Promise<{
+    mountElementId: any;
+    base: any;
     routes: any;
     favicon: any;
     headScripts: any;

package/dist/commands/dev/getMarkupArgs.js

@@ -41,6 +41,8 @@ function getMarkupArgs(opts) {
             initialValue: opts.api.config.favicon,
         });
         return {
+            mountElementId: opts.api.config.mountElementId,
+            base: opts.api.config.base,
             routes: opts.api.appData.routes,
             favicon,
             headScripts,

package/dist/features/configPlugins/configPlugins.js

@@ -34,6 +34,8 @@ exports.default = (api) => {
         externals: {},
         autoCSSModules: true,
         publicPath: '/',
+        mountElementId: 'root',
+        base: '/',
     };
     const bundleSchemas = (0, schema_1.getSchemas)();
     const extraSchemas = (0, schema_2.getSchemas)();
@@ -55,7 +57,9 @@ exports.default = (api) => {
     }
     // api.paths is ready after register
     api.modifyConfig((memo, args) => {
-        memo.alias = Object.assign(Object.assign({}, memo.alias), { '@': args.paths.absSrcPath, '@@': args.paths.absTmpPath });
+        memo.alias = Object.assign(Object.assign({}, memo.alias), { '@': args.paths.absSrcPath, '@@': args.paths.absTmpPath, 
+            // like vite, use to pre-bundling dependencies in vite mode
+            '@fs': '/' });
         return memo;
     });
 };

package/dist/features/configPlugins/schema.js

@@ -4,11 +4,13 @@ exports.getSchemas = void 0;
 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())),
+        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),
         routes: (Joi) => Joi.array().items(Joi.object()),
     };

package/dist/features/favicon/favicon.js

@@ -53,6 +53,8 @@ exports.default = (api) => {
         }
     });
     api.modifyHTMLFavicon((memo) => {
-        return `${api.config.publicPath}${api.appData.faviconFile}` || memo;
+        return api.appData.faviconFile
+            ? `${api.config.publicPath}${api.appData.faviconFile}`
+            : memo;
     });
 };

package/dist/features/lowImport/babelPlugin.d.ts

@@ -3,11 +3,13 @@ import * as t from '@umijs/bundler-utils/compiled/babel/types';
 import { IOpts } from './lowImport';
 interface IPluginOpts {
     opts: IOpts;
+    css: string;
 }
 export default function (): {
     visitor: {
         Identifier(path: Babel.NodePath<t.Identifier>, state: {
             opts: IPluginOpts;
+            file: any;
         }): void;
         MemberExpression(path: Babel.NodePath<t.MemberExpression>, state: {
             opts: IPluginOpts;

package/dist/features/lowImport/babelPlugin.js

@@ -21,11 +21,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const helper_module_imports_1 = require("@umijs/bundler-utils/compiled/babel/helper-module-imports");
 const t = __importStar(require("@umijs/bundler-utils/compiled/babel/types"));
+const path_1 = require("path");
 function default_1() {
     return {
         visitor: {
             Identifier(path, state) {
-                var _a, _b;
+                var _a, _b, _c;
                 const { name } = path.node;
                 if (path.scope.hasBinding(path.node.name)) {
                     return;
@@ -44,7 +45,15 @@ function default_1() {
                         nameHint: name,
                     }));
                 }
-                // TODO: state.opts.opts.namespaceToLib
+                else if ((_c = state.opts.opts.namespaceToLib) === null || _c === void 0 ? void 0 : _c[name]) {
+                    path.replaceWith((0, helper_module_imports_1.addNamespace)(path, state.opts.opts.namespaceToLib[name]));
+                }
+                // import css
+                if (name === 'styles' && state.opts.css) {
+                    const { filename } = state.file.opts;
+                    const cssFilename = (0, path_1.basename)(filename, (0, path_1.extname)(filename)) + '.' + state.opts.css;
+                    path.replaceWith((0, helper_module_imports_1.addDefault)(path, './' + cssFilename, { nameHint: name }));
+                }
             },
             MemberExpression(path, state) {
                 const { object, property } = path.node;

package/dist/features/lowImport/lowImport.js

@@ -25,6 +25,7 @@ exports.default = (api) => {
             schema(Joi) {
                 return Joi.object({
                     libs: Joi.array(),
+                    css: Joi.string(),
                 });
             },
         },
@@ -46,7 +47,7 @@ exports.default = (api) => {
                 const memberDts = (lib.members || [])
                     .map((member) => `${member}: typeof import('${lib.importFrom}')['${member}'],`)
                     .join('\n');
-                return `const ${lib.withObj} = {\n${memberDts}\n};`;
+                return `const ${lib.withObj} : {\n${memberDts}\n};`;
             }
             else if (lib.namespaceImport) {
                 return `const ${lib.namespaceImport}: typeof import('${lib.importFrom}');`;
@@ -60,20 +61,24 @@ exports.default = (api) => {
                     .join('\n');
             }
         });
+        // TODO: styles 的类型提示
         const content = `
 // generated by umi
 declare global {
-${dts}
+${dts.join('\n')}
+const styles: any;
 }
 export {}
     `.trim() + `\n`;
         (0, fs_1.writeFileSync)((0, path_1.join)(api.paths.cwd, 'lowImport.d.ts'), content, 'utf-8');
     });
     api.addBeforeBabelPresets(() => {
+        var _a;
         const opts = normalizeLibs(api.appData.lowImport);
+        const css = ((_a = api.config.lowImport) === null || _a === void 0 ? void 0 : _a.css) || 'less';
         return [
             {
-                plugins: [[babelPlugin_1.default, { opts }]],
+                plugins: [[babelPlugin_1.default, { opts, css }]],
             },
         ];
     });

package/dist/features/tmpFiles/routes.js

@@ -51,6 +51,10 @@ function getRoutes(opts) {
                 routes,
             });
         }
+        routes = yield opts.api.applyPlugins({
+            key: 'modifyRoutes',
+            initialValue: routes,
+        });
         return routes;
     });
 }
@@ -62,6 +66,12 @@ function getRouteComponents(opts) {
             const route = opts.routes[key];
             if (!route.file)
                 return `// ${key}: no file to import`;
+            // e.g.
+            // component: () => <h1>foo</h1>
+            // component: (() => () => <h1>foo</h1>)()
+            if (route.file.startsWith('(')) {
+                return `'${key}': () => Promise.resolve(${route.file}),`;
+            }
             const path = (0, path_1.isAbsolute)(route.file) || route.file.startsWith('@/')
                 ? route.file
                 : `${opts.prefix}${route.file}`;

package/dist/features/tmpFiles/tmpFiles.js

@@ -31,6 +31,7 @@ exports.default = (api) => {
             path: 'umi.ts',
             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',
@@ -55,6 +56,7 @@ exports.default = (api) => {
                     key: 'addEntryImports',
                     initialValue: [],
                 })).join('\n'),
+                basename: api.config.base,
             },
         });
         // route.ts
@@ -72,7 +74,7 @@ exports.default = (api) => {
         const prefix = hasSrc ? '../../../src/pages/' : '../../pages/';
         api.writeTmpFile({
             noPluginDir: true,
-            path: 'core/route.ts',
+            path: 'core/route.tsx',
             tplPath: (0, path_1.join)(constants_1.TEMPLATES_DIR, 'route.tpl'),
             context: {
                 routes: JSON.stringify(routes),
@@ -108,7 +110,7 @@ exports.default = (api) => {
                 'accessProvider',
                 'dataflowProvider',
                 'outerProvider',
-                // 'render',
+                'render',
                 // 'onRouteChange',
             ],
         });

package/dist/index.js

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

package/dist/registerMethods.js

@@ -7,6 +7,7 @@ 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");
 exports.default = (api) => {
     [
@@ -52,7 +53,7 @@ exports.default = (api) => {
         // 'modifyExportRouteMap',
         // 'modifyPublicPathStr',
         'modifyRendererPath',
-        // 'modifyRoutes',
+        'modifyRoutes',
     ].forEach((name) => {
         api.registerMethod({ name });
     });
@@ -84,6 +85,10 @@ exports.default = (api) => {
             ]
                 .filter((text) => text !== false)
                 .join('\n');
+            // transform imports for all javascript-like files
+            if (/\.(t|j)sx?$/.test(absPath)) {
+                content = (0, transformIEAR_1.default)({ content, path: absPath }, api);
+            }
             if (!(0, fs_1.existsSync)(absPath) || (0, fs_1.readFileSync)(absPath, 'utf-8') !== content) {
                 (0, fs_1.writeFileSync)(absPath, content, 'utf-8');
             }

package/dist/types.d.ts

@@ -131,6 +131,7 @@ export declare type IApi = PluginAPI & IServicePluginAPI & {
         path: string;
     }>;
     modifyRendererPath: IModify<string, {}>;
+    modifyRoutes: IModify<Record<string, IRoute>, {}>;
     modifyWebpackConfig: IModify<webpack.Configuration, {
         webpack: typeof webpack;
         env: Env;

package/dist/utils/transformIEAR.d.ts

@@ -0,0 +1,22 @@
+import type { IApi } from '../types';
+/**
+ * import/export/await-import/require match regular expression
+ *
+ * WHY: REGEXP
+ * ref: https://github.com/umijs/umi-next/pull/230
+ *
+ * TODO: more choices
+ * 1. fork es-module-lexer, support jsx
+ * 2. use sourcemap of esbuild
+ */
+export declare const IEAR_REG_EXP: RegExp;
+/**
+ * transform absolute import/export/await-import/require path
+ * @note  use to vite can deps:
+ *        transform to relative path for .umi dir imports
+ *        prefix `@fs` for node_modules imports
+ */
+export default function transformIEAR({ content, path }: {
+    content: string;
+    path: string;
+}, api: IApi): string;

package/dist/utils/transformIEAR.js

@@ -0,0 +1,96 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IEAR_REG_EXP = void 0;
+const utils_1 = require("@umijs/utils");
+const path_1 = require("path");
+/**
+ * import/export/await-import/require match regular expression
+ *
+ * WHY: REGEXP
+ * ref: https://github.com/umijs/umi-next/pull/230
+ *
+ * TODO: more choices
+ * 1. fork es-module-lexer, support jsx
+ * 2. use sourcemap of esbuild
+ */
+exports.IEAR_REG_EXP = new RegExp([
+    // match content before quote ($1)
+    '(',
+    [
+        // import/export statements
+        [
+            '(?:',
+            // match head
+            '(?:^|\\r|\\n|;)\\s*',
+            // match identifier
+            '(?:import|export)\\s+',
+            [
+                '(?:',
+                '(?:',
+                // match body
+                [
+                    // match default & member import
+                    [
+                        // match default import
+                        [
+                            '(?:',
+                            // match type import
+                            '(?:type\\s*)?',
+                            // match variable name
+                            '[a-zA-Z_$][\\w_$]*\\s*,?\\s+',
+                            // optional
+                            ')?',
+                        ].join(''),
+                        // match member import/export (optional)
+                        '(?:{[^}]+}\\s+)?',
+                    ].join(''),
+                    // match contents import/export
+                    '(?:type\\s*)?\\*\\s+(?:as\\s+[a-zA-Z][\\w_$]*\\s+)?',
+                ].join('|'),
+                ')',
+                // match from
+                'from\\s+',
+                // match direct file import
+                '|\\s*',
+                ')',
+            ].join(''),
+            ')',
+        ].join(''),
+        // import/require call
+        [
+            // match head (must be single function name)
+            '(?:^|[^a-zA-Z\\w_$\\.])',
+            // match call
+            '(?:import|require)\\(\\s*',
+        ].join(''),
+    ].join('|'),
+    ')',
+    '(?:',
+    // match quotes ($2)
+    `('|")`,
+    // match absolute file path ($3)
+    `(\\/.*[^\\\\])\\2`,
+    ')',
+].join(''), 
+// match full-content
+'g');
+/**
+ * transform absolute import/export/await-import/require path
+ * @note  use to vite can deps:
+ *        transform to relative path for .umi dir imports
+ *        prefix `@fs` for node_modules imports
+ */
+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));
+        }
+        else if (absPath.includes('node_modules')) {
+            // transform node_modules absolute imports
+            absPath = `@fs${absPath}`;
+        }
+        return `${prefix}${quote}${absPath}${quote}`;
+    });
+}
+exports.default = transformIEAR;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-umi",
-  "version": "4.0.0-beta.13",
+  "version": "4.0.0-beta.14",
   "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.13",
-    "@umijs/babel-preset-umi": "4.0.0-beta.13",
-    "@umijs/bundler-utils": "4.0.0-beta.13",
-    "@umijs/bundler-vite": "4.0.0-beta.13",
-    "@umijs/bundler-webpack": "4.0.0-beta.13",
-    "@umijs/core": "4.0.0-beta.13",
-    "@umijs/renderer-react": "4.0.0-beta.13",
-    "@umijs/server": "4.0.0-beta.13",
-    "@umijs/utils": "4.0.0-beta.13",
+    "@umijs/ast": "4.0.0-beta.14",
+    "@umijs/babel-preset-umi": "4.0.0-beta.14",
+    "@umijs/bundler-utils": "4.0.0-beta.14",
+    "@umijs/bundler-vite": "4.0.0-beta.14",
+    "@umijs/bundler-webpack": "4.0.0-beta.14",
+    "@umijs/core": "4.0.0-beta.14",
+    "@umijs/renderer-react": "4.0.0-beta.14",
+    "@umijs/server": "4.0.0-beta.14",
+    "@umijs/utils": "4.0.0-beta.14",
     "current-script-polyfill": "1.0.0",
     "enhanced-resolve": "5.8.3",
     "magic-string": "0.25.7",
@@ -47,7 +47,7 @@
     "@types/multer": "1.4.7",
     "body-parser": "1.19.0",
     "multer": "1.4.3",
-    "vite": "2.6.13"
+    "vite": "2.7.6"
   },
   "publishConfig": {
     "access": "public"

package/templates/umi.tpl

@@ -3,7 +3,7 @@
 import { renderClient } from '{{{ rendererPath }}}';
 import { getRoutes } from './core/route';
 import { createPluginManager } from './core/plugin';
-import { PluginManager } from 'umi';
+import { ApplyPluginsType, PluginManager } from 'umi';
 {{{ imports }}}
 
 async function render() {
@@ -23,8 +23,19 @@ async function render() {
     routes,
     routeComponents,
     pluginManager,
+    rootElement: document.getElementById('{{{ mountElementId }}}'),
+{{#basename}}
+    basename: '{{{ basename }}}',
+{{/basename}}
   };
-  return renderClient(context);
+
+  return (pluginManager.applyPlugins({
+    key: 'render',
+    type: ApplyPluginsType.compose,
+    initialValue() {
+      return renderClient(context);
+    },
+  }))();
 }
 
 {{{ entryCodeAhead }}}

package/dist/libs/moduleGraph.d.ts

@@ -1,2 +0,0 @@
-export declare class ModuleGraph {
-}

package/dist/libs/moduleGraph.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ModuleGraph = void 0;
-class ModuleGraph {
-}
-exports.ModuleGraph = ModuleGraph;