Skip to content

Commit f7681e9

Browse files
author
Dario Lehmhus
committed
1.4.0
2 parents 05385f1 + f8c99e6 commit f7681e9

23 files changed

Lines changed: 10131 additions & 4825 deletions

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
matrix:
1616
os: [windows-latest, ubuntu-latest, macos-latest]
17-
node: [18, 20, 22]
17+
node: [20, 22, 24]
1818
steps:
1919
- name: Prepare git on Windows
2020
if: matrix.os == 'windows-latest'
@@ -23,7 +23,7 @@ jobs:
2323
- uses: actions/checkout@v4
2424
- uses: pnpm/action-setup@v4
2525
with:
26-
version: 8.15.0
26+
version: 10.33.0
2727

2828
- name: Use Node.js ${{ matrix.node-version }}
2929
uses: actions/setup-node@v3

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ test-results/
55
.DS_Store
66
tests/example/apps/nextjs/.vscode/settings.json
77
.cursorrules
8+
.pnpm-store

.oxfmtrc.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"$schema": "./node_modules/oxfmt/configuration_schema.json",
3+
"singleQuote": true,
4+
"useTabs": false,
5+
"trailingComma": "all",
6+
"semi": true,
7+
"tabWidth": 2,
8+
"printWidth": 80,
9+
"sortPackageJson": false,
10+
"ignorePatterns": []
11+
}

.prettierrc.json

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

.vscode/settings.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"typescript",
66
"typescriptreact"
77
],
8-
"eslint.packageManager": "pnpm",
9-
"npm.packageManager": "pnpm"
8+
"npm.packageManager": "pnpm",
9+
"editor.defaultFormatter": "oxc.oxc-vscode",
10+
"editor.formatOnSave": true
1011
}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ const config: LinariaConfig = {
6969
},
7070
};
7171

72-
export default withRspack(withLinaria(config));
72+
export default withLinaria(withRspack(config));
7373
```
7474

7575
Now you can use linaria in all the places where Next.js also allows you to use [CSS Modules](https://beta.nextjs.org/docs/styling/css-modules). That currently means in every file in the `app` directory and the `pages` directory.

package.json

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,39 @@
11
{
22
"name": "next-with-linaria",
3-
"version": "1.3.0",
3+
"version": "1.4.0",
44
"description": "Linaria support for Next.js App Router",
55
"main": "lib/with-linaria.js",
66
"scripts": {
77
"build": "tsc",
88
"watch": "tsc -w",
99
"clean": "rm -rf lib",
10-
"lint": "eslint --fix src/**",
11-
"test": "pnpm test --filter ./tests/example",
10+
"lint": "oxlint",
11+
"lint:fix": "oxlint --fix",
12+
"fmt": "oxfmt",
13+
"fmt:check": "oxfmt --check",
14+
"test": "pnpm --filter ./tests/example run test",
1215
"prepublish": "pnpm run clean && pnpm run build"
1316
},
14-
"packageManager": "pnpm@8.15.0",
17+
"packageManager": "pnpm@10.33.0",
1518
"devDependencies": {
16-
"@rspack/core": "1.5.5",
19+
"@rspack/core": "1.7.11",
1720
"@types/fs-extra": "11.0.4",
18-
"@typescript-eslint/eslint-plugin": "8.44.0",
19-
"@typescript-eslint/parser": "8.44.0",
20-
"@wyw-in-js/babel-preset": "0.7.0",
21-
"@wyw-in-js/transform": "0.7.0",
22-
"eslint": "9.35.0",
23-
"eslint-config-prettier": "10.1.8",
24-
"eslint-plugin-prettier": "5.5.4",
25-
"eslint-plugin-simple-import-sort": "12.1.1",
26-
"eslint-plugin-typescript-sort-keys": "3.3.0",
27-
"eslint-plugin-unused-imports": "4.2.0",
28-
"globals": "16.4.0",
21+
"@wyw-in-js/babel-preset": "1.0.7",
22+
"@wyw-in-js/transform": "1.0.7",
23+
"globals": "17.4.0",
2924
"is-ci": "4.1.0",
30-
"lint-staged": "16.1.6",
31-
"next": "16.0.0",
32-
"prettier": "3.6.2",
25+
"lint-staged": "16.4.0",
26+
"next": "16.2.2",
27+
"oxfmt": "0.44.0",
28+
"oxlint": "1.59.0",
3329
"simple-git-hooks": "2.13.1",
34-
"typescript": "5.9.2",
35-
"webpack": "5.101.3"
30+
"typescript": "6.0.2",
31+
"webpack": "5.105.4"
3632
},
3733
"peerDependencies": {
3834
"@babel/runtime": "7.x",
39-
"@wyw-in-js/babel-preset": "0.x",
40-
"@wyw-in-js/transform": "0.x"
35+
"@wyw-in-js/babel-preset": "1.x",
36+
"@wyw-in-js/transform": "1.x"
4137
},
4238
"files": [
4339
"lib"
@@ -47,10 +43,10 @@
4743
},
4844
"lint-staged": {
4945
"**/*.(js|jsx|ts|tsx)": [
50-
"eslint --fix"
46+
"oxlint --fix"
5147
],
5248
"**/*.(js|jsx|ts|tsx|json|css|md|mdx)": [
53-
"prettier --write"
49+
"oxfmt"
5450
]
5551
},
5652
"author": "Dario Lehmhus",

0 commit comments

Comments
 (0)