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

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

@@ -8,31 +8,19 @@ exports.getRouteComponents = getRouteComponents;
 exports.renderRoutes = renderRoutes;
 exports.standardSlash = standardSlash;
 exports.urlJoin = void 0;
-
 var _react = _interopRequireWildcard(require("react"));
-
 var _reactRouterDom = require("react-router-dom");
-
 var _DefaultNotFound = require("./DefaultNotFound");
-
+var _root = require("./root");
 var _jsxRuntime = require("react/jsx-runtime");
-
 const _excluded = ["Component"];
-
 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; }
-
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
 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; }
-
 const renderNestedRoute = (nestedRoute, parent) => {
   const {
     children,
@@ -55,26 +43,33 @@ const renderNestedRoute = (nestedRoute, parent) => {
     index: nestedRoute.index,
     errorElement: nestedRoute.errorElement
   };
-
   if (nestedRoute.error) {
     const errorElement = /*#__PURE__*/(0, _jsxRuntime.jsx)(nestedRoute.error, {});
     routeProps.errorElement = errorElement;
   }
-
+  let element;
   if (Component) {
     if (parent !== null && parent !== void 0 && parent.loading) {
       const Loading = parent.loading;
-      routeProps.element = /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.Suspense, {
+      element = /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.Suspense, {
         fallback: /*#__PURE__*/(0, _jsxRuntime.jsx)(Loading, {}),
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {})
       });
     } else {
-      routeProps.element = /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.Suspense, {
+      element = /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.Suspense, {
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {})
       });
     }
   }
-
+  if (!parent) {
+    element = /*#__PURE__*/(0, _jsxRuntime.jsx)(_root.RootLayout, {
+      routes: [nestedRoute],
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.Suspense, {
+        children: element
+      })
+    });
+  }
+  routeProps.element = element;
   const routeElement = index ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactRouterDom.Route, _objectSpread(_objectSpread({}, routeProps), {}, {
     index: true
   }), id) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactRouterDom.Route, _objectSpread(_objectSpread({}, routeProps), {}, {
@@ -83,27 +78,21 @@ const renderNestedRoute = (nestedRoute, parent) => {
   }), id);
   return routeElement;
 };
-
 function getRouteComponents(routes, globalApp) {
   const Layout = _ref => {
     let {
-      Component
-    } = _ref,
-        props = _objectWithoutProperties(_ref, _excluded);
-
+        Component
+      } = _ref,
+      props = _objectWithoutProperties(_ref, _excluded);
     const GlobalLayout = globalApp;
-
     if (!GlobalLayout) {
       return /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, _objectSpread({}, props));
     }
-
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(GlobalLayout, _objectSpread({
       Component: Component
     }, props));
   };
-
   const routeElements = [];
-
   for (const route of routes) {
     if (route.type === 'nested') {
       const routeElement = renderNestedRoute(route);
@@ -118,75 +107,58 @@ function getRouteComponents(routes, globalApp) {
       routeElements.push(routeElement);
     }
   }
-
   routeElements.push( /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactRouterDom.Route, {
     path: "*",
     element: /*#__PURE__*/(0, _jsxRuntime.jsx)(_DefaultNotFound.DefaultNotFound, {})
   }, "*"));
   return routeElements;
 }
-
 function renderRoutes(routesConfig) {
   if (!routesConfig) {
     return null;
   }
-
   const {
     routes,
     globalApp
   } = routesConfig;
-
   if (!routes) {
     return null;
   }
-
   const routeElements = getRouteComponents(routes, globalApp);
   return routeElements;
 }
-
 function getLocation(serverContext) {
   var _url$replace;
-
   const {
     pathname,
     url
   } = (serverContext === null || serverContext === void 0 ? void 0 : serverContext.request) || {};
   const cleanUrl = url === null || url === void 0 ? void 0 : (_url$replace = url.replace('http://', '')) === null || _url$replace === void 0 ? void 0 : _url$replace.replace('https://', '');
   const index = (cleanUrl || '').indexOf(pathname);
-
   if (index === -1) {
     return pathname;
   }
-
   return cleanUrl.substring(index);
 }
