ssr-plugin-react 6.2.42 → 6.2.45

package/src/entry/server-entry.tsx

@@ -1,18 +1,19 @@
 import * as React from 'react'
+import { createElement } from 'react'
 import { StaticRouter } from 'react-router-dom'
-import { findRoute, getManifest, logGreen, normalizePath, getAsyncCssChunk, getAsyncJsChunk, reactRefreshFragment } from 'ssr-server-utils'
-import { ISSRContext, IConfig, ReactRoutesType, ReactESMPreloadFeRouteItem, DynamicFC, StaticFC } from 'ssr-types-react'
+import { findRoute, getManifest, logGreen, normalizePath, getAsyncCssChunk, getAsyncJsChunk, reactRefreshFragment, setStoreContext } from 'ssr-common-utils'
+import { ISSRContext, IConfig, ReactESMPreloadFeRouteItem, DynamicFC, StaticFC } from 'ssr-types'
 import { serialize } from 'ssr-serialize-javascript'
-// @ts-expect-error
 import { STORE_CONTEXT as Context } from '_build/create-context'
 import { Routes } from './create-router'
 
-const { FeRoutes, layoutFetch, state, Layout } = Routes as ReactRoutesType
+const { FeRoutes, layoutFetch, state, Layout } = Routes
 
-const serverRender = async (ctx: ISSRContext, config: IConfig): Promise<React.ReactElement> => {
+const serverRender = async (ctx: ISSRContext, config: IConfig) => {
   const { mode, parallelFetch, prefix, isVite, isDev, clientPrefix } = config
   const path = normalizePath(ctx.request.path, prefix)
   const routeItem = findRoute<ReactESMPreloadFeRouteItem>(FeRoutes, path)
+  setStoreContext(Context)
 
   if (!routeItem) {
     throw new Error(`
@@ -23,7 +24,7 @@ const serverRender = async (ctx: ISSRContext, config: IConfig): Promise<React.Re
 
   const { fetch, webpackChunkName, component } = routeItem
   const dynamicCssOrder = await getAsyncCssChunk(ctx, webpackChunkName, config)
-  const dynamicJsOrder = await getAsyncJsChunk(ctx, webpackChunkName,  config)
+  const dynamicJsOrder = await getAsyncJsChunk(ctx, webpackChunkName, config)
   const manifest = await getManifest(config)
 
   const injectCss = ((isVite && isDev) ? [
@@ -58,7 +59,6 @@ const serverRender = async (ctx: ISSRContext, config: IConfig): Promise<React.Re
   let fetchData = {}
   if (!isCsr) {
     const currentFetch = fetch ? (await fetch()).default : null
-
     // csr 下不需要服务端获取数据
     if (parallelFetch) {
       [layoutFetchData, fetchData] = await Promise.all([
@@ -74,15 +74,20 @@ const serverRender = async (ctx: ISSRContext, config: IConfig): Promise<React.Re
   const injectState = isCsr ? <script dangerouslySetInnerHTML={{ __html: `window.prefix="${prefix}";${clientPrefix ? `window.clientPrefix="${clientPrefix}";` : ''}` }} /> : <script dangerouslySetInnerHTML={{
     __html: `window.__USE_SSR__=true; window.__INITIAL_DATA__ =${serialize(combineData)}; window.prefix="${prefix}";${clientPrefix ? `window.clientPrefix="${clientPrefix}";` : ''}`
   }} />
-  return (
-    <StaticRouter location={ctx.request.url} basename={prefix === '/' ? undefined : prefix}>
-      <Context.Provider value={{ state: combineData }}>
-        <Layout ctx={ctx} config={config} staticList={staticList} injectState={injectState}>
-          <Component />
-        </Layout>
-      </Context.Provider>
-    </StaticRouter>
-  )
+  // with jsx type error, use createElement here
+  return createElement(StaticRouter, {
+    location: ctx.request.url,
+    basename: prefix === '/' ? undefined : prefix
+  }, createElement(Context.Provider, {
+    value: {
+      state: combineData
+    }
+  }, createElement(Layout, {
+    ctx: ctx,
+    config: config,
+    staticList: staticList,
+    injectState: injectState
+  }, createElement(Component, null))))
 }
 
 export {

package/src/index.ts

@@ -1,4 +1,4 @@
-import { loadConfig } from 'ssr-server-utils'
+import { loadConfig } from 'ssr-common-utils'
 
 const { isVite, optimize } = loadConfig()
 const spinner = require('ora')('Building')

package/src/tools/vite.ts

@@ -2,7 +2,7 @@ import { build, UserConfig } from 'vite'
 import {
   loadConfig, chunkNamePlugin, rollupOutputOptions, manifestPlugin, commonConfig,
   asyncOptimizeChunkPlugin, getOutputPublicPath
-} from 'ssr-server-utils'
+} from 'ssr-common-utils'
 import react from '@vitejs/plugin-react'
 import { createStyleImportPlugin, AndDesignVueResolve, VantResolve, ElementPlusResolve, NutuiResolve, AntdResolve } from 'ssr-vite-plugin-style-import'
 const { getOutput, reactServerEntry, reactClientEntry, viteConfig, supportOptinalChaining, isDev, define, babelOptions, optimize } = loadConfig()
@@ -44,6 +44,12 @@ const serverConfig: UserConfig = {
     keepNames: true,
     logOverride: { 'this-is-undefined-in-esm': 'silent' }
   },
+  optimizeDeps: {
+    esbuildOptions: {
+      // @ts-expect-error
+      bundle: isDev
+    }
+  },
   build: {
     ...viteConfig?.().server?.otherConfig?.build,
     ssr: reactServerEntry,