Skip to content

Commit d6369f3

Browse files
authored
fix: resolve oxc runtime from Vite directory correctly (#269)
1 parent 24721d2 commit d6369f3

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

packages/vite/rolldown.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ function buildTimeImportMetaUrlPlugin(): Plugin {
351351
for (const { t, ss, se } of imports) {
352352
if (t === 3 && code.slice(se, se + 4) === '.url') {
353353
// ignore import.meta.url with /** #__KEEP__ */ comment
354-
if (keepCommentRE.test(code.slice(0, se))) {
354+
if (keepCommentRE.test(code.slice(0, ss))) {
355355
keepCommentRE.lastIndex = 0
356356
continue
357357
}

packages/vite/src/node/plugins/oxc.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,9 @@ export function oxcPlugin(config: ResolvedConfig): Plugin {
295295
jsxRefreshInclude,
296296
jsxRefreshExclude,
297297
isServerConsumer: environment.config.consumer === 'server',
298-
runtimeResolveBase: normalizePath(url.fileURLToPath(import.meta.url)),
298+
runtimeResolveBase: normalizePath(
299+
url.fileURLToPath(/** #__KEEP__ */ import.meta.url),
300+
),
299301
jsxInject,
300302
transformOptions,
301303
})
@@ -344,7 +346,9 @@ export function oxcPlugin(config: ResolvedConfig): Plugin {
344346

345347
return result
346348
}
347-
const runtimeResolveBase = normalizePath(url.fileURLToPath(import.meta.url))
349+
const runtimeResolveBase = normalizePath(
350+
url.fileURLToPath(/** #__KEEP__ */ import.meta.url),
351+
)
348352

349353
let server: ViteDevServer
350354

@@ -526,7 +530,7 @@ async function generateRuntimeHelpers(
526530
runtimeHelpers: readonly [string, string][],
527531
): Promise<string> {
528532
const bundle = await rolldown({
529-
cwd: url.fileURLToPath(import.meta.url),
533+
cwd: url.fileURLToPath(/** #__KEEP__ */ import.meta.url),
530534
input: 'entrypoint',
531535
platform: 'neutral',
532536
logLevel: 'silent',

0 commit comments

Comments
 (0)