Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion packages/cli/snap-tests/command-helper/snap.txt
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ Usage: [-c=PATH] [PATH]...
Mode Options:
--init Initialize `.oxfmtrc.json` with default values
--migrate=SOURCE Migrate configuration to `.oxfmtrc.json` from specified source
Available sources: prettier
Available sources: prettier, biome
--lsp Start language server protocol (LSP) server
--stdin-filepath=PATH Specify the file name to use to infer which parser to use

Expand Down
10 changes: 8 additions & 2 deletions packages/cli/src/resolve-lint.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,14 @@ export async function lint(): Promise<{
binPath: string;
envs: Record<string, string>;
}> {
// Resolve the oxlint binary directly (it's a native executable)
const binPath = resolve('oxlint/bin/oxlint');
// Resolve the oxlint package path first, then navigate to the bin file.
// The bin/oxlint subpath is not exported in package.json exports, so we
// resolve the main entry point and derive the bin path from it.
// resolve('oxlint') returns .../oxlint/dist/index.js, so we need to go up
// two directories (past 'dist') to reach the package root.
const oxlintMainPath = resolve('oxlint');
const oxlintPackageRoot = dirname(dirname(oxlintMainPath));
const binPath = join(oxlintPackageRoot, 'bin', 'oxlint');
let oxlintTsgolintPath = resolve('oxlint-tsgolint/bin/tsgolint');
if (process.platform === 'win32') {
// If on Windows, resolve the tsgolint binary from the local node_modules
Expand Down
2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@
"node": "^20.19.0 || >=22.12.0"
},
"bundledVersions": {
"vite": "8.0.0-beta.11",
"vite": "8.0.0-beta.12",
"rolldown": "1.0.0-rc.2",
"tsdown": "0.20.1"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/tools/.upstream-versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
"rolldown-vite": {
"repo": "https://github.com/vitejs/vite.git",
"branch": "main",
"hash": "b68900bf6090b65d35bba3b759a55fa51e99fee5"
"hash": "f124ed846fff2dca679d3b0dd2b27b029ed4ec5c"
}
}
Loading
Loading