Skip to content

Commit 2ee44b7

Browse files
committed
progress
1 parent ca4a435 commit 2ee44b7

File tree

3 files changed

+19
-0
lines changed

3 files changed

+19
-0
lines changed

sdk/src/vite/directiveModulesDevPlugin.mts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import path from "node:path";
33
import { writeFileSync, mkdirSync } from "node:fs";
44
import { normalizeModulePath } from "../lib/normalizeModulePath.mjs";
55
import { runEsbuildScan } from "./runEsbuildScan.mjs";
6+
import { getViteEsbuild } from "./getViteEsbuild.mjs";
67

78
export const VIRTUAL_CLIENT_BARREL_ID = "virtual:rwsdk:client-module-barrel";
89
export const VIRTUAL_SERVER_BARREL_ID = "virtual:rwsdk:server-module-barrel";

sdk/src/vite/getViteEsbuild.mts

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import path from "node:path";
2+
import { createRequire } from "node:module";
3+
4+
const require = createRequire(import.meta.url);
5+
6+
export async function getViteEsbuild(projectRootDir: string): Promise<any> {
7+
const vitePath = require.resolve("vite/package.json", {
8+
paths: [projectRootDir],
9+
});
10+
const viteDir = path.dirname(vitePath);
11+
12+
const esbuildPath = require.resolve("esbuild", { paths: [viteDir] });
13+
14+
const esbuildModule = await import(esbuildPath);
15+
return esbuildModule.default || esbuildModule;
16+
}

sdk/src/vite/runEsbuildScan.mts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import { hasDirective } from "./hasDirective.mjs";
1313
import path from "node:path";
1414
import debug from "debug";
1515
import { ensureAliasArray } from "./ensureAliasArray.mjs";
16+
import { getViteEsbuild } from "./getViteEsbuild.mjs";
1617

1718
const log = debug("rwsdk:vite:esbuild-scan");
1819

@@ -96,6 +97,7 @@ export async function runEsbuildScan({
9697
clientFiles: Set<string>;
9798
serverFiles: Set<string>;
9899
}) {
100+
const esbuild = await getViteEsbuild(rootConfig.root);
99101
const env = rootConfig.environments[envName];
100102
const input = env.build.rollupOptions?.input;
101103
let entries: string[];

0 commit comments

Comments
 (0)