Skip to content

Commit a93dc02

Browse files
committed
Merge branch 'main' into fix/compiler-friendly-provider
2 parents 6f52df2 + 9bb6aa4 commit a93dc02

File tree

8 files changed

+1264
-1090
lines changed

8 files changed

+1264
-1090
lines changed

.github/workflows/compressed-size-action.yml renamed to .github/workflows/compressed-size.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Compressed Size
33
on: [pull_request]
44

55
jobs:
6-
build:
6+
compressed_size:
77
runs-on: ubuntu-latest
88
steps:
99
- uses: actions/checkout@v4

.github/workflows/test-multiple-versions.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ jobs:
2020
- 18.2.0
2121
- 18.3.1
2222
- 19.0.0
23-
- 19.1.0-canary-f9d78089-20250306
24-
- 0.0.0-experimental-f9d78089-20250306
23+
- 19.1.0
24+
- 19.2.0-canary-1d6c8168-20250411
25+
- 0.0.0-experimental-1d6c8168-20250411
2526
steps:
2627
- uses: actions/checkout@v4
2728
- uses: pnpm/action-setup@v4

.github/workflows/test-old-typescript.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
sed -i~ 's/"jotai": \["\.\/src\/index\.ts"\],/"jotai": [".\/dist\/ts3.8\/index.d.ts"],/' tsconfig.json
6969
sed -i~ 's/"jotai\/\*": \["\.\/src\/\*\.ts"\]/"jotai\/*": [".\/dist\/ts3.8\/*.d.ts"]/' tsconfig.json
7070
sed -i~ 's/"include": .*/"include": ["src\/types.d.ts", "dist\/**\/*", "tests\/**\/*"],/' tsconfig.json
71-
pnpm add -D @testing-library/[email protected] @types/[email protected]
71+
pnpm add -D @testing-library/[email protected] @types/[email protected] @types/[email protected]
7272
- name: Patch for Older TS
7373
if: ${{ matrix.typescript == '4.2.3' || matrix.typescript == '4.1.5' || matrix.typescript == '4.0.5' || startsWith(matrix.typescript, '3.') }}
7474
run: |
@@ -78,7 +78,7 @@ jobs:
7878
sed -i~ 's/"noUncheckedIndexedAccess": true,//' tsconfig.json
7979
sed -i~ 's/^import type /import /' tests/*/*.tsx tests/*/*/*.tsx
8080
pnpm json -I -f package.json -e "this.resolutions={}; this.resolutions['@types/prettier']='2.4.2'; this.resolutions['@types/node']='18.11.18'; this.resolutions['@types/react']='18.2.56';"
81-
81+
8282
rm -r tests/react/vanilla-utils/atomWithObservable.*
8383
- name: Install old TypeScript
8484
run: pnpm add -D typescript@${{ matrix.typescript }}

package.json

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "👻 Primitive and flexible state management for React",
44
"private": true,
55
"type": "commonjs",
6-
"version": "2.12.2",
6+
"version": "2.12.3",
77
"main": "./index.js",
88
"types": "./index.d.ts",
99
"typesVersions": {
@@ -117,58 +117,58 @@
117117
"homepage": "https://github.com/pmndrs/jotai",
118118
"packageManager": "[email protected]",
119119
"devDependencies": {
120-
"@babel/core": "^7.26.9",
120+
"@babel/core": "^7.26.10",
121121
"@babel/plugin-transform-react-jsx": "^7.25.9",
122-
"@babel/plugin-transform-typescript": "^7.26.8",
122+
"@babel/plugin-transform-typescript": "^7.27.0",
123123
"@babel/preset-env": "^7.26.9",
124-
"@babel/template": "^7.26.9",
125-
"@eslint/js": "^9.22.0",
124+
"@babel/template": "^7.27.0",
125+
"@eslint/js": "^9.24.0",
126126
"@rollup/plugin-alias": "^5.1.1",
127127
"@rollup/plugin-babel": "^6.0.4",
128-
"@rollup/plugin-node-resolve": "^16.0.0",
128+
"@rollup/plugin-node-resolve": "^16.0.1",
129129
"@rollup/plugin-replace": "^6.0.2",
130130
"@rollup/plugin-terser": "^0.4.4",
131131
"@rollup/plugin-typescript": "^12.1.2",
132132
"@testing-library/dom": "^10.4.0",
133133
"@testing-library/jest-dom": "^6.6.3",
134-
"@testing-library/react": "^16.2.0",
134+
"@testing-library/react": "^16.3.0",
135135
"@testing-library/user-event": "^14.6.1",
136136
"@types/babel__core": "^7.20.5",
137137
"@types/babel__template": "^7.4.4",
138-
"@types/node": "^22.13.10",
139-
"@types/react": "^19.0.10",
140-
"@types/react-dom": "^19.0.4",
138+
"@types/node": "^22.14.1",
139+
"@types/react": "^19.1.1",
140+
"@types/react-dom": "^19.1.2",
141141
"@vitejs/plugin-react": "^4.3.4",
142-
"@vitest/coverage-v8": "^3.0.8",
143-
"@vitest/eslint-plugin": "^1.1.36",
144-
"@vitest/ui": "^3.0.8",
142+
"@vitest/coverage-v8": "^3.1.1",
143+
"@vitest/eslint-plugin": "^1.1.42",
144+
"@vitest/ui": "^3.1.1",
145145
"benny": "^3.7.1",
146146
"downlevel-dts": "^0.11.0",
147-
"esbuild": "^0.25.1",
148-
"eslint": "9.22.0",
149-
"eslint-import-resolver-typescript": "^3.8.3",
147+
"esbuild": "^0.25.2",
148+
"eslint": "9.24.0",
149+
"eslint-import-resolver-typescript": "^4.3.2",
150150
"eslint-plugin-import": "^2.31.0",
151151
"eslint-plugin-jest-dom": "^5.5.0",
152-
"eslint-plugin-react": "^7.37.4",
153-
"eslint-plugin-react-compiler": "19.0.0-beta-bafa41b-20250307",
152+
"eslint-plugin-react": "^7.37.5",
153+
"eslint-plugin-react-compiler": "19.0.0-beta-e993439-20250405",
154154
"eslint-plugin-react-hooks": "^5.2.0",
155155
"eslint-plugin-testing-library": "^7.1.1",
156156
"jest-leak-detector": "^29.7.0",
157-
"jsdom": "^26.0.0",
157+
"jsdom": "^26.1.0",
158158
"json": "^11.0.0",
159159
"prettier": "^3.5.3",
160-
"react": "^19.0.0",
161-
"react-dom": "^19.0.0",
162-
"rollup": "^4.35.0",
160+
"react": "^19.1.0",
161+
"react-dom": "^19.1.0",
162+
"rollup": "^4.40.0",
163163
"rollup-plugin-banner2": "^1.3.1",
164164
"rollup-plugin-esbuild": "^6.2.1",
165165
"rxjs": "^7.8.2",
166-
"shelljs": "^0.9.1",
167-
"shx": "^0.3.4",
166+
"shelljs": "^0.9.2",
167+
"shx": "^0.4.0",
168168
"ts-expect": "^1.3.0",
169-
"typescript": "^5.8.2",
170-
"typescript-eslint": "^8.26.0",
171-
"vitest": "^3.0.8",
169+
"typescript": "^5.8.3",
170+
"typescript-eslint": "^8.29.1",
171+
"vitest": "^3.1.1",
172172
"wonka": "^6.3.5"
173173
},
174174
"peerDependencies": {

0 commit comments

Comments
 (0)