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

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

@@ -25,9 +25,7 @@ Object.defineProperty(exports, "model", {
     return _store.model;
   }
 });
-
 var _react = require("@modern-js-reduck/react");
-
 Object.keys(_react).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -39,11 +37,8 @@ Object.keys(_react).forEach(function (key) {
     }
   });
 });
-
 var _store = require("@modern-js-reduck/store");
-
 var _plugin = _interopRequireWildcard(require("./plugin"));
-
 Object.keys(_plugin).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -55,7 +50,5 @@ Object.keys(_plugin).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/runtime/plugin.js

@@ -5,17 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 var _exportNames = {};
 exports.default = void 0;
-
 var _react = require("react");
-
 var _store = require("@modern-js-reduck/store");
-
 var _react2 = require("@modern-js-reduck/react");
-
 var _hoistNonReactStatics = _interopRequireDefault(require("hoist-non-react-statics"));
-
 var _plugins = require("../plugins");
-
 Object.keys(_plugins).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -27,28 +21,19 @@ Object.keys(_plugins).forEach(function (key) {
     }
   });
 });
-
 var _core = require("../../core");
-
 var _common = require("../../common");
-
 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 StatePluginHandleMap = {
   immer: _plugins.immer,
   effects: _plugins.effects,
   autoActions: _plugins.autoActions,
   devtools: _plugins.devtools
 };
-
 const getStoreConfig = config => {
   const internalPlugins = ['immer', 'effects', 'autoActions', 'devtools'];
   const plugins = [];
@@ -57,7 +42,6 @@ const getStoreConfig = config => {
     plugins
   };
 };
-
 const state = config => ({
   name: '@modern-js/plugin-state',
   setup: () => {
@@ -74,29 +58,23 @@ const state = config => ({
             children: /*#__PURE__*/(0, _jsxRuntime.jsx)(App, _objectSpread({}, props))
           });
         };
-
         return next({
           App: (0, _hoistNonReactStatics.default)(getStateApp, App)
         });
       },
-
       init({
         context
       }, next) {
         const storeConfig = getStoreConfig(config || {});
-
         if ((0, _common.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 = (0, _store.createStore)(storeConfig);
-        next({
+        return next({
           context
         });
       },
-
       pickContext({
         context,
         pickedContext
@@ -108,10 +86,8 @@ const state = config => ({
           })
         });
       }
-
     };
   }
 });
-
 var _default = state;
 exports.default = _default;

package/dist/js/treeshaking/cli/index.js

@@ -5,11 +5,12 @@ import { PLUGIN_SCHEMAS, cleanRequireCache, isReact18 } from '@modern-js/utils';
 import PluginState from "../state/cli";
 import PluginSSR from "../ssr/cli";
 import PluginRouter from "../router/cli";
