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

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

@@ -7,33 +7,25 @@ exports.aggMatchesFromPropsList = exports.aggKeysFromPropsList = void 0;
 exports.exist = exist;
 exports.getOutermostProperty = exports.getInnermostProperty = void 0;
 const REQUEST_META = ['header', 'query'];
-
 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;
 };
-
 exports.getInnermostProperty = getInnermostProperty;
-
 const getOutermostProperty = function getOutermostProperty(propsList, propName) {
   for (const props of propsList) {
     if (props.hasOwnProperty(propName)) {
       return props[propName];
     }
   }
-
   return null;
 };
-
 exports.getOutermostProperty = getOutermostProperty;
-
 const aggKeysFromPropsList = function aggKeysFromPropsList(propsList, propName) {
   const initResult = REQUEST_META.reduce((result, next) => {
     const key = next;
@@ -43,7 +35,6 @@ const aggKeysFromPropsList = function aggKeysFromPropsList(propsList, propName)
   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]));
       }
@@ -52,19 +43,14 @@ const aggKeysFromPropsList = function aggKeysFromPropsList(propsList, propName)
   }, 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);
 };
-
 exports.aggKeysFromPropsList = aggKeysFromPropsList;
-
 const aggMatchesFromPropsList = function aggMatchesFromPropsList(propsList, propName) {
   const initResult = REQUEST_META.reduce((result, next) => {
     const key = next;
@@ -73,8 +59,8 @@ const aggMatchesFromPropsList = function aggMatchesFromPropsList(propsList, prop
   }, {});
   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]);
       }
@@ -83,37 +69,28 @@ const aggMatchesFromPropsList = function aggMatchesFromPropsList(propsList, prop
   }, 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);
 };
-
 exports.aggMatchesFromPropsList = aggMatchesFromPropsList;
-
 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;
 }
-
 function exist(target) {
   return target != null;
 }

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

@@ -4,10 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.WithCallback = void 0;
-
 var _react = require("react");
-
 // See https://github.com/reactwg/react-18/discussions/5#discussioncomment-2276079
