ssr-plugin-react 6.2.44 → 6.2.47

package/src/entry/create-router.ts

@@ -1,28 +1,10 @@
-// @ts-expect-error
+import { combineRoutes } from 'ssr-common-utils'
 import * as declareRoutes from '_build/ssr-declare-routes'
-// @ts-expect-error
 import * as ManualRoutes from '_build/ssr-manual-routes'
-import { ReactRoutesType } from 'ssr-types-react'
+import { ReactRoutesType } from 'ssr-types'
 
-const declareRoutesWithType = declareRoutes as ReactRoutesType
-const ManualRoutesWithType = ManualRoutes as ReactRoutesType
+const Routes = combineRoutes(declareRoutes, ManualRoutes) as ReactRoutesType
 
-const Routes: ReactRoutesType = {
-  ...declareRoutes,
-  ...ManualRoutesWithType
-}
-if (ManualRoutesWithType.FeRoutes) {
-  // 声明式路由覆盖约定式路由同名path
-  const combineRoutes = declareRoutesWithType.FeRoutes.map(route => ManualRoutesWithType.FeRoutes.find(e => e.path === route.path) ?? route)
-  ManualRoutesWithType.FeRoutes.forEach(route => {
-    // 补充声明式路由新增的配置
-    const found = combineRoutes.find(e => e.path === route.path)
-    if (!found) {
-      combineRoutes.push(route)
-    }
-  })
-  Routes.FeRoutes = combineRoutes
-}
 export {
   Routes
 }

package/src/entry/server-entry.tsx

@@ -1,14 +1,13 @@
 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 { setStoreContext } from 'ssr-common-utils'
+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'
 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) => {
   const { mode, parallelFetch, prefix, isVite, isDev, clientPrefix } = config

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,14 @@ const serverConfig: UserConfig = {
     keepNames: true,
     logOverride: { 'this-is-undefined-in-esm': 'silent' }
   },
+  optimizeDeps: {
+    include: ['react-router'].concat(...viteConfig?.().client?.otherConfig?.optimizeDeps?.include ?? []),
+    exclude: ['ssr-hoc-react'].concat(...viteConfig?.().client?.otherConfig?.optimizeDeps?.exclude ?? []),
+    esbuildOptions: {
+      // @ts-expect-error
+      bundle: isDev
+    }
+  },
   build: {
     ...viteConfig?.().server?.otherConfig?.build,
     ssr: reactServerEntry,