@modern-js/runtime 2.0.0-beta.1 → 2.0.0-beta.3

package/CHANGELOG.md

@@ -1,5 +1,186 @@
 # @modern-js/runtime
 
+## 2.0.0-beta.3
+
+### Major Changes
+
+- dda38c9c3e: chore: v2
+
+### Minor Changes
+
+- c9e800d39a: feat: support React18 streaming SSR
+  feat: 支持 React18 流式 SSR
+- 543be9558e: feat: compile server loader and support handle loader request
+  feat: 编译 server loader 并支持处理 loader 的请求
+
+### Patch Changes
+
+- 2344eb26ed: fix: bootstrap function params type define
+
+  fix: 修复 bootstrap 函数参数类型定义
+
+- a11fcf8b50: feat: fallback logic of streaming ssr
+  feat: streaming ssr 降级逻辑
+- e7ce063: fix: root layout css chunks should't be loaded
+  fix: 不应该加载 root layout 的 css chunks
+- b18fa8f3ed: feat: remove @loadable/component in streaming ssr
+  feat: 移除 streaming ssr 中的 @loadable/component 逻辑
+- 6604f1b: feat: support router basename
+  feat: router 插件支持设置 basename
+- fda836f: feat: support `models`,`initialState` config for state plugin
+  feat: state 插件支持`model`,`initialState` 配置
+- 3e57f2bd58: feat: add document feature with plugin
+
+  feat: 增加 document 功能插件
+
+- 2e60319: fix: some optimizations for router and loader
+  fix: 一些 router 和 loader 的优化
+  q
+- fbf5eed5aa: fix: fix ssg failure due to lack of Web Response API
+  fix: 修复因为缺少 Web Response API 而导致 ssg 失败
+- a2509bfbdb: feat: bump esbuild from 0.14.38 to 0.15.7
+
+  feat: 将 esbuild 从 0.14.38 版本升级至 0.15.7 版本
+
+- 425e570: feat: export react-router-dom/server staticRouter
+  feat: 导出 react-router-dom/server 的 staticRouter 组件
+- e4357f1: fix: change default document file and name
+
+  fix: 重置默认的 document 文件和文件名
+
+- 4369648ae2: fix: fix html template of streaming ssr
+  fix: 修复流式渲染的 html 模版
+- 92c0994468: chore: remove `registerPrefetch`
+  chore: 移除 `registerPrefetch`
+- 6bda14ed71: feat: refactor router with react-router@6.4
+
+  feat: 使用 react-router@6.4 重构路由模块
+
+- 92004d1906: feat: support load chunks parallelly
+  feat: 支持并行加载 chunks
+- 40ed5874c6: feat: inject css chunk into html for streaming ssr
+  feat: streaming ssr 返回的 html 注入 css chunk
+- 60d5378632: fix: function extname should not return array
+  fix: 函数 extname 不应该返回一个数组
+- 8b8e1bb571: feat: support nested routes
+  feat: 支持嵌套路由
+- 3bbea92b2a: feat: support Hook、Middleware new API
+  feat: 支持 Hook、Middleware 的新 API
+- 18aaf42249: fix: fix server loader redirects
+  fix: 修复 server loader 重定向错误
+- 34702d5: feat: support internal env vars: metaName_TARGET
+  feat: 支持内置环境变量 metaName_TARGET
+- fcace5b5b9: fix: remove overmuch `@modernjs/utils` dependency import in ssr runtime & SSR hydrate error
+  fix: 去除 ssr 运行时过多的 `@modernjs/utils` 依赖引入 & SSR hydrate 错误
+- Updated dependencies [6aca875]
+- Updated dependencies [2e60319]
+- Updated dependencies [92f0eade39]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f2e9]
+- Updated dependencies [6bda14ed71]
+- Updated dependencies [92004d1906]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [40ed5874c6]
+- Updated dependencies [87c1ff86b9]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9c3e]
+- Updated dependencies [102d32e4ba]
+- Updated dependencies [8b8e1bb571]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [b710adb]
+- Updated dependencies [f179749375]
+- Updated dependencies [ea7cf06]
+- Updated dependencies [bbe4c4a]
+- Updated dependencies [e4558a0]
+- Updated dependencies [abf3421a75]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712da84]
+  - @modern-js/utils@2.0.0-beta.3
+  - @modern-js/types@2.0.0-beta.3
+  - @modern-js/plugin@2.0.0-beta.3
+
+## 2.0.0-beta.2
+
+### Major Changes
+
+- dda38c9c3e: chore: v2
+
+### Minor Changes
+
+- c9e800d39a: feat: support React18 streaming SSR
+  feat: 支持 React18 流式 SSR
+- 543be9558e: feat: compile server loader and support handle loader request
+  feat: 编译 server loader 并支持处理 loader 的请求
+
+### Patch Changes
+
+- 2344eb2: fix: bootstrap function params type define
+
+  fix: 修复 bootstrap 函数参数类型定义
+
+- a11fcf8: feat: fallback logic of streaming ssr
+  feat: streaming ssr 降级逻辑
+- b18fa8f3ed: feat: remove @loadable/component in streaming ssr
+  feat: 移除 streaming ssr 中的 @loadable/component 逻辑
+- 3e57f2b: feat: add document feature with plugin
+
+  feat: 增加 document 功能插件
+
+- fbf5eed: fix: fix ssg failure due to lack of Web Response API
+  fix: 修复因为缺少 Web Response API 而导致 ssg 失败
+- a2509bfbdb: feat: bump esbuild from 0.14.38 to 0.15.7
+
+  feat: 将 esbuild 从 0.14.38 版本升级至 0.15.7 版本
+
+- e4357f1: fix: change default document file and name
+
+  fix: 重置默认的 document 文件和文件名
+
+- 4369648ae2: fix: fix html template of streaming ssr
+  fix: 修复流式渲染的 html 模版
+- 92c0994: chore: remove `registerPrefetch`
+  chore: 移除 `registerPrefetch`
+- 6bda14ed71: feat: refactor router with react-router@6.4
+
+  feat: 使用 react-router@6.4 重构路由模块
+
+- 92004d1: feat: support load chunks parallelly
+  feat: 支持并行加载 chunks
+- 40ed587: feat: inject css chunk into html for streaming ssr
+  feat: streaming ssr 返回的 html 注入 css chunk
+- 60d5378632: fix: function extname should not return array
+  fix: 函数 extname 不应该返回一个数组
+- 8b8e1bb571: feat: support nested routes
+  feat: 支持嵌套路由
+- 3bbea92b2a: feat: support Hook、Middleware new API
+  feat: 支持 Hook、Middleware 的新 API
+- 18aaf42: fix: fix server loader redirects
+  fix: 修复 server loader 重定向错误
+- fcace5b5b9: fix: remove overmuch `@modernjs/utils` dependency import in ssr runtime & SSR hydrate error
+  fix: 去除 ssr 运行时过多的 `@modernjs/utils` 依赖引入 & SSR hydrate 错误
+- Updated dependencies [92f0ead]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f2e9]
+- Updated dependencies [6bda14ed71]
+- Updated dependencies [92004d1]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [40ed587]
+- Updated dependencies [87c1ff8]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9c3e]
+- Updated dependencies [102d32e4ba]
+- Updated dependencies [8b8e1bb571]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [f179749]
+- Updated dependencies [abf3421a75]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712da84]
+  - @modern-js/utils@2.0.0-beta.2
+  - @modern-js/types@2.0.0-beta.2
+  - @modern-js/plugin@2.0.0-beta.2
+
 ## 2.0.0-beta.1
 
 ### Major Changes

