ssr-plugin-react 7.0.6 → 7.0.7

package/package.json

@@ -1,59 +1,58 @@
 {
   "name": "ssr-plugin-react",
-  "version": "7.0.6",
+  "version": "7.0.7",
   "description": "plugin-react for ssr",
-  "main": "./cjs/index.js",
-  "module": "./esm/index.js",
-  "sideEffects": false,
-  "scripts": {
-    "build": "concurrently \"tsc -p ./tsconfig.cjs.json \" \" tsc -p ./tsconfig.esm.json\"",
-    "watch": "concurrently \"tsc -w -p ./tsconfig.cjs.json \" \"tsc -w -p ./tsconfig.esm.json \""
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/zhangyuang/ssr.git"
-  },
   "keywords": [
     "cli",
+    "react",
     "serverless",
     "ssr",
-    "react",
     "vue"
   ],
-  "author": "zhangyuang",
-  "license": "MIT",
+  "homepage": "https://github.com/zhangyuang/ssr#readme",
   "bugs": {
     "url": "https://github.com/zhangyuang/ssr/issues"
   },
-  "engines": {
-    "node": ">=14.17.0"
+  "license": "MIT",
+  "author": "zhangyuang",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/zhangyuang/ssr.git"
+  },
+  "sideEffects": false,
+  "main": "./cjs/index.js",
+  "module": "./esm/index.js",
+  "scripts": {
+    "build": "concurrently \"tsc -p ./tsconfig.cjs.json \" \" tsc -p ./tsconfig.esm.json\"",
+    "watch": "concurrently \"tsc -w -p ./tsconfig.cjs.json \" \"tsc -w -p ./tsconfig.esm.json \""
   },
-  "homepage": "https://github.com/zhangyuang/ssr#readme",
   "dependencies": {
-    "ssr-common-utils": "^7.0.0",
-    "@vitejs/plugin-react-oxc": "^0.3.0",
-    "@vitejs/plugin-react": "^4.0.0",
+    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.5",
+    "@vitejs/plugin-react": "^6.0.1",
     "babel-preset-react-app": "^10.0.0",
+    "ssr-common-utils": "^7.0.0",
     "ssr-hoc-react": "^7.0.0",
-    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.5",
     "valtio": "^1.13.2"
   },
-  "peerDependencies": {
-    "react": ">=17.0.1",
-    "react-dom": ">=17.0.0",
-    "react-router": "^5.1.8",
-    "react-router-dom": "^5.0.0"
-  },
   "devDependencies": {
-    "@types/react18": "npm:@types/react@^18.0.0",
-    "@types/react-dom18": "npm:@types/react-dom@^18.0.0",
     "@types/react": "^17.0.0",
     "@types/react-dom": "^17.0.0",
+    "@types/react-dom18": "npm:@types/react-dom@^18.0.0",
     "@types/react-router-dom": "^5.1.3",
+    "@types/react18": "npm:@types/react@^18.0.0",
     "@types/webpack": "^4.41.10",
     "concurrently": "^5.1.0",
     "ssr-types": "workspace:*",
-    "ssr-webpack": "workspace:*",
-    "ssr-vite": "workspace:*"
+    "ssr-vite": "workspace:*",
+    "ssr-webpack": "workspace:*"
+  },
+  "peerDependencies": {
+    "react": ">=17.0.1",
+    "react-dom": ">=17.0.0",
+    "react-router": "^5.1.8",
+    "react-router-dom": "^5.0.0"
+  },
+  "engines": {
+    "node": ">=14.17.0"
   }
 }

package/src/entry/context.tsx

@@ -1,42 +1,46 @@
-import { useReducer, createElement } from 'react'
-import { IProps, Action, IWindow, ReactRoutesType } from 'ssr-types'
-import { Routes } from './create'
+import { useReducer, createElement } from "react";
+import { IProps, Action, IWindow, ReactRoutesType } from "ssr-types";
+import { Routes } from "./create";
 
-const { reducer, state } = Routes as ReactRoutesType
+const { reducer, state } = Routes as ReactRoutesType;
 
-const userState = state ?? {}
-const userReducer = reducer ?? function () {}
+const userState = state ?? {};
+const userReducer = reducer ?? function () {};
 
-const isDev = process.env.NODE_ENV !== 'production'
+const isDev = process.env.NODE_ENV !== "production";
 
