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

package/dist/js/modern/ssr/prefetch.js

@@ -2,18 +2,15 @@ import { renderToStaticMarkup } from 'react-dom/server';
 import { run } from '@modern-js/utils/ssr';
 import { ChunkExtractor } from '@loadable/server';
 import { jsx as _jsx } from "react/jsx-runtime";
-
 // todo: SSRContext
 const prefetch = async (App, context) => run(context.ssrContext.request.headers, async () => {
   var _context$store;
-
   const {
     ssrContext
   } = context;
   const {
     loadableStats
   } = ssrContext;
-
   if (loadableStats) {
     const extractor = new ChunkExtractor({
       stats: loadableStats,
@@ -27,18 +24,15 @@ const prefetch = async (App, context) => run(context.ssrContext.request.headers,
       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);
@@ -53,5 +47,4 @@ const prefetch = async (App, context) => run(context.ssrContext.request.headers,
     storeState: context === null || context === void 0 ? void 0 : (_context$store = context.store) === null || _context$store === void 0 ? void 0 : _context$store.getState()
   };
 });
-
 export default prefetch;

package/dist/js/modern/ssr/react/prerender/index.js

@@ -1,9 +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 withSideEffect from 'react-side-effect';
 import React, { createElement } from 'react';
 import { getOutermostProperty, aggKeysFromPropsList, exist, aggMatchesFromPropsList } from "./util";
@@ -16,10 +13,9 @@ const PROP_NAMES = {
   FALLBACK: 'fallback',
   MATCHES: 'matches'
 };
-
-const handleClientStateChange = () => {// not used
+const handleClientStateChange = () => {
+  // not used
 };
-
 const mapStateOnServer = reduceProps => {
   const defaultProps = {
     interval: 10,
@@ -34,17 +30,14 @@ const mapStateOnServer = reduceProps => {
     const propKey = key;
     const reduceProp = reduceProps[propKey];
     let nextProps = props;
-
     if (exist(reduceProp)) {
       nextProps = _objectSpread(_objectSpread({}, props), {}, {
         [propKey]: reduceProp
       });
     }
-
     return nextProps;
   }, defaultProps);
 };
-
 const reducePropsToState = propsList => {
   const reduceProps = {
     interval: getOutermostProperty(propsList, PROP_NAMES.INTERVAL),
@@ -57,48 +50,34 @@ const reducePropsToState = propsList => {
   };
   return reduceProps;
 };
-
 function factory(Component) {
   class Spr extends React.Component {
     static set canUseDOM(canUseDOM) {
       Component.canUseDOM = canUseDOM;
     }
-
     static get canUseDOM() {
       return Component.canUseDOM;
     }
-
     verify() {
       return true;
     }
-
     render() {
       const newProps = _objectSpread({}, this.props);
-
       const validate = this.verify();
-
       if (!validate) {
         throw new Error('invalid props, check usage');
       }
-
       return /*#__PURE__*/createElement(Component, _objectSpread({}, newProps));
     }
-
   }
-
   _defineProperty(Spr, "peek", Component.peek);
-
   _defineProperty(Spr, "rewind", Component.rewind);
-
   _defineProperty(Spr, "config", () => {
     const mappedState = Component.rewind();
     return mappedState;
   });
-
   return Spr;
 }
-
 const NullComponent = () => null;
-
 const SprSideEffects = withSideEffect(reducePropsToState, handleClientStateChange, mapStateOnServer)(NullComponent);
 export const PreRender = factory(SprSideEffects);

package/dist/js/modern/ssr/react/prerender/util.js

@@ -2,12 +2,10 @@ const REQUEST_META = ['header', 'query'];
 export const getInnermostProperty = function getInnermostProperty(propsList, propName) {
   for (let i = propsList.length - 1; i >= 0; i--) {
     const props = propsList[i];
-
     if (props.hasOwnProperty(propName)) {
       return props[propName];
     }
   }
-
   return null;
 };
 export const getOutermostProperty = function getOutermostProperty(propsList, propName) {
@@ -16,7 +14,6 @@ export const getOutermostProperty = function getOutermostProperty(propsList, pro
       return props[propName];
     }
   }
-
   return null;
 };
 export const aggKeysFromPropsList = function aggKeysFromPropsList(propsList, propName) {
@@ -28,7 +25,6 @@ export const aggKeysFromPropsList = function aggKeysFromPropsList(propsList, pro
   const res = propsList.filter(props => usefulObject(props[propName])).reduce((result, next) => {
     REQUEST_META.forEach(key => {
       const prop = next[propName];
-
       if (prop !== null && prop !== void 0 && prop.hasOwnProperty(key) && usefulArray(prop[key])) {
         result[key] = unique(result[key].concat(prop[key]));
       }
@@ -37,13 +33,10 @@ export const aggKeysFromPropsList = function aggKeysFromPropsList(propsList, pro
   }, initResult);
   return REQUEST_META.reduce((result, next) => {
     var _result$key;
-
     const key = next;
-
     if (result[key] && ((_result$key = result[key]) === null || _result$key === void 0 ? void 0 : _result$key.length) === 0) {
       delete result[key];
     }
-
     return result;
   }, res);
 };
@@ -55,8 +48,8 @@ export const aggMatchesFromPropsList = function aggMatchesFromPropsList(propsLis
   }, {});
   const res = propsList.filter(props => usefulObject(props[propName])).reduce((result, next) => {
     REQUEST_META.forEach(key => {
-      const prop = next[propName]; // 这边目前是浅拷贝，越后渲染优先级越高
-
+      const prop = next[propName];
+      // 这边目前是浅拷贝，越后渲染优先级越高
       if (prop !== null && prop !== void 0 && prop.hasOwnProperty(key) && usefulObject(prop[key])) {
         result[key] = Object.assign(result[key], prop[key]);
       }
@@ -65,35 +58,27 @@ export const aggMatchesFromPropsList = function aggMatchesFromPropsList(propsLis
   }, initResult);
   return REQUEST_META.reduce((result, next) => {
     const key = next;
-
     if (result[key] && Object.keys(result[key]).length === 0) {
       delete result[key];
     }
-
     return result;
   }, res);
 };
-
 function unique(arr) {
   return Array.from(new Set(arr));
 }
-
 function usefulObject(target) {
   if (!exist(target)) {
     return false;
   }
-
   return target.constructor === Object && Object.keys(target).length > 0;
 }
-
 function usefulArray(target) {
   if (!exist(target)) {
     return false;
   }
-
   return Array.isArray(target) && target.length > 0;
 }
-
 export function exist(target) {
   return target != null;
 }

package/dist/js/modern/ssr/react/withCallback/index.js

@@ -9,7 +9,6 @@ export const WithCallback = ({
     if (once.current) {
       return;
     }
-
     once.current = true;
     callback();
   }, [callback]);

package/dist/js/modern/ssr/serverRender/helmet.js

@@ -1,46 +1,38 @@
 // 用于 react-helmet 正则替换
+import { EOL } from 'os';
 const RE_HTML_ATTR = /<html[^>]*>/;
 const RE_BODY_ATTR = /<body[^>]*>/;
 const RE_LAST_IN_HEAD = /<\/head>/;
 const RE_TITLE = /<title[^>]*>([\s\S\n\r]*?)<\/title>/;
-const TEST_TITLE_CONTENT = /(?<=<title[^>]*>)([\s\S\n\r]*?)([.|\S])([\s\S\n\r]*?)(?=<\/title>)/; // 通过 react-helmet 修改模板
+const TEST_TITLE_CONTENT = /(?<=<title[^>]*>)([\s\S\n\r]*?)([.|\S])([\s\S\n\r]*?)(?=<\/title>)/;
 
+// 通过 react-helmet 修改模板
 export default function helmet(content, helmetData) {
   let result = content;
   const bodyAttributes = helmetData.bodyAttributes.toString();
-
   if (bodyAttributes) {
     result = result.replace(RE_BODY_ATTR, `<body ${bodyAttributes}>`);
   }
-
   const htmlAttributes = helmetData.htmlAttributes.toString();
-
   if (htmlAttributes) {
     result = result.replace(RE_HTML_ATTR, `<html ${htmlAttributes}>`);
   }
-
   const base = helmetData.base.toString();
   const link = helmetData.link.toString();
   const meta = helmetData.meta.toString();
   const noscript = helmetData.noscript.toString();
   const script = helmetData.script.toString();
   const style = helmetData.style.toString();
-  const title = helmetData.title.toString(); // 如果模板中存在 title，且 helmetData title 有内容则做替换
-
-  const existTitle = RE_TITLE.test(content);
+  const title = helmetData.title.toString();
 
-  if (TEST_TITLE_CONTENT.test(title.trim()) && existTitle) {
+  // 如果模板中存在 title，且 helmetData title 有内容则做替换
+  const existTitleTag = RE_TITLE.test(content);
+  const shouldReplaceTitle = existTitleTag && TEST_TITLE_CONTENT.test(title.trim());
+  if (shouldReplaceTitle) {
     result = result.replace(RE_TITLE, title);
   }
-
-  return result.replace(RE_LAST_IN_HEAD, `
-    ${base}
-    ${link}
-    ${meta}
-    ${noscript}
-    ${script}
-    ${style}
-    ${existTitle ? '' : title}
-    </head>
-  `);
+  const helmetStr = [base, link, meta, noscript, script, style, !existTitleTag ? title : ''].reduce((pre, cur) => {
+    return pre + (cur.length > 0 ? `  ${cur}${EOL}` : '');
+  }, '');
+  return result.replace(RE_LAST_IN_HEAD, `${helmetStr}</head>`);
 }

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

@@ -1,8 +1,7 @@
 /* eslint-disable eslint-comments/disable-enable-pair */
-
 /* eslint-disable @typescript-eslint/no-var-requires */
-
 /* eslint-disable @typescript-eslint/no-require-imports */
+
 import { isReact18 } from "../utils";
 export default async function serverRender(options) {
   if (isReact18() && options.config.mode === 'stream') {

package/dist/js/modern/ssr/serverRender/renderToStream/buildTemplate.after.js

@@ -3,15 +3,14 @@ import { buildTemplate } from "./buildTemplate.share";
 export function buildShellAfterTemplate(afterAppTemplate, options) {
   const callbacks = [injectSSRDataScript];
   return buildTemplate(afterAppTemplate, callbacks);
-
   function injectSSRDataScript(template) {
     const ssrDataScript = buildSSRDataScript();
     return template.replace('<!--<?- SSRDataScript ?>-->', ssrDataScript);
-
     function buildSSRDataScript() {
       const {
-        ssrContext
-      } = options.context;
+        ssrContext,
+        renderLevel
+      } = options;
       const {
         request
       } = ssrContext;
@@ -26,7 +25,8 @@ export function buildShellAfterTemplate(afterAppTemplate, options) {
             headers: request.headers,
             cookieMap: request.cookieMap
           }
-        }
+        },
+        renderLevel
       };
       return `
       <script>window._SSR_DATA = ${serialize(SSRData, {

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

@@ -1,24 +1,58 @@
 import ReactHelmet from 'react-helmet';
+import { matchRoutes } from 'react-router-dom';
 import helmetReplace from "../helmet";
-import { HEAD_REG_EXP, buildTemplate } from "./buildTemplate.share"; // build head template
+import { HEAD_REG_EXP, buildTemplate } from "./buildTemplate.share";
+const CSS_CHUNKS_PLACEHOLDER = '<!--<?- chunksMap.css ?>-->';
 
-function getHeadTemplate(beforeEntryTemplate) {
+// build head template
+function getHeadTemplate(beforeEntryTemplate, context) {
   const callbacks = [headTemplate => {
     const helmetData = ReactHelmet.renderStatic();
     return helmetData ? helmetReplace(headTemplate, helmetData) : headTemplate;
-  }];
+  },
+  // @TODO: prefetch scripts of lazy component
+  injectCss];
   const [headTemplate = ''] = beforeEntryTemplate.match(HEAD_REG_EXP) || [];
-
   if (!headTemplate.length) {
     return '';
   }
+  return buildTemplate(headTemplate, callbacks);
+  function injectCss(headTemplate) {
+    return headTemplate.replace(CSS_CHUNKS_PLACEHOLDER, getCssChunks());
+    function getCssChunks() {
+      const {
+        routeManifest,
+        routerContext,
+        routes
+      } = context;
+      if (!routeManifest || !routerContext || !routes) {
+        return '';
+      }
+      const {
+        routeAssets
+      } = routeManifest;
+      const cssChunks = [];
+      const matches = matchRoutes(routes, routerContext.location);
+      matches === null || matches === void 0 ? void 0 : matches.forEach(match => {
+        const routeId = match.route.id;
+        if (routeId) {
+          const {
+            assets = []
+          } = routeAssets[routeId];
+          const _cssChunks = assets.filter(asset => asset === null || asset === void 0 ? void 0 : asset.endsWith('.css'));
+          cssChunks.push(..._cssChunks);
+        }
+      });
+      const styleLinks = cssChunks.map(chunk => {
+        return `<link href="${chunk}" rel="stylesheet" />`;
+      });
+      return `${styleLinks.join('')}`;
+    }
+  }
+}
 
-  return buildTemplate(headTemplate, callbacks); // @TODO: inject css chunks of lazy components
-  // @TODO: prefetch scripts of lazy component
-} // build script
-
-
-export function buildShellBeforeTemplate(beforeAppTemplate) {
-  const headTemplate = getHeadTemplate(beforeAppTemplate);
+// build script
+export function buildShellBeforeTemplate(beforeAppTemplate, context) {
+  const headTemplate = getHeadTemplate(beforeAppTemplate, context);
   return beforeAppTemplate.replace(HEAD_REG_EXP, headTemplate);
 }

package/dist/js/modern/ssr/serverRender/renderToStream/index.js

@@ -2,7 +2,6 @@ import { createElement } from 'react';
 import { run } from '@modern-js/utils/ssr';
 import { PreRender } from "../../react/prerender";
 import { time } from "../utils";
-import { createTemplates } from "./template";
 import renderToPipe from "./renderToPipe";
 export const render = ({
   App,
@@ -11,63 +10,31 @@ export const render = ({
   const {
     ssrContext
   } = context;
-
   if (!ssrContext) {
     throw new Error('The "ssrContext" must not be undefined, but received undefined');
   }
-
   return run(ssrContext.request.headers, async () => {
-    const end_all = time();
+    const end = time();
     const rootElement = /*#__PURE__*/createElement(App, {
       context: Object.assign(context || {}, {
         ssr: true
       })
     });
-    const getTemplates = createTemplates(context);
-    const end = time();
-    const pipe = renderToPipe(rootElement, getTemplates, {
+    const pipe = renderToPipe(rootElement, context, {
       onShellReady() {
         // set cacheConfig
         const cacheConfig = PreRender.config();
-
         if (cacheConfig) {
-          context.ssrContext.cacheConfig = cacheConfig;
+          ssrContext.cacheConfig = cacheConfig;
         }
       },
-
       onAllReady() {
-        // computed render html cost
+        // calculate streaming ssr cost
         const cost = end();
         ssrContext.logger.debug('App Render To HTML cost = %d ms', cost);
-        ssrContext.metrics.emitTimer('app.render.html.cost', cost); // computed all ssr const
-
-        const cost_all = end_all();
-        ssrContext.logger.info('App Render Total cost = %d ms', cost_all);
-        ssrContext.metrics.emitTimer('app.render.cost', cost_all);
+        ssrContext.metrics.emitTimer('app.render.html.cost', cost);
       }
-
     });
     return pipe;
-  }); // eslint-disable-next-line @typescript-eslint/no-unused-vars
-
-  async function prefetch(App, context) {
-    const {
-      prefetch
-    } = App;
-    const ssrContext = context.ssrContext;
-    let prefetchData;
-    const end = time();
-
-    try {
-      prefetchData = prefetch ? await prefetch(context) : null;
-      const prefetchCost = end();
-      ssrContext.logger.debug(`App Prefetch cost = %d ms`, prefetchCost);
-      ssrContext.metrics.emitTimer('app.prefetch.cost', prefetchCost);
-    } catch (e) {
-      ssrContext.logger.error('App Prefetch Render', e);
-      ssrContext.metrics.emitCounter('app.prefetch.render.error', 1);
-    }
-
-    return prefetchData || {};
-  }
+  });
 };

package/dist/js/modern/ssr/serverRender/renderToStream/loadable.js

@@ -7,13 +7,11 @@ export function getLoadableChunks({
     loadableStats,
     entryName
   } = context.ssrContext;
-
   if (!loadableStats) {
     return {
       jsx
     };
   }
-
   const extractor = new ChunkExtractor({
     stats: loadableStats,
     entrypoints: [entryName]

package/dist/js/modern/ssr/serverRender/renderToStream/renderToPipe.js

@@ -1,15 +1,15 @@
 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 { Transform } from 'stream';
 import { renderToPipeableStream } from 'react-dom/server';
-
-function renderToPipe(rootElement, getTemplates, options) {
+import { RenderLevel } from "../types";
+import { getTemplates } from "./template";
+function renderToPipe(rootElement, context, options) {
   let isShellStream = true;
-
+  const {
+    ssrContext
+  } = context;
   const forUserPipe = stream => {
     return new Promise(resolve => {
       const {
@@ -17,12 +17,11 @@ function renderToPipe(rootElement, getTemplates, options) {
       } = renderToPipeableStream(rootElement, _objectSpread(_objectSpread({}, options), {}, {
         onShellReady() {
           var _options$onShellReady;
-
-          options === null || options === void 0 ? void 0 : (_options$onShellReady = options.onShellReady) === null || _options$onShellReady === void 0 ? void 0 : _options$onShellReady.call(options);
           const {
             shellAfter,
             shellBefore
-          } = getTemplates();
+          } = getTemplates(context, RenderLevel.SERVER_RENDER);
+          options === null || options === void 0 ? void 0 : (_options$onShellReady = options.onShellReady) === null || _options$onShellReady === void 0 ? void 0 : _options$onShellReady.call(options);
           const injectableTransform = new Transform({
             transform(chunk, _encoding, callback) {
               try {
@@ -32,7 +31,6 @@ function renderToPipe(rootElement, getTemplates, options) {
                 } else {
                   this.push(chunk);
                 }
-
                 callback();
               } catch (e) {
                 if (e instanceof Error) {
@@ -42,20 +40,33 @@ function renderToPipe(rootElement, getTemplates, options) {
                 }
               }
             }
-
           });
           resolve(pipe(injectableTransform).pipe(stream));
+        },
+        onShellError(error) {
+          var _options$onShellError;
+          // Don't log error in `onShellError` callback, since it has been logged in `onError` callback
+          ssrContext.metrics.emitCounter('app.render.streaming.shell.error', 1);
+          const {
+            shellAfter,
+            shellBefore
+          } = getTemplates(context, RenderLevel.CLIENT_RENDER);
+          const fallbackHtml = `${shellBefore}${shellAfter}`;
+          resolve(fallbackHtml);
+          options === null || options === void 0 ? void 0 : (_options$onShellError = options.onShellError) === null || _options$onShellError === void 0 ? void 0 : _options$onShellError.call(options, error);
+        },
+        onError(error) {
+          var _options$onError;
+          ssrContext.logger.error('An error occurs during streaming SSR', error);
+          ssrContext.metrics.emitCounter('app.render.streaming.error', 1);
+          options === null || options === void 0 ? void 0 : (_options$onError = options.onError) === null || _options$onError === void 0 ? void 0 : _options$onError.call(options, error);
         }
-
       }));
     });
   };
-
   return forUserPipe;
-
   function joinChunk(before = '', chunk, after = '') {
     return `${before}${chunk.toString()}${after}`;
   }
 }
-
 export default renderToPipe;

package/dist/js/modern/ssr/serverRender/renderToStream/template.js

@@ -1,22 +1,18 @@
 import { buildShellAfterTemplate } from "./buildTemplate.after";
 import { buildShellBeforeTemplate } from "./bulidTemplate.before";
 const HTML_SEPARATOR = '<!--<?- html ?>-->';
-export function createTemplates(context) {
-  const getTemplates = () => {
-    const {
-      template
-    } = context.ssrContext;
-    const [beforeAppTemplate = '', afterAppHtmlTemplate = ''] = template.split(HTML_SEPARATOR) || []; // templates injected some variables
-
-    const builtBeforeTemplate = buildShellBeforeTemplate(beforeAppTemplate);
-    const builtAfterTemplate = buildShellAfterTemplate(afterAppHtmlTemplate, {
-      context
-    });
-    return {
-      shellBefore: builtBeforeTemplate,
-      shellAfter: builtAfterTemplate
-    };
+export const getTemplates = (context, renderLevel) => {
+  const {
+    ssrContext
+  } = context;
+  const [beforeAppTemplate = '', afterAppHtmlTemplate = ''] = ssrContext.template.split(HTML_SEPARATOR) || [];
+  const builtBeforeTemplate = buildShellBeforeTemplate(beforeAppTemplate, context);
+  const builtAfterTemplate = buildShellAfterTemplate(afterAppHtmlTemplate, {
+    ssrContext: ssrContext,
+    renderLevel
+  });
+  return {
+    shellBefore: builtBeforeTemplate,
+    shellAfter: builtAfterTemplate
   };
-
-  return getTemplates;
-}
+};