Skip to content

Commit c35750a

Browse files
adelrodriguezadelrodriguez
committed
chore: update dependencies and migrate to oxlint config with Zed editor settings
1 parent 6483ec3 commit c35750a

File tree

10 files changed

+267
-142
lines changed

10 files changed

+267
-142
lines changed

‎.changeset/jolly-queens-kick.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
"pastry": minor
3+
---
4+
5+
Migrate oxlint config to TypeScript (`oxlint.config.ts`) and update tooling defaults
6+
7+
- **Breaking config change**: `.oxlintrc.json` replaced with `oxlint.config.ts`. If you've customized the JSON config, migrate your rules to the new TypeScript format.
8+
- **Oxfmt**: `experimentalSortImports` renamed to `sortImports`, `experimentalTailwindcss` renamed to `sortTailwindcss` (following upstream stabilization in oxfmt 0.35).
9+
- **CI**: Node.js 22 now set up explicitly; pinned Bun version removed.
10+
- **Editor**: Added `.zed/settings.json` with oxfmt and oxlint LSP integration.
11+
- **Dependencies**: adamantite 0.30 (effect v4 beta), oxfmt 0.35, oxlint 1.50, TypeScript pinned to 5.9.3.

‎.github/workflows/adamantite.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,13 @@ jobs:
3636
- name: Checkout
3737
uses: actions/checkout@v4
3838

39+
- name: Setup Node.js
40+
uses: actions/setup-node@v6
41+
with:
42+
node-version: "24"
43+
3944
- name: Setup Bun
4045
uses: oven-sh/setup-bun@v2
41-
with:
42-
bun-version: 1.3.6
4346

4447
- name: Cache dependencies
4548
uses: actions/cache@v4

‎.oxfmtrc.jsonc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"bracketSpacing": true,
66
"embeddedLanguageFormatting": "auto",
77
"endOfLine": "lf",
8-
"experimentalSortImports": {
8+
"sortImports": {
99
"groups": [
1010
["value-builtin", "type-import"],
1111
["value-external"],
@@ -24,7 +24,7 @@
2424
"partitionByComment": true,
2525
"sortSideEffects": false,
2626
},
27-
"experimentalTailwindcss": {
27+
"sortTailwindcss": {
2828
"attributes": ["className", "class"],
2929
"functions": ["clsx", "cn", "cva", "tw", "twMerge"],
3030
"preserveDuplicates": false,

‎.oxlintrc.json‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎.zed/settings.json‎

Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
{
2+
"languages": {
3+
"CSS": {
4+
"format_on_save": "on",
5+
"formatter": [
6+
{
7+
"language_server": {
8+
"name": "oxfmt"
9+
}
10+
}
11+
]
12+
},
13+
"HTML": {
14+
"format_on_save": "on",
15+
"formatter": [
16+
{
17+
"language_server": {
18+
"name": "oxfmt"
19+
}
20+
}
21+
]
22+
},
23+
"JSON": {
24+
"format_on_save": "on",
25+
"formatter": [
26+
{
27+
"language_server": {
28+
"name": "oxfmt"
29+
}
30+
}
31+
]
32+
},
33+
"JSONC": {
34+
"format_on_save": "on",
35+
"formatter": [
36+
{
37+
"language_server": {
38+
"name": "oxfmt"
39+
}
40+
}
41+
]
42+
},
43+
"JavaScript": {
44+
"format_on_save": "on",
45+
"formatter": [
46+
{
47+
"language_server": {
48+
"name": "oxfmt"
49+
}
50+
},
51+
{
52+
"code_action": "source.fixAll.oxc"
53+
}
54+
]
55+
},
56+
"MDX": {
57+
"format_on_save": "on",
58+
"formatter": [
59+
{
60+
"language_server": {
61+
"name": "oxfmt"
62+
}
63+
}
64+
]
65+
},
66+
"Markdown": {
67+
"format_on_save": "on",
68+
"formatter": [
69+
{
70+
"language_server": {
71+
"name": "oxfmt"
72+
}
73+
}
74+
]
75+
},
76+
"TSX": {
77+
"format_on_save": "on",
78+
"formatter": [
79+
{
80+
"language_server": {
81+
"name": "oxfmt"
82+
}
83+
}
84+
]
85+
},
86+
"TypeScript": {
87+
"format_on_save": "on",
88+
"formatter": [
89+
{
90+
"language_server": {
91+
"name": "oxfmt"
92+
}
93+
}
94+
]
95+
},
96+
"YAML": {
97+
"format_on_save": "on",
98+
"formatter": [
99+
{
100+
"language_server": {
101+
"name": "oxfmt"
102+
}
103+
}
104+
]
105+
}
106+
},
107+
"lsp": {
108+
"oxfmt": {
109+
"initialization_options": {
110+
"settings": {
111+
"configPath": null,
112+
"fmt.experimental": true,
113+
"run": "onSave",
114+
"typeAware": false,
115+
"unusedDisableDirectives": false
116+
}
117+
}
118+
},
119+
"oxlint": {
120+
"initialization_options": {
121+
"settings": {
122+
"configPath": null,
123+
"fixKind": "safe_fix",
124+
"run": "onType",
125+
"typeAware": true,
126+
"unusedDisableDirectives": "deny"
127+
}
128+
}
129+
}
130+
}
131+
}

‎bun.lock‎

Lines changed: 94 additions & 122 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎knip.json‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,19 @@
1818
},
1919
"ignoreExportsUsedInFile": true,
2020
"ignoreFiles": [
21+
"**/dist/**",
22+
"**/build/**",
23+
"**/coverage/**",
24+
"**/.next/**",
25+
"**/.vercel/**",
26+
"**/.turbo/**",
2127
"**/dist/**",
2228
"**/build/**",
2329
"**/coverage/**",
2430
"**/.next/**",
2531
"**/.vercel/**",
2632
"**/.turbo/**"
2733
],
28-
"ignore": ["**/*.d.ts"],
34+
"ignore": ["**/*.d.ts", "**/*.d.ts"],
2935
"project": ["src/**/*.ts"]
3036
}

‎oxlint.config.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import core from "adamantite/lint"
2+
import { defineConfig } from "oxlint"
3+
4+
export default defineConfig({
5+
extends: [core],
6+
})

‎package.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@
3939
"analyze": "adamantite analyze"
4040
},
4141
"devDependencies": {
42-
"@changesets/cli": "2.29.8",
43-
"@clack/prompts": "1.0.1",
44-
"@types/bun": "1.3.9",
45-
"adamantite": "^0.29.1",
46-
"bunup": "0.16.29",
47-
"knip": "5.80.1",
48-
"oxfmt": "0.34.0",
49-
"oxlint": "1.49.0",
42+
"@changesets/cli": "2.30.0",
43+
"@clack/prompts": "1.1.0",
44+
"@types/bun": "1.3.10",
45+
"adamantite": "^0.30.2",
46+
"bunup": "0.16.31",
47+
"knip": "5.85.0",
48+
"oxfmt": "0.35.0",
49+
"oxlint": "1.50.0",
5050
"oxlint-tsgolint": "0.14.2",
51-
"typescript": "^5.9.3"
51+
"typescript": "5.9.3"
5252
},
53-
"packageManager": "bun@1.3.1"
53+
"packageManager": "bun@1.3.10"
5454
}

‎tsconfig.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
"moduleResolution": "bundler",
1111
"verbatimModuleSyntax": true
1212
},
13-
"include": ["src/**/*.ts"],
13+
"include": ["src/**/*.ts", "*.config.ts"],
1414
"exclude": ["node_modules", "dist"]
1515
}

0 commit comments

Comments
 (0)