@modern-js/runtime 2.15.1-alpha.2 → 2.16.1-alpha.0

package/dist/esm-node/ssr/serverRender/renderToString/template.js

@@ -1,3 +1,16 @@
+function _define_property(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      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 = {
@@ -14,14 +27,27 @@ function encodeChar(c) {
 function escape(str) {
   return str.replace(MATCH_HTML, encodeChar);
 }
-const _Fragment = class {
+export class Fragment {
+  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;
+  }
   constructor(template) {
+    _define_property(this, "isVariable", void 0);
+    _define_property(this, "content", void 0);
+    _define_property(this, "filters", void 0);
+    _define_property(this, "path", void 0);
     const match = VARIABLE_REG_EXP.exec(template);
     if (match) {
       const [, filterFlag, content] = match;
       this.isVariable = true;
       this.content = content;
-      this.filters = [_Fragment.filterMap[filterFlag]];
+      this.filters = [
+        Fragment.filterMap[filterFlag]
+      ];
       this.path = content.replace(/\[['"](.*?)['"]\]/g, ".$1").split(".");
     } else {
       this.isVariable = false;
@@ -30,21 +56,13 @@ const _Fragment = class {
       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;
-  }
-};
-let Fragment = _Fragment;
-Fragment.filterMap = {
+}
+_define_property(Fragment, "filterMap", {
   "=": escape,
   "-": (v) => v
-};
+});
 const fragmentListMap = {};
-function toFragments(template, entryName) {
+export function toFragments(template, entryName) {
   if (fragmentListMap[entryName]) {
     return fragmentListMap[entryName];
   }
@@ -52,7 +70,3 @@ function toFragments(template, entryName) {
   fragmentListMap[entryName] = fragmentList;
   return fragmentList;
 }
-export {
-  Fragment,
-  toFragments
-};

package/dist/esm-node/ssr/serverRender/renderToString/type.js

@@ -1,9 +1,6 @@
-var RenderLevel = /* @__PURE__ */ ((RenderLevel2) => {
+export var RenderLevel;
+(function(RenderLevel2) {
   RenderLevel2[RenderLevel2["CLIENT_RENDER"] = 0] = "CLIENT_RENDER";
   RenderLevel2[RenderLevel2["SERVER_PREFETCH"] = 1] = "SERVER_PREFETCH";
   RenderLevel2[RenderLevel2["SERVER_RENDER"] = 2] = "SERVER_RENDER";
-  return RenderLevel2;
-})(RenderLevel || {});
-export {
-  RenderLevel
-};
+})(RenderLevel || (RenderLevel = {}));

package/dist/esm-node/ssr/serverRender/time.js

@@ -2,12 +2,9 @@ const getLatency = (hrtime) => {
   const [s, ns] = process.hrtime(hrtime);
   return s * 1e3 + ns / 1e6;
 };
-const time = () => {
+export const time = () => {
   const hrtime = process.hrtime();
   return () => {
     return getLatency(hrtime);
   };
 };
-export {
-  time
-};

package/dist/esm-node/ssr/serverRender/time.worker.js

@@ -11,18 +11,18 @@ function processHrtime(previousTimestamp) {
       nanoseconds += 1e9;
     }
   }
-  return [seconds, nanoseconds];
+  return [
+    seconds,
+    nanoseconds
+  ];
 }
 const getLatency = (hrtime) => {
   const [s, ns] = processHrtime(hrtime);
   return s * 1e3 + ns / 1e6;
 };
-const time = () => {
+export const time = () => {
   const hrtime = processHrtime();
   return () => {
     return getLatency(hrtime);
   };
 };
-export {
-  time
-};

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

@@ -1,4 +1,2 @@
 import { RenderLevel } from "./renderToString/type";
-export {
-  RenderLevel
-};
+export { RenderLevel };

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

@@ -1,7 +1,7 @@
-const CSS_CHUNKS_PLACEHOLDER = "<!--<?- chunksMap.css ?>-->";
-const SSR_DATA_JSON_ID = "__MODERN_SSR_DATA__";
-const ROUTER_DATA_JSON_ID = "__MODERN_ROUTER_DATA__";
-function getLoadableScripts(extractor) {
+export const CSS_CHUNKS_PLACEHOLDER = "<!--<?- chunksMap.css ?>-->";
+export const SSR_DATA_JSON_ID = "__MODERN_SSR_DATA__";
+export const ROUTER_DATA_JSON_ID = "__MODERN_ROUTER_DATA__";
+export function getLoadableScripts(extractor) {
   const check = (scripts2) => (scripts2 || "").includes("__LOADABLE_REQUIRED_CHUNKS___ext");
   const scripts = extractor.getScriptTags();
   if (!check(scripts)) {
@@ -9,9 +9,3 @@ function getLoadableScripts(extractor) {
   }
   return scripts.split("</script>").slice(0, 2).map((i) => `${i}</script>`).join("");
 }
-export {
-  CSS_CHUNKS_PLACEHOLDER,
-  ROUTER_DATA_JSON_ID,
-  SSR_DATA_JSON_ID,
-  getLoadableScripts
-};

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

@@ -1,11 +1,7 @@
 import cookieTool from "cookie";
-const isReact18 = () => process.env.IS_REACT18 === "true";
-const formatServer = (request) => {
-  const {
-    cookie = "",
-    "user-agent": userAgent = "",
-    referer
-  } = request.headers || {};
+export const isReact18 = () => process.env.IS_REACT18 === "true";
+export const formatServer = (request) => {
+  const { cookie = "", "user-agent": userAgent = "", referer } = request.headers || {};
   return {
     cookie,
     cookieMap: cookieTool.parse(cookie || "") || {},
@@ -21,8 +17,8 @@ const getQuery = () => window.location.search.substring(1).split("&").reduce((re
   }
   return res;
 }, {});
-const formatClient = (request) => {
-  var _a;
+export const formatClient = (request) => {
+  var _request_headers;
   return {
     params: request.params || {},
     host: request.host || location.host,
@@ -30,13 +26,13 @@ const formatClient = (request) => {
     headers: request.headers || {},
     cookieMap: cookieTool.parse(document.cookie || "") || {},
     cookie: document.cookie || "",
-    userAgent: ((_a = request.headers) == null ? void 0 : _a["user-agent"]) || navigator.userAgent,
+    userAgent: ((_request_headers = request.headers) === null || _request_headers === void 0 ? void 0 : _request_headers["user-agent"]) || navigator.userAgent,
     referer: request.referer || document.referrer,
     query: request.query || getQuery(),
     url: location.href
   };
 };
-const mockResponse = () => {
+export const mockResponse = () => {
   return {
     setHeader() {
       console.warn("response.setHeader() can only be used in the server side");
@@ -50,7 +46,7 @@ const mockResponse = () => {
     }
   };
 };
-const isCrossOrigin = (url = "", base) => {
+export const isCrossOrigin = (url = "", base) => {
   if (url.startsWith("/") || url.startsWith("./")) {
     return false;
   } else if (!url.includes(base)) {
@@ -59,10 +55,3 @@ const isCrossOrigin = (url = "", base) => {
     return false;
   }
 };
-export {
-  formatClient,
-  formatServer,
-  isCrossOrigin,
-  isReact18,
-  mockResponse
-};

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

@@ -1,83 +1,68 @@
-import {
-  getEntryOptions,
-  createRuntimeExportsUtils,
-  PLUGIN_SCHEMAS
-} from "@modern-js/utils";
+import { getEntryOptions, createRuntimeExportsUtils, PLUGIN_SCHEMAS } from "@modern-js/utils";
 const PLUGIN_IDENTIFIER = "state";
-var cli_default = () => ({
-  name: "@modern-js/plugin-state",
-  required: ["@modern-js/runtime"],
-  setup: (api) => {
-    const stateConfigMap = /* @__PURE__ */ new Map();
-    let pluginsExportsUtils;
-    return {
-      config() {
-        const appContext = api.useAppContext();
-        pluginsExportsUtils = createRuntimeExportsUtils(
-          appContext.internalDirectory,
-          "plugins"
-        );
-        return {
-          source: {
-            alias: {
-              "@modern-js/runtime/plugins": pluginsExportsUtils.getPath()
+export default () => {
+  return {
+    name: "@modern-js/plugin-state",
+    required: [
+      "@modern-js/runtime"
+    ],
+    setup: (api) => {
+      const stateConfigMap = /* @__PURE__ */ new Map();
+      let pluginsExportsUtils;
+      return {
+        config() {
+          const appContext = api.useAppContext();
+          pluginsExportsUtils = createRuntimeExportsUtils(appContext.internalDirectory, "plugins");
+          return {
+            source: {
+              alias: {
+                "@modern-js/runtime/plugins": pluginsExportsUtils.getPath()
+              }
             }
+          };
+        },
+        modifyEntryImports({ entrypoint, imports }) {
+          var _getEntryOptions;
+          const { entryName } = entrypoint;
+          const userConfig = api.useResolvedConfigContext();
+          const { packageName } = 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",
+              specifiers: [
+                {
+                  imported: PLUGIN_IDENTIFIER
+                }
+              ]
+            });
           }
-        };
-      },
-      modifyEntryImports({ entrypoint, imports }) {
-        var _a;
-        const { entryName } = entrypoint;
-        const userConfig = api.useResolvedConfigContext();
-        const { packageName } = api.useAppContext();
-        const stateConfig = (_a = getEntryOptions(
-          entryName,
-          userConfig.runtime,
-          userConfig.runtimeByEntries,
-          packageName
-        )) == null ? void 0 : _a.state;
-        stateConfigMap.set(entryName, stateConfig);
-        if (stateConfig) {
-          imports.push({
-            value: "@modern-js/runtime/plugins",
-            specifiers: [
-              {
-                imported: PLUGIN_IDENTIFIER
-              }
-            ]
-          });
-        }
-        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,
+            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'`);
         }
-        return {
-          entrypoint,
-          plugins
-        };
-      },
-      validateSchema() {
-        return PLUGIN_SCHEMAS["@modern-js/plugin-state"];
-      },
-      addRuntimeExports() {
-        pluginsExportsUtils.addExport(
-          `export { default as state } from '@modern-js/runtime/model'`
-        );
-      }
-    };
-  }
-});
-export {
-  cli_default as default
+      };
+    }
+  };
 };

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

@@ -1,7 +1,3 @@
-import { default as default2 } from "./runtime";
-import { default as default3 } from "./runtime";
+export { default as state } from "./runtime";
+export { default } from "./runtime";
 export * from "./runtime";
-export {
-  default3 as default,
-  default2 as state
-};

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

@@ -1,13 +1,7 @@
 import { plugin as effectsPlugin } from "@modern-js-reduck/plugin-effects";
 import autoActionsPlugin from "@modern-js-reduck/plugin-auto-actions";
 import immerPlugin from "@modern-js-reduck/plugin-immutable";
-import { default as default2 } from "@modern-js-reduck/plugin-devtools";
-const effects = () => effectsPlugin;
-const immer = () => immerPlugin;
-const autoActions = () => autoActionsPlugin;
-export {
-  autoActions,
-  default2 as devtools,
-  effects,
-  immer
-};
+export { default as devtools } from "@modern-js-reduck/plugin-devtools";
+export const effects = () => effectsPlugin;
+export const immer = () => immerPlugin;
+export const autoActions = () => autoActionsPlugin;

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

@@ -1,6 +1,3 @@
 export * from "@modern-js-reduck/react";
-import { default as default2 } from "./plugin";
+export { default } from "./plugin";
 export * from "./plugin";
-export {
-  default2 as default
-};

package/dist/esm-node/state/runtime/plugin.js

@@ -1,8 +1,6 @@
-import { jsx } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 import { useContext } from "react";
-import {
-  createStore
-} from "@modern-js-reduck/store";
+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";
@@ -22,9 +20,7 @@ const getStoreConfig = (config) => {
     "devtools"
   ];
   const plugins = [];
-  internalPlugins.filter((plugin) => config[plugin] !== false).forEach(
-    (plugin) => plugins.push(StatePluginHandleMap[plugin](config[plugin]))
-  );
+  internalPlugins.filter((plugin) => config[plugin] !== false).forEach((plugin) => plugins.push(StatePluginHandleMap[plugin](config[plugin])));
   const storeConfig = {};
   for (const [key, value] of Object.entries(config)) {
     if (!internalPlugins.includes(key)) {
@@ -34,42 +30,49 @@ const getStoreConfig = (config) => {
   storeConfig.plugins = plugins;
   return storeConfig;
 };
-const state = (config) => ({
-  name: "@modern-js/plugin-state",
-  setup: () => {
-    const storeConfig = getStoreConfig(config);
-    return {
-      hoc({ App }, next) {
-        const getStateApp = (props) => {
-          const context = useContext(RuntimeReactContext);
-          return /* @__PURE__ */ jsx(Provider, { store: context.store, config: storeConfig, children: /* @__PURE__ */ jsx(App, { ...props }) });
-        };
-        return next({
-          App: hoistNonReactStatics(getStateApp, App)
-        });
-      },
-      init({ context }, next) {
-        var _a, _b;
-        if (isBrowser()) {
-          storeConfig.initialState = storeConfig.initialState || ((_b = (_a = window == null ? void 0 : window._SSR_DATA) == null ? void 0 : _a.data) == null ? void 0 : _b.storeState) || {};
-        }
-        context.store = createStore(storeConfig);
-        return next({ context });
-      },
-      pickContext({ context, pickedContext }, next) {
-        return next({
-          context,
-          pickedContext: {
-            ...pickedContext,
-            store: context.store
+const state = (config) => {
+  return {
+    name: "@modern-js/plugin-state",
+    setup: () => {
+      const storeConfig = getStoreConfig(config);
+      return {
+        hoc({ App }, next) {
+          const getStateApp = (props) => {
+            const context = useContext(RuntimeReactContext);
+            return /* @__PURE__ */ _jsx(Provider, {
+              store: context.store,
+              config: storeConfig,
+              children: /* @__PURE__ */ _jsx(App, {
+                ...props
+              })
+            });
+          };
+          return next({
+            App: hoistNonReactStatics(getStateApp, App)
+          });
+        },
+        init({ context }, next) {
+          if (isBrowser()) {
+            var _window__SSR_DATA, _window__SSR_DATA_data;
+            storeConfig.initialState = storeConfig.initialState || (window === null || window === void 0 ? void 0 : (_window__SSR_DATA = window._SSR_DATA) === null || _window__SSR_DATA === void 0 ? void 0 : (_window__SSR_DATA_data = _window__SSR_DATA.data) === null || _window__SSR_DATA_data === void 0 ? void 0 : _window__SSR_DATA_data.storeState) || {};
           }
-        });
-      }
-    };
-  }
-});
-var plugin_default = state;
-export * from "../plugins";
-export {
-  plugin_default as default
+          context.store = createStore(storeConfig);
+          return next({
+            context
+          });
+        },
+        pickContext({ context, pickedContext }, next) {
+          return next({
+            context,
+            pickedContext: {
+              ...pickedContext,
+              store: context.store
+            }
+          });
+        }
+      };
+    }
+  };
 };
+export default state;
+export * from "../plugins";

package/dist/esm-node/state/types.js

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

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

@@ -9,5 +9,5 @@ export { Link, NavLink } from './PrefetchLink';
 export type { LinkProps, NavLinkProps } from './PrefetchLink';
 export declare const useRouteLoaderData: typeof useRouteData;
 export type { FormEncType, FormMethod, GetScrollRestorationKeyFunction, ParamKeyValuePair, SubmitOptions, URLSearchParamsInit, FetcherWithComponents, BrowserRouterProps, HashRouterProps, HistoryRouterProps, FormProps, ScrollRestorationProps, SubmitFunction, ActionFunction, ActionFunctionArgs, AwaitProps, unstable_Blocker, unstable_BlockerFunction, DataRouteMatch, DataRouteObject, Fetcher, Hash, IndexRouteObject, IndexRouteProps, JsonFunction, LayoutRouteProps, LoaderFunction, LoaderFunctionArgs, Location, MemoryRouterProps, NavigateFunction, NavigateOptions, NavigateProps, Navigation, Navigator, NonIndexRouteObject, OutletProps, Params, ParamParseKey, Path, PathMatch, Pathname, PathPattern, PathRouteProps, RedirectFunction, RelativeRoutingType, RouteMatch, RouteObject, RouteProps, RouterProps, RouterProviderProps, RoutesProps, Search, ShouldRevalidateFunction, To } from 'react-router-dom';
-export { createBrowserRouter, createHashRouter, createMemoryRouter, RouterProvider, BrowserRouter, HashRouter, MemoryRouter, Router, Await, Form, Navigate, Outlet, Route, Routes, ScrollRestoration, useActionData, useAsyncError, useAsyncValue, useBeforeUnload, useFetcher, useFetchers, useFormAction, useHref, useInRouterContext, useLinkClickHandler, useLoaderData, useLocation, useMatch, useMatches, useNavigate, useNavigation, useNavigationType, useOutlet, useOutletContext, useParams, useResolvedPath, useRevalidator, useRouteError, useRoutes, useSearchParams, useSubmit, createRoutesFromChildren, createRoutesFromElements, createSearchParams, generatePath, isRouteErrorResponse, matchPath, matchRoutes, renderMatches, resolvePath, createPath } from 'react-router-dom';
+export { createBrowserRouter, createHashRouter, createMemoryRouter, RouterProvider, BrowserRouter, HashRouter, MemoryRouter, Router, Await, Form, Navigate, Outlet, Route, Routes, ScrollRestoration, useActionData, useAsyncError, useAsyncValue, useBeforeUnload, useFetcher, useFetchers, useFormAction, useHref, useInRouterContext, useLinkClickHandler, useLoaderData, useLocation, useMatch, useMatches, useNavigate, useNavigation, useNavigationType, useOutlet, useOutletContext, useParams, useResolvedPath, useRevalidator, useRouteError, useRoutes, useSearchParams, useSubmit, createRoutesFromChildren, createRoutesFromElements, createSearchParams, generatePath, isRouteErrorResponse, matchPath, matchRoutes, renderMatches, resolvePath, createPath, unstable_useBlocker, unstable_usePrompt } from 'react-router-dom';
 export { defer, json, redirect } from '@modern-js/utils/universal/remix-router';

package/package.json

@@ -3,7 +3,11 @@
   "description": "A Progressive React Framework for modern web development.",
   "homepage": "https://modernjs.dev",
   "bugs": "https://github.com/web-infra-dev/modern.js/issues",
-  "repository": "web-infra-dev/modern.js",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/web-infra-dev/modern.js",
+    "directory": "packages/runtime/plugin-runtime"
+  },
   "license": "MIT",
   "keywords": [
     "react",
@@ -11,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.15.1-alpha.2",
+  "version": "2.16.1-alpha.0",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -158,9 +162,9 @@
     "react-side-effect": "^2.1.1",
     "redux-logger": "^3.0.6",
     "styled-components": "^5.3.1",
-    "@modern-js/plugin": "2.15.0",
-    "@modern-js/types": "2.15.0",
-    "@modern-js/utils": "2.15.1-alpha.0"
+    "@modern-js/plugin": "2.16.0",
+    "@modern-js/types": "2.16.0",
+    "@modern-js/utils": "2.16.0"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -180,11 +184,11 @@
     "react-dom": "^18",
     "ts-jest": "^29.0.5",
     "typescript": "^4",
-    "@modern-js/app-tools": "2.15.0",
-    "@modern-js/core": "2.15.0",
-    "@modern-js/server-core": "2.15.0",
-    "@scripts/build": "2.15.0",
-    "@scripts/jest-config": "2.15.0"
+    "@modern-js/app-tools": "2.16.0",
+    "@scripts/build": "2.16.0",
+    "@modern-js/core": "2.16.0",
+    "@modern-js/server-core": "2.16.0",
+    "@scripts/jest-config": "2.16.0"
   },
   "sideEffects": false,
   "modernConfig": {},

package/types/model.d.ts

@@ -3,4 +3,5 @@
 /// <reference types="@modern-js-reduck/plugin-effects" />
 /// <reference types="@modern-js-reduck/plugin-immutable" />
 
+export { default } from '../dist/types/state';
 export * from '../dist/types/state';