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

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

@@ -14,8 +14,8 @@ declare const runtimeHooks: {
   client: import("@modern-js/plugin").AsyncPipeline<{
     App: React.ComponentType<any>;
     readonly context?: RuntimeContext | undefined;
-    ModernRender: (App: React.ReactNode) => void;
-    ModernHydrate: (App: React.ReactNode, callback?: () => void) => void;
+    ModernRender: (App: React.ReactElement) => void;
+    ModernHydrate: (App: React.ReactElement, callback?: () => void) => void;
   }, void>;
   server: import("@modern-js/plugin").AsyncPipeline<{
     App: React.ComponentType<any>;
@@ -49,8 +49,8 @@ export declare const createRuntime: () => import("@modern-js/plugin").Manager<{
   client: import("@modern-js/plugin").AsyncPipeline<{
     App: React.ComponentType<any>;
     readonly context?: RuntimeContext | undefined;
-    ModernRender: (App: React.ReactNode) => void;
-    ModernHydrate: (App: React.ReactNode, callback?: () => void) => void;
+    ModernRender: (App: React.ReactElement) => void;
+    ModernHydrate: (App: React.ReactElement, callback?: () => void) => void;
   }, void>;
   server: import("@modern-js/plugin").AsyncPipeline<{
     App: React.ComponentType<any>;
@@ -80,8 +80,8 @@ export declare const runtime: import("@modern-js/plugin").Manager<{
   client: import("@modern-js/plugin").AsyncPipeline<{
     App: React.ComponentType<any>;
     readonly context?: RuntimeContext | undefined;
-    ModernRender: (App: React.ReactNode) => void;
-    ModernHydrate: (App: React.ReactNode, callback?: () => void) => void;
+    ModernRender: (App: React.ReactElement) => void;
+    ModernHydrate: (App: React.ReactElement, callback?: () => void) => void;
   }, void>;
   server: import("@modern-js/plugin").AsyncPipeline<{
     App: React.ComponentType<any>;
@@ -107,8 +107,8 @@ export declare const createPlugin: (setup?: Setup<{
   client: import("@modern-js/plugin").AsyncPipeline<{
     App: React.ComponentType<any>;
     readonly context?: RuntimeContext | undefined;
-    ModernRender: (App: React.ReactNode) => void;
-    ModernHydrate: (App: React.ReactNode, callback?: () => void) => void;
+    ModernRender: (App: React.ReactElement) => void;
+    ModernHydrate: (App: React.ReactElement, callback?: () => void) => void;
   }, void>;
   server: import("@modern-js/plugin").AsyncPipeline<{
     App: React.ComponentType<any>;
@@ -133,8 +133,8 @@ export declare const createPlugin: (setup?: Setup<{
   client: import("@modern-js/plugin").AsyncPipeline<{
     App: React.ComponentType<any>;
     readonly context?: RuntimeContext | undefined;
-    ModernRender: (App: React.ReactNode) => void;
-    ModernHydrate: (App: React.ReactNode, callback?: () => void) => void;
+    ModernRender: (App: React.ReactElement) => void;
+    ModernHydrate: (App: React.ReactElement, callback?: () => void) => void;
   }, void>;
   server: import("@modern-js/plugin").AsyncPipeline<{
     App: React.ComponentType<any>;
@@ -159,8 +159,8 @@ export declare const createPlugin: (setup?: Setup<{
   client: import("@modern-js/plugin").AsyncPipeline<{
     App: React.ComponentType<any>;
     readonly context?: RuntimeContext | undefined;
-    ModernRender: (App: React.ReactNode) => void;
-    ModernHydrate: (App: React.ReactNode, callback?: () => void) => void;
+    ModernRender: (App: React.ReactElement) => void;
+    ModernHydrate: (App: React.ReactElement, callback?: () => void) => void;
   }, void>;
   server: import("@modern-js/plugin").AsyncPipeline<{
     App: React.ComponentType<any>;
@@ -173,7 +173,7 @@ export declare const createPlugin: (setup?: Setup<{
     context: RuntimeContext;
     pickedContext: TRuntimeContext;
   }, TRuntimeContext>;
-}, Record<string, never>>, Record<string, unknown>> | undefined) => import("@modern-js/plugin").Plugin<{
+}, Record<string, never>>, Record<string, unknown>, any, any> | undefined) => import("@modern-js/plugin").Plugin<{
   hoc: import("@modern-js/plugin").Pipeline<{
     App: React.ComponentType<any>;
   }, React.ComponentType<any>>;
@@ -185,8 +185,8 @@ export declare const createPlugin: (setup?: Setup<{
   client: import("@modern-js/plugin").AsyncPipeline<{
     App: React.ComponentType<any>;
     readonly context?: RuntimeContext | undefined;
-    ModernRender: (App: React.ReactNode) => void;
-    ModernHydrate: (App: React.ReactNode, callback?: () => void) => void;
+    ModernRender: (App: React.ReactElement) => void;
+    ModernHydrate: (App: React.ReactElement, callback?: () => void) => void;
   }, void>;
   server: import("@modern-js/plugin").AsyncPipeline<{
     App: React.ComponentType<any>;

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

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

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

@@ -6,7 +6,7 @@ export declare const HTML_SSRDATASCRIPT_SEPARATOR = "<!--<?- SSRDataScript ?>-->
 export declare const DOCUMENT_SSR_PLACEHOLDER: string;
 export declare const DOCUMENT_CHUNKSMAP_PLACEHOLDER: string;
 export declare const DOCUMENT_SSRDATASCRIPT_PLACEHOLDER: string;
-export declare const DOCUMENT_FILE_NAME = "document";
+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 PLACEHOLDER_REPLACER_MAP: {

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

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

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

@@ -3,6 +3,7 @@ import type { RouterConfig } from './types';
 export declare const routerPlugin: ({
   serverBase,
   supportHtml5History,
+  basename,
   routesConfig,
   createRoutes
 }: RouterConfig) => Plugin;

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

@@ -3,6 +3,7 @@ import { SSRServerContext } from '../../ssr/serverRender/types';
 import type { RouterConfig } from './types';
 export declare function createFetchHeaders(requestHeaders: SSRServerContext['request']['headers']): Headers;
 export declare const routerPlugin: ({
+  basename,
   routesConfig,
   createRoutes
 }: RouterConfig) => Plugin;

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

@@ -0,0 +1 @@
+export * from 'react-router-dom/server';

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

@@ -32,5 +32,6 @@ export declare type RouterConfig = {
   };
   serverBase?: string[];
   supportHtml5History?: boolean;
+  basename?: string;
   createRoutes?: () => RouteObject[];
 };

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

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

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

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import type { ServerConfig } from '@modern-js/core';
+import { ServerUserConfig } from '@modern-js/app-tools';
 import type { RuntimeContext } from '../../core';
 import { RenderLevel } from './renderToString/type';
 export type { SSRServerContext } from './renderToString/type';
@@ -7,7 +7,7 @@ export declare type ModernSSRReactComponent = React.ComponentType<any>;
 export { RuntimeContext, RenderLevel };
 export declare type SSRPluginConfig = {
   crossorigin?: boolean | 'anonymous' | 'use-credentials';
-} & Exclude<ServerConfig['ssr'], boolean>;
+} & Exclude<ServerUserConfig['ssr'], boolean>;
 export declare type ServerRenderOptions = {
   App: ModernSSRReactComponent;
   config: SSRPluginConfig;

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

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

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

@@ -1,6 +1,11 @@
+import { type Model } from '@modern-js-reduck/store';
 import type { Plugin } from '../../core';
-export declare type StatePluginType = 'immer' | 'effects' | 'autoActions' | 'devtools';
-export declare type StateConfig = Partial<Record<StatePluginType, boolean>>;
+declare type StatePluginType = 'immer' | 'effects' | 'autoActions' | 'devtools';
+declare type StateExtraType = {
+  initialState: any;
+  models: Array<Model>;
+};
+export declare type StateConfig = Partial<Record<StatePluginType, boolean> & StateExtraType>;
 declare const state: (config: StateConfig) => Plugin;
 export default state;
 export * from '../plugins';

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.3",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -72,10 +72,10 @@
       "node": "./dist/js/node/router/index.js",
       "default": "./dist/js/treeshaking/router/index.js"
     },
-    "./router-server": {
-      "jsnext:source": "./src/router/server/index.ts",
-      "node": "./dist/js/node/router/server/index.js",
-      "default": "./dist/js/treeshaking/router/server/index.js"
+    "./router/server": {
+      "jsnext:source": "./src/router/server.ts",
+      "node": "./dist/js/node/router/server.js",
+      "default": "./dist/js/treeshaking/router/server.js"
     }
   },
   "typesVersions": {
@@ -110,8 +110,8 @@
       "router": [
         "./dist/types/router/index.d.ts"
       ],
-      "router-server": [
-        "./dist/types/router/server/index.d.ts"
+      "router/server": [
+        "./dist/types/router/runtime/server.d.ts"
       ]
     }
   },
@@ -122,12 +122,12 @@
     "@loadable/webpack-plugin": "5.15.2",
     "@loadable/component": "^5.15.0",
     "@loadable/server": "^5.15.1",
-    "@modern-js-reduck/plugin-auto-actions": "^1.0.2",
-    "@modern-js-reduck/plugin-devtools": "^1.0.3",
-    "@modern-js-reduck/plugin-effects": "^1.0.2",
-    "@modern-js-reduck/plugin-immutable": "^1.0.1",
-    "@modern-js-reduck/react": "^1.0.1",
-    "@modern-js-reduck/store": "^1.0.3",
+    "@modern-js-reduck/plugin-auto-actions": "^1.1.4",
+    "@modern-js-reduck/plugin-devtools": "^1.1.4",
+    "@modern-js-reduck/plugin-effects": "^1.1.4",
+    "@modern-js-reduck/plugin-immutable": "^1.1.4",
+    "@modern-js-reduck/react": "^1.1.4",
+    "@modern-js-reduck/store": "^1.1.4",
     "@types/loadable__component": "^5.13.4",
     "@types/react-helmet": "^6.1.2",
     "@types/redux-logger": "^3.0.9",
@@ -136,16 +136,16 @@
     "invariant": "^2.2.4",
     "react-helmet": "^6.1.0",
     "@remix-run/node": "^1.7.0",
-    "@remix-run/router": "^1.0.1",
+    "@remix-run/router": "^1.0.4",
     "react-is": "^18",
-    "react-router-dom": "^6.4.0",
+    "react-router-dom": "^6.4.4",
     "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.1",
-    "@modern-js/types": "2.0.0-beta.1",
-    "@modern-js/utils": "2.0.0-beta.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"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -166,11 +166,12 @@
     "react-dom": "^18",
     "ts-jest": "^27.0.4",
     "typescript": "^4",
-    "@modern-js/core": "2.0.0-beta.1",
-    "@modern-js/server-core": "2.0.0-beta.1",
-    "@modern-js/utils": "2.0.0-beta.1",
-    "@scripts/build": "2.0.0-beta.1",
-    "@scripts/jest-config": "2.0.0-beta.1"
+    "@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"
   },
   "sideEffects": false,
   "modernConfig": {},
@@ -179,9 +180,9 @@
     "access": "public"
   },
   "scripts": {
-    "dev": "modern build --watch",
-    "new": "modern new",
-    "build": "modern build",
-    "test": "jest --passWithNoTests"
+    "dev": "modern-lib build --watch",
+    "new": "modern-lib new",
+    "build": "modern-lib build",
+    "test": "jest"
   }
 }