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

package/dist/js/modern/ssr/serverRender/renderToString/entry.js

@@ -1,5 +1,4 @@
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 import React from 'react';
 import ReactDomServer from 'react-dom/server';
 import serialize from 'serialize-javascript';
@@ -7,11 +6,11 @@ import ReactHelmet from 'react-helmet';
 import helmetReplace from "../helmet";
 import { RenderLevel } from "../types";
 import { time } from "../utils";
+import prefetch from "../../prefetch";
 import { toFragments } from "./template";
 import { reduce } from "./reduce";
 import * as loadableRenderer from "./loadable";
 import * as styledComponentRenderer from "./styledComponent";
-
 const buildTemplateData = (context, data, renderLevel) => {
   const {
     request
@@ -32,25 +31,16 @@ const buildTemplateData = (context, data, renderLevel) => {
     renderLevel
   };
 };
-
 export default 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
@@ -78,32 +68,24 @@ export default class Entry {
       }
     };
   }
-
   async renderToHtml(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 >= 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);
@@ -111,22 +93,14 @@ export default class Entry {
         html += fragment.getValue(this.result);
       }
     }
-
     const helmetData = ReactHelmet.renderStatic();
     return helmetData ? helmetReplace(html, helmetData) : html;
   }
-
   async prefetch(context) {
-    const {
-      App: {
-        prefetch
-      }
-    } = this;
     let prefetchData;
     const end = time();
-
     try {
-      prefetchData = prefetch ? await prefetch(context) : null;
+      prefetchData = await prefetch(this.App, context);
       this.result.renderLevel = RenderLevel.SERVER_PREFETCH;
       const prefetchCost = end();
       this.logger.debug(`App Prefetch cost = %d ms`, prefetchCost);
@@ -136,17 +110,14 @@ export default class Entry {
       this.logger.error('App Prefetch Render', e);
       this.metrics.emitCounter('app.prefetch.render.error', 1);
     }
-
     return prefetchData || {};
   }
-
   renderToString(context) {
     let html = '';
     const end = time();
     const {
       ssrContext
     } = context;
-
     try {
       const App = /*#__PURE__*/React.createElement(this.App, {
         context: Object.assign(context, {
@@ -169,10 +140,8 @@ export default class Entry {
       this.logger.error('App Render To HTML', e);
       this.metrics.emitCounter('app.render.html.error', 1);
     }
-
     return html;
   }
-
   getSSRDataScript(templateData) {
     return {
       SSRDataScript: `
@@ -182,5 +151,4 @@ export default class Entry {
       `
     };
   }
-
 }

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

@@ -21,11 +21,9 @@ export const render = ({
     entry.logger.info('App Render Total cost = %d ms', cost);
     entry.metrics.emitTimer('app.render.cost', cost);
     const cacheConfig = PreRender.config();
-
     if (cacheConfig) {
       context.ssrContext.cacheConfig = cacheConfig;
     }
-
     return html;
   });
 };

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

@@ -1,15 +1,12 @@
 import { ChunkExtractor } from '@loadable/server';
 import { isCrossOrigin } from "../../utils";
 import { getLoadableScripts } from "../utils";
-
 const extname = uri => {
   if (typeof uri !== 'string' || !uri.includes('.')) {
     return '';
   }
-
   return `.${uri === null || uri === void 0 ? void 0 : uri.split('.').pop()}` || '';
 };
-
 export const toHtml = (jsx, renderer, next) => {
   const {
     stats,
@@ -19,11 +16,9 @@ export const toHtml = (jsx, renderer, next) => {
     host,
     config = {}
   } = renderer;
-
   if (!stats || chunksMap.js) {
     return next(jsx);
   }
-
   const extractor = new ChunkExtractor({
     stats,
     entrypoints: [renderer.entryName]
@@ -31,25 +26,20 @@ export const toHtml = (jsx, renderer, next) => {
   const html = next(extractor.collectChunks(jsx));
   const chunks = extractor.getChunkAssets(extractor.chunks);
   chunksMap.js = (chunksMap.js || '') + getLoadableScripts(extractor);
-
   for (const v of chunks) {
     const fileType = extname(v.url).slice(1);
-
     if (fileType === 'js') {
       const props = [];
       const {
         crossorigin
       } = config;
-
       if (crossorigin && 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;
 };

package/dist/js/modern/ssr/serverRender/renderToString/reduce.js

@@ -1,7 +1,5 @@
 export function reduce(jsx, renderer, middleware) {
   let index = 0;
-
   const createNext = () => App => middleware[index++](App, renderer, createNext());
-
   return createNext()(jsx);
 }

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

@@ -1,5 +1,4 @@
 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 = {
@@ -10,27 +9,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);
 }
-
 export 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;
@@ -44,29 +35,23 @@ export 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;
   }
-
 }
-
 _defineProperty(Fragment, "filterMap", {
   '=': escape,
   '-': v => v
 });
-
 const fragmentListMap = {};
 export 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/modern/ssr/serverRender/renderToString/type.js

@@ -1,5 +1,4 @@
 export let RenderLevel;
-
 (function (RenderLevel) {
   RenderLevel[RenderLevel["CLIENT_RENDER"] = 0] = "CLIENT_RENDER";
   RenderLevel[RenderLevel["SERVER_PREFETCH"] = 1] = "SERVER_PREFETCH";

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

@@ -1,21 +1,17 @@
 export 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
+  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;
 };
-
 export const time = () => {
   const hrtime = process.hrtime();
   return () => {

package/dist/js/modern/ssr/utils.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; }
-
 export const isReact18 = () => process.env.IS_REACT18 === 'true';
 export const formatServer = request => {
   const {
@@ -17,20 +14,15 @@ export const formatServer = request => {
     referer
   }, request);
 };
-
 const getQuery = () => window.location.search.substring(1).split('&').reduce((res, item) => {
   const [key, value] = item.split('=');
-
   if (key) {
     res[key] = value;
   }
-
   return res;
 }, {});
-
 export const formatClient = request => {
   var _request$headers, _request$headers2;
-
   return {
     params: request.params || {},
     host: request.host || location.host,
@@ -49,16 +41,13 @@ export const mockResponse = () => {
     setHeader() {
       console.warn('response.setHeader() can only be used in the server side');
     },
-
     status() {
       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 {};
     }
-
   };
 };
 export const isCrossOrigin = (url = '', base) => {

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

@@ -19,13 +19,11 @@ export default (() => ({
           }
         };
       },
-
       modifyEntryImports({
         entrypoint,
         imports
       }) {
         var _getEntryOptions;
-
         const {
           entryName
         } = entrypoint;
@@ -35,7 +33,6 @@ export default (() => ({
         } = api.useAppContext();
         const stateConfig = (_getEntryOptions = 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',
@@ -44,40 +41,33 @@ export 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 PLUGIN_SCHEMAS['@modern-js/plugin-state'];
       },
-
       addRuntimeExports() {
         pluginsExportsUtils.addExport(`export { default as state } from '@modern-js/runtime/model'`);
       }
-
     };
   }
 }));

package/dist/js/modern/state/runtime/plugin.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 { useContext } from 'react';
 import { createStore } from '@modern-js-reduck/store';
 import { Provider } from '@modern-js-reduck/react';
@@ -18,7 +15,6 @@ const StatePluginHandleMap = {
   autoActions,
   devtools
 };
-
 const getStoreConfig = config => {
   const internalPlugins = ['immer', 'effects', 'autoActions', 'devtools'];
   const plugins = [];
@@ -27,7 +23,6 @@ const getStoreConfig = config => {
     plugins
   };
 };
-
 const state = config => ({
   name: '@modern-js/plugin-state',
   setup: () => {
@@ -44,29 +39,23 @@ const state = config => ({
             children: /*#__PURE__*/_jsx(App, _objectSpread({}, props))
           });
         };
-
         return next({
           App: hoistNonReactStatics(getStateApp, App)
         });
       },
-
       init({
         context
       }, next) {
         const storeConfig = getStoreConfig(config || {});
-
         if (isBrowser()) {
           var _window, _window$_SSR_DATA, _window$_SSR_DATA$dat;
-
           storeConfig.initialState = storeConfig.initialState || ((_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$dat = _window$_SSR_DATA.data) === null || _window$_SSR_DATA$dat === void 0 ? void 0 : _window$_SSR_DATA$dat.storeState) || {};
         }
-
         context.store = createStore(storeConfig);
-        next({
+        return next({
           context
         });
       },
-
       pickContext({
         context,
         pickedContext
@@ -78,10 +67,8 @@ const state = config => ({
           })
         });
       }
-
     };
   }
 });
-
 export default state;
 export * from "../plugins";

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

@@ -4,23 +4,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _path = _interopRequireDefault(require("path"));
-
 var _utils = require("@modern-js/utils");
-
 var _cli = _interopRequireDefault(require("../state/cli"));
-
 var _cli2 = _interopRequireDefault(require("../ssr/cli"));
-
 var _cli3 = _interopRequireDefault(require("../router/cli"));
-
+var _cli4 = _interopRequireDefault(require("../document/cli"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 var _default = () => ({
   name: '@modern-js/runtime',
-  post: ['@modern-js/plugin-router', '@modern-js/plugin-ssr', '@modern-js/plugin-state', '@modern-js/plugin-design-token'],
-  usePlugins: [(0, _cli.default)(), (0, _cli2.default)(), (0, _cli3.default)()],
+  post: ['@modern-js/plugin-router', '@modern-js/plugin-ssr', '@modern-js/plugin-document', '@modern-js/plugin-state', '@modern-js/plugin-design-token'],
+  usePlugins: [(0, _cli.default)(), (0, _cli2.default)(), (0, _cli3.default)(), (0, _cli4.default)()],
   setup: api => {
     return {
       config() {
@@ -42,17 +36,13 @@ var _default = () => ({
           }
         };
       },
-
       validateSchema() {
         return _utils.PLUGIN_SCHEMAS['@modern-js/runtime'];
       },
-
       async beforeRestart() {
         (0, _utils.cleanRequireCache)([require.resolve("../state/cli"), require.resolve("../router/cli"), require.resolve("../ssr/cli")]);
       }
-
     };
   }
 });
-
 exports.default = _default;

package/dist/js/node/common.js

@@ -4,7 +4,5 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.isBrowser = void 0;
-
 const isBrowser = () => typeof window !== 'undefined' && window.name !== 'nodejs';
-
 exports.isBrowser = isBrowser;

package/dist/js/node/core/app-config.js

@@ -5,18 +5,15 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getConfig = exports.defineConfig = void 0;
 const APP_CONFIG_SYMBOL = 'config';
-
-const getConfig = Component => // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+const getConfig = Component =>
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-expect-error
 Component[APP_CONFIG_SYMBOL];
-
 exports.getConfig = getConfig;
-
 const defineConfig = (Component, config) => {
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-expect-error
   Component[APP_CONFIG_SYMBOL] = config;
   return Component;
 };
-
 exports.defineConfig = defineConfig;