-declare const window: IWindow
+declare const window: IWindow;
 
 function defaultReducer(state: any, action: Action) {
-	switch (action.type) {
-		case 'updateContext':
-			if (isDev) {
-				console.log('[SSR:updateContext]: dispatch updateContext with action')
-				console.log(action)
-			}
-			return { ...state, ...action.payload }
-	}
+  switch (action.type) {
+    case "updateContext":
+      if (isDev) {
+        console.log("[SSR:updateContext]: dispatch updateContext with action");
+        console.log(action);
+      }
+      return { ...state, ...action.payload };
+  }
 }
 
 function combineReducer(state: any, action: any) {
-	return defaultReducer(state, action) || userReducer(state, action)
+  return defaultReducer(state, action) || userReducer(state, action);
 }
 
 export function AppContext(props: IProps) {
-	const initialState = Object.assign({}, userState ?? {}, __isBrowser__ ? window?.__INITIAL_DATA__ : props.initialState)
-	const [state, dispatch] = useReducer(combineReducer, initialState)
-	return createElement(
-		props.context.Provider,
-		{
-			value: {
-				state,
-				dispatch
-			}
-		},
-		props.children as any
-	)
+  const initialState = Object.assign(
+    {},
+    userState ?? {},
+    __isBrowser__ ? window?.__INITIAL_DATA__ : props.initialState,
+  );
+  const [state, dispatch] = useReducer(combineReducer, initialState);
+  return createElement(
+    props.context.Provider,
+    {
+      value: {
+        state,
+        dispatch,
+      },
+    },
+    props.children as any,
+  );
 }

package/src/entry/create.ts

@@ -1,31 +1,31 @@
-import * as declareRoutes from '_build/ssr-declare-routes'
-import * as ManualRoutes from '_build/ssr-manual-routes'
-import { createContext } from 'react'
-import { combineRoutes } from 'ssr-common-utils'
-import { deepClone } from 'ssr-deepclone'
-import { proxy } from 'valtio'
-import type { IContext, ReactRoutesType } from 'ssr-types'
+import * as declareRoutes from "_build/ssr-declare-routes";
+import * as ManualRoutes from "_build/ssr-manual-routes";
+import { createContext } from "react";
+import { combineRoutes } from "ssr-common-utils";
+import { deepClone } from "ssr-deepclone";
+import { proxy } from "valtio";
+import type { IContext, ReactRoutesType } from "ssr-types";
 
-export const Routes = combineRoutes(declareRoutes, ManualRoutes) as ReactRoutesType
+export const Routes = combineRoutes(declareRoutes, ManualRoutes) as ReactRoutesType;
 export const ssrCreateContext = () => {
-	const STORE_CONTEXT = createContext<IContext>({
-		state: {}
-	})
-	if (__isBrowser__) {
-		window.STORE_CONTEXT = STORE_CONTEXT
-	}
-	return STORE_CONTEXT
-}
+  const STORE_CONTEXT = createContext<IContext>({
+    state: {},
+  });
+  if (__isBrowser__) {
+    window.STORE_CONTEXT = STORE_CONTEXT;
+  }
+  return STORE_CONTEXT;
+};
 
 export function createStore() {
-	const { store } = Routes
-	const storeInstance = __isBrowser__ ? store : proxy(deepClone(store))
-	if (__isBrowser__) {
-		for (const key in storeInstance) {
-			if (__isBrowser__ && window.__VALTIO_DATA__?.[key]) {
-				Object.assign(storeInstance[key], window.__VALTIO_DATA__[key])
-			}
-		}
-	}
-	return storeInstance
+  const { store } = Routes;
+  const storeInstance = __isBrowser__ ? store : proxy(deepClone(store));
+  if (__isBrowser__) {
+    for (const key in storeInstance) {
+      if (__isBrowser__ && window.__VALTIO_DATA__?.[key]) {
+        Object.assign(storeInstance[key], window.__VALTIO_DATA__[key]);
+      }
+    }
+  }
+  return storeInstance;
 }

package/src/entry/react17-client-entry.tsx

