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

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

@@ -1,5 +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/core/compatible.d.ts

@@ -1,5 +1,7 @@
 import React from 'react';
-import { TRuntimeContext } from '../runtime-context';
+import type { Renderer } from 'react-dom';
+import type { hydrateRoot, createRoot } from 'react-dom/client';
+import { RuntimeContext, TRuntimeContext } from '../runtime-context';
 import { Plugin } from './plugin';
 export declare type CreateAppOptions = {
   plugins: Plugin[];
@@ -7,15 +9,11 @@ export declare type CreateAppOptions = {
 export declare const createApp: ({
   plugins
 }: CreateAppOptions) => (App?: React.ComponentType<any>) => React.ComponentType<any>;
-interface HydrateFunc {
-  (container: Element | Document, initialChildren: React.ReactNode): void;
-  (initialChildren: React.ReactNode, container: Element | Document, callback?: () => void): void;
-}
-declare type BootStrap<T = unknown> = (App: React.ComponentType, id: string | Record<string, any> | HTMLElement, root: any, ReactDOM: {
-  render: (children: React.ReactNode, rootElement?: HTMLElement) => void;
-  hydrate: HydrateFunc;
-  createRoot?: (rootElement: HTMLElement) => any;
-  hydrateRoot: HydrateFunc;
+declare type BootStrap<T = unknown> = (App: React.ComponentType, id: string | HTMLElement | RuntimeContext, root?: any, ReactDOM?: {
+  render?: Renderer;
+  hydrate?: Renderer;
+  createRoot?: typeof createRoot;
+  hydrateRoot?: typeof hydrateRoot;
 }) => Promise<T>;
 export declare const bootstrap: BootStrap;
 export declare const useRuntimeContext: () => TRuntimeContext;

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

@@ -1,4 +1,4 @@
-export { createPlugin, createRuntime, runtime, registerInit, registerPrefetch } from './plugin';
+export { createPlugin, createRuntime, runtime, registerInit } from './plugin';
 export type { Plugin } from './plugin';
 export { defineConfig, getConfig } from './app-config';
 export * from './compatible';

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

@@ -35,7 +35,6 @@ 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,28 +20,23 @@ 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

@@ -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>;
@@ -30,16 +30,12 @@ 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<{
@@ -53,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>;
@@ -71,15 +67,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;
-/**
- * register prefetch hook. It would be revoked both ssr and csr.
- * But if ssr success, It wont exec in csr again.
- * If ssr prefetch failed, It will fallback to exec in csr.
- */
-
-declare const registerPrefetch: (App: React.ComponentType, prefetch: (context: RuntimeContext) => Promise<any>) => void;
 export declare const runtime: import("@modern-js/plugin").Manager<{
   hoc: import("@modern-js/plugin").Pipeline<{
     App: React.ComponentType<any>;
@@ -92,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>;
@@ -119,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>;
@@ -145,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>;
@@ -171,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>;
@@ -185,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>>;
@@ -197,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>;
@@ -212,4 +200,4 @@ export declare const createPlugin: (setup?: Setup<{
     pickedContext: TRuntimeContext;
   }, TRuntimeContext>;
 }, Record<string, never>>;
-export { registerInit, registerPrefetch };
+export { registerInit };

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

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

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

@@ -0,0 +1,13 @@
+import React from 'react';
+declare type DocumentProps = {
+  [x: string]: any;
+  config?: any;
+  templateParams: {
+    [y: string]: any;
+    mountId?: string;
+  };
+  processEnv?: Record<string, string | undefined>;
+  children?: JSX.Element;
+};
+export declare const DocumentContext: React.Context<DocumentProps>;
+export {};

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

@@ -0,0 +1,10 @@
+import React, { ReactNode } from 'react';
+declare type DocumentStructrueContextProps = {
+  hasSetHead?: boolean;
+  hasSetScripts?: boolean;
+  hasSetBody?: boolean;
+  hasSetRoot?: boolean;
+  docChild?: ReactNode;
+};
+export declare const DocumentStructrueContext: React.Context<DocumentStructrueContextProps>;
+export {};

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

@@ -0,0 +1,5 @@
+/// <reference types="react" />
+export declare function Head(props: {
+  children?: any;
+}): JSX.Element;
+export declare function DefaultHead(): JSX.Element;

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

@@ -0,0 +1,4 @@
+/// <reference types="react" />
+export declare function Html(props: {
+  children: any[];
+}): JSX.Element;

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

@@ -0,0 +1,8 @@
+/// <reference types="react" />
+export declare function Root(props: {
+  children?: any;
+  rootId?: string;
+}): JSX.Element;
+export declare function DefaultRoot(props: {
+  children?: any;
+}): JSX.Element;

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

@@ -0,0 +1,2 @@
+/// <reference types="react" />
+export declare function Scripts(): JSX.Element;

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

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

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

@@ -0,0 +1,14 @@
+export declare const DOC_EXT: string[];
+export declare const DOCUMENT_META_PLACEHOLDER: string;
+export declare const HTML_SEPARATOR = "<!--<?- html ?>-->";
+export declare const HTML_CHUNKSMAP_SEPARATOR = "<!--<?- chunksMap.js ?>-->";
+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_SCRIPTS_PLACEHOLDER: string;
+export declare const DOCUMENT_NO_SCRIPTE_PLACEHOLDER: string;
+export declare const PLACEHOLDER_REPLACER_MAP: {
+  [x: string]: string;
+};

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

@@ -0,0 +1,8 @@
+export * from './Html';
+export * from './DocumentContext';
+export * from './DocumentStructrueContext';
+export * from './Head';
+export * from './Body';
+export * from './Root';
+export * from './Scripts';
+export * from './constants';

package/dist/types/exports/server.d.ts

@@ -4,7 +4,7 @@ export declare const hook: (attacher: ({
   afterMatch,
   afterRender
 }: {
-  addMiddleware: (mid: RequestHandler) => void;
+  addMiddleware: (mid: Middleware) => void;
   afterRender: (hook: AfterRenderHook) => void;
   afterMatch: (hook: AfterMatchHook) => void;
 }) => void) => ({
@@ -12,10 +12,10 @@ export declare const hook: (attacher: ({
   afterMatch,
   afterRender
 }: {
-  addMiddleware: (mid: RequestHandler) => void;
+  addMiddleware: (mid: Middleware) => void;
   afterRender: (hook: AfterRenderHook) => void;
   afterMatch: (hook: AfterMatchHook) => void;
 }) => void;
 export declare type AfterRenderHook = (context: AfterRenderContext, next: NextFunction) => void;
 export declare type AfterMatchHook = (context: AfterMatchContext, next: NextFunction) => void;
-export declare type RequestHandler = (context: MiddlewareContext, next: NextFunction) => Promise<void> | void;
+export declare type Middleware = (context: MiddlewareContext, next: NextFunction) => Promise<void> | void;

package/dist/types/index.d.ts

@@ -4,5 +4,5 @@ export type { Plugin } from './core';
 export type { AppConfig } from './common';
 export { isBrowser } from './common';
 export type { BaseRuntimeContext, RuntimeContext, BaseTRuntimeContext, TRuntimeContext } from './runtime-context';
-export { createApp, createPlugin, useLoader, bootstrap, RuntimeReactContext, registerPrefetch, defineConfig, registerInit, useRuntimeContext } from './core';
+export { createApp, createPlugin, useLoader, bootstrap, RuntimeReactContext, defineConfig, registerInit, useRuntimeContext } from './core';
 export { StateConfig, RouterConfig };

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

@@ -1,5 +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/root/index.d.ts

@@ -0,0 +1,8 @@
+import React from 'react';
+import type { NestedRoute } from '@modern-js/types';
+interface IProps {
+  children: React.ReactNode;
+  routes: NestedRoute[];
+}
+export declare function RootLayout(props: IProps): JSX.Element;
+export {};

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

@@ -0,0 +1,22 @@
+import { Location, Params } from 'react-router-dom';
+import type { NestedRoute } from '@modern-js/types';
+interface RouteAssets {
+  [routeId: string]: {
+    chunkIds?: (string | number)[];
+    assets?: string[];
+  };
+}
+interface RouteManifest {
+  routeAssets: RouteAssets;
+  enableFetchParallel?: boolean;
+  enableLogging?: boolean;
+}
+export interface RouteMatch<Route> {
+  params: Params;
+  pathname: string;
+  route: Route;
+}
+export declare function handleLoad(routes: NestedRoute[], location: Location, routeManifest: RouteManifest): void;
+export declare function matchClientRoutes(routes: NestedRoute[], location: Location): RouteMatch<NestedRoute>[];
+export declare function loadRouteModule(route: NestedRoute, routeAssets: RouteAssets): Promise<string[] | void>;
+export {};

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

@@ -18,12 +18,10 @@ export declare type SingleRouteConfig = RouteProps & {
   /**
    * layout component
    */
-
   layout?: React.ComponentType;
   /**
    * component would be rendered when route macthed.
    */
-
   component?: React.ComponentType;
 };
 export declare type RouterConfig = {

package/dist/types/runtime-context.d.ts

@@ -4,6 +4,7 @@ import { createLoaderManager } from './core/loader/loaderManager';
 import { runtime } from './core/plugin';
 import { SSRServerContext } from './ssr/serverRender/types';
 export interface BaseRuntimeContext {
+  initialData?: Record<string, unknown>;
   loaderManager: ReturnType<typeof createLoaderManager>;
   runner: ReturnType<typeof runtime.init>;
   ssrContext?: SSRServerContext;

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

@@ -1,5 +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/prefetch.d.ts

@@ -1,12 +1,12 @@
 import { RuntimeContext } from '../core';
 declare const prefetch: (App: React.ComponentType<any>, context: RuntimeContext) => Promise<{
-  initialData: any;
+  initialData: Record<string, unknown> | undefined;
   i18nData: any;
   loadersData?: undefined;
   storeState?: undefined;
 } | {
   loadersData: Record<string, import("../core/loader/loaderManager").LoaderResult>;
-  initialData: any;
+  initialData: Record<string, unknown> | undefined;
   i18nData: any;
   storeState: any;
 }>;

package/dist/types/ssr/serverRender/renderToStream/buildTemplate.after.d.ts

@@ -1,6 +1,7 @@
-import { RuntimeContext } from 'src/runtime-context';
+import { RenderLevel, SSRServerContext } from '../types';
 declare type BuildShellAfterTemplateOptions = {
-  context: RuntimeContext;
+  ssrContext: SSRServerContext;
+  renderLevel: RenderLevel;
 };
 export declare function buildShellAfterTemplate(afterAppTemplate: string, options: BuildShellAfterTemplateOptions): string;
 export {};

package/dist/types/ssr/serverRender/renderToStream/bulidTemplate.before.d.ts

@@ -1 +1,2 @@
-export declare function buildShellBeforeTemplate(beforeAppTemplate: string): string;
+import { RuntimeContext } from '../types';
+export declare function buildShellBeforeTemplate(beforeAppTemplate: string, context: RuntimeContext): string;

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

@@ -2,7 +2,7 @@
 /// <reference types="react" />
 import { Writable } from 'stream';
 import { RenderToPipeableStreamOptions } from 'react-dom/server';
-import { InjectTemplate } from './type';
-export declare type Pipe<T extends Writable> = (output: T) => Promise<T>;
-declare function renderToPipe(rootElement: React.ReactElement, getTemplates: () => InjectTemplate, options?: RenderToPipeableStreamOptions): Pipe<Writable>;
+import { RuntimeContext } from '../types';
+export declare type Pipe<T extends Writable> = (output: T) => Promise<T | string>;
+declare function renderToPipe(rootElement: React.ReactElement, context: RuntimeContext, options?: RenderToPipeableStreamOptions): Pipe<Writable>;
 export default renderToPipe;

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

@@ -1,3 +1,3 @@
-import { RuntimeContext } from '../types';
+import { RenderLevel, RuntimeContext } from '../types';
 import { InjectTemplate } from './type';
-export declare function createTemplates(context: RuntimeContext): () => InjectTemplate;
+export declare const getTemplates: (context: RuntimeContext, renderLevel: RenderLevel) => InjectTemplate;

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

@@ -1,16 +1,13 @@
 /// <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';
-export declare type ModernSSRReactComponent = React.ComponentType<any> & {
-  init: (context: RuntimeContext) => Promise<void>;
-  prefetch: (context: RuntimeContext) => Promise<Record<string, any>>;
-};
+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,5 +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/types.d.ts

@@ -11,7 +11,6 @@ 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.0",
+  "version": "2.0.0-beta.2",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -48,6 +48,11 @@
       "node": "./dist/js/node/exports/server.js",
       "default": "./dist/js/treeshaking/exports/server.js"
     },
+    "./document": {
+      "jsnext:source": "./src/document/index.ts",
+      "node": "./dist/js/node/document/index.js",
+      "default": "./dist/js/treeshaking/document/index.js"
+    },
     "./ssr": {
       "jsnext:source": "./src/ssr/index.ts",
       "node": "./dist/js/node/ssr/index",
@@ -93,6 +98,9 @@
       "server": [
         "./dist/types/exports/server.d.ts"
       ],
+      "document": [
+        "./dist/types/document/index.d.ts"
+      ],
       "ssr": [
         "./dist/types/ssr/index.d.ts"
       ],
@@ -120,9 +128,6 @@
     "@modern-js-reduck/plugin-immutable": "^1.0.1",
     "@modern-js-reduck/react": "^1.0.1",
     "@modern-js-reduck/store": "^1.0.3",
-    "@modern-js/plugin": "2.0.0-beta.0",
-    "@modern-js/types": "2.0.0-beta.0",
-    "@modern-js/utils": "2.0.0-beta.0",
     "@types/loadable__component": "^5.13.4",
     "@types/react-helmet": "^6.1.2",
     "@types/redux-logger": "^3.0.9",
@@ -137,18 +142,16 @@
     "react-side-effect": "^2.1.1",
     "redux-logger": "^3.0.6",
     "serialize-javascript": "^6.0.0",
-    "styled-components": "^5.3.1"
+    "styled-components": "^5.3.1",
+    "@modern-js/plugin": "2.0.0-beta.2",
+    "@modern-js/types": "2.0.0-beta.2",
+    "@modern-js/utils": "2.0.0-beta.2"
   },
   "peerDependencies": {
     "react": ">=17",
     "react-dom": ">=17"
   },
   "devDependencies": {
-    "@modern-js/core": "2.0.0-beta.0",
-    "@modern-js/server-core": "2.0.0-beta.0",
-    "@modern-js/utils": "2.0.0-beta.0",
-    "@scripts/build": "2.0.0-beta.0",
-    "@scripts/jest-config": "2.0.0-beta.0",
     "@testing-library/react": "^13.4.0",
     "@testing-library/react-hooks": "^8.0.1",
     "@remix-run/web-fetch": "^4.1.3",
@@ -162,7 +165,13 @@
     "react": "^18",
     "react-dom": "^18",
     "ts-jest": "^27.0.4",
-    "typescript": "^4"
+    "typescript": "^4",
+    "@modern-js/core": "2.0.0-beta.2",
+    "@modern-js/server-core": "2.0.0-beta.2",
+    "@modern-js/utils": "2.0.0-beta.2",
+    "@scripts/build": "2.0.0-beta.2",
+    "@modern-js/app-tools": "2.0.0-beta.2",
+    "@scripts/jest-config": "2.0.0-beta.2"
   },
   "sideEffects": false,
   "modernConfig": {},
@@ -171,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"
   }
 }