@modern-js/runtime 2.35.0 → 2.36.0

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

@@ -1,6 +1,6 @@
 import cookieTool from "cookie";
-export const isReact18 = () => process.env.IS_REACT18 === "true";
-export const formatServer = (request) => {
+const isReact18 = () => process.env.IS_REACT18 === "true";
+const formatServer = (request) => {
   const { cookie = "", "user-agent": userAgent = "", referer } = request.headers || {};
   return {
     cookie,
@@ -17,7 +17,7 @@ const getQuery = () => window.location.search.substring(1).split("&").reduce((re
   }
   return res;
 }, {});
-export const formatClient = (request) => {
+const formatClient = (request) => {
   var _request_headers;
   return {
     params: request.params || {},
@@ -35,7 +35,7 @@ export const formatClient = (request) => {
     url: location.href
   };
 };
-export const mockResponse = () => {
+const mockResponse = () => {
   return {
     setHeader() {
       console.warn("response.setHeader() can only be used in the server side");
@@ -49,3 +49,9 @@ export const mockResponse = () => {
     }
   };
 };
+export {
+  formatClient,
+  formatServer,
+  isReact18,
+  mockResponse
+};

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

@@ -1,6 +1,6 @@
 import { getEntryOptions, createRuntimeExportsUtils } from "@modern-js/utils";
 const PLUGIN_IDENTIFIER = "state";
-export const statePlugin = () => ({
+const statePlugin = () => ({
   name: "@modern-js/plugin-state",
   required: [
     "@modern-js/runtime"
@@ -74,4 +74,8 @@ export const statePlugin = () => ({
     };
   }
 });
-export default statePlugin;
+var cli_default = statePlugin;
+export {
+  cli_default as default,
+  statePlugin
+};

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

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

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

@@ -1,7 +1,13 @@
 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";
-export { default as devtools } from "@modern-js-reduck/plugin-devtools";
-export const effects = () => effectsPlugin;
-export const immer = () => immerPlugin;
-export const autoActions = () => autoActionsPlugin;
+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
+};

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

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

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

@@ -72,5 +72,8 @@ const state = (config) => ({
     };
   }
 });
-export default state;
+var plugin_default = state;
 export * from "../plugins";
+export {
+  plugin_default as default
+};

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { LinkProps as RouterLinkProps, NavLinkProps as RouterNavLinkProps } from '@modern-js/utils/runtime/router';
+import { LinkProps as RouterLinkProps, NavLinkProps as RouterNavLinkProps } from '@modern-js/runtime-utils/router';
 export declare function composeEventHandlers<EventType extends React.SyntheticEvent | Event>(theirHandler: ((event: EventType) => any) | undefined, ourHandler: (event: EventType) => any): (event: EventType) => any;
 /**
  * Modified from https://github.com/remix-run/remix/blob/9a0601bd704d2f3ee622e0ddacab9b611eb0c5bc/packages/remix-react/components.tsx#L218

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

@@ -1,3 +1,3 @@
-import { RouteObject } from '@modern-js/utils/runtime/router';
+import { RouteObject } from '@modern-js/runtime-utils/router';
 declare const modifyRoutes: import("@modern-js/plugin").Waterfall<RouteObject[]>;
 export { modifyRoutes };

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

@@ -1,4 +1,4 @@
-import { useRouteLoaderData as useRouteData } from '@modern-js/utils/runtime/router';
+import { useRouteLoaderData as useRouteData } from '@modern-js/runtime-utils/router';
 import { routerPlugin } from './plugin';
 import type { SingleRouteConfig, RouterConfig } from './types';
 export type { SingleRouteConfig, RouterConfig };
@@ -10,5 +10,5 @@ export { Link, NavLink } from './PrefetchLink';
 export type { LinkProps, NavLinkProps } from './PrefetchLink';
 export declare const useRouteLoaderData: typeof useRouteData;
 export type { LoaderFunction, LoaderFunctionArgs } from './types';
-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, 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 '@modern-js/utils/runtime/router';
-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, defer, json, redirect } from '@modern-js/utils/runtime/router';
+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, 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 '@modern-js/runtime-utils/router';
+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, defer, json, redirect } from '@modern-js/runtime-utils/router';

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

@@ -1 +1 @@
-export * from '@modern-js/utils/runtime-node/router';
+export * from '@modern-js/runtime-utils/node/router';

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

@@ -1,7 +1,7 @@
 /// <reference types="react" />
-import type { RouteProps, RouteObject, Params } from '@modern-js/utils/runtime/router';
+import type { RouteProps, RouteObject, Params } from '@modern-js/runtime-utils/router';
 import { PageRoute, NestedRoute } from '@modern-js/types';
-import type { RequestContext } from '@modern-js/utils/runtime-node';
+import type { RequestContext } from '@modern-js/runtime-utils/node';
 declare global {
   interface Window {
     _SERVER_DATA?: {

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import type { Reporter, NestedRoute, PageRoute, SSRMode } from '@modern-js/types';
-import { type StaticHandlerContext, type Router } from '@modern-js/utils/runtime/remix-router';
+import { type StaticHandlerContext, type Router } from '@modern-js/runtime-utils/remix-router';
 import { RouterConfig } from './types';
 export declare function getRouteComponents(routes: (NestedRoute | PageRoute)[], {
   globalApp,

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { useLocation, useNavigate } from '@modern-js/utils/runtime/router';
+import { useLocation, useNavigate } from '@modern-js/runtime-utils/router';
 export interface WithRouterProps {
   location: ReturnType<typeof useLocation>;
   params: Record<string, string>;

package/dist/types/runtimeContext.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import { Store } from '@modern-js-reduck/store';
-import { type StaticHandlerContext, type Router, type RouterState } from '@modern-js/utils/runtime/remix-router';
+import { type StaticHandlerContext, type Router, type RouterState } from '@modern-js/runtime-utils/remix-router';
 import { createLoaderManager } from './core/loader/loaderManager';
 import { runtime } from './core/plugin';
 import { RouteManifest } from './router/runtime/types';

package/dist/types/ssr/serverRender/renderToString/loadable.d.ts

@@ -8,6 +8,7 @@ declare class LoadableCollector implements Collector {
   constructor(options: LoadableCollectorOptions);
   collect(comopnent: ReactElement): ReactElement;
   effect(): void;
+  private generateAttributes;
 }
 export interface LoadableCollectorOptions {
   nonce?: string;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.35.0",
+  "version": "2.36.0",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -162,7 +162,6 @@
     "@remix-run/node": "^1.12.0",
     "@types/loadable__component": "^5.13.4",
     "@types/react-helmet": "^6.1.2",
-    "@types/redux-logger": "^3.0.9",
     "@types/styled-components": "^5.1.14",
     "esbuild": "0.17.19",
     "hoist-non-react-statics": "^3.3.2",
@@ -170,12 +169,12 @@
     "react-helmet": "^6.1.0",
     "react-is": "^18",
     "react-side-effect": "^2.1.1",
-    "redux-logger": "^3.0.6",
     "styled-components": "^5.3.1",
     "@swc/helpers": "0.5.1",
-    "@modern-js/plugin": "2.35.0",
-    "@modern-js/types": "2.35.0",
-    "@modern-js/utils": "2.35.0"
+    "@modern-js/plugin": "2.36.0",
+    "@modern-js/types": "2.36.0",
+    "@modern-js/utils": "2.36.0",
+    "@modern-js/runtime-utils": "2.36.0"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -196,11 +195,11 @@
     "ts-jest": "^29.1.0",
     "typescript": "^5",
     "webpack": "^5.88.1",
-    "@modern-js/app-tools": "2.35.0",
-    "@modern-js/core": "2.35.0",
-    "@modern-js/server-core": "2.35.0",
-    "@scripts/build": "2.35.0",
-    "@scripts/jest-config": "2.35.0"
+    "@modern-js/app-tools": "2.36.0",
+    "@modern-js/core": "2.36.0",
+    "@modern-js/server-core": "2.36.0",
+    "@scripts/build": "2.36.0",
+    "@scripts/jest-config": "2.36.0"
   },
   "sideEffects": false,
   "publishConfig": {

package/dist/cjs/state/types.js

@@ -1,4 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});

package/dist/esm/state/types.js

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

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

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

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

@@ -1,16 +0,0 @@
-import { createStore } from '@modern-js-reduck/store';
-import { ReduxLoggerOptions } from 'redux-logger';
-export type PluginOptions = Parameters<typeof createStore>[0] & {
-  /**
-   * If it's false, the logger will be disabled.
-   * If it's a object, it means options will pass to createLogger function
-   */
-  logger?: false | ReduxLoggerOptions;
-  effects?: any;
-  /**
-   * When it's true, will remove immer plugin
-   * @default false
-   */
-  disableImmer?: boolean;
-  devtools?: any;
-};