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
12 changes: 11 additions & 1 deletion .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,15 @@
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": ["github>Boshen/renovate", "helpers:pinGitHubActionDigestsToSemver"],
"ignorePaths": ["crates/oxc_linter/fixtures/**"],
"ignoreDeps": ["@types/vscode", "allocator-api2"]
"ignoreDeps": ["@types/vscode", "allocator-api2"],
"packageRules": [
{
"groupName": "oxlint",
"matchManagers": ["npm"],
"matchPackageNames": ["oxlint", "oxlint-tsgolint"],
"rangeStrategy": "auto",
"schedule": ["at any time"],
"automergeSchedule": ["at any time"]
}
]
}
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: taiki-e/checkout-action@b13d20b7cda4e2f325ef19895128f7ff735c0b3d # v1.3.1
- uses: oxc-project/setup-node@f42e3bda950c7454575e78ee4eaac880a077700c # v1.0.0
- uses: oxc-project/setup-rust@cd82e1efec7fef815e2c23d296756f31c7cdc03d # v1.0.0
with:
save-cache: ${{ github.ref_name == 'main' }}
Expand All @@ -219,6 +220,7 @@ jobs:
- run: cargo lint -- -D warnings
- run: cargo lint --profile dev-no-debug-assertions -- -D warnings
- run: RUSTDOCFLAGS='-D warnings' cargo doc --no-deps --document-private-items
- run: node --run lint

conformance:
name: Conformance
Expand Down
15 changes: 2 additions & 13 deletions .github/workflows/ci_vscode.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,28 +25,17 @@ concurrency:
cancel-in-progress: ${{ github.ref_name != 'main' }}

jobs:
lint:
name: Check VSCode
test:
name: Test VSCode
runs-on: ubuntu-latest
steps:
- uses: taiki-e/checkout-action@b13d20b7cda4e2f325ef19895128f7ff735c0b3d # v1.3.1
- uses: oxc-project/setup-node@f42e3bda950c7454575e78ee4eaac880a077700c # v1.0.0

- name: Lint VSCode
working-directory: editors/vscode
run: pnpm run lint

- name: Type-Check VSCode
working-directory: editors/vscode
run: pnpm run type-check

test:
name: Test VSCode
runs-on: ubuntu-latest
steps:
- uses: taiki-e/checkout-action@b13d20b7cda4e2f325ef19895128f7ff735c0b3d # v1.3.1
- uses: oxc-project/setup-node@f42e3bda950c7454575e78ee4eaac880a077700c # v1.0.0

- name: Build Language Server
working-directory: editors/vscode
run: pnpm run server:build:debug
Expand Down
9 changes: 0 additions & 9 deletions editors/vscode/.oxlintrc.json

This file was deleted.

2 changes: 1 addition & 1 deletion editors/vscode/client/ConfigService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export class ConfigService implements IDisposable {

dispose() {
for (const disposable of this._disposables) {
disposable.dispose();
void disposable.dispose();
}
}
}
4 changes: 1 addition & 3 deletions editors/vscode/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,6 @@
"install-extension": "code --install-extension oxc_language_server.vsix --force",
"server:build:debug": "cross-env CARGO_TARGET_DIR=./target cargo build -p oxc_language_server",
"server:build:release": "cross-env CARGO_TARGET_DIR=./target cargo build -p oxc_language_server --release",
"lint": "npx oxlint --tsconfig=tsconfig.json",
"test": "esbuild tests/*.spec.ts --bundle --outdir=out --external:vscode --format=cjs --platform=node --target=node16 --sourcemap && vscode-test",
"type-check": "tsc --noEmit"
},
Expand All @@ -195,8 +194,7 @@
"cross-env": "^10.0.0",
"esbuild": "^0.25.0",
"ovsx": "^0.10.0",
"oxlint": "^1.0.0",
"typescript": "^5.4.5"
"typescript": "catalog:"
},
"dependencies": {
"vscode-languageclient": "^9.0.1"
Expand Down
33 changes: 33 additions & 0 deletions oxlintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"$schema": "./node_modules/oxlint/configuration_schema.json",
"plugins": [
"typescript",
"unicorn",
"react",
"react-perf",
"oxc",
"import",
"jsdoc",
"node",
"promise",
"vitest"
],
"categories": {
"correctness": "error",
"perf": "error"
},
"ignorePatterns": [
"**/fixtures/**",
"**/generated/**",
"npm/runtime/**",
"tasks/coverage/**",
"crates/oxc_semantic/tests/**",
"tasks/e2e/**", // TODO
"napi/**", // TODO
"editors/vscode/tests/**", // TODO,
"crates/oxc_traverse/scripts/lib/parse.mjs", // TODO
"tasks/lint_rules/src/oxlint-rules.mjs", // TODO
"tasks/transform_conformance/update_fixtures.mjs", // TODO
"tasks/lint_rules/src/main.mjs" // TODO
]
}
6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,14 @@
"build": "pnpm --workspace-concurrency=1 --filter './napi/*' build",
"build-dev": "pnpm --workspace-concurrency=1 --filter './napi/*' build-dev",
"build-test": "pnpm --workspace-concurrency=1 --filter './napi/*' build-test",
"test": "pnpm --workspace-concurrency=1 --filter './napi/*' test"
"test": "pnpm --workspace-concurrency=1 --filter './napi/*' test",
"lint": "oxlint -c oxlintrc.json --type-aware --deny-warnings"
},
"devDependencies": {
"@napi-rs/cli": "catalog:",
"emnapi": "1.4.5",
"oxlint-tsgolint": "0.0.3",
"oxlint-tsgolint": "0.0.4",
"oxlint": "^1.12.0",
"typescript": "catalog:",
"vitest": "catalog:"
}
Expand Down
Loading
Loading