Skip to content

Commit 91e5c10

Browse files
committed
fix: bring back ssr module deps in findModuleDependencies
1 parent 78fcb9f commit 91e5c10

1 file changed

Lines changed: 13 additions & 20 deletions

File tree

packages/start/src/server/collect-styles.ts

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@ import path from "node:path";
22
import { join, resolve } from "pathe";
33
import type { DevEnvironment, EnvironmentModuleNode } from "vite";
44

5+
const prepareTransformResult = async (vite: DevEnvironment, module: EnvironmentModuleNode) => {
6+
if (module.transformResult || !module.id) return;
7+
try {
8+
await vite.transformRequest(module.id);
9+
} catch (e) {
10+
console.warn(`Failed to transform '${module.id}' during css collection.`, e);
11+
}
12+
};
13+
514
async function getViteModuleNode(
615
vite: DevEnvironment,
716
file: string,
@@ -28,30 +37,13 @@ async function getViteModuleNode(
2837
node = vite.moduleGraph.getModuleById(nodePath);
2938
}
3039

31-
if (nodePath.includes("node_modules")) {
40+
if (!node || nodePath.includes("node_modules")) {
3241
return;
3342
}
3443

35-
try {
36-
if (!node?.transformResult && !ssr) {
37-
await vite.transformRequest(nodePath);
38-
node = vite.moduleGraph.getModuleById(nodePath);
39-
}
40-
41-
// if (ssr && !node?.ssrTransformResult) {
42-
// if (skip.includes(file)) {
43-
// return null;
44-
// }
45-
// await vite.ssrLoadModule(file);
46-
// node = vite.moduleGraph.getModuleById(nodePath);
47-
// }
44+
await prepareTransformResult(vite, node);
4845

49-
// vite.config.logger.error = prev;
50-
return node;
51-
} catch (e) {
52-
// vite.config.logger.error = prev;
53-
return null;
54-
}
46+
return node;
5547
}
5648

5749
async function findModuleDependencies(
@@ -76,6 +68,7 @@ async function findModuleDependencies(
7668
if (module.url.endsWith(".css")) return;
7769

7870
if (ssr) {
71+
await prepareTransformResult(vite, module);
7972
if (module.transformResult?.deps) {
8073
for (const url of module.transformResult.deps) {
8174
await addByUrl(url, ssr);

0 commit comments

Comments
 (0)