From 4a9679bad109a786b80939ca9ead32f1505be186 Mon Sep 17 00:00:00 2001 From: Innei Date: Sat, 23 Nov 2024 00:31:15 +0800 Subject: [PATCH] fix: revert merge chunk Signed-off-by: Innei --- plugins/vite/deps.ts | 58 ++++++++++++++++++++++++++------------------ vite.config.ts | 1 + 2 files changed, 35 insertions(+), 24 deletions(-) diff --git a/plugins/vite/deps.ts b/plugins/vite/deps.ts index da2c254a8..f63be5612 100644 --- a/plugins/vite/deps.ts +++ b/plugins/vite/deps.ts @@ -15,33 +15,43 @@ export function createDependencyChunksPlugin(dependencies: string[][]): Plugin { return chunkInfo.name.startsWith("vendor/") ? "[name]-[hash].js" : "assets/[name]-[hash].js" } - outputConfig.manualChunks = (id: string) => { - const matchedDep = dependencies.findIndex((dep) => - dep.some((d) => id.includes(`/node_modules/${d}`)), - ) + outputConfig.manualChunks = (id: string, { getModuleInfo }) => { + const moduleInfo = getModuleInfo(id) + if (moduleInfo?.dynamicImporters?.length && moduleInfo?.importers?.length) { + return null + } + + const matchedDep = dependencies.findIndex((dep) => { + return dep.some((d) => { + const pattern = `/node_modules/${d}/` + return id.includes(pattern) && !id.includes(`${pattern}node_modules/`) + }) + }) + if (matchedDep !== -1) { return `vendor/${matchedDep}` } - const chunkMap: Record = { - modules: ["/src/modules"], - infra: [ - "/src/store", - "/src/atoms", - "/src/database", - "/src/services", - "/src/initialize", - "/src/lib", - "/src/queries", - ], - components: ["/src/components", "/src/hooks"], - packages: ["@follow/"], - app: ["/src/pages", "/src/providers", "/src/constants", "/src/App", "/src/main"], - } - for (const [chunk, paths] of Object.entries(chunkMap)) { - if (paths.some((path) => id.includes(path))) { - return chunk - } - } + // const chunkMap: Record = { + // modules: ["/src/modules"], + // infra: [ + // "/src/store", + // "/src/atoms", + // "/src/database", + // "/src/services", + // "/src/initialize", + // "/src/lib", + // "/src/queries", + // ], + // components: ["/src/components", "/src/hooks"], + // packages: ["@follow/"], + // app: ["/src/pages", "/src/providers", "/src/constants", "/src/App", "/src/main"], + // } + // for (const [chunk, paths] of Object.entries(chunkMap)) { + // if (paths.some((path) => id.includes(path))) { + // return chunk + // } + // } + return null } }, } diff --git a/vite.config.ts b/vite.config.ts index 0304d2bdf..9c9903029 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -59,6 +59,7 @@ export default ({ mode }) => { __debug_proxy: resolve(ROOT, "/__debug_proxy.html"), }, }, + minify: false, }, server: { port: 2233,