-
 const urlJoin = (...parts) => {
   const separator = '/';
   const replace = new RegExp(`${separator}{1,}`, 'g');
   return standardSlash(parts.join(separator).replace(replace, separator));
 };
-
 exports.urlJoin = urlJoin;
-
 function standardSlash(str) {
   let addr = str;
-
   if (!addr || typeof addr !== 'string') {
     return addr;
   }
-
   if (addr.startsWith('.')) {
     addr = addr.slice(1);
   }
-
   if (!addr.startsWith('/')) {
     addr = `/${addr}`;
   }
-
   if (addr.endsWith('/') && addr !== '/') {
     addr = addr.slice(0, addr.length - 1);
   }
-
   return addr;
 }

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

@@ -4,21 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.withRouter = void 0;
-
 var _react = _interopRequireDefault(require("react"));
-
 var _reactRouterDom = require("react-router-dom");
-
 var _jsxRuntime = require("react/jsx-runtime");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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; }
-
 const withRouter = Component => {
   return props => {
     const location = (0, _reactRouterDom.useLocation)();
@@ -31,5 +23,4 @@ const withRouter = Component => {
     }));
   };
 };
-
 exports.withRouter = withRouter;

package/dist/js/node/runtime-context.js

@@ -4,9 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ServerRouterContext = exports.RuntimeReactContext = void 0;
-
 var _react = require("react");
-
 const RuntimeReactContext = /*#__PURE__*/(0, _react.createContext)({});
 exports.RuntimeReactContext = RuntimeReactContext;
 const ServerRouterContext = /*#__PURE__*/(0, _react.createContext)({});

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

@@ -4,22 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _utils = require("@modern-js/utils");
-
 const PLUGIN_IDENTIFIER = 'ssr';
