Skip to content

fix(cli,bin): Add env.VP_VERSION for oxlint and oxfmt #946

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
leaysgur wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −2
Open

fix(cli,bin): Add env.VP_VERSION for oxlint and oxfmt #946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/cli/bin/oxfmt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,13 @@ if (!process.argv.includes('--lsp')) {
import { createRequire } from 'node:module';
import { dirname, join } from 'node:path';
import { pathToFileURL } from 'node:url';
import pkg from '../package.json' with { type: 'json' };

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

// This allows oxfmt to load vite.config.ts
// For `vp check` and `vp fmt`, it is injected by `merge_resolved_envs_with_version()` in `cli.rs`
process.env.VP_VERSION = pkg.version;
await import(pathToFileURL(oxfmtBin).href);
4 changes: 4 additions & 0 deletions packages/cli/bin/oxlint
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,13 @@ if (!process.argv.includes('--lsp')) {
import { createRequire } from 'node:module';
import { dirname, join } from 'node:path';
import { pathToFileURL } from 'node:url';
import pkg from '../package.json' with { type: 'json' };

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

// This allows oxlint to load vite.config.ts
// For `vp check` and `vp lint`, it is injected by `merge_resolved_envs_with_version()` in `cli.rs`
process.env.VP_VERSION = pkg.version;
await import(pathToFileURL(oxlintBin).href);
4 changes: 2 additions & 2 deletions packages/cli/binding/src/cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ impl SubcommandResolver {
untracked_env: None,
input: None,
}),
envs: merge_resolved_envs(envs, resolved.envs),
envs: merge_resolved_envs_with_version(envs, resolved.envs),
})
}
SynthesizableSubcommand::Fmt { mut args } => {
Expand Down Expand Up @@ -309,7 +309,7 @@ impl SubcommandResolver {
untracked_env: None,
input: None,
}),
envs: merge_resolved_envs(envs, resolved.envs),
envs: merge_resolved_envs_with_version(envs, resolved.envs),
})
}
SynthesizableSubcommand::Build { args } => {
Expand Down
Loading