+import Document from "../document/cli";
 export default (function () {
   return {
     name: '@modern-js/runtime',
-    post: ['@modern-js/plugin-router', '@modern-js/plugin-ssr', '@modern-js/plugin-state', '@modern-js/plugin-design-token'],
-    usePlugins: [PluginState(), PluginSSR(), PluginRouter()],
+    post: ['@modern-js/plugin-router', '@modern-js/plugin-ssr', '@modern-js/plugin-document', '@modern-js/plugin-state', '@modern-js/plugin-design-token'],
+    usePlugins: [PluginState(), PluginSSR(), PluginRouter(), Document()],
     setup: function setup(api) {
       return {
         config: function config() {
@@ -27,7 +28,9 @@ export default (function () {
                  */
                 'styled-components': require.resolve('styled-components')
               },
-              envVars: ['IS_REACT18']
+              globalVars: {
+                'process.env.IS_REACT18': process.env.IS_REACT18
+              }
             }
           };
         },
@@ -41,7 +44,6 @@ export default (function () {
                 switch (_context.prev = _context.next) {
                   case 0:
                     cleanRequireCache([require.resolve("../state/cli"), require.resolve("../router/cli"), require.resolve("../ssr/cli")]);
-
                   case 1:
                   case "end":
                     return _context.stop();

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

@@ -1,6 +1,7 @@
 var APP_CONFIG_SYMBOL = 'config';
 export var getConfig = function getConfig(Component) {
-  return (// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  return (
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-expect-error
     Component[APP_CONFIG_SYMBOL]
   );

package/dist/js/treeshaking/core/compatible.js

@@ -5,35 +5,31 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 var _excluded = ["context"];
 import React, { useContext, useMemo } from 'react';
-import defaultReactDOM from 'react-dom';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 import { RuntimeReactContext } from "../runtime-context";
 import { runtime } from "./plugin";
 import { createLoaderManager } from "./loader/loaderManager";
 import { jsx as _jsx } from "react/jsx-runtime";
 var IS_REACT18 = process.env.IS_REACT18 === 'true';
-
+var ROUTE_MANIFEST = "_MODERNJS_ROUTE_MANIFEST";
 function isClientArgs(id) {
   return typeof id === 'string' || typeof HTMLElement !== 'undefined' && id instanceof HTMLElement;
 }
-
 var runnerMap = new WeakMap();
-
 var getInitialContext = function getInitialContext(runner) {
   return {
     loaderManager: createLoaderManager({}),
     runner: runner,
-    isBrowser: true
+    isBrowser: true,
+    routeManifest: typeof window !== 'undefined' && window[ROUTE_MANIFEST]
   };
 };
-
 export var createApp = function createApp(_ref) {
   var plugins = _ref.plugins;
   var appRuntime = runtime.clone();
   appRuntime.usePlugin.apply(appRuntime, _toConsumableArray(plugins));
   return function (App) {
     var runner = appRuntime.init();
-
     var WrapperComponent = function WrapperComponent(props) {
       var element = /*#__PURE__*/React.createElement(App || React.Fragment, _objectSpread({}, props), props.children);
       var context = useContext(RuntimeReactContext);
@@ -48,25 +44,21 @@ export var createApp = function createApp(_ref) {
         }
       });
     };
-
     if (App) {
       hoistNonReactStatics(WrapperComponent, App);
     }
-
     var HOCApp = runner.hoc({
       App: WrapperComponent
     }, {
       onLast: function onLast(_ref3) {
         var App = _ref3.App;
-
         var WrapComponent = function WrapComponent(_ref4) {
           var _contextValue;
-
           var context = _ref4.context,
-              props = _objectWithoutProperties(_ref4, _excluded);
-
-          var contextValue = context; // We should construct the context, when root component is not passed into `bootstrap`.
+            props = _objectWithoutProperties(_ref4, _excluded);
+          var contextValue = context;
 
+          // We should construct the context, when root component is not passed into `bootstrap`.
           if (!((_contextValue = contextValue) !== null && _contextValue !== void 0 && _contextValue.runner)) {
             contextValue = getInitialContext(runner);
             runner.init({
@@ -74,19 +66,16 @@ export var createApp = function createApp(_ref) {
             }, {
               onLast: function onLast(_ref5) {
                 var _App$init;
-
                 var context1 = _ref5.context;
                 return App === null || App === void 0 ? void 0 : (_App$init = App.init) === null || _App$init === void 0 ? void 0 : _App$init.call(App, context1);
               }
             });
           }
-
           return /*#__PURE__*/_jsx(RuntimeReactContext.Provider, {
             value: contextValue,
             children: /*#__PURE__*/_jsx(App, _objectSpread({}, props))
           });
         };
-
         return hoistNonReactStatics(WrapComponent, App);
       }
     });
@@ -104,87 +93,58 @@ export var bootstrap = /*#__PURE__*/function () {
   /**
    * root.render need use root to run function
    */
-  root) {
-    var ReactDOM,
-        App,
-        runner,
-        context,
-        runInit,
-        isBrowser,
-        _ssrData$data,
-        _ssrData$data2,
-        ssrData,
-        loadersData,
-        initialLoadersState,
-        initialData,
-        _rootElement,
-        ModernRender,
-        ModernHydrate,
-        _initialData,
-        _args = arguments;
-
+  root, ReactDOM
+  // eslint-disable-next-line consistent-return
+  ) {
+    var App, runner, context, runInit, isBrowser, _ssrData$data, _ssrData$data2, ssrData, loadersData, initialLoadersState, initialData, rootElement, ModernRender, ModernHydrate, isRedirectResponse, _initialData;
     return _regeneratorRuntime().wrap(function _callee$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
-            ReactDOM = _args.length > 3 && _args[3] !== undefined ? _args[3] : defaultReactDOM;
             App = BootApp;
             runner = runnerMap.get(App); // ensure Component used is created by `createApp`
-
             if (!runner) {
               App = createApp({
                 plugins: []
               })(App);
               runner = runnerMap.get(App);
             }
-
             context = getInitialContext(runner);
-
             runInit = function runInit(_context) {
               return runner.init({
                 context: _context
               }, {
                 onLast: function onLast(_ref7) {
                   var _App, _App$init2;
-
                   var context1 = _ref7.context;
                   return (_App = App) === null || _App === void 0 ? void 0 : (_App$init2 = _App.init) === null || _App$init2 === void 0 ? void 0 : _App$init2.call(_App, context1);
                 }
               });
             }; // don't mount the App, let user in charge of it.
-
-
             if (id) {
-              _context2.next = 8;
+              _context2.next = 7;
               break;
             }
-
             return _context2.abrupt("return", /*#__PURE__*/React.createElement(App, {
               context: context
             }));
-
-          case 8:
+          case 7:
             isBrowser = typeof window !== 'undefined' && window.name !== 'nodejs';
-
             if (!isBrowser) {
-              _context2.next = 29;
+              _context2.next = 30;
               break;
             }
-
             if (!isClientArgs(id)) {
-              _context2.next = 26;
+              _context2.next = 27;
               break;
             }
-
             ssrData = window._SSR_DATA;
             loadersData = (ssrData === null || ssrData === void 0 ? void 0 : (_ssrData$data = ssrData.data) === null || _ssrData$data === void 0 ? void 0 : _ssrData$data.loadersData) || {};
             initialLoadersState = Object.keys(loadersData).reduce(function (res, key) {
               var loaderData = loadersData[key];
-
               if (loaderData.loading !== false) {
                 return res;
               }
-
               res[key] = loaderData;
               return res;
             }, {});
@@ -196,34 +156,50 @@ export var bootstrap = /*#__PURE__*/function () {
               ssrContext: ssrData === null || ssrData === void 0 ? void 0 : ssrData.context
             } : {}));
             context.initialData = ssrData === null || ssrData === void 0 ? void 0 : (_ssrData$data2 = ssrData.data) === null || _ssrData$data2 === void 0 ? void 0 : _ssrData$data2.initialData;
-            _context2.next = 18;
+            _context2.next = 17;
             return runInit(context);
-
-          case 18:
+          case 17:
             initialData = _context2.sent;
-
             if (initialData) {
               context.initialData = initialData;
             }
-
-            _rootElement = typeof id !== 'string' ? id : document.getElementById(id || 'root'); // https://reactjs.org/blog/2022/03/08/react-18-upgrade-guide.html
-
+            rootElement = typeof id !== 'string' ? id : document.getElementById(id || 'root');
+            if (ReactDOM) {
+              _context2.next = 22;
+              break;
+            }
+            throw Error('The `bootstrap` need provide `ReactDOM` parameter');
+          case 22:
+            // https://reactjs.org/blog/2022/03/08/react-18-upgrade-guide.html
             ModernRender = function ModernRender(App) {
               if (IS_REACT18) {
-                (root || ReactDOM.createRoot(_rootElement)).render(App);
+                if (root) {
+                  root.render(App);
+                } else if (ReactDOM.createRoot) {
+                  ReactDOM.createRoot(rootElement).render(App);
+                } else {
+                  throw Error('The `bootstrap` `ReactDOM` parameter needs to provide the `createRoot` method');
+                }
               } else {
-                ReactDOM.render(App, _rootElement);
+                if (!ReactDOM.render) {
+                  throw Error('The `bootstrap` `ReactDOM` parameter needs to provide the `render` method');
+                }
+                ReactDOM.render(App, rootElement);
               }
             };
-
             ModernHydrate = function ModernHydrate(App, callback) {
               if (IS_REACT18) {
-                ReactDOM.hydrateRoot(_rootElement, App);
+                if (!ReactDOM.hydrateRoot) {
+                  throw Error('The `bootstrap` `ReactDOM` parameter needs to provide the `hydrateRoot` method');
+                }
+                ReactDOM.hydrateRoot(rootElement, App);
               } else {
-                ReactDOM.hydrate(App, _rootElement, callback);
+                if (!ReactDOM.hydrate) {
+                  throw Error('The `bootstrap` `ReactDOM` parameter needs to provide the `hydrate` method');
+                }
+                ReactDOM.hydrate(App, rootElement, callback);
               }
             };
-
             return _context2.abrupt("return", runner.client({
               App: App,
               context: context,
@@ -237,15 +213,12 @@ export var bootstrap = /*#__PURE__*/function () {
                 }));
               }
             }));
-
-          case 26:
-            throw Error('`bootstrap` needs id in browser environment, it needs to be string or element');
-
           case 27:
-            _context2.next = 35;
+            throw Error('`bootstrap` needs id in browser environment, it needs to be string or element');
+          case 28:
+            _context2.next = 38;
             break;
-
-          case 29:
+          case 30:
             Object.assign(context, {
               ssrContext: id,
               isBrowser: false,
@@ -255,26 +228,46 @@ export var bootstrap = /*#__PURE__*/function () {
                 skipStatic: process.env.NODE_ENV === 'production' && !id.staticGenerate
               })
             });
-            _context2.next = 32;
-            return runInit(context);
 
-          case 32:
+            // Handle redirects from React Router with an HTTP redirect
+            isRedirectResponse = function isRedirectResponse(result) {
+              if (typeof Response !== 'undefined' &&
+              // fix: ssg workflow doesn't inject Web Response
+              result instanceof Response && result.status >= 300 && result.status <= 399) {
+                var status = result.status;
+                var redirectUrl = result.headers.get('Location') || '/';
+                var ssrContext = context.ssrContext;
+                if (ssrContext) {
+                  ssrContext.res.statusCode = status;
+                  ssrContext.res.setHeader('Location', redirectUrl);
+                  ssrContext.redirection.status = status;
+                  ssrContext.redirection.url = redirectUrl;
+                }
+                return true;
+              }
+              return false;
+            };
+            _context2.next = 34;
+            return runInit(context);
+          case 34:
             _initialData = _context2.sent;
+            if (isRedirectResponse(_initialData)) {
+              _context2.next = 38;
+              break;
+            }
             context.initialData = _initialData;
             return _context2.abrupt("return", runner.server({
               App: App,
               context: context
             }));
-
-          case 35:
+          case 38:
           case "end":
             return _context2.stop();
         }
       }
     }, _callee);
   }));
-
-  return function bootstrap(_x, _x2, _x3) {
+  return function bootstrap(_x, _x2, _x3, _x4) {
     return _ref6.apply(this, arguments);
   };
 }();

package/dist/js/treeshaking/core/index.js

@@ -1,6 +1,7 @@
-export { createPlugin, createRuntime, runtime, registerInit, registerPrefetch } from "./plugin";
-export { defineConfig, getConfig } from "./app-config"; // compatible
+export { createPlugin, createRuntime, runtime, registerInit } from "./plugin";
+export { defineConfig, getConfig } from "./app-config";
 
+// compatible
 export * from "./compatible";
 export { RuntimeReactContext, ServerRouterContext } from "../runtime-context";
 export * from "./loader";