@@ -1,73 +1,73 @@
-import type { LayoutProps } from 'ssr-types'
-import ReactDOM from 'react-dom'
-import { createElement } from 'react'
-import { BrowserRouter, Route, Switch } from 'react-router-dom'
-import { preloadComponent, isMicro, setStoreContext, setStore } from 'ssr-common-utils'
-import { wrapComponent } from 'ssr-hoc-react'
-import { ssrCreateContext, Routes, createStore } from './create'
-import { AppContext } from './context'
+import type { LayoutProps } from "ssr-types";
+import ReactDOM from "react-dom";
+import { createElement } from "react";
+import { BrowserRouter, Route, Switch } from "react-router-dom";
+import { preloadComponent, isMicro, setStoreContext, setStore } from "ssr-common-utils";
+import { wrapComponent } from "ssr-hoc-react";
+import { ssrCreateContext, Routes, createStore } from "./create";
+import { AppContext } from "./context";
 
-const { FeRoutes, layoutFetch, App } = Routes
+const { FeRoutes, layoutFetch, App } = Routes;
 
 const clientRender = async (): Promise<void> => {
-	const IApp =
-		App ??
-		function (props: LayoutProps) {
-			return props.children!
-		}
-	const context = ssrCreateContext() as any
-	setStoreContext(context)
-	const store = createStore()
-	setStore(store ?? {})
-	const baseName = isMicro() ? window.clientPrefix : window.prefix
-	const routes = await preloadComponent(FeRoutes, baseName)
-	const container = document.querySelector(window.ssrDevInfo.rootId ?? '#app')!
-	const ele = createElement(
-		//@ts-ignore
-		BrowserRouter,
-		{
-			basename: baseName
-		},
-		createElement(AppContext, {
-			context,
-			children: createElement(
-				Switch,
-				null,
-				createElement(
-					IApp as any,
-					null,
-					createElement(
-						Switch,
-						null,
-						routes.map((item) => {
-							const { fetch, component, path } = item
-							component.fetch = fetch
-							component.layoutFetch = layoutFetch
-							const WrappedComponent = wrapComponent(component)
-							return createElement(Route, {
-								exact: true,
-								key: path,
-								path: path,
-								render: (props) =>
-									createElement(WrappedComponent, {
-										...props,
-										key: props.history.location.key
-									})
-							})
-						})
-					)
-				)
-			)
-		})
-	)
+  const IApp =
+    App ??
+    function (props: LayoutProps) {
+      return props.children!;
+    };
+  const context = ssrCreateContext() as any;
+  setStoreContext(context);
+  const store = createStore();
+  setStore(store ?? {});
+  const baseName = isMicro() ? window.clientPrefix : window.prefix;
+  const routes = await preloadComponent(FeRoutes, baseName);
+  const container = document.querySelector(window.ssrDevInfo.rootId ?? "#app")!;
+  const ele = createElement(
+    //@ts-ignore
+    BrowserRouter,
+    {
+      basename: baseName,
+    },
+    createElement(AppContext, {
+      context,
+      children: createElement(
+        Switch,
+        null,
+        createElement(
+          IApp as any,
+          null,
+          createElement(
+            Switch,
+            null,
+            routes.map((item) => {
+              const { fetch, component, path } = item;
+              component.fetch = fetch;
+              component.layoutFetch = layoutFetch;
+              const WrappedComponent = wrapComponent(component);
+              return createElement(Route, {
+                exact: true,
+                key: path,
+                path: path,
+                render: (props) =>
+                  createElement(WrappedComponent, {
+                    ...props,
+                    key: props.history.location.key,
+                  }),
+              });
+            }),
+          ),
+        ),
+      ),
+    }),
+  );
 
-	ReactDOM[window.__USE_SSR__ ? 'hydrate' : 'render'](ele, container)
+  ReactDOM[window.__USE_SSR__ ? "hydrate" : "render"](ele, container);
 
-	if (!window.__USE_VITE__) {
-		;(module as any)?.hot?.accept?.()
-	}
-}
+  if (!window.__USE_VITE__) {
+    (module as any)?.hot?.accept?.();
+  }
+};
 
-clientRender()
+clientRender();
 
-export { clientRender }
+export { clientRender };

package/src/entry/react18-client-entry.tsx

@@ -1,78 +1,78 @@
-import type { hydrateRoot as HydrateRoot, createRoot as CreateRoot } from 'react-dom18/client'
-import type { LayoutProps } from 'ssr-types'
+import type { hydrateRoot as HydrateRoot, createRoot as CreateRoot } from "react-dom18/client";
+import type { LayoutProps } from "ssr-types";
 
 //@ts-ignore
