@modern-js/runtime 2.0.0-beta.3 → 2.0.0-beta.5

package/dist/js/treeshaking/state/runtime/plugin.js

@@ -1,86 +1,198 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import { useContext } from 'react';
-import { createStore } from '@modern-js-reduck/store';
-import { Provider } from '@modern-js-reduck/react';
-import hoistNonReactStatics from 'hoist-non-react-statics';
+function _arrayLikeToArray(arr, len) {
+    if (len == null || len > arr.length) len = arr.length;
+    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
+    return arr2;
+}
+function _arrayWithHoles(arr) {
+    if (Array.isArray(arr)) return arr;
+}
+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 _iterableToArrayLimit(arr, i) {
+    var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
+    if (_i == null) return;
+    var _arr = [];
+    var _n = true;
+    var _d = false;
+    var _s, _e;
+    try {
+        for(_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true){
+            _arr.push(_s.value);
+            if (i && _arr.length === i) break;
+        }
+    } catch (err) {
+        _d = true;
+        _e = err;
+    } finally{
+        try {
+            if (!_n && _i["return"] != null) _i["return"]();
+        } finally{
+            if (_d) throw _e;
+        }
+    }
+    return _arr;
+}
+function _nonIterableRest() {
+    throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+function _objectSpread(target) {
+    for(var i = 1; i < arguments.length; i++){
+        var source = arguments[i] != null ? arguments[i] : {};
+        var ownKeys = Object.keys(source);
+        if (typeof Object.getOwnPropertySymbols === "function") {
+            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+            }));
+        }
+        ownKeys.forEach(function(key) {
+            _defineProperty(target, key, source[key]);
+        });
+    }
+    return target;
+}
+function ownKeys(object, enumerableOnly) {
+    var keys = Object.keys(object);
+    if (Object.getOwnPropertySymbols) {
+        var symbols = Object.getOwnPropertySymbols(object);
+        if (enumerableOnly) {
+            symbols = symbols.filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+            });
+        }
+        keys.push.apply(keys, symbols);
+    }
+    return keys;
+}
+function _objectSpreadProps(target, source) {
+    source = source != null ? source : {};
+    if (Object.getOwnPropertyDescriptors) {
+        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+    } else {
+        ownKeys(Object(source)).forEach(function(key) {
+            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+        });
+    }
+    return target;
+}
+function _slicedToArray(arr, i) {
+    return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
+}
+function _unsupportedIterableToArray(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return _arrayLikeToArray(o, minLen);
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+    if (n === "Object" && o.constructor) n = o.constructor.name;
+    if (n === "Map" || n === "Set") return Array.from(n);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
+}
+import { jsx } from "react/jsx-runtime";
+import { useContext } from "react";
+import { createStore } from "@modern-js-reduck/store";
+import { Provider } from "@modern-js-reduck/react";
+import hoistNonReactStatics from "hoist-non-react-statics";
 import { immer, effects, autoActions, devtools } from "../plugins";
 import { RuntimeReactContext } from "../../core";
 import { isBrowser } from "../../common";
-import { jsx as _jsx } from "react/jsx-runtime";
 var StatePluginHandleMap = {
-  immer: immer,
-  effects: effects,
-  autoActions: autoActions,
-  devtools: devtools
+    immer: immer,
+    effects: effects,
+    autoActions: autoActions,
+    devtools: devtools
 };