package/dist/js/modern/cli/index.js

@@ -25,7 +25,9 @@ export default (() => ({
                */
               'styled-components': require.resolve('styled-components')
             },
-            envVars: ['IS_REACT18']
+            globalVars: {
+              'process.env.IS_REACT18': process.env.IS_REACT18
+            }
           }
         };
       },

package/dist/js/modern/core/compatible.js

@@ -5,7 +5,6 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 import React, { useContext, useMemo } from 'react';
-import defaultReactDOM from 'react-dom';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 import { RuntimeReactContext } from "../runtime-context";
 import { runtime } from "./plugin";
@@ -95,7 +94,7 @@ id,
 /**
  * root.render need use root to run function
  */
-root, ReactDOM = defaultReactDOM
+root, ReactDOM
 // eslint-disable-next-line consistent-return
 ) => {
   let App = BootApp;
@@ -153,7 +152,9 @@ root, ReactDOM = defaultReactDOM
         context.initialData = initialData;
       }
       const rootElement = typeof id !== 'string' ? id : document.getElementById(id || 'root');
-
+      if (!ReactDOM) {
+        throw Error('The `bootstrap` need provide `ReactDOM` parameter');
+      }
       // https://reactjs.org/blog/2022/03/08/react-18-upgrade-guide.html
       const ModernRender = App => {
         if (IS_REACT18) {

package/dist/js/modern/document/cli/index.js

@@ -9,10 +9,15 @@ import { createDebugger, findExists } from '@modern-js/utils';
 import { DocumentContext } from "../DocumentContext";
 import { DOCUMENT_SCRIPTS_PLACEHOLDER, DOCUMENT_FILE_NAME, DOCUMENT_META_PLACEHOLDER, PLACEHOLDER_REPLACER_MAP, DOC_EXT, DOCUMENT_SSR_PLACEHOLDER, DOCUMENT_CHUNKSMAP_PLACEHOLDER, DOCUMENT_SSRDATASCRIPT_PLACEHOLDER, HTML_SEPARATOR } from "../constants";
 const debug = createDebugger('html_genarate');
-const getDocumenByEntryName = function getDocumenByEntryName(entrypoints, entryName) {
+
+// get the entry document file,
+// if not exist, fallback to src/
+const getDocumenByEntryName = function getDocumenByEntryName(entrypoints, entryName, fallbackDir) {
   var _entrypoints$find;
   const entryDir = (_entrypoints$find = entrypoints.find(item => item.entryName === entryName)) === null || _entrypoints$find === void 0 ? void 0 : _entrypoints$find.absoluteEntryDir;
-  const docFile = findExists(DOC_EXT.map(item => `${entryDir}${path.sep}${DOCUMENT_FILE_NAME}.${item}`));
+  const entryDirs = DOC_EXT.map(item => `${entryDir}${path.sep}${DOCUMENT_FILE_NAME}.${item}`);
+  const fallbackDirs = fallbackDir ? DOC_EXT.map(item => [fallbackDir, 'src', `${DOCUMENT_FILE_NAME}.${item}`].join(path.sep)) : [];
+  const docFile = findExists([...entryDirs, ...fallbackDirs]);
   return docFile || undefined;
 };
 export default (() => ({
@@ -39,14 +44,11 @@ export default (() => ({
     const documentEntry = (entryName, templateParameters) => {
       const {
         entrypoints,
-        internalDirectory
+        internalDirectory,
+        appDirectory
       } = api.useAppContext();
       // search the document.[tsx|jsx|js|ts] under entry
-      // if not, use main as default
-      let documentFilePath = getDocumenByEntryName(entrypoints, entryName);
-      if (!documentFilePath) {
-        documentFilePath = getDocumenByEntryName(entrypoints, 'main');
-      }
+      const documentFilePath = getDocumenByEntryName(entrypoints, entryName, appDirectory);
       // if no document file, do nothing as default
       if (!documentFilePath) {
         return null;

package/dist/js/modern/document/constants.js

@@ -8,7 +8,7 @@ export const HTML_SSRDATASCRIPT_SEPARATOR = '<!--<?- SSRDataScript ?>-->';
 export const DOCUMENT_SSR_PLACEHOLDER = encodeURIComponent(HTML_SEPARATOR);
 export const DOCUMENT_CHUNKSMAP_PLACEHOLDER = encodeURIComponent(HTML_CHUNKSMAP_SEPARATOR);
 export const DOCUMENT_SSRDATASCRIPT_PLACEHOLDER = encodeURIComponent(HTML_SSRDATASCRIPT_SEPARATOR);
-export const DOCUMENT_FILE_NAME = 'document';
+export const DOCUMENT_FILE_NAME = 'Document';
 export const DOCUMENT_SCRIPTS_PLACEHOLDER = encodeURIComponent('<!-- chunk scripts placeholder -->');
 export const DOCUMENT_NO_SCRIPTE_PLACEHOLDER = encodeURIComponent('<!-- no-script -->');
 export const PLACEHOLDER_REPLACER_MAP = {

package/dist/js/modern/router/runtime/plugin.js

@@ -4,11 +4,12 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 import React from 'react';
 import { createBrowserRouter, createHashRouter, RouterProvider, createRoutesFromElements } from 'react-router-dom';
 import hoistNonReactStatics from 'hoist-non-react-statics';
-import { renderRoutes } from "./utils";
+import { renderRoutes, urlJoin } from "./utils";
 import { jsx as _jsx } from "react/jsx-runtime";
 export const routerPlugin = ({
   serverBase: _serverBase = [],
   supportHtml5History: _supportHtml5History = true,
+  basename: _basename2 = '',
   routesConfig,
   createRoutes
 }) => {
@@ -22,7 +23,7 @@ export const routerPlugin = ({
         }, next) => {
           // can not get routes config, skip wrapping React Router.
           // e.g. App.tsx as the entrypoint
-          if (!routesConfig) {
+          if (!routesConfig && !createRoutes) {
             return next({
               App
             });
@@ -30,13 +31,13 @@ export const routerPlugin = ({
           const getRouteApp = () => {
             return props => {
               var _window$_SERVER_DATA;
-              const routeElements = renderRoutes(routesConfig);
-              const routes = createRoutes ? createRoutes() : createRoutesFromElements(routeElements);
+              const routes = createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes(routesConfig));
               const baseUrl = ((_window$_SERVER_DATA = window._SERVER_DATA) === null || _window$_SERVER_DATA === void 0 ? void 0 : _window$_SERVER_DATA.router.baseUrl) || select(location.pathname);
+              const _basename = baseUrl === '/' ? urlJoin(baseUrl, _basename2) : baseUrl;
               const router = _supportHtml5History ? createBrowserRouter(routes, {
-                basename: baseUrl
+                basename: _basename
               }) : createHashRouter(routes, {
-                basename: baseUrl
+                basename: _basename
               });
               return /*#__PURE__*/_jsx(App, _objectSpread(_objectSpread({}, props), {}, {
                 children: /*#__PURE__*/_jsx(RouterProvider, {
@@ -46,7 +47,7 @@ export const routerPlugin = ({
             };
           };
           const RouteApp = getRouteApp();
-          if (routesConfig.globalApp) {
+          if (routesConfig !== null && routesConfig !== void 0 && routesConfig.globalApp) {
             return next({
               App: hoistNonReactStatics(RouteApp, routesConfig.globalApp)
             });

package/dist/js/modern/router/runtime/plugin.node.js

@@ -8,7 +8,7 @@ import hoistNonReactStatics from 'hoist-non-react-statics';
 import { installGlobals } from '@remix-run/node';
 import { createRoutesFromElements } from 'react-router-dom';
 import { RuntimeReactContext } from "../../core";
-import { renderRoutes } from "./utils";
+import { renderRoutes, urlJoin } from "./utils";
 
 // Polyfill Web Fetch API
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -54,6 +54,7 @@ export function createFetchHeaders(requestHeaders) {
   return headers;
 }
 export const routerPlugin = ({
+  basename: _basename2 = '',
   routesConfig,
   createRoutes
 }) => {
@@ -66,7 +67,7 @@ export const routerPlugin = ({
         }, next) {
           // can not get routes config, skip wrapping React Router.
           // e.g. App.tsx as the entrypoint
-          if (!routesConfig) {
+          if (!routesConfig && !createRoutes) {
             return next({
               context
             });
@@ -74,11 +75,14 @@ export const routerPlugin = ({
           const {
             request
           } = context.ssrContext;
-          const routeElements = renderRoutes(routesConfig);
-          const routes = createRoutes ? createRoutes() : createRoutesFromElements(routeElements);
+          const baseUrl = request.baseUrl;
+          const _basename = baseUrl === '/' ? urlJoin(baseUrl, _basename2) : baseUrl;
+          const routes = createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes(routesConfig));
           const {
             query
-          } = createStaticHandler(routes);
+          } = createStaticHandler(routes, {
+            basename: _basename
+          });
           const remixRequest = createFetchRequest(request);
           const routerContext = await query(remixRequest);
           if (routerContext instanceof Response) {
@@ -122,7 +126,7 @@ export const routerPlugin = ({
             };
           };
           const RouteApp = getRouteApp();
-          if (routesConfig.globalApp) {
+          if (routesConfig !== null && routesConfig !== void 0 && routesConfig.globalApp) {
             return next({
               App: hoistNonReactStatics(RouteApp, routesConfig.globalApp)
             });

package/dist/js/modern/router/runtime/server.js

@@ -0,0 +1 @@
+export * from 'react-router-dom/server';

package/dist/js/modern/router/runtime/utils.js

@@ -49,12 +49,10 @@ const renderNestedRoute = (nestedRoute, parent) => {
       });
     }
   }
-  if (!parent) {
+  if (!parent && element) {
     element = /*#__PURE__*/_jsx(RootLayout, {
       routes: [nestedRoute],
-      children: /*#__PURE__*/_jsx(Suspense, {
-        children: element
-      })
+      children: element
     });
   }
   routeProps.element = element;

package/dist/js/modern/ssr/cli/index.js

@@ -1,3 +1,6 @@
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 import { getEntryOptions, SERVER_RENDER_FUNCTION_NAME, LOADABLE_STATS_FILE, isUseSSRBundle, createRuntimeExportsUtils, isSingleEntry } from '@modern-js/utils';
 const PLUGIN_IDENTIFIER = 'ssr';
 const hasStringSSREntry = userConfig => {
@@ -36,6 +39,7 @@ export default (() => ({
           tools: {
             webpackChain: (chain, {
               name,
+              isServer,
               CHAIN_ID
             }) => {
               const userConfig = api.useResolvedConfigContext();
@@ -46,6 +50,16 @@ export default (() => ({
                   filename: LOADABLE_STATS_FILE
                 }]);
               }
+
+              // add environment variables to determine the node/browser
+              const prefix = `${appContext.metaName.split(/[-_]/)[0]}_`.toUpperCase();
+              const modernVars = {
+                [`process.env.${prefix}TARGET`]: JSON.stringify(isServer ? 'node' : 'browser')
+              };
+              chain.plugin(CHAIN_ID.PLUGIN.DEFINE).tap(args => {
+                const [vars, ...rest] = args;
+                return [_objectSpread(_objectSpread({}, vars), modernVars), ...rest];
+              });
             },
             babel: config => {
               const userConfig = api.useResolvedConfigContext();

package/dist/js/modern/ssr/serverRender/renderToStream/bulidTemplate.before.js

@@ -33,7 +33,11 @@ function getHeadTemplate(beforeEntryTemplate, context) {
       } = routeManifest;
       const cssChunks = [];
       const matches = matchRoutes(routes, routerContext.location);
-      matches === null || matches === void 0 ? void 0 : matches.forEach(match => {
+      matches === null || matches === void 0 ? void 0 : matches.forEach((match, index) => {
+        // root layout css chunks should't be loaded
+        if (!index) {
+          return;
+        }
         const routeId = match.route.id;
         if (routeId) {
           const {

package/dist/js/modern/state/cli/index.js

@@ -1,5 +1,4 @@
 import { getEntryOptions, createRuntimeExportsUtils, PLUGIN_SCHEMAS } from '@modern-js/utils';
-import "../types";
 const PLUGIN_IDENTIFIER = 'state';
 export default (() => ({
   name: '@modern-js/plugin-state',

package/dist/js/modern/state/runtime/plugin.js

@@ -19,9 +19,16 @@ const getStoreConfig = config => {
   const internalPlugins = ['immer', 'effects', 'autoActions', 'devtools'];
   const plugins = [];
   internalPlugins.filter(plugin => config[plugin] !== false).forEach(plugin => plugins.push(StatePluginHandleMap[plugin](config[plugin])));
-  return {
-    plugins
-  };
+  const storeConfig = {};
+  for (const [key, value] of Object.entries(config)) {
+    if (internalPlugins.includes(key)) {
+      plugins.push(StatePluginHandleMap[key](value));
+    } else {
+      storeConfig[key] = value;
+    }
+  }
+  storeConfig.plugins = plugins;
+  return storeConfig;
 };
 const state = config => ({
   name: '@modern-js/plugin-state',

package/dist/js/node/cli/index.js

@@ -32,7 +32,9 @@ var _default = () => ({
                */
               'styled-components': require.resolve('styled-components')
             },
-            envVars: ['IS_REACT18']
+            globalVars: {
+              'process.env.IS_REACT18': process.env.IS_REACT18
+            }
           }
         };
       },

package/dist/js/node/core/compatible.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useRuntimeContext = exports.createApp = exports.bootstrap = void 0;
 var _react = _interopRequireWildcard(require("react"));
-var _reactDom = _interopRequireDefault(require("react-dom"));
 var _hoistNonReactStatics = _interopRequireDefault(require("hoist-non-react-statics"));
 var _runtimeContext = require("../runtime-context");
 var _plugin = require("./plugin");
@@ -105,7 +104,7 @@ id,
 /**
  * root.render need use root to run function
  */
-root, ReactDOM = _reactDom.default
+root, ReactDOM
 // eslint-disable-next-line consistent-return
 ) => {
   let App = BootApp;
@@ -163,7 +162,9 @@ root, ReactDOM = _reactDom.default
         context.initialData = initialData;
       }
       const rootElement = typeof id !== 'string' ? id : document.getElementById(id || 'root');
-
+      if (!ReactDOM) {
+        throw Error('The `bootstrap` need provide `ReactDOM` parameter');
+      }
       // https://reactjs.org/blog/2022/03/08/react-18-upgrade-guide.html
       const ModernRender = App => {
         if (IS_REACT18) {

package/dist/js/node/document/cli/index.js

@@ -18,10 +18,15 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 const debug = (0, _utils.createDebugger)('html_genarate');
-const getDocumenByEntryName = function getDocumenByEntryName(entrypoints, entryName) {
+
+// get the entry document file,
+// if not exist, fallback to src/
+const getDocumenByEntryName = function getDocumenByEntryName(entrypoints, entryName, fallbackDir) {
   var _entrypoints$find;
   const entryDir = (_entrypoints$find = entrypoints.find(item => item.entryName === entryName)) === null || _entrypoints$find === void 0 ? void 0 : _entrypoints$find.absoluteEntryDir;
-  const docFile = (0, _utils.findExists)(_constants.DOC_EXT.map(item => `${entryDir}${_path.default.sep}${_constants.DOCUMENT_FILE_NAME}.${item}`));
+  const entryDirs = _constants.DOC_EXT.map(item => `${entryDir}${_path.default.sep}${_constants.DOCUMENT_FILE_NAME}.${item}`);
+  const fallbackDirs = fallbackDir ? _constants.DOC_EXT.map(item => [fallbackDir, 'src', `${_constants.DOCUMENT_FILE_NAME}.${item}`].join(_path.default.sep)) : [];
+  const docFile = (0, _utils.findExists)([...entryDirs, ...fallbackDirs]);
   return docFile || undefined;
 };
 var _default = () => ({
@@ -48,14 +53,11 @@ var _default = () => ({
     const documentEntry = (entryName, templateParameters) => {
       const {
         entrypoints,
-        internalDirectory
+        internalDirectory,
+        appDirectory
       } = api.useAppContext();
       // search the document.[tsx|jsx|js|ts] under entry
-      // if not, use main as default
-      let documentFilePath = getDocumenByEntryName(entrypoints, entryName);
-      if (!documentFilePath) {
-        documentFilePath = getDocumenByEntryName(entrypoints, 'main');
-      }
+      const documentFilePath = getDocumenByEntryName(entrypoints, entryName, appDirectory);
       // if no document file, do nothing as default
       if (!documentFilePath) {
         return null;

package/dist/js/node/document/constants.js

@@ -21,7 +21,7 @@ const DOCUMENT_CHUNKSMAP_PLACEHOLDER = encodeURIComponent(HTML_CHUNKSMAP_SEPARAT
 exports.DOCUMENT_CHUNKSMAP_PLACEHOLDER = DOCUMENT_CHUNKSMAP_PLACEHOLDER;
 const DOCUMENT_SSRDATASCRIPT_PLACEHOLDER = encodeURIComponent(HTML_SSRDATASCRIPT_SEPARATOR);
 exports.DOCUMENT_SSRDATASCRIPT_PLACEHOLDER = DOCUMENT_SSRDATASCRIPT_PLACEHOLDER;
-const DOCUMENT_FILE_NAME = 'document';
+const DOCUMENT_FILE_NAME = 'Document';
 exports.DOCUMENT_FILE_NAME = DOCUMENT_FILE_NAME;
 const DOCUMENT_SCRIPTS_PLACEHOLDER = encodeURIComponent('<!-- chunk scripts placeholder -->');
 exports.DOCUMENT_SCRIPTS_PLACEHOLDER = DOCUMENT_SCRIPTS_PLACEHOLDER;

package/dist/js/node/router/runtime/plugin.js

@@ -16,6 +16,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 const routerPlugin = ({
   serverBase: _serverBase = [],
   supportHtml5History: _supportHtml5History = true,
+  basename: _basename2 = '',
   routesConfig,
   createRoutes
 }) => {
@@ -29,7 +30,7 @@ const routerPlugin = ({
         }, next) => {
           // can not get routes config, skip wrapping React Router.
           // e.g. App.tsx as the entrypoint
-          if (!routesConfig) {
+          if (!routesConfig && !createRoutes) {
             return next({
               App
             });
@@ -37,13 +38,13 @@ const routerPlugin = ({
           const getRouteApp = () => {
             return props => {
               var _window$_SERVER_DATA;
-              const routeElements = (0, _utils.renderRoutes)(routesConfig);
-              const routes = createRoutes ? createRoutes() : (0, _reactRouterDom.createRoutesFromElements)(routeElements);
+              const routes = createRoutes ? createRoutes() : (0, _reactRouterDom.createRoutesFromElements)((0, _utils.renderRoutes)(routesConfig));
               const baseUrl = ((_window$_SERVER_DATA = window._SERVER_DATA) === null || _window$_SERVER_DATA === void 0 ? void 0 : _window$_SERVER_DATA.router.baseUrl) || select(location.pathname);
+              const _basename = baseUrl === '/' ? (0, _utils.urlJoin)(baseUrl, _basename2) : baseUrl;
               const router = _supportHtml5History ? (0, _reactRouterDom.createBrowserRouter)(routes, {
-                basename: baseUrl
+                basename: _basename
               }) : (0, _reactRouterDom.createHashRouter)(routes, {
-                basename: baseUrl
+                basename: _basename
               });
               return /*#__PURE__*/(0, _jsxRuntime.jsx)(App, _objectSpread(_objectSpread({}, props), {}, {
                 children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactRouterDom.RouterProvider, {
@@ -53,7 +54,7 @@ const routerPlugin = ({
             };
           };
           const RouteApp = getRouteApp();
-          if (routesConfig.globalApp) {
+          if (routesConfig !== null && routesConfig !== void 0 && routesConfig.globalApp) {
             return next({
               App: (0, _hoistNonReactStatics.default)(RouteApp, routesConfig.globalApp)
             });

package/dist/js/node/router/runtime/plugin.node.js

@@ -63,6 +63,7 @@ function createFetchHeaders(requestHeaders) {
   return headers;
 }
 const routerPlugin = ({
+  basename: _basename2 = '',
   routesConfig,
   createRoutes
 }) => {
@@ -75,7 +76,7 @@ const routerPlugin = ({
         }, next) {
           // can not get routes config, skip wrapping React Router.
           // e.g. App.tsx as the entrypoint
-          if (!routesConfig) {
+          if (!routesConfig && !createRoutes) {
             return next({
               context
             });
@@ -83,11 +84,14 @@ const routerPlugin = ({
           const {
             request
           } = context.ssrContext;
-          const routeElements = (0, _utils.renderRoutes)(routesConfig);
-          const routes = createRoutes ? createRoutes() : (0, _reactRouterDom.createRoutesFromElements)(routeElements);
+          const baseUrl = request.baseUrl;
+          const _basename = baseUrl === '/' ? (0, _utils.urlJoin)(baseUrl, _basename2) : baseUrl;
+          const routes = createRoutes ? createRoutes() : (0, _reactRouterDom.createRoutesFromElements)((0, _utils.renderRoutes)(routesConfig));
           const {
             query
-          } = (0, _router.unstable_createStaticHandler)(routes);
+          } = (0, _router.unstable_createStaticHandler)(routes, {
+            basename: _basename
+          });
           const remixRequest = createFetchRequest(request);
           const routerContext = await query(remixRequest);
           if (routerContext instanceof Response) {
@@ -131,7 +135,7 @@ const routerPlugin = ({
             };
           };
           const RouteApp = getRouteApp();
-          if (routesConfig.globalApp) {
+          if (routesConfig !== null && routesConfig !== void 0 && routesConfig.globalApp) {
             return next({
               App: (0, _hoistNonReactStatics.default)(RouteApp, routesConfig.globalApp)
             });