+
 const WithCallback = ({
   callback,
   children
@@ -17,11 +16,9 @@ const WithCallback = ({
     if (once.current) {
       return;
     }
-
     once.current = true;
     callback();
   }, [callback]);
   return children;
 };
-
 exports.WithCallback = WithCallback;

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

@@ -4,49 +4,42 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = helmet;
+var _os = require("os");
 // 用于 react-helmet 正则替换
+
 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 修改模板
 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}${_os.EOL}` : '');
+  }, '');
+  return result.replace(RE_LAST_IN_HEAD, `${helmetStr}</head>`);
 }

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

@@ -3,43 +3,18 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.render = void 0;
-
-var _ssr = require("@modern-js/utils/ssr");
-
-var _prerender = require("../react/prerender");
-
-var _entry = _interopRequireDefault(require("./entry"));
-
-var _measure = require("./measure");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const render = async (ctx, config, App) => {
-  const {
-    ssrContext
-  } = ctx;
-  return (0, _ssr.run)(ssrContext.request.headers, async () => {
-    const entry = new _entry.default({
-      ctx: ssrContext,
-      App,
-      config
-    });
-    entry.metrics.emitCounter('app.visit.count', 1);
-    const end = (0, _measure.time)();
-    const html = await entry.renderToHtml(ctx);
-    const cost = end();
-    entry.logger.info('App Render Total cost = %d ms', cost);
-    entry.metrics.emitTimer('app.render.cost', cost);
-
-    const cacheConfig = _prerender.PreRender.config();
-
-    if (cacheConfig) {
-      ctx.ssrContext.cacheConfig = cacheConfig;
-    }
-
+exports.default = serverRender;
+var _utils = require("../utils");
+/* eslint-disable eslint-comments/disable-enable-pair */
+/* eslint-disable @typescript-eslint/no-var-requires */
+/* eslint-disable @typescript-eslint/no-require-imports */
+
+async function serverRender(options) {
+  if ((0, _utils.isReact18)() && options.config.mode === 'stream') {
+    const pipe = await require("./renderToStream").render(options);
+    return pipe;
+  } else {
+    const html = await require("./renderToString").render(options);
     return html;
-  });
-};
-
-exports.render = render;
+  }
+}

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

@@ -0,0 +1,45 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.buildShellAfterTemplate = buildShellAfterTemplate;
+var _serializeJavascript = _interopRequireDefault(require("serialize-javascript"));
+var _buildTemplate = require("./buildTemplate.share");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function buildShellAfterTemplate(afterAppTemplate, options) {
+  const callbacks = [injectSSRDataScript];
+  return (0, _buildTemplate.buildTemplate)(afterAppTemplate, callbacks);
+  function injectSSRDataScript(template) {
+    const ssrDataScript = buildSSRDataScript();
+    return template.replace('<!--<?- SSRDataScript ?>-->', ssrDataScript);
+    function buildSSRDataScript() {
+      const {
+        ssrContext,
+        renderLevel
+      } = options;
+      const {
+        request
+      } = ssrContext;
+      const SSRData = {
+        context: {
+          request: {
+            params: request.params,
+            query: request.query,
+            pathname: request.pathname,
+            host: request.host,
+            url: request.url,
+            headers: request.headers,
+            cookieMap: request.cookieMap
+          }
+        },
+        renderLevel
+      };
+      return `
+      <script>window._SSR_DATA = ${(0, _serializeJavascript.default)(SSRData, {
+        isJSON: true
+      })}</script>
+      `;
+    }
+  }
+}

package/dist/js/node/ssr/serverRender/renderToStream/buildTemplate.share.js

@@ -0,0 +1,13 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.HEAD_REG_EXP = void 0;
+exports.buildTemplate = buildTemplate;
+// share script
+const HEAD_REG_EXP = /<head(.|\n)*>(.|\n)*<\/head>/;
+exports.HEAD_REG_EXP = HEAD_REG_EXP;
+function buildTemplate(template, callbacks) {
+  return callbacks.reduce((template, buildTemplateCb) => buildTemplateCb(template), template);
+}

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

@@ -0,0 +1,65 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.buildShellBeforeTemplate = buildShellBeforeTemplate;
+var _reactHelmet = _interopRequireDefault(require("react-helmet"));
+var _reactRouterDom = require("react-router-dom");
+var _helmet = _interopRequireDefault(require("../helmet"));
+var _buildTemplate = require("./buildTemplate.share");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const CSS_CHUNKS_PLACEHOLDER = '<!--<?- chunksMap.css ?>-->';
+
+// build head template
+function getHeadTemplate(beforeEntryTemplate, context) {
+  const callbacks = [headTemplate => {
+    const helmetData = _reactHelmet.default.renderStatic();
+    return helmetData ? (0, _helmet.default)(headTemplate, helmetData) : headTemplate;
+  },
+  // @TODO: prefetch scripts of lazy component
+  injectCss];
+  const [headTemplate = ''] = beforeEntryTemplate.match(_buildTemplate.HEAD_REG_EXP) || [];
+  if (!headTemplate.length) {
+    return '';
+  }
+  return (0, _buildTemplate.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 = (0, _reactRouterDom.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('')}`;
+    }
+  }
+}
+
+// build script
+function buildShellBeforeTemplate(beforeAppTemplate, context) {
+  const headTemplate = getHeadTemplate(beforeAppTemplate, context);
+  return beforeAppTemplate.replace(_buildTemplate.HEAD_REG_EXP, headTemplate);
+}

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