-var getStoreConfig = function getStoreConfig(config) {
-  var internalPlugins = ['immer', 'effects', 'autoActions', 'devtools'];
-  var plugins = [];
-  internalPlugins.filter(function (plugin) {
-    return config[plugin] !== false;
-  }).forEach(function (plugin) {
-    return plugins.push(StatePluginHandleMap[plugin](config[plugin]));
-  });
-  var storeConfig = {};
-  for (var _i = 0, _Object$entries = Object.entries(config); _i < _Object$entries.length; _i++) {
-    var _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
-      key = _Object$entries$_i[0],
-      value = _Object$entries$_i[1];
-    if (internalPlugins.includes(key)) {
-      plugins.push(StatePluginHandleMap[key](value));
-    } else {
-      storeConfig[key] = value;
+var getStoreConfig = function(config) {
+    var internalPlugins = [
+        "immer",
+        "effects",
+        "autoActions",
+        "devtools"
+    ];
+    var plugins = [];
+    internalPlugins.filter(function(plugin) {
+        return config[plugin] !== false;
+    }).forEach(function(plugin) {
+        return plugins.push(StatePluginHandleMap[plugin](config[plugin]));
+    });
+    var storeConfig = {};
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    try {
+        for(var _iterator = Object.entries(config)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var _value = _slicedToArray(_step.value, 2), key = _value[0], value = _value[1];
+            if (!internalPlugins.includes(key)) {
+                storeConfig[key] = value;
+            }
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+            }
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
+            }
+        }
     }
-  }
-  storeConfig.plugins = plugins;
-  return storeConfig;
+    storeConfig.plugins = plugins;
+    return storeConfig;
 };
