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

package/dist/js/node/ssr/serverRender/{entry.js → renderToString/entry.js}

@@ -4,37 +4,22 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _react = _interopRequireDefault(require("react"));
-
 var _server = _interopRequireDefault(require("react-dom/server"));
-
 var _serializeJavascript = _interopRequireDefault(require("serialize-javascript"));
-
 var _reactHelmet = _interopRequireDefault(require("react-helmet"));
-
+var _helmet = _interopRequireDefault(require("../helmet"));
+var _types = require("../types");
+var _utils = require("../utils");
+var _prefetch = _interopRequireDefault(require("../../prefetch"));
 var _template = require("./template");
-
-var _type = require("./type");
-
-var _helmet = _interopRequireDefault(require("./helmet"));
-
 var _reduce = require("./reduce");
-
 var loadableRenderer = _interopRequireWildcard(require("./loadable"));
-
 var styledComponentRenderer = _interopRequireWildcard(require("./styledComponent"));
-
-var _measure = require("./measure");
-
 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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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 buildTemplateData = (context, data, renderLevel) => {
   const {
     request
@@ -55,25 +40,16 @@ const buildTemplateData = (context, data, renderLevel) => {
     renderLevel
   };
 };
-
 class Entry {
   constructor(options) {
     _defineProperty(this, "entryName", void 0);
-
     _defineProperty(this, "result", void 0);
-
     _defineProperty(this, "metrics", void 0);
-
     _defineProperty(this, "logger", void 0);
-
     _defineProperty(this, "App", void 0);
-
     _defineProperty(this, "fragments", void 0);
-
     _defineProperty(this, "pluginConfig", void 0);
-
     _defineProperty(this, "host", void 0);
-
     const {
       ctx,
       config
@@ -93,7 +69,7 @@ class Entry {
     this.metrics = ctx.metrics;
     this.logger = ctx.logger;
     this.result = {
-      renderLevel: _type.RenderLevel.CLIENT_RENDER,
+      renderLevel: _types.RenderLevel.CLIENT_RENDER,
       html: '',
       chunksMap: {
         js: '',
@@ -101,34 +77,24 @@ class Entry {
       }
     };
   }
-
   async renderToHtml(context) {
-    const {
-      ssrContext
-    } = context;
-
+    const ssrContext = context.ssrContext;
     if (ssrContext.redirection.url) {
       return '';
     }
-
     const prefetchData = await this.prefetch(context);
-
     if (ssrContext.redirection.url) {
       return '';
     }
-
-    if (this.result.renderLevel >= _type.RenderLevel.SERVER_PREFETCH) {
+    if (this.result.renderLevel >= _types.RenderLevel.SERVER_PREFETCH) {
       this.result.html = this.renderToString(context);
     }
-
     if (ssrContext.redirection.url) {
       return '';
     }
-
     let html = '';
     const templateData = buildTemplateData(ssrContext, prefetchData, this.result.renderLevel);
     const SSRData = this.getSSRDataScript(templateData);
-
     for (const fragment of this.fragments) {
       if (fragment.isVariable && fragment.content === 'SSRDataScript') {
         html += fragment.getValue(SSRData);
@@ -136,50 +102,37 @@ class Entry {
         html += fragment.getValue(this.result);
       }
     }
-
     const helmetData = _reactHelmet.default.renderStatic();
-
     return helmetData ? (0, _helmet.default)(html, helmetData) : html;
   }
-
   async prefetch(context) {
-    const {
-      App: {
-        prefetch
-      }
-    } = this;
     let prefetchData;
-    const end = (0, _measure.time)();
-
+    const end = (0, _utils.time)();
     try {
-      prefetchData = prefetch ? await prefetch(context) : null;
-      this.result.renderLevel = _type.RenderLevel.SERVER_PREFETCH;
+      prefetchData = await (0, _prefetch.default)(this.App, context);
+      this.result.renderLevel = _types.RenderLevel.SERVER_PREFETCH;
       const prefetchCost = end();
       this.logger.debug(`App Prefetch cost = %d ms`, prefetchCost);
       this.metrics.emitTimer('app.prefetch.cost', prefetchCost);
     } catch (e) {
-      this.result.renderLevel = _type.RenderLevel.CLIENT_RENDER;
+      this.result.renderLevel = _types.RenderLevel.CLIENT_RENDER;
       this.logger.error('App Prefetch Render', e);
       this.metrics.emitCounter('app.prefetch.render.error', 1);
     }
-
     return prefetchData || {};
   }
-
   renderToString(context) {
     let html = '';
-    const end = (0, _measure.time)();
+    const end = (0, _utils.time)();
     const {
       ssrContext
     } = context;
-
     try {
       const App = /*#__PURE__*/_react.default.createElement(this.App, {
         context: Object.assign(context, {
           ssr: true
         })
       });
-
       const renderContext = {
         stats: ssrContext.loadableStats,
         host: this.host,
@@ -191,15 +144,13 @@ class Entry {
       const cost = end();
       this.logger.debug('App Render To HTML cost = %d ms', cost);
       this.metrics.emitTimer('app.render.html.cost', cost);
-      this.result.renderLevel = _type.RenderLevel.SERVER_RENDER;
+      this.result.renderLevel = _types.RenderLevel.SERVER_RENDER;
     } catch (e) {
       this.logger.error('App Render To HTML', e);
       this.metrics.emitCounter('app.render.html.error', 1);
     }
-
     return html;
   }
-
   getSSRDataScript(templateData) {
     return {
       SSRDataScript: `
@@ -209,7 +160,5 @@ class Entry {
       `
     };
   }
-
 }
-
 exports.default = Entry;

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

@@ -0,0 +1,37 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.render = void 0;
+var _ssr = require("@modern-js/utils/ssr");
+var _prerender = require("../../react/prerender");
+var _utils = require("../utils");
+var _entry = _interopRequireDefault(require("./entry"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const render = ({
+  App,
+  context,
+  config
+}) => {
+  const ssrContext = context.ssrContext;
+  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, _utils.time)();
+    const html = await entry.renderToHtml(context);
+    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) {
+      context.ssrContext.cacheConfig = cacheConfig;
+    }
+    return html;
+  });
+};
+exports.render = render;

package/dist/js/node/ssr/serverRender/{loadable.js → renderToString/loadable.js}

@@ -4,32 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.toHtml = void 0;
-
 var _server = require("@loadable/server");
-
-var _utils = require("../utils");
-
+var _utils = require("../../utils");
+var _utils2 = require("../utils");
 const extname = uri => {
   if (typeof uri !== 'string' || !uri.includes('.')) {
     return '';
   }
-
   return `.${uri === null || uri === void 0 ? void 0 : uri.split('.').pop()}` || '';
 };
-
-function getLoadableScripts(extractor) {
-  const check = scripts => (scripts || '').includes('__LOADABLE_REQUIRED_CHUNKS___ext');
-
-  const scripts = extractor.getScriptTags();
-
-  if (!check(scripts)) {
-    return '';
-  }
-
-  return scripts.split('</script>') // 前两个 script为 loadable 必须的 script
-  .slice(0, 2).map(i => `${i}</script>`).join('');
-}
-
 const toHtml = (jsx, renderer, next) => {
   const {
     stats,
@@ -39,39 +22,31 @@ const toHtml = (jsx, renderer, next) => {
     host,
     config = {}
   } = renderer;
-
   if (!stats || chunksMap.js) {
     return next(jsx);
   }
-
   const extractor = new _server.ChunkExtractor({
     stats,
     entrypoints: [renderer.entryName]
   });
   const html = next(extractor.collectChunks(jsx));
   const chunks = extractor.getChunkAssets(extractor.chunks);
-  chunksMap.js = (chunksMap.js || '') + getLoadableScripts(extractor);
-
+  chunksMap.js = (chunksMap.js || '') + (0, _utils2.getLoadableScripts)(extractor);
   for (const v of chunks) {
     const fileType = extname(v.url).slice(1);
-
     if (fileType === 'js') {
       const props = [];
       const {
         crossorigin
       } = config;
-
       if (crossorigin && (0, _utils.isCrossOrigin)(v.url, host)) {
         props.push(`crossorigin="${crossorigin === true ? 'anonymous' : crossorigin}"`);
       }
-
       chunksMap[fileType] += `<script src="${v.url}" ${props.join(' ')}></script>`;
     } else if (fileType === 'css') {
       chunksMap[fileType] += `<link href="${v.url}" rel="stylesheet" />`;
     }
   }
-
   return html;
 };
-
 exports.toHtml = toHtml;

package/dist/js/node/ssr/serverRender/{reduce.js → renderToString/reduce.js}

@@ -4,11 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.reduce = reduce;
-
 function reduce(jsx, renderer, middleware) {
   let index = 0;
-
   const createNext = () => App => middleware[index++](App, renderer, createNext());
-
   return createNext()(jsx);
 }

package/dist/js/node/ssr/serverRender/{styledComponent.js → renderToString/styledComponent.js}

@@ -4,9 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.toHtml = void 0;
-
 var _styledComponents = require("styled-components");
-
 const toHtml = (jsx, renderer, next) => {
   const sheet = new _styledComponents.ServerStyleSheet();
   const html = next(sheet.collectStyles(jsx));
@@ -14,5 +12,4 @@ const toHtml = (jsx, renderer, next) => {
   renderer.result.chunksMap.css += css;
   return html;
 };
-
 exports.toHtml = toHtml;

package/dist/js/node/ssr/serverRender/{template.js → renderToString/template.js}

@@ -5,9 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Fragment = void 0;
 exports.toFragments = toFragments;
-
 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 VARIABLE_REG_EXP = /<!--<\?([-=+])\s*(.*?)\s*\?>-->/;
 const VARIABLE_SPLITTER = /(<!--<\?.*?\?>-->)/;
 const ENCODE_HTML_RULES = {
@@ -18,27 +16,19 @@ const ENCODE_HTML_RULES = {
   "'": '&#39;'
 };
 const MATCH_HTML = /[&<>'"]/g;
-
 function encodeChar(c) {
   return ENCODE_HTML_RULES[c] || c;
 }
-
 function escape(str) {
   return str.replace(MATCH_HTML, encodeChar);
 }
-
 class Fragment {
   constructor(template) {
     _defineProperty(this, "isVariable", void 0);
-
     _defineProperty(this, "content", void 0);
-
     _defineProperty(this, "filters", void 0);
-
     _defineProperty(this, "path", void 0);
-
     const match = VARIABLE_REG_EXP.exec(template);
-
     if (match) {
       const [, filterFlag, content] = match;
       this.isVariable = true;
@@ -52,32 +42,24 @@ class Fragment {
       this.path = [];
     }
   }
-
   getValue(data) {
     if (this.isVariable) {
       const value = this.path.reduce((p, n) => p != null ? p[n] : p, data);
       return this.filters.reduce((p, n) => n(p), value != null ? value : '');
     }
-
     return this.content;
   }
-
 }
-
 exports.Fragment = Fragment;
-
 _defineProperty(Fragment, "filterMap", {
   '=': escape,
   '-': v => v
 });
-
 const fragmentListMap = {};
-
 function toFragments(template, entryName) {
   if (fragmentListMap[entryName]) {
     return fragmentListMap[entryName];
   }
-
   const fragmentList = template.split(VARIABLE_SPLITTER).filter(v => Boolean(v)).map(v => new Fragment(v));
   fragmentListMap[entryName] = fragmentList;
   return fragmentList;

package/dist/js/node/ssr/serverRender/{type.js → renderToString/type.js}

@@ -4,10 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.RenderLevel = void 0;
-// import { IncomingHttpHeaders } from 'http';
 let RenderLevel;
 exports.RenderLevel = RenderLevel;
-
 (function (RenderLevel) {
   RenderLevel[RenderLevel["CLIENT_RENDER"] = 0] = "CLIENT_RENDER";
   RenderLevel[RenderLevel["SERVER_PREFETCH"] = 1] = "SERVER_PREFETCH";

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

@@ -0,0 +1,12 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "RenderLevel", {
+  enumerable: true,
+  get: function () {
+    return _type.RenderLevel;
+  }
+});
+var _type = require("./renderToString/type");

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

@@ -0,0 +1,28 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getLoadableScripts = getLoadableScripts;
+exports.time = void 0;
+function getLoadableScripts(extractor) {
+  const check = scripts => (scripts || '').includes('__LOADABLE_REQUIRED_CHUNKS___ext');
+  const scripts = extractor.getScriptTags();
+  if (!check(scripts)) {
+    return '';
+  }
+  return scripts.split('</script>')
+  // 前两个 script为 loadable 必须的 script
+  .slice(0, 2).map(i => `${i}</script>`).join('');
+}
+const getLatency = hrtime => {
+  const [s, ns] = process.hrtime(hrtime);
+  return s * 1e3 + ns / 1e6;
+};
+const time = () => {
+  const hrtime = process.hrtime();
+  return () => {
+    return getLatency(hrtime);
+  };
+};
+exports.time = time;

package/dist/js/node/ssr/utils.js

@@ -3,14 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.mockResponse = exports.isCrossOrigin = exports.formatServer = exports.formatClient = void 0;
-
+exports.mockResponse = exports.isReact18 = exports.isCrossOrigin = exports.formatServer = exports.formatClient = void 0;
 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 isReact18 = () => process.env.IS_REACT18 === 'true';
+exports.isReact18 = isReact18;
 const formatServer = request => {
   const {
     cookie = '',
@@ -23,22 +21,16 @@ const formatServer = request => {
     referer
   }, request);
 };
-
 exports.formatServer = formatServer;
-
 const getQuery = () => window.location.search.substring(1).split('&').reduce((res, item) => {
   const [key, value] = item.split('=');
-
   if (key) {
     res[key] = value;
   }
-
   return res;
 }, {});
-
 const formatClient = request => {
   var _request$headers, _request$headers2;
-
   return {
     params: request.params || {},
     host: request.host || location.host,
@@ -52,25 +44,23 @@ const formatClient = request => {
     url: location.href
   };
 };
-
 exports.formatClient = formatClient;
-
 const mockResponse = () => {
   return {
     setHeader() {
-      console.info('setHeader can only be used in the server side');
+      console.warn('response.setHeader() can only be used in the server side');
     },
-
     status() {
-      console.info('status can only be used in the server side');
+      console.warn('response.status() can only be used in the server side');
+    },
+    get locals() {
+      console.warn('response.locals can only be used in the server side');
+      return {};
     }
-
   };
 };
-
 exports.mockResponse = mockResponse;
-
-const isCrossOrigin = (url, base) => {
+const isCrossOrigin = (url = '', base) => {
   if (url.startsWith('/') || url.startsWith('./')) {
     return false;
   } else if (!url.includes(base)) {
@@ -79,5 +69,4 @@ const isCrossOrigin = (url, base) => {
     return false;
   }
 };
-
 exports.isCrossOrigin = isCrossOrigin;

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

@@ -4,13 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _utils = require("@modern-js/utils");
-
 require("../types");
-
 const PLUGIN_IDENTIFIER = 'state';
-
 var _default = () => ({
   name: '@modern-js/plugin-state',
   required: ['@modern-js/runtime'],
@@ -29,13 +25,11 @@ var _default = () => ({
           }
         };
       },
-
       modifyEntryImports({
         entrypoint,
         imports
       }) {
         var _getEntryOptions;
-
         const {
           entryName
         } = entrypoint;
@@ -45,7 +39,6 @@ var _default = () => ({
         } = api.useAppContext();
         const stateConfig = (_getEntryOptions = (0, _utils.getEntryOptions)(entryName, userConfig.runtime, userConfig.runtimeByEntries, packageName)) === null || _getEntryOptions === void 0 ? void 0 : _getEntryOptions.state;
         stateConfigMap.set(entryName, stateConfig);
-
         if (stateConfig) {
           imports.push({
             value: '@modern-js/runtime/plugins',
@@ -54,42 +47,34 @@ var _default = () => ({
             }]
           });
         }
-
         return {
           entrypoint,
           imports
         };
       },
-
       modifyEntryRuntimePlugins({
         entrypoint,
         plugins
       }) {
         const stateOptions = stateConfigMap.get(entrypoint.entryName);
-
         if (stateOptions) {
           plugins.push({
             name: PLUGIN_IDENTIFIER,
             options: `${JSON.stringify(stateConfigMap.get(entrypoint.entryName))}`
           });
         }
-
         return {
           entrypoint,
           plugins
         };
       },
-
       validateSchema() {
         return _utils.PLUGIN_SCHEMAS['@modern-js/plugin-state'];
       },
-
       addRuntimeExports() {
         pluginsExportsUtils.addExport(`export { default as state } from '@modern-js/runtime/model'`);
       }
-
     };
   }
 });
-
 exports.default = _default;

package/dist/js/node/state/index.js

@@ -18,9 +18,7 @@ Object.defineProperty(exports, "state", {
     return _runtime.default;
   }
 });
-
 var _runtime = _interopRequireWildcard(require("./runtime"));
-
 Object.keys(_runtime).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -32,7 +30,5 @@ Object.keys(_runtime).forEach(function (key) {
     }
   });
 });
-
 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; }

package/dist/js/node/state/plugins.js

@@ -11,25 +11,14 @@ Object.defineProperty(exports, "devtools", {
   }
 });
 exports.immer = exports.effects = void 0;
-
 var _pluginEffects = require("@modern-js-reduck/plugin-effects");
-
 var _pluginAutoActions = _interopRequireDefault(require("@modern-js-reduck/plugin-auto-actions"));
-
 var _pluginImmutable = _interopRequireDefault(require("@modern-js-reduck/plugin-immutable"));
-
 var _pluginDevtools = _interopRequireDefault(require("@modern-js-reduck/plugin-devtools"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const effects = () => _pluginEffects.plugin;
-
 exports.effects = effects;
-
 const immer = () => _pluginImmutable.default;
-
 exports.immer = immer;
-
 const autoActions = () => _pluginAutoActions.default;
-
 exports.autoActions = autoActions;