-
 const hasStringSSREntry = userConfig => {
   const isStreaming = ssr => ssr && typeof ssr === 'object' && ssr.mode === 'stream';
-
   const {
     server
   } = userConfig;
-
   if (server !== null && server !== void 0 && server.ssr && !isStreaming(server.ssr)) {
     return true;
   }
-
   if (server !== null && server !== void 0 && server.ssrByEntries && typeof server.ssrByEntries === 'object') {
     for (const name of Object.keys(server.ssrByEntries)) {
       if (!isStreaming(server.ssrByEntries[name])) {
@@ -27,10 +21,8 @@ const hasStringSSREntry = userConfig => {
       }
     }
   }
-
   return false;
 };
-
 var _default = () => ({
   name: '@modern-js/plugin-ssr',
   required: ['@modern-js/runtime'],
@@ -53,11 +45,9 @@ var _default = () => ({
               CHAIN_ID
             }) => {
               const userConfig = api.useResolvedConfigContext();
-
               if ((0, _utils.isUseSSRBundle)(userConfig) && name !== 'server' && hasStringSSREntry(userConfig)) {
                 // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires
                 const LoadableWebpackPlugin = require('@loadable/webpack-plugin');
-
                 chain.plugin(CHAIN_ID.PLUGIN.LOADABLE).use(LoadableWebpackPlugin, [{
                   filename: _utils.LOADABLE_STATS_FILE
                 }]);
@@ -65,7 +55,6 @@ var _default = () => ({
             },
             babel: config => {
               const userConfig = api.useResolvedConfigContext();
-
               if ((0, _utils.isUseSSRBundle)(userConfig) && hasStringSSREntry(userConfig)) {
                 config.plugins.push(require.resolve('@loadable/babel-plugin'));
               }
@@ -73,7 +62,6 @@ var _default = () => ({
           }
         };
       },
-
       modifyEntryImports({
         entrypoint,
         imports
@@ -87,28 +75,23 @@ var _default = () => ({
           packageName,
           entrypoints
         } = api.useAppContext();
-        pluginsExportsUtils.addExport(`export { default as ssr } from '@modern-js/runtime/ssr'`); // if use ssg then set ssr config to true
+        pluginsExportsUtils.addExport(`export { default as ssr } from '@modern-js/runtime/ssr'`);
 
+        // if use ssg then set ssr config to true
         const ssrConfig = (0, _utils.getEntryOptions)(entryName, userConfig.server.ssr, userConfig.server.ssrByEntries, packageName);
-
         if (typeof ssrConfig === 'object' && ssrConfig.mode === 'stream') {
           var _runtimeConfig$router;
-
           const runtimeConfig = (0, _utils.getEntryOptions)(entryName, userConfig.runtime, userConfig.runtimeByEntries, packageName);
-
           if (runtimeConfig !== null && runtimeConfig !== void 0 && (_runtimeConfig$router = runtimeConfig.router) !== null && _runtimeConfig$router !== void 0 && _runtimeConfig$router.legacy) {
             throw new Error(`Legacy router plugin doesn't support streaming SSR, check your config 'runtime.router'`);
           }
-
           if (fileSystemRoutes && !entrypoint.nestedRoutesEntry) {
             throw new Error(`You should switch to file-system based router to support streaming SSR.`);
           }
         }
-
         const ssgConfig = userConfig.output.ssg;
         const useSSG = (0, _utils.isSingleEntry)(entrypoints) ? Boolean(ssgConfig) : ssgConfig === true || typeof (ssgConfig === null || ssgConfig === void 0 ? void 0 : ssgConfig[0]) === 'function' || Boolean(ssgConfig === null || ssgConfig === void 0 ? void 0 : ssgConfig[entryName]);
         ssrConfigMap.set(entryName, ssrConfig || useSSG);
-
         if (ssrConfig || useSSG) {
           imports.push({
             value: '@modern-js/runtime/plugins',
@@ -117,13 +100,11 @@ var _default = () => ({
             }]
           });
         }
-
         return {
           entrypoint,
           imports
         };
       },
-
       modifyEntryRuntimePlugins({
         entrypoint,
         plugins
@@ -134,13 +115,11 @@ var _default = () => ({
             options: JSON.stringify(ssrConfigMap.get(entrypoint.entryName))
           });
         }
-
         return {
           entrypoint,
           plugins
         };
       },
-
       modifyEntryExport({
         entrypoint,
         exportStatement
@@ -153,15 +132,12 @@ var _default = () => ({
             }`, exportStatement].join('\n')
           };
         }
-
         return {
           entrypoint,
           exportStatement
         };
       }
-
     };
   }
 });
-
 exports.default = _default;

package/dist/js/node/ssr/index.js

@@ -7,21 +7,13 @@ var _exportNames = {
   ssr: true
 };
 exports.ssr = exports.default = void 0;
-
 var _component = require("@loadable/component");
-
 var _hoistNonReactStatics = _interopRequireDefault(require("hoist-non-react-statics"));
-
 var _types = require("./serverRender/types");
-
 var _withCallback = require("./react/withCallback");
-
 var _utils = require("./utils");
-
 var _jsxRuntime = require("react/jsx-runtime");
-
 var _react = require("./react");
-
 Object.keys(_react).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -33,15 +25,10 @@ Object.keys(_react).forEach(function (key) {
     }
   });
 });
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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; }
-
 const ssr = config => ({
   name: '@modern-js/plugin-ssr',
   setup: () => {
@@ -53,29 +40,26 @@ const ssr = config => ({
         ModernRender,
         ModernHydrate
       }) => {
+        var _window, _window$_SSR_DATA;
         const hydrateContext = _objectSpread(_objectSpread({}, context), {}, {
           _hydration: true
         });
-
         const callback = () => {
           // won't cause component re-render because context's reference identity doesn't change
           delete hydrateContext._hydration;
-        }; // react streamSSR hydrate
+        };
 
+        // if render level not exist, use client render
+        const renderLevel = ((_window = window) === null || _window === void 0 ? void 0 : (_window$_SSR_DATA = _window._SSR_DATA) === null || _window$_SSR_DATA === void 0 ? void 0 : _window$_SSR_DATA.renderLevel) || _types.RenderLevel.CLIENT_RENDER;
 
+        // react streamSSR hydrate
         if ((0, _utils.isReact18)() && config.mode === 'stream') {
           return streamSSRHydrate();
-        } // react stringSSR hydrate
-
-
+        }
+        // react stringSSR hydrate
         return stringSSRHydrate();
-
         function stringSSRHydrate() {
-          var _window, _window$_SSR_DATA;
-
-          // if render level not exist, use client render
-          const renderLevel = ((_window = window) === null || _window === void 0 ? void 0 : (_window$_SSR_DATA = _window._SSR_DATA) === null || _window$_SSR_DATA === void 0 ? void 0 : _window$_SSR_DATA.renderLevel) || _types.RenderLevel.CLIENT_RENDER; // client render and server prefetch use same logic
-
+          // client render and server prefetch use same logic
           if (renderLevel === _types.RenderLevel.CLIENT_RENDER || renderLevel === _types.RenderLevel.SERVER_PREFETCH) {
             ModernRender( /*#__PURE__*/(0, _jsxRuntime.jsx)(App, {
               context: context
@@ -90,7 +74,6 @@ const ssr = config => ({
                     context: hydrateContext
                   })
                 });
-
                 SSRApp = (0, _hoistNonReactStatics.default)(SSRApp, App);
                 ModernHydrate( /*#__PURE__*/(0, _jsxRuntime.jsx)(SSRApp, {}));
               });
@@ -109,28 +92,29 @@ const ssr = config => ({
             }));
           }
         }
-
         function streamSSRHydrate() {
-          // callback: https://github.com/reactwg/react-18/discussions/5
-          let SSRApp = () => /*#__PURE__*/(0, _jsxRuntime.jsx)(_withCallback.WithCallback, {
-            callback: callback,
-            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(App, {
-              context: hydrateContext
-            })
-          });
-
-          SSRApp = (0, _hoistNonReactStatics.default)(SSRApp, App);
-          ModernHydrate( /*#__PURE__*/(0, _jsxRuntime.jsx)(SSRApp, {}));
+          if (renderLevel === _types.RenderLevel.SERVER_RENDER) {
+            // callback: https://github.com/reactwg/react-18/discussions/5
+            let SSRApp = () => /*#__PURE__*/(0, _jsxRuntime.jsx)(_withCallback.WithCallback, {
+              callback: callback,
+              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(App, {
+                context: hydrateContext
+              })
+            });
+            SSRApp = (0, _hoistNonReactStatics.default)(SSRApp, App);
+            ModernHydrate( /*#__PURE__*/(0, _jsxRuntime.jsx)(SSRApp, {}));
+          } else {
+            ModernRender( /*#__PURE__*/(0, _jsxRuntime.jsx)(App, {
+              context: context
+            }));
+          }
         }
       },
-
       init({
         context
       }, next) {
         var _window2, _window2$_SSR_DATA, _window2$_SSR_DATA$co;
-
         const request = (_window2 = window) === null || _window2 === void 0 ? void 0 : (_window2$_SSR_DATA = _window2._SSR_DATA) === null || _window2$_SSR_DATA === void 0 ? void 0 : (_window2$_SSR_DATA$co = _window2$_SSR_DATA.context) === null || _window2$_SSR_DATA$co === void 0 ? void 0 : _window2$_SSR_DATA$co.request;
-
         if (!request) {
           context.ssrContext = _objectSpread(_objectSpread({}, context.ssrContext), {}, {
             response: mockResp,
@@ -140,25 +124,21 @@ const ssr = config => ({
             context
           });
         }
-
         context.ssrContext.response = mockResp;
         context.ssrContext.request = (0, _utils.formatClient)(request);
         return next({
           context
         });
       },
-
       pickContext: ({
         context,
         pickedContext
       }, next) => {
         var _window3, _window3$_SSR_DATA, _window3$_SSR_DATA$co;
-
         const request = (_window3 = window) === null || _window3 === void 0 ? void 0 : (_window3$_SSR_DATA = _window3._SSR_DATA) === null || _window3$_SSR_DATA === void 0 ? void 0 : (_window3$_SSR_DATA$co = _window3$_SSR_DATA.context) === null || _window3$_SSR_DATA$co === void 0 ? void 0 : _window3$_SSR_DATA$co.request;
         const {
           initialData
         } = context;
-
         if (!request) {
           return next({
             context,
@@ -167,7 +147,6 @@ const ssr = config => ({
             })
           });
         }
-
         return next({
           context,
           pickedContext: _objectSpread(_objectSpread({}, pickedContext), {}, {
@@ -180,7 +159,6 @@ const ssr = config => ({
     };
   }
 });
-
 exports.ssr = ssr;
 var _default = ssr;
 exports.default = _default;

package/dist/js/node/ssr/index.node.js

@@ -7,17 +7,9 @@ var _exportNames = {
   ssr: true
 };
 exports.ssr = exports.default = void 0;
-
-var _core = require("../core");
-
-var _prefetch = _interopRequireDefault(require("./prefetch"));
-
 var _utils = require("./utils");
-
 var _serverRender = _interopRequireDefault(require("./serverRender"));
-
 var _react = require("./react");
-
 Object.keys(_react).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -29,17 +21,10 @@ Object.keys(_react).forEach(function (key) {
     }
   });
 });
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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; }
-
-const registeredApps = new WeakSet();
-
 const ssr = (config = {}) => ({
   name: '@modern-js/plugin-ssr',
   setup: () => {
@@ -48,11 +33,6 @@ const ssr = (config = {}) => ({
         App,
         context
       }) => {
-        if (!registeredApps.has(App)) {
-          (0, _core.registerPrefetch)(App, _context => (0, _prefetch.default)(App, _context));
-          registeredApps.add(App);
-        }
-
         const html = await (0, _serverRender.default)({
           context: context,
           App: App,
@@ -60,7 +40,6 @@ const ssr = (config = {}) => ({
         });
         return html;
       },
-
       init({
         context
       }, next) {
@@ -72,7 +51,6 @@ const ssr = (config = {}) => ({
           context
         });
       },
-
       pickContext: ({
         context,
         pickedContext
@@ -97,7 +75,6 @@ const ssr = (config = {}) => ({
     };
   }
 });
-
 exports.ssr = ssr;
 var _default = ssr;
 exports.default = _default;

package/dist/js/node/ssr/prefetch.js

@@ -4,26 +4,19 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _server = require("react-dom/server");
-
 var _ssr = require("@modern-js/utils/ssr");
-
 var _server2 = require("@loadable/server");
-
 var _jsxRuntime = require("react/jsx-runtime");
-
 // todo: SSRContext
 const prefetch = async (App, context) => (0, _ssr.run)(context.ssrContext.request.headers, async () => {
   var _context$store;
-
   const {
     ssrContext
   } = context;
   const {
     loadableStats
   } = ssrContext;
-
   if (loadableStats) {
     const extractor = new _server2.ChunkExtractor({
       stats: loadableStats,
@@ -37,18 +30,15 @@ const prefetch = async (App, context) => (0, _ssr.run)(context.ssrContext.reques
       context: context
     }));
   }
-
   if (!context.loaderManager.hasPendingLoaders()) {
     return {
       initialData: context.initialData,
       i18nData: context.__i18nData__
     };
   }
-
   const loadersData = await context.loaderManager.awaitPendingLoaders();
   Object.keys(loadersData).forEach(id => {
     const data = loadersData[id];
-
     if (data._error) {
       ssrContext.logger.error('App Prefetch Loader', data._error);
       ssrContext.metrics.emitCounter('app.prefetch.loader.error', 1);
@@ -63,6 +53,5 @@ const prefetch = async (App, context) => (0, _ssr.run)(context.ssrContext.reques
     storeState: context === null || context === void 0 ? void 0 : (_context$store = context.store) === null || _context$store === void 0 ? void 0 : _context$store.getState()
   };
 });
-
 var _default = prefetch;
 exports.default = _default;

package/dist/js/node/ssr/react/index.js

@@ -15,7 +15,5 @@ Object.defineProperty(exports, "PreRender", {
     return _prerender.PreRender;
   }
 });
-
 var _prerender = require("./prerender");
-
 var _nossr = require("./nossr");

package/dist/js/node/ssr/react/nossr/index.js

@@ -4,15 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.NoSSR = void 0;
-
 var _react = _interopRequireWildcard(require("react"));
-
 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; }
-
 let csr = false;
-
 const NoSSR = props => {
   const [isMounted, setMounted] = (0, _react.useState)(csr);
   (0, _react.useEffect)(() => {
@@ -24,5 +19,4 @@ const NoSSR = props => {
   } = props;
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, isMounted ? children : null);
 };
-
 exports.NoSSR = NoSSR;