-var state = function state(config) {
-  return {
-    name: '@modern-js/plugin-state',
-    setup: function setup() {
-      return {
-        hoc: function hoc(_ref, next) {
-          var App = _ref.App;
-          var getStateApp = function getStateApp(props) {
-            // eslint-disable-next-line react-hooks/rules-of-hooks
-            var context = useContext(RuntimeReactContext);
-            return /*#__PURE__*/_jsx(Provider, {
-              store: context.store,
-              config: getStoreConfig(config),
-              children: /*#__PURE__*/_jsx(App, _objectSpread({}, props))
-            });
-          };
-          return next({
-            App: hoistNonReactStatics(getStateApp, App)
-          });
-        },
-        init: function init(_ref2, next) {
-          var context = _ref2.context;
-          var 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);
-          return next({
-            context: context
-          });
-        },
-        pickContext: function pickContext(_ref3, next) {
-          var context = _ref3.context,
-            pickedContext = _ref3.pickedContext;
-          return next({
-            context: context,
-            pickedContext: _objectSpread(_objectSpread({}, pickedContext), {}, {
-              store: context.store
-            })
-          });
+var state = function(config) {
+    return {
+        name: "@modern-js/plugin-state",
+        setup: function() {
+            var storeConfig = getStoreConfig(config);
+            return {
+                hoc: function hoc(param, next) {
+                    var App = param.App;
+                    var getStateApp = function(props) {
+                        var context = useContext(RuntimeReactContext);
+                        return /* @__PURE__ */ jsx(Provider, {
+                            store: context.store,
+                            config: storeConfig,
+                            children: /* @__PURE__ */ jsx(App, _objectSpread({}, props))
+                        });
+                    };
+                    return next({
+                        App: hoistNonReactStatics(getStateApp, App)
+                    });
+                },
+                init: function init(param, next) {
+                    var context = param.context;
+                    if (isBrowser()) {
+                        var ref, ref1;
+                        storeConfig.initialState = storeConfig.initialState || (window === null || window === void 0 ? void 0 : (ref = window._SSR_DATA) === null || ref === void 0 ? void 0 : (ref1 = ref.data) === null || ref1 === void 0 ? void 0 : ref1.storeState) || {};
+                    }
+                    context.store = createStore(storeConfig);
+                    return next({
+                        context: context
+                    });
+                },
+                pickContext: function pickContext(param, next) {
+                    var context = param.context, pickedContext = param.pickedContext;
+                    return next({
+                        context: context,
+                        pickedContext: _objectSpreadProps(_objectSpread({}, pickedContext), {
+                            store: context.store
+                        })
+                    });
+                }
+            };
         }
-      };
-    }
-  };
+    };
 };
-export default state;
-export * from "../plugins";
+var plugin_default = state;
+export * from "../plugins";
+export { plugin_default as default };

package/dist/js/treeshaking/state/types.js

@@ -1 +1 @@
-export {};
+"use strict";

package/dist/types/cli/index.d.ts

@@ -1,3 +1,5 @@
 import type { CliPlugin, AppTools } from '@modern-js/app-tools';
+
 declare const _default: () => CliPlugin<AppTools>;
+
 export default _default;

package/dist/types/core/loader/loaderManager.d.ts

@@ -35,6 +35,7 @@ declare type ManagerOption = {
  * Create loaders manager. It's returned instance will add to context
  * @param initialDataMap used to initialing loader data
  */
+
 export declare const createLoaderManager: (initialDataMap: Record<string, LoaderResult>, managerOptions?: ManagerOption) => {
   hasPendingLoaders: () => boolean;
   awaitPendingLoaders: () => Promise<Record<string, LoaderResult>>;

package/dist/types/core/loader/useLoader.d.ts

@@ -20,23 +20,28 @@ export interface LoaderOptions<Params = any, TData = any, TError extends Error =
   /**
    * Revoke when loader ended with error
    */
+
   onError?: (error: TError) => void;
   /**
    * initialData to display once loader is ready.
    */
+
   initialData?: TData;
   /**
    * whether skip loader
    * if true, the loader will not exec.
    */
+
   skip?: boolean;
   /**
    * User params, it will pass to loader's second parameter.
    */
+
   params?: Params;
   /**
    * whether loader can exec on build phase.
    */
+
   static?: boolean;
 }
 declare type LoaderFn<P = any, T = any> = (context: any, params: P) => Promise<T>;

package/dist/types/core/plugin.d.ts

@@ -30,12 +30,16 @@ declare const runtimeHooks: {
   }, TRuntimeContext>;
 };
 /** All hooks of runtime plugin. */
+
 export declare type RuntimeHooks = typeof runtimeHooks;
 /** All hook callbacks of runtime plugin. */
+
 export declare type RuntimeHookCallbacks = ToThreads<RuntimeHooks>;
 /** All apis for runtime plugin. */
+
 export declare type PluginAPI = CommonAPI<RuntimeHooks>;
 /** Plugin options of a runtime plugin. */
+
 export declare type Plugin = PluginOptions<RuntimeHooks, Setup<RuntimeHooks>>;
 export declare const createRuntime: () => import("@modern-js/plugin").Manager<{
   hoc: import("@modern-js/plugin").Pipeline<{
@@ -67,6 +71,7 @@ export declare const createRuntime: () => import("@modern-js/plugin").Manager<{
 /**
  * register init hook. It would be revoked both ssr and csr.
  */
+
 declare const registerInit: (App: React.ComponentType, _init: (context: RuntimeContext) => any | Promise<any>) => void;
 export declare const runtime: import("@modern-js/plugin").Manager<{
   hoc: import("@modern-js/plugin").Pipeline<{
@@ -173,7 +178,7 @@ export declare const createPlugin: (setup?: Setup<{
     context: RuntimeContext;
     pickedContext: TRuntimeContext;
   }, TRuntimeContext>;
-}, Record<string, never>>, Record<string, unknown>, any, any> | undefined) => import("@modern-js/plugin").Plugin<{
+}, Record<string, never>>, Record<string, unknown>> | undefined) => import("@modern-js/plugin").Plugin<{
   hoc: import("@modern-js/plugin").Pipeline<{
     App: React.ComponentType<any>;
   }, React.ComponentType<any>>;

package/dist/types/document/Script.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="react" />
+export declare function Script(props: {
+  content: () => void;
+}): JSX.Element;

package/dist/types/document/cli/index.d.ts

@@ -1,3 +1,5 @@
 import type { CliPlugin, AppTools } from '@modern-js/app-tools';
+
 declare const _default: () => CliPlugin<AppTools>;
+
 export default _default;

package/dist/types/document/constants.d.ts

@@ -9,6 +9,8 @@ export declare const DOCUMENT_SSRDATASCRIPT_PLACEHOLDER: string;
 export declare const DOCUMENT_FILE_NAME = "Document";
 export declare const DOCUMENT_SCRIPTS_PLACEHOLDER: string;
 export declare const DOCUMENT_NO_SCRIPTE_PLACEHOLDER: string;
+export declare const DOCUMENT_SCRIPT_PLACEHOLDER_START: string;
+export declare const DOCUMENT_SCRIPT_PLACEHOLDER_END: string;
 export declare const PLACEHOLDER_REPLACER_MAP: {
   [x: string]: string;
 };

package/dist/types/document/index.d.ts

@@ -5,4 +5,5 @@ export * from './Head';
 export * from './Body';
 export * from './Root';
 export * from './Scripts';
+export * from './Script';
 export * from './constants';

package/dist/types/router/cli/index.d.ts

@@ -1,3 +1,5 @@
 import type { CliPlugin, AppTools } from '@modern-js/app-tools';
+
 declare const _default: () => CliPlugin<AppTools>;
+
 export default _default;

package/dist/types/router/runtime/index.d.ts

@@ -2,5 +2,6 @@ import { routerPlugin } from './plugin';
 import type { SingleRouteConfig, RouterConfig } from './types';
 export type { SingleRouteConfig, RouterConfig };
 export default routerPlugin;
+export { modifyRoutes } from './plugin';
 export * from 'react-router-dom';
 export * from './withRouter';

package/dist/types/router/runtime/plugin.d.ts

@@ -1,5 +1,8 @@
-import type { Plugin } from '../../core';
-import type { RouterConfig } from './types';
+import { Plugin } from '../../core';
+import type { RouterConfig, Routes } from './types';
+export declare let finalRouteConfig: RouterConfig['routesConfig'];
+export declare let beforeCreateRouter: boolean;
+export declare function modifyRoutes(modifyFunction: (routes: Routes) => Routes): void;
 export declare const routerPlugin: ({
   serverBase,
   supportHtml5History,

package/dist/types/router/runtime/types.d.ts

@@ -18,14 +18,16 @@ export declare type SingleRouteConfig = RouteProps & {
   /**
    * layout component
    */
+
   layout?: React.ComponentType;
   /**
    * component would be rendered when route macthed.
    */
+
   component?: React.ComponentType;
 };
 export declare type RouterConfig = {
-  legacy?: boolean;
+  mode?: 'react-router-5';
   routesConfig: {
     globalApp?: React.ComponentType<any>;
     routes: (NestedRoute | PageRoute)[];
@@ -34,4 +36,5 @@ export declare type RouterConfig = {
   supportHtml5History?: boolean;
   basename?: string;
   createRoutes?: () => RouteObject[];
-};
+};
+export declare type Routes = RouterConfig['routesConfig']['routes'];

package/dist/types/ssr/cli/babel-plugin-ssr-loader-id.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/types/ssr/cli/index.d.ts

@@ -1,3 +1,5 @@
 import type { CliPlugin, AppTools } from '@modern-js/app-tools';
+
 declare const _default: () => CliPlugin<AppTools>;
+
 export default _default;

package/dist/types/state/cli/index.d.ts

@@ -1,3 +1,5 @@
 import type { CliPlugin, AppTools } from '@modern-js/app-tools';
+
 declare const _default: () => CliPlugin<AppTools>;
+
 export default _default;

package/dist/types/state/types.d.ts

@@ -11,6 +11,7 @@ export declare type PluginOptions = Parameters<typeof createStore>[0] & {
    * Default: false
    * When it's true, will remove immer plugin
    */
+
   disableImmer?: boolean;
   devtools?: any;
 };

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.0-beta.3",
+  "version": "2.0.0-beta.5",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -53,6 +53,11 @@
       "node": "./dist/js/node/document/index.js",
       "default": "./dist/js/treeshaking/document/index.js"
     },
+    "./document/cli": {
+      "jsnext:source": "./src/document/cli/index.ts",
+      "node": "./dist/js/node/document/cli/index.js",
+      "default": "./dist/js/treeshaking/document/cli/index.js"
+    },
     "./ssr": {
       "jsnext:source": "./src/ssr/index.ts",
       "node": "./dist/js/node/ssr/index",
@@ -60,7 +65,7 @@
     },
     "./model": {
       "jsnext:source": "./src/state/index.ts",
-      "node": "./dist/js/node/state/index",
+      "node": "./dist/js/node/state/index.js",
       "default": "./dist/js/treeshaking/state/index.js"
     },
     "./cli": {
@@ -89,6 +94,9 @@
       "loadable": [
         "./dist/types/exports/loadable.d.ts"
       ],
+      "cli": [
+        "./dist/types/cli/index.d.ts"
+      ],
       "head": [
         "./dist/types/exports/head.d.ts"
       ],
@@ -101,6 +109,9 @@
       "document": [
         "./dist/types/document/index.d.ts"
       ],
+      "document/cli": [
+        "./dist/types/document/cli/index.d.ts"
+      ],
       "ssr": [
         "./dist/types/ssr/index.d.ts"
       ],
@@ -117,6 +128,7 @@
   },
   "dependencies": {
     "@babel/core": "^7.18.0",
+    "@babel/types": "^7.18.0",
     "@babel/runtime": "^7.18.0",
     "@loadable/babel-plugin": "^5.13.2",
     "@loadable/webpack-plugin": "5.15.2",
@@ -128,6 +140,9 @@
     "@modern-js-reduck/plugin-immutable": "^1.1.4",
     "@modern-js-reduck/react": "^1.1.4",
     "@modern-js-reduck/store": "^1.1.4",
+    "@modern-js/plugin": "2.0.0-beta.4",
+    "@modern-js/types": "2.0.0-beta.4",
+    "@modern-js/utils": "2.0.0-beta.4",
     "@types/loadable__component": "^5.13.4",
     "@types/react-helmet": "^6.1.2",
     "@types/redux-logger": "^3.0.9",
@@ -142,16 +157,18 @@
     "react-side-effect": "^2.1.1",
     "redux-logger": "^3.0.6",
     "serialize-javascript": "^6.0.0",
-    "styled-components": "^5.3.1",
-    "@modern-js/plugin": "2.0.0-beta.3",
-    "@modern-js/types": "2.0.0-beta.3",
-    "@modern-js/utils": "2.0.0-beta.3"
+    "styled-components": "^5.3.1"
   },
   "peerDependencies": {
     "react": ">=17",
     "react-dom": ">=17"
   },
   "devDependencies": {
+    "@modern-js/core": "2.0.0-beta.4",
+    "@modern-js/server-core": "2.0.0-beta.4",
+    "@scripts/build": "2.0.0-beta.4",
+    "@modern-js/app-tools": "2.0.0-beta.4",
+    "@scripts/jest-config": "2.0.0-beta.4",
     "@testing-library/react": "^13.4.0",
     "@testing-library/react-hooks": "^8.0.1",
     "@remix-run/web-fetch": "^4.1.3",
@@ -165,13 +182,7 @@
     "react": "^18",
     "react-dom": "^18",
     "ts-jest": "^27.0.4",
-    "typescript": "^4",
-    "@modern-js/core": "2.0.0-beta.3",
-    "@modern-js/server-core": "2.0.0-beta.3",
-    "@modern-js/utils": "2.0.0-beta.3",
-    "@scripts/build": "2.0.0-beta.3",
-    "@modern-js/app-tools": "2.0.0-beta.3",
-    "@scripts/jest-config": "2.0.0-beta.3"
+    "typescript": "^4"
   },
   "sideEffects": false,
   "modernConfig": {},

package/types/index.d.ts

@@ -1,7 +1,7 @@
 import { StateConfig } from '../dist/types';
 
-declare module '@modern-js/core/config' {
-  interface RuntimeConfig {
+declare module '@modern-js/app-tools' {
+  interface RuntimeUserConfig {
     state?: StateConfig | boolean;
   }
 }

package/types/router.d.ts

@@ -1,8 +1,8 @@
 import { RouterConfig } from '../dist/types';
 import '../dist/types/router';
 
-declare module '@modern-js/core/config' {
-  interface RuntimeConfig {
+declare module '@modern-js/app-tools' {
+  interface RuntimeUserConfig {
     router?: RouterConfig | boolean;
   }
 }