Skip to content

Commit b5e4d12

Browse files
committed
fix: collect Page chunk modules in entry file
1 parent 23ab99d commit b5e4d12

File tree

4 files changed

+10
-1
lines changed

4 files changed

+10
-1
lines changed

packages/rspack/src/utils/split-chunk.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ export class splitChunkPlugin {
4242
: incomings
4343
.map((c) => {
4444
const { query, path } = (c.originModule as NormalModule)?.resourceResolveData ?? {}
45+
if (path?.includes('ssr-plugin') || path?.includes('packages/plugin')) {
46+
return 'Page'
47+
}
4548
return query?.includes('chunkName') ? chunkNameRe.exec(query ?? '')?.[1] : dependenciesMap[path ?? '']
4649
})
4750
.flat()

packages/utils/src/server/parse.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ const parseFeRoutes = async () => {
5959
const isReact = framework.includes('ssr-plugin-react')
6060
let routes = `
6161
// The file is provisional which will be overwritten when restart
62-
export const FeRoutes = ${JSON.stringify(arr)}
6362
export { default as Layout } from "${layoutPath}"
6463
export { default as App } from "${AppPath}"
6564
${layoutFetch ? 'export { default as layoutFetch } from "@/components/layout/fetch"' : ''}
6665
${accessStore && !isReact ? 'export * as store from "@/store/index"' : ''}
6766
${accessStore && isReact ? 'export * from "@/store/index"' : ''}
67+
export const FeRoutes = ${JSON.stringify(arr)}
6868
`
6969
routes = routes.replace(/"component":("(.+?)")/g, (_global, _m1, m2) => {
7070
const currentWebpackChunkName = re.exec(routes)![2]

packages/vite/src/build-plugins.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ const asyncOptimizeChunkPlugin = (): Plugin => {
5858
const chunkName = chunkNameRe.exec(id)![1]
5959
dependenciesMap[getModuleName(id)] = [chunkName]
6060
}
61+
if (id.includes('client-entry')) {
62+
dependenciesMap[getModuleName(id)] = ['Page']
63+
}
6164
},
6265

6366
async buildEnd(this, err) {

packages/webpack/src/utils/split-chunk.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ export class splitChunkPlugin {
4141
? [chunkNameRe.exec(normalModule.resource ?? '')?.[1]]
4242
: incomings
4343
.map((c) => {
44+
if (c.resource?.includes('ssr-plugin') || c.resource?.includes('packages/plugin')) {
45+
return 'Page'
46+
}
4447
return c.resource?.includes('chunkName')
4548
? chunkNameRe.exec(c.resource ?? '')?.[1]
4649
: dependenciesMap[c.resource?.split('?')[0] ?? '']

0 commit comments

Comments
 (0)