@@ -0,0 +1,48 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.render = void 0;
+var _react = require("react");
+var _ssr = require("@modern-js/utils/ssr");
+var _prerender = require("../../react/prerender");
+var _utils = require("../utils");
+var _renderToPipe = _interopRequireDefault(require("./renderToPipe"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const render = ({
+  App,
+  context
+}) => {
+  const {
+    ssrContext
+  } = context;
+  if (!ssrContext) {
+    throw new Error('The "ssrContext" must not be undefined, but received undefined');
+  }
+  return (0, _ssr.run)(ssrContext.request.headers, async () => {
+    const end = (0, _utils.time)();
+    const rootElement = /*#__PURE__*/(0, _react.createElement)(App, {
+      context: Object.assign(context || {}, {
+        ssr: true
+      })
+    });
+    const pipe = (0, _renderToPipe.default)(rootElement, context, {
+      onShellReady() {
+        // set cacheConfig
+        const cacheConfig = _prerender.PreRender.config();
+        if (cacheConfig) {
+          ssrContext.cacheConfig = cacheConfig;
+        }
+      },
+      onAllReady() {
+        // 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);
+      }
+    });
+    return pipe;
+  });
+};
+exports.render = render;

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

@@ -0,0 +1,30 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getLoadableChunks = getLoadableChunks;
+var _server = require("@loadable/server");
+function getLoadableChunks({
+  context,
+  jsx
+}) {
+  const {
+    loadableStats,
+    entryName
+  } = context.ssrContext;
+  if (!loadableStats) {
+    return {
+      jsx
+    };
+  }
+  const extractor = new _server.ChunkExtractor({
+    stats: loadableStats,
+    entrypoints: [entryName]
+  });
+  const collectedJsx = extractor.collectChunks(jsx);
+  return {
+    jsx: collectedJsx,
+    chunkExtractor: extractor
+  };
+}

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

@@ -0,0 +1,79 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _stream = require("stream");
+var _server = require("react-dom/server");
+var _types = require("../types");
+var _template = require("./template");
+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; }
+function renderToPipe(rootElement, context, options) {
+  let isShellStream = true;
+  const {
+    ssrContext
+  } = context;
+  const forUserPipe = stream => {
+    return new Promise(resolve => {
+      const {
+        pipe
+      } = (0, _server.renderToPipeableStream)(rootElement, _objectSpread(_objectSpread({}, options), {}, {
+        onShellReady() {
+          var _options$onShellReady;
+          const {
+            shellAfter,
+            shellBefore
+          } = (0, _template.getTemplates)(context, _types.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 _stream.Transform({
+            transform(chunk, _encoding, callback) {
+              try {
+                if (isShellStream) {
+                  this.push(joinChunk(shellBefore, chunk, shellAfter));
+                  isShellStream = false;
+                } else {
+                  this.push(chunk);
+                }
+                callback();
+              } catch (e) {
+                if (e instanceof Error) {
+                  callback(e);
+                } else {
+                  callback(new Error('Received unkown error when streaming'));
+                }
+              }
+            }
+          });
+          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
+          } = (0, _template.getTemplates)(context, _types.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}`;
+  }
+}
+var _default = renderToPipe;
+exports.default = _default;

package/dist/js/node/ssr/serverRender/renderToStream/styledComponent.js

@@ -0,0 +1,17 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getStyledComponentCss = getStyledComponentCss;
+var _styledComponents = require("styled-components");
+function getStyledComponentCss({
+  jsx
+}) {
+  const sheet = new _styledComponents.ServerStyleSheet();
+  const collectedJsx = sheet.collectStyles(jsx);
+  return {
+    styleSheet: sheet,
+    jsx: collectedJsx
+  };
+}

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

@@ -0,0 +1,25 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getTemplates = void 0;
+var _buildTemplate = require("./buildTemplate.after");
+var _bulidTemplate = require("./bulidTemplate.before");
+const HTML_SEPARATOR = '<!--<?- html ?>-->';
+const getTemplates = (context, renderLevel) => {
+  const {
+    ssrContext
+  } = context;
+  const [beforeAppTemplate = '', afterAppHtmlTemplate = ''] = ssrContext.template.split(HTML_SEPARATOR) || [];
+  const builtBeforeTemplate = (0, _bulidTemplate.buildShellBeforeTemplate)(beforeAppTemplate, context);
+  const builtAfterTemplate = (0, _buildTemplate.buildShellAfterTemplate)(afterAppHtmlTemplate, {
+    ssrContext: ssrContext,
+    renderLevel
+  });
+  return {
+    shellBefore: builtBeforeTemplate,
+    shellAfter: builtAfterTemplate
+  };
+};
+exports.getTemplates = getTemplates;