-import { hydrateRoot, createRoot } from 'react-dom/client'
-import { createElement } from 'react'
-import { BrowserRouter, Route, Switch } from 'react-router-dom'
-import { preloadComponent, isMicro, setStoreContext, setStore } from 'ssr-common-utils'
-import { wrapComponent } from 'ssr-hoc-react'
-import { ssrCreateContext, Routes, createStore } from './create'
-import { AppContext } from './context'
-const { FeRoutes, layoutFetch, App } = Routes
+import { hydrateRoot, createRoot } from "react-dom/client";
+import { createElement } from "react";
+import { BrowserRouter, Route, Switch } from "react-router-dom";
+import { preloadComponent, isMicro, setStoreContext, setStore } from "ssr-common-utils";
+import { wrapComponent } from "ssr-hoc-react";
+import { ssrCreateContext, Routes, createStore } from "./create";
+import { AppContext } from "./context";
+const { FeRoutes, layoutFetch, App } = Routes;
 const clientRender = async (): Promise<void> => {
-	const IApp =
-		App ??
-		function (props: LayoutProps) {
-			return props.children!
-		}
-	const context = ssrCreateContext() as any
-	setStoreContext(context)
-	const store = createStore()
-	setStore(store ?? {})
-	const baseName = isMicro() ? window.clientPrefix : window.prefix
-	const routes = await preloadComponent(FeRoutes, baseName)
-	const container = document.querySelector(window.ssrDevInfo.rootId ?? '#app')!
-	const ele = createElement(
-		//@ts-ignore
-		BrowserRouter,
-		{
-			basename: baseName
-		},
-		createElement(AppContext, {
-			context,
-			children: createElement(
-				Switch,
-				null,
-				createElement(
-					IApp as any,
-					null,
-					createElement(
-						Switch,
-						null,
-						routes.map((item) => {
-							const { fetch, component, path } = item
-							component.fetch = fetch
-							component.layoutFetch = layoutFetch
-							const WrappedComponent = wrapComponent(component)
-							return createElement(Route, {
-								exact: true,
-								key: path,
-								path: path,
-								render: (props) =>
-									createElement(WrappedComponent, {
-										...props,
-										key: props.history.location.key
-									})
-							})
-						})
-					)
-				)
-			)
-		})
-	)
-	if (window.__USE_SSR__) {
-		;(hydrateRoot as typeof HydrateRoot)(container, ele)
-	} else {
-		const root = (createRoot as typeof CreateRoot)(container)
-		root.render(ele)
-	}
+  const IApp =
+    App ??
+    function (props: LayoutProps) {
+      return props.children!;
+    };
+  const context = ssrCreateContext() as any;
+  setStoreContext(context);
+  const store = createStore();
+  setStore(store ?? {});
+  const baseName = isMicro() ? window.clientPrefix : window.prefix;
+  const routes = await preloadComponent(FeRoutes, baseName);
+  const container = document.querySelector(window.ssrDevInfo.rootId ?? "#app")!;
+  const ele = createElement(
+    //@ts-ignore
+    BrowserRouter,
+    {
+      basename: baseName,
+    },
+    createElement(AppContext, {
+      context,
+      children: createElement(
+        Switch,
+        null,
+        createElement(
+          IApp as any,
+          null,
+          createElement(
+            Switch,
+            null,
+            routes.map((item) => {
+              const { fetch, component, path } = item;
+              component.fetch = fetch;
+              component.layoutFetch = layoutFetch;
+              const WrappedComponent = wrapComponent(component);
+              return createElement(Route, {
+                exact: true,
+                key: path,
+                path: path,
+                render: (props) =>
+                  createElement(WrappedComponent, {
+                    ...props,
+                    key: props.history.location.key,
+                  }),
+              });
+            }),
+          ),
+        ),
+      ),
+    }),
+  );
+  if (window.__USE_SSR__) {
+    (hydrateRoot as typeof HydrateRoot)(container, ele);
+  } else {
+    const root = (createRoot as typeof CreateRoot)(container);
+    root.render(ele);
+  }
 
-	if (!window.__USE_VITE__) {
-		;(module as any)?.hot?.accept?.()
-	}
-}
+  if (!window.__USE_VITE__) {
+    (module as any)?.hot?.accept?.();
+  }
+};
 
-clientRender()
+clientRender();
 
-export { clientRender }
+export { clientRender };