Skip to content

Commit 1a15ffc

Browse files
committed
fix(cli,editor): Add env.VITE_PLUS_VERSION for oxlint and oxfmt
1 parent 31e90b9 commit 1a15ffc

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

packages/cli/bin/oxfmt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,13 @@ if (!process.argv.includes('--lsp')) {
1313
import { createRequire } from 'node:module';
1414
import { dirname, join } from 'node:path';
1515
import { pathToFileURL } from 'node:url';
16+
import pkg from '../package.json' with { type: 'json' };
1617

1718
const require = createRequire(import.meta.url);
1819
const oxfmtMainPath = require.resolve('oxfmt');
1920
const oxfmtBin = join(dirname(dirname(oxfmtMainPath)), 'bin', 'oxfmt');
2021

22+
// This allows oxfmt to load vite.config.ts
23+
// For `vp check` and `vp fmt`, it is injected by `merge_resolved_envs_with_version()` in `cli.rs`
24+
process.env.VP_VERSION = pkg.version;
2125
await import(pathToFileURL(oxfmtBin).href);

packages/cli/bin/oxlint

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,13 @@ if (!process.argv.includes('--lsp')) {
1313
import { createRequire } from 'node:module';
1414
import { dirname, join } from 'node:path';
1515
import { pathToFileURL } from 'node:url';
16+
import pkg from '../package.json' with { type: 'json' };
1617

1718
const require = createRequire(import.meta.url);
1819
const oxlintMainPath = require.resolve('oxlint');
1920
const oxlintBin = join(dirname(dirname(oxlintMainPath)), 'bin', 'oxlint');
2021

22+
// This allows oxlint to load vite.config.ts
23+
// For `vp check` and `vp lint`, it is injected by `merge_resolved_envs_with_version()` in `cli.rs`
24+
process.env.VP_VERSION = pkg.version;
2125
await import(pathToFileURL(oxlintBin).href);

packages/cli/binding/src/cli.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ impl SubcommandResolver {
271271
untracked_env: None,
272272
input: None,
273273
}),
274-
envs: merge_resolved_envs(envs, resolved.envs),
274+
envs: merge_resolved_envs_with_version(envs, resolved.envs),
275275
})
276276
}
277277
SynthesizableSubcommand::Fmt { mut args } => {
@@ -309,7 +309,7 @@ impl SubcommandResolver {
309309
untracked_env: None,
310310
input: None,
311311
}),
312-
envs: merge_resolved_envs(envs, resolved.envs),
312+
envs: merge_resolved_envs_with_version(envs, resolved.envs),
313313
})
314314
}
315315
SynthesizableSubcommand::Build { args } => {

0 commit comments

Comments
 (0)