diff --git a/.github/publish-ci/are-the-types-wrong/package.json b/.github/publish-ci/are-the-types-wrong/package.json index 3b1c5bf469..e3b349c6e3 100644 --- a/.github/publish-ci/are-the-types-wrong/package.json +++ b/.github/publish-ci/are-the-types-wrong/package.json @@ -10,7 +10,7 @@ "@react-spring/web": "*", "ink": "^4.0.0", "object-hash": "^3.0.0", - "react": "^18.2.0" + "react": "18.2.0" }, "devDependencies": { "@arethetypeswrong/core": "^0.0.4", diff --git a/.github/publish-ci/cra4/package.json b/.github/publish-ci/cra4/package.json index f7d7b1e192..97cc7352eb 100644 --- a/.github/publish-ci/cra4/package.json +++ b/.github/publish-ci/cra4/package.json @@ -4,8 +4,8 @@ "private": true, "dependencies": { "@react-spring/web": "*", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "18.2.0", + "react-dom": "18.2.0", "react-scripts": "^4", "web-vitals": "^2.1.4" }, diff --git a/.github/publish-ci/cra5/package.json b/.github/publish-ci/cra5/package.json index 5df3dbb2c7..189454e01c 100644 --- a/.github/publish-ci/cra5/package.json +++ b/.github/publish-ci/cra5/package.json @@ -4,8 +4,8 @@ "private": true, "dependencies": { "@react-spring/web": "*", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "18.2.0", + "react-dom": "18.2.0", "react-scripts": "5", "web-vitals": "^2.1.4" }, diff --git a/.github/publish-ci/next/package.json b/.github/publish-ci/next/package.json index 0a8c214831..35ab68e3e4 100644 --- a/.github/publish-ci/next/package.json +++ b/.github/publish-ci/next/package.json @@ -10,8 +10,8 @@ "dependencies": { "@react-spring/web": "0.0.0-d80cafe1f0ccd7ce193b8f558285515ede3b8afc-20230625160448", "next": "^13.2", - "react": "^18.2.0", - "react-dom": "^18.2.0" + "react": "18.2.0", + "react-dom": "18.2.0" }, "devDependencies": { "@types/node": "^20.10.4", diff --git a/.github/publish-ci/node-esm/package.json b/.github/publish-ci/node-esm/package.json index 7b6bc94ff2..b643a21460 100644 --- a/.github/publish-ci/node-esm/package.json +++ b/.github/publish-ci/node-esm/package.json @@ -9,8 +9,8 @@ }, "dependencies": { "@react-spring/web": "*", - "react": "^18.2.0", - "react-dom": "^18.2.0" + "react": "18.2.0", + "react-dom": "18.2.0" }, "devDependencies": { "resolve-esm": "^2.0.3" diff --git a/.github/publish-ci/node-standard/package.json b/.github/publish-ci/node-standard/package.json index 4fce2edaa2..1d64586a2b 100644 --- a/.github/publish-ci/node-standard/package.json +++ b/.github/publish-ci/node-standard/package.json @@ -8,7 +8,7 @@ }, "dependencies": { "@react-spring/web": "*", - "react": "^18.2.0", - "react-dom": "^18.2.0" + "react": "18.2.0", + "react-dom": "18.2.0" } } diff --git a/.github/publish-ci/vite/package.json b/.github/publish-ci/vite/package.json index 8640950ec7..949e7d5c37 100644 --- a/.github/publish-ci/vite/package.json +++ b/.github/publish-ci/vite/package.json @@ -12,8 +12,8 @@ }, "dependencies": { "@react-spring/web": "*", - "react": "^18.2.0", - "react-dom": "^18.2.0" + "react": "18.2.0", + "react-dom": "18.2.0" }, "devDependencies": { "@types/node": "^20.10.4", diff --git a/demo/package.json b/demo/package.json index 5c0ba21d57..3fa17709b0 100644 --- a/demo/package.json +++ b/demo/package.json @@ -24,8 +24,8 @@ "lodash.clamp": "^4.0.3", "lodash.shuffle": "^4.2.0", "lorem-ipsum": "^2.0.8", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "18.2.0", + "react-dom": "18.2.0", "react-feather": "^2.0.10", "react-use-gesture": "^9.1.3", "react-use-measure": "^2.1.1", diff --git a/demo/src/sandboxes/animating-auto/package.json b/demo/src/sandboxes/animating-auto/package.json index 3c7be064a9..4bc8beb509 100644 --- a/demo/src/sandboxes/animating-auto/package.json +++ b/demo/src/sandboxes/animating-auto/package.json @@ -12,8 +12,8 @@ ], "dependencies": { "@react-spring/web": "*", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "18.2.0", + "react-dom": "18.2.0", "react-scripts": "5.0.1", "react-use-measure": "2.1.1" }, diff --git a/demo/src/sandboxes/card/package.json b/demo/src/sandboxes/card/package.json index f67eed0292..ca028fe13a 100644 --- a/demo/src/sandboxes/card/package.json +++ b/demo/src/sandboxes/card/package.json @@ -12,8 +12,8 @@ ], "dependencies": { "@react-spring/web": "*", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "18.2.0", + "react-dom": "18.2.0", "react-scripts": "5.0.1", "react-use-gesture": "^9.1.3" }, diff --git a/demo/src/sandboxes/cards-stack/package.json b/demo/src/sandboxes/cards-stack/package.json index 6cb0835a8f..843f144e6f 100644 --- a/demo/src/sandboxes/cards-stack/package.json +++ b/demo/src/sandboxes/cards-stack/package.json @@ -12,8 +12,8 @@ ], "dependencies": { "@react-spring/web": "*", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "18.2.0", + "react-dom": "18.2.0", "react-scripts": "5.0.1", "react-use-gesture": "^9.1.3" }, diff --git a/demo/src/sandboxes/chain/package.json b/demo/src/sandboxes/chain/package.json index b6dde7b1d8..65f8d844f7 100644 --- a/demo/src/sandboxes/chain/package.json +++ b/demo/src/sandboxes/chain/package.json @@ -11,8 +11,8 @@ ], "dependencies": { "@react-spring/web": "*", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "18.2.0", + "react-dom": "18.2.0", "react-scripts": "5.0.1" }, "scripts": { diff --git a/demo/src/sandboxes/css-gradients/package.json b/demo/src/sandboxes/css-gradients/package.json index 308ec66b0a..740b6dfb64 100644 --- a/demo/src/sandboxes/css-gradients/package.json +++ b/demo/src/sandboxes/css-gradients/package.json @@ -14,8 +14,8 @@ "@react-spring/web": "*", "easing-coordinates": "2.0.2", "leva": "0.9.34", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "18.2.0", + "react-dom": "18.2.0", "react-scripts": "5.0.1" }, "scripts": { diff --git a/demo/src/sandboxes/css-keyframes/package.json b/demo/src/sandboxes/css-keyframes/package.json index 6fbdb15af2..08df6289e4 100644 --- a/demo/src/sandboxes/css-keyframes/package.json +++ b/demo/src/sandboxes/css-keyframes/package.json @@ -11,8 +11,8 @@ "main": "src/index.tsx", "dependencies": { "@react-spring/web": "*", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "18.2.0", + "react-dom": "18.2.0", "react-scripts": "5.0.1" }, "scripts": { diff --git a/demo/src/sandboxes/css-variables/package.json b/demo/src/sandboxes/css-variables/package.json index 6c96020a4d..64f38b2326 100644 --- a/demo/src/sandboxes/css-variables/package.json +++ b/demo/src/sandboxes/css-variables/package.json @@ -13,8 +13,8 @@ ], "dependencies": { "@react-spring/web": "*", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "18.2.0", + "react-dom": "18.2.0", "react-scripts": "5.0.1" }, "scripts": { diff --git a/demo/src/sandboxes/draggable-list/package.json b/demo/src/sandboxes/draggable-list/package.json index 55ece48da9..19c52f6c7c 100644 --- a/demo/src/sandboxes/draggable-list/package.json +++ b/demo/src/sandboxes/draggable-list/package.json @@ -14,8 +14,8 @@ "@react-spring/web": "*", "lodash.clamp": "4.0.3", "lodash-move": "1.1.1", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "18.2.0", + "react-dom": "18.2.0", "react-scripts": "5.0.1", "react-use-gesture": "^9.1.3" }, diff --git a/demo/src/sandboxes/exit-before-enter/package.json b/demo/src/sandboxes/exit-before-enter/package.json index c94d40a179..a53ba748fb 100644 --- a/demo/src/sandboxes/exit-before-enter/package.json +++ b/demo/src/sandboxes/exit-before-enter/package.json @@ -12,8 +12,8 @@ "main": "src/index.tsx", "dependencies": { "@react-spring/web": "*", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "18.2.0", + "react-dom": "18.2.0", "react-scripts": "5.0.1" }, "scripts": { diff --git a/demo/src/sandboxes/flip-card/package.json b/demo/src/sandboxes/flip-card/package.json index 01df13f668..09d6bbbac5 100644 --- a/demo/src/sandboxes/flip-card/package.json +++ b/demo/src/sandboxes/flip-card/package.json @@ -11,8 +11,8 @@ "main": "src/index.tsx", "dependencies": { "@react-spring/web": "*", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "18.2.0", + "react-dom": "18.2.0", "react-scripts": "5.0.1" }, "scripts": { diff --git a/demo/src/sandboxes/floating-button/package.json b/demo/src/sandboxes/floating-button/package.json index f855c64117..7ba483a572 100644 --- a/demo/src/sandboxes/floating-button/package.json +++ b/demo/src/sandboxes/floating-button/package.json @@ -15,8 +15,8 @@ "@react-spring/web": "*", "@stitches/react": "^1.2.8", "@use-gesture/react": "^10.2.24", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "18.2.0", + "react-dom": "18.2.0", "react-scripts": "5.0.1" }, "devDependencies": { diff --git a/demo/src/sandboxes/goo-blobs/package.json b/demo/src/sandboxes/goo-blobs/package.json index b5878ab977..4a84436158 100644 --- a/demo/src/sandboxes/goo-blobs/package.json +++ b/demo/src/sandboxes/goo-blobs/package.json @@ -12,8 +12,8 @@ "main": "src/index.tsx", "dependencies": { "@react-spring/web": "*", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "18.2.0", + "react-dom": "18.2.0", "react-scripts": "5.0.1", "react-use-measure": "2.1.1" }, diff --git a/demo/src/sandboxes/image-fade/package.json b/demo/src/sandboxes/image-fade/package.json index a59dceae35..6662cb94a0 100644 --- a/demo/src/sandboxes/image-fade/package.json +++ b/demo/src/sandboxes/image-fade/package.json @@ -11,8 +11,8 @@ "main": "src/index.tsx", "dependencies": { "@react-spring/web": "*", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "18.2.0", + "react-dom": "18.2.0", "react-scripts": "5.0.1" }, "scripts": { diff --git a/demo/src/sandboxes/list-reordering/package.json b/demo/src/sandboxes/list-reordering/package.json index a0182007ff..ddbd023f8d 100644 --- a/demo/src/sandboxes/list-reordering/package.json +++ b/demo/src/sandboxes/list-reordering/package.json @@ -10,8 +10,8 @@ "dependencies": { "@react-spring/web": "*", "lodash.shuffle": "4.2.0", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "18.2.0", + "react-dom": "18.2.0", "react-scripts": "5.0.1", "react-use-gesture": "^9.1.3" }, diff --git a/demo/src/sandboxes/macos-dock/package.json b/demo/src/sandboxes/macos-dock/package.json index 60da1dfe61..35cbdc63b2 100644 --- a/demo/src/sandboxes/macos-dock/package.json +++ b/demo/src/sandboxes/macos-dock/package.json @@ -13,8 +13,8 @@ "dependencies": { "@react-spring/web": "*", "@use-gesture/react": "^10.2.24", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "18.2.0", + "react-dom": "18.2.0", "react-scripts": "5.0.1" }, "scripts": { diff --git a/demo/src/sandboxes/masonry/package.json b/demo/src/sandboxes/masonry/package.json index cd1f3ac5bb..ae9aeb5919 100644 --- a/demo/src/sandboxes/masonry/package.json +++ b/demo/src/sandboxes/masonry/package.json @@ -11,8 +11,8 @@ "dependencies": { "@react-spring/web": "*", "lodash.shuffle": "4.2.0", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "18.2.0", + "react-dom": "18.2.0", "react-scripts": "5.0.1", "react-use-gesture": "^9.1.3", "react-use-measure": "^2.1.1" diff --git a/demo/src/sandboxes/multistage-transition/package.json b/demo/src/sandboxes/multistage-transition/package.json index f02b0c07af..558167ded0 100644 --- a/demo/src/sandboxes/multistage-transition/package.json +++ b/demo/src/sandboxes/multistage-transition/package.json @@ -10,8 +10,8 @@ "main": "src/index.tsx", "dependencies": { "@react-spring/web": "*", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "18.2.0", + "react-dom": "18.2.0", "react-scripts": "5.0.1" }, "scripts": { diff --git a/demo/src/sandboxes/notification-hub/package.json b/demo/src/sandboxes/notification-hub/package.json index 4e6338d8d2..f56ee0b8c6 100644 --- a/demo/src/sandboxes/notification-hub/package.json +++ b/demo/src/sandboxes/notification-hub/package.json @@ -11,8 +11,8 @@ "dependencies": { "@react-spring/web": "*", "lorem-ipsum": "2.0.8", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "18.2.0", + "react-dom": "18.2.0", "react-feather": "2.0.10", "react-scripts": "5.0.1", "styled-components": "^5.3.8" diff --git a/demo/src/sandboxes/parallax-sticky/package.json b/demo/src/sandboxes/parallax-sticky/package.json index 355be2ec25..35b4975d31 100644 --- a/demo/src/sandboxes/parallax-sticky/package.json +++ b/demo/src/sandboxes/parallax-sticky/package.json @@ -10,8 +10,8 @@ "dependencies": { "@react-spring/parallax": "*", "@react-spring/web": "*", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "18.2.0", + "react-dom": "18.2.0", "react-scripts": "5.0.1" }, "scripts": { diff --git a/demo/src/sandboxes/parallax-vert/package.json b/demo/src/sandboxes/parallax-vert/package.json index 3325e17296..5ffd26b21c 100644 --- a/demo/src/sandboxes/parallax-vert/package.json +++ b/demo/src/sandboxes/parallax-vert/package.json @@ -10,8 +10,8 @@ "dependencies": { "@react-spring/parallax": "*", "@react-spring/web": "*", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "18.2.0", + "react-dom": "18.2.0", "react-scripts": "5.0.1" }, "scripts": { diff --git a/demo/src/sandboxes/parallax/package.json b/demo/src/sandboxes/parallax/package.json index ee85a79389..f1789ed637 100644 --- a/demo/src/sandboxes/parallax/package.json +++ b/demo/src/sandboxes/parallax/package.json @@ -10,8 +10,8 @@ "dependencies": { "@react-spring/parallax": "*", "@react-spring/web": "*", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "18.2.0", + "react-dom": "18.2.0", "react-scripts": "5.0.1" }, "scripts": { diff --git a/demo/src/sandboxes/popup-modal/package.json b/demo/src/sandboxes/popup-modal/package.json index 4f0bfb840f..a71e47b16f 100644 --- a/demo/src/sandboxes/popup-modal/package.json +++ b/demo/src/sandboxes/popup-modal/package.json @@ -11,8 +11,8 @@ ], "dependencies": { "@react-spring/web": "*", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "18.2.0", + "react-dom": "18.2.0", "react-scripts": "5.0.1", "react95": "^4.0.0", "styled-components": "^5.3.8" diff --git a/demo/src/sandboxes/rocket-decay/package.json b/demo/src/sandboxes/rocket-decay/package.json index ed0900bf58..7ce50de022 100644 --- a/demo/src/sandboxes/rocket-decay/package.json +++ b/demo/src/sandboxes/rocket-decay/package.json @@ -14,8 +14,8 @@ "main": "src/index.js", "dependencies": { "@react-spring/web": "*", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "18.2.0", + "react-dom": "18.2.0", "react-scripts": "5.0.1", "react-use-gesture": "9.1.3", "vec-la": "1.5.0" diff --git a/demo/src/sandboxes/scrolling-wave/package.json b/demo/src/sandboxes/scrolling-wave/package.json index 2041f35520..9a05e5d0aa 100644 --- a/demo/src/sandboxes/scrolling-wave/package.json +++ b/demo/src/sandboxes/scrolling-wave/package.json @@ -11,8 +11,8 @@ ], "dependencies": { "@react-spring/web": "*", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "18.2.0", + "react-dom": "18.2.0", "react-scripts": "5.0.1" }, "scripts": { diff --git a/demo/src/sandboxes/simple-transition/package.json b/demo/src/sandboxes/simple-transition/package.json index 0ebe281fec..d23964e7c1 100644 --- a/demo/src/sandboxes/simple-transition/package.json +++ b/demo/src/sandboxes/simple-transition/package.json @@ -10,8 +10,8 @@ "main": "src/index.tsx", "dependencies": { "@react-spring/web": "*", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "18.2.0", + "react-dom": "18.2.0", "react-scripts": "5.0.1" }, "scripts": { diff --git a/demo/src/sandboxes/slide/package.json b/demo/src/sandboxes/slide/package.json index a066f7788e..c3d050db51 100644 --- a/demo/src/sandboxes/slide/package.json +++ b/demo/src/sandboxes/slide/package.json @@ -11,8 +11,8 @@ "main": "src/index.tsx", "dependencies": { "@react-spring/web": "*", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "18.2.0", + "react-dom": "18.2.0", "react-scripts": "5.0.1", "react-use-gesture": "^9.1.3" }, diff --git a/demo/src/sandboxes/springy-boxes/package.json b/demo/src/sandboxes/springy-boxes/package.json index b7f4ab74d8..0437060419 100644 --- a/demo/src/sandboxes/springy-boxes/package.json +++ b/demo/src/sandboxes/springy-boxes/package.json @@ -11,8 +11,8 @@ "main": "src/index.js", "dependencies": { "@react-three/fiber": "8.12.0", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "18.2.0", + "react-dom": "18.2.0", "react-scripts": "5.0.1", "@react-spring/three": "*", "three": "0.150.1" diff --git a/demo/src/sandboxes/svg-filter/package.json b/demo/src/sandboxes/svg-filter/package.json index c79395e5f2..8cb573f5c6 100644 --- a/demo/src/sandboxes/svg-filter/package.json +++ b/demo/src/sandboxes/svg-filter/package.json @@ -11,8 +11,8 @@ "main": "src/index.tsx", "dependencies": { "@react-spring/web": "*", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "18.2.0", + "react-dom": "18.2.0", "react-scripts": "5.0.1" }, "scripts": { diff --git a/demo/src/sandboxes/trail/package.json b/demo/src/sandboxes/trail/package.json index 3f46567160..32d2e517d7 100644 --- a/demo/src/sandboxes/trail/package.json +++ b/demo/src/sandboxes/trail/package.json @@ -10,8 +10,8 @@ "main": "src/index.tsx", "dependencies": { "@react-spring/web": "*", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "18.2.0", + "react-dom": "18.2.0", "react-scripts": "5.0.1" }, "scripts": { diff --git a/demo/src/sandboxes/tree/package.json b/demo/src/sandboxes/tree/package.json index 63059da4d6..50ddec36b6 100644 --- a/demo/src/sandboxes/tree/package.json +++ b/demo/src/sandboxes/tree/package.json @@ -12,8 +12,8 @@ "main": "src/index.tsx", "dependencies": { "@react-spring/web": "*", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "18.2.0", + "react-dom": "18.2.0", "react-scripts": "5.0.1", "react-use-measure": "^2.1.1", "styled-components": "^5.3.8" diff --git a/demo/src/sandboxes/viewpager/package.json b/demo/src/sandboxes/viewpager/package.json index ba8d62fe7c..8ede53cb04 100644 --- a/demo/src/sandboxes/viewpager/package.json +++ b/demo/src/sandboxes/viewpager/package.json @@ -14,8 +14,8 @@ "lodash-es": "4.17.21", "lodash-move": "1.1.1", "lodash.clamp": "4.0.3", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "18.2.0", + "react-dom": "18.2.0", "react-scripts": "5.0.1", "react-use-gesture": "^9.1.3", "react-use-measure": "2.1.1" diff --git a/demo/src/sandboxes/webgl-switch/package.json b/demo/src/sandboxes/webgl-switch/package.json index 9fff0c4a1a..22140240f6 100644 --- a/demo/src/sandboxes/webgl-switch/package.json +++ b/demo/src/sandboxes/webgl-switch/package.json @@ -15,8 +15,8 @@ "@react-spring/web": "*", "@react-three/drei": "9.57.3", "@react-three/fiber": "8.12.0", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "18.2.0", + "react-dom": "18.2.0", "react-scripts": "5.0.1", "three": "0.150.1", "three-stdlib": "2.21.8" diff --git a/package.json b/package.json index e9c0495bcf..e37178cfcd 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ } }, "devDependencies": { - "@changesets/cli": "^2.27.1", + "@changesets/cli": "^2.27.3", "@commitlint/cli": "^19.3.0", "@commitlint/config-conventional": "^19.2.2", "@react-three/fiber": "^8.11.9", @@ -87,15 +87,15 @@ "cypress": "^13.6.1", "eslint": "^8.55.0", "flush-microtasks": "^1.0.1", - "husky": "^8.0.3", + "husky": "^9.0.11", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", "konva": "^9.2.3", "mock-raf": "npm:@react-spring/mock-raf@1.1.1", - "prettier": "^3.1.1", - "pretty-quick": "^3.1.3", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "prettier": "^3.2.5", + "pretty-quick": "^4.0.0", + "react": "18.2.0", + "react-dom": "18.2.0", "react-konva": "^18.2.5", "react-native": "^0.71.3", "react-zdog": "^1.0.11", @@ -103,7 +103,7 @@ "start-server-and-test": "^2.0.3", "three": "^0.150.1", "tsup": "^6.7.0", - "turbo": "^1.11.1", + "turbo": "^1.13.3", "typescript": "5.3.3", "vite": "^5.2.11", "zdog": "^1.1.3" diff --git a/packages/core/src/types/common.ts b/packages/core/src/types/common.ts index 4b3f8b2fea..6f44c3a196 100644 --- a/packages/core/src/types/common.ts +++ b/packages/core/src/types/common.ts @@ -26,12 +26,8 @@ export type RawValues = { * * When `any` is passed, the resolved type is `true | false`. */ -export type IsPlainObject = T extends ReadonlyArray - ? Any - : T extends object - ? object - : Any +export type IsPlainObject = + T extends ReadonlyArray ? Any : T extends object ? object : Any -export type StringKeys = T extends IsPlainObject - ? string & keyof T - : string +export type StringKeys = + T extends IsPlainObject ? string & keyof T : string diff --git a/packages/core/src/types/functions.ts b/packages/core/src/types/functions.ts index 7643197f41..9dc420ae87 100644 --- a/packages/core/src/types/functions.ts +++ b/packages/core/src/types/functions.ts @@ -41,9 +41,8 @@ type StopFn = InferTarget extends { stop: infer T } ? T : never * The `T` parameter can be a set of animated values (as an object type) * or a primitive type for a single animated value. */ -export type SpringUpdateFn = T extends IsPlainObject - ? UpdateValuesFn - : UpdateValueFn +export type SpringUpdateFn = + T extends IsPlainObject ? UpdateValuesFn : UpdateValueFn interface AnyUpdateFn< T extends SpringValue | Controller, diff --git a/packages/core/src/types/internal.ts b/packages/core/src/types/internal.ts index 8a61b78d7e..fd0295ab88 100644 --- a/packages/core/src/types/internal.ts +++ b/packages/core/src/types/internal.ts @@ -15,18 +15,20 @@ export interface Readable { } /** @internal */ -export type InferState = T extends Controller - ? State - : T extends SpringValue - ? U - : unknown +export type InferState = + T extends Controller + ? State + : T extends SpringValue + ? U + : unknown /** @internal */ -export type InferProps = T extends Controller - ? ControllerUpdate - : T extends SpringValue - ? SpringUpdate - : Lookup +export type InferProps = + T extends Controller + ? ControllerUpdate + : T extends SpringValue + ? SpringUpdate + : Lookup /** @internal */ export type InferTarget = T extends object diff --git a/packages/core/src/types/props.ts b/packages/core/src/types/props.ts index 5b9e16c895..0831d65946 100644 --- a/packages/core/src/types/props.ts +++ b/packages/core/src/types/props.ts @@ -106,9 +106,10 @@ export type GoalProp = [T] extends [IsPlainObject] : GoalValue /** A set of values for a `Controller` to animate from/to. */ -export type GoalValues = FluidProps extends infer Props - ? { [P in keyof Props]?: Props[P] | null } - : never +export type GoalValues = + FluidProps extends infer Props + ? { [P in keyof Props]?: Props[P] | null } + : never /** * A value that `SpringValue` objects can animate from/to. @@ -233,9 +234,8 @@ export interface ControllerProps< export type LoopProp = boolean | T | (() => boolean | T) -export type VelocityProp = T extends ReadonlyArray - ? number[] - : number +export type VelocityProp = + T extends ReadonlyArray ? number[] : number /** For props that can be set on a per-key basis. */ export type MatchProp = diff --git a/packages/types/src/utils.ts b/packages/types/src/utils.ts index 0ced273ea4..19807b4532 100644 --- a/packages/types/src/utils.ts +++ b/packages/types/src/utils.ts @@ -123,13 +123,16 @@ type Intersect = (U extends any ? (k: U) => void : never) extends ( export type AllKeys = T extends any ? keyof T : never -export type Exclusive = AllKeys extends infer K - ? T extends any - ? Remap< - LoosePick & { [P in Exclude]?: undefined } - > +export type Exclusive = + AllKeys extends infer K + ? T extends any + ? Remap< + LoosePick & { + [P in Exclude]?: undefined + } + > + : never : never - : never /** An object that needs to be manually disposed of */ export interface Disposable { dispose(): void diff --git a/targets/native/src/animated.ts b/targets/native/src/animated.ts index 58a3b1447e..628a67fc2a 100644 --- a/targets/native/src/animated.ts +++ b/targets/native/src/animated.ts @@ -54,20 +54,20 @@ type AnimatedArray> = { } // An animated array of style objects -type AnimatedStyles> = unknown & - T extends RecursiveArray - ? { [P in keyof T]: RecursiveArray> }[keyof T] - : { - [P in keyof T]: [T[P]] extends [infer DT] // DT is a distributed union - ? DT extends ReadonlyArray - ? AnimatedStyles
- : DT extends object - ? [AssignableKeys] extends [never] - ? AnimatedProp
- : { [P in keyof DT]: AnimatedProp } - : DT - : never - } +type AnimatedStyles> = + unknown & T extends RecursiveArray + ? { [P in keyof T]: RecursiveArray> }[keyof T] + : { + [P in keyof T]: [T[P]] extends [infer DT] // DT is a distributed union + ? DT extends ReadonlyArray + ? AnimatedStyles
+ : DT extends object + ? [AssignableKeys] extends [never] + ? AnimatedProp
+ : { [P in keyof DT]: AnimatedProp } + : DT + : never + } // An animated object of style attributes export type AnimatedStyle = [T, T] extends [infer T, infer DT] // T is a union, DT is a distributed union diff --git a/targets/web/src/animated.ts b/targets/web/src/animated.ts index 8f3d5084e8..90cc133996 100644 --- a/targets/web/src/animated.ts +++ b/targets/web/src/animated.ts @@ -95,11 +95,12 @@ type AnimatedObject = | (T extends ReadonlyArray ? FluidValue> : never) // An animated primitive (or an array of them) -type AnimatedLeaf = NonObject extends infer U - ? [U] extends [never] - ? never - : FluidValue - : never +type AnimatedLeaf = + NonObject extends infer U + ? [U] extends [never] + ? never + : FluidValue + : never type NonObject = | Extract> diff --git a/yarn.lock b/yarn.lock index 8ac87f961a..03e1d3f325 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1266,9 +1266,9 @@ __metadata: languageName: node linkType: hard -"@changesets/apply-release-plan@npm:^7.0.0": - version: 7.0.0 - resolution: "@changesets/apply-release-plan@npm:7.0.0" +"@changesets/apply-release-plan@npm:^7.0.1": + version: 7.0.1 + resolution: "@changesets/apply-release-plan@npm:7.0.1" dependencies: "@babel/runtime": ^7.20.1 "@changesets/config": ^3.0.0 @@ -1283,7 +1283,7 @@ __metadata: prettier: ^2.7.1 resolve-from: ^5.0.0 semver: ^7.5.3 - checksum: ad83f89a3d46cd5249fa960cb0324114532bd5f25e74466d181afd6661273824859d038a12ba587a5e044f9169810e4a6febbb61e23c3819b3b28c00176a8bdf + checksum: 44a2686d3dc3ee569f23862a6c3da5c247987b320ddaf64be6c2096bb486b3da620c9336164f73e30e6272149e435988b46776508b81f328e1d66e885a8264cc languageName: node linkType: hard @@ -1310,12 +1310,12 @@ __metadata: languageName: node linkType: hard -"@changesets/cli@npm:^2.27.1": - version: 2.27.1 - resolution: "@changesets/cli@npm:2.27.1" +"@changesets/cli@npm:^2.27.3": + version: 2.27.3 + resolution: "@changesets/cli@npm:2.27.3" dependencies: "@babel/runtime": ^7.20.1 - "@changesets/apply-release-plan": ^7.0.0 + "@changesets/apply-release-plan": ^7.0.1 "@changesets/assemble-release-plan": ^6.0.0 "@changesets/changelog-git": ^0.2.0 "@changesets/config": ^3.0.0 @@ -1327,7 +1327,7 @@ __metadata: "@changesets/pre": ^2.0.0 "@changesets/read": ^0.6.0 "@changesets/types": ^6.0.0 - "@changesets/write": ^0.3.0 + "@changesets/write": ^0.3.1 "@manypkg/get-packages": ^1.1.3 "@types/semver": ^7.5.0 ansi-colors: ^4.1.3 @@ -1348,7 +1348,7 @@ __metadata: tty-table: ^4.1.5 bin: changeset: bin.js - checksum: 0d030dec7e0ef28626082a257d57f46cdf65edb65a95f5a3511a9d298ca052388d8ab7f9a714943864eddc59148c4afb0b802a9c75b5bea45aade4c0dc7a5fa6 + checksum: e3b0bb3a123f71701f3b76e80104968fdf99a7403b97860631ed6f98f7ba0df5d9fb56767191fa46148372a0b35d44f7883decb2b70f60d5fa2716692332c0fd languageName: node linkType: hard @@ -1488,16 +1488,16 @@ __metadata: languageName: node linkType: hard -"@changesets/write@npm:^0.3.0": - version: 0.3.0 - resolution: "@changesets/write@npm:0.3.0" +"@changesets/write@npm:^0.3.1": + version: 0.3.1 + resolution: "@changesets/write@npm:0.3.1" dependencies: "@babel/runtime": ^7.20.1 "@changesets/types": ^6.0.0 fs-extra: ^7.0.1 human-id: ^1.0.2 prettier: ^2.7.1 - checksum: 37588eb3ef2af15b3ea09d46864c994780619d20b791ea5b654801a035a3a12540c7f953e6e4f36731678615edc6d1c32f8fe174d599d3e6ce2d68263865788b + checksum: 6df0447e05ededbab71f36e6ad23aa77cf06eb6adda7a8b8e7fb9d6bd5bc93acceb916d55b2a37cb7e93fb05d39a236a0dd7ade5243aae4772885081101d4784 languageName: node linkType: hard @@ -4954,8 +4954,8 @@ __metadata: lodash.clamp: ^4.0.3 lodash.shuffle: ^4.2.0 lorem-ipsum: ^2.0.8 - react: ^18.2.0 - react-dom: ^18.2.0 + react: 18.2.0 + react-dom: 18.2.0 react-feather: ^2.0.10 react-use-gesture: ^9.1.3 react-use-measure: ^2.1.1 @@ -6297,13 +6297,6 @@ __metadata: languageName: node linkType: hard -"@types/minimatch@npm:^3.0.3": - version: 3.0.5 - resolution: "@types/minimatch@npm:3.0.5" - checksum: c41d136f67231c3131cf1d4ca0b06687f4a322918a3a5adddc87ce90ed9dbd175a3610adee36b106ae68c0b92c637c35e02b58c8a56c424f71d30993ea220b92 - languageName: node - linkType: hard - "@types/minimist@npm:^1.2.0": version: 1.2.1 resolution: "@types/minimist@npm:1.2.1" @@ -7306,13 +7299,6 @@ __metadata: languageName: node linkType: hard -"array-differ@npm:^3.0.0": - version: 3.0.0 - resolution: "array-differ@npm:3.0.0" - checksum: 117edd9df5c1530bd116c6e8eea891d4bd02850fd89b1b36e532b6540e47ca620a373b81feca1c62d1395d9ae601516ba538abe5e8172d41091da2c546b05fb7 - languageName: node - linkType: hard - "array-flatten@npm:1.1.1": version: 1.1.1 resolution: "array-flatten@npm:1.1.1" @@ -7413,13 +7399,6 @@ __metadata: languageName: node linkType: hard -"arrify@npm:^2.0.1": - version: 2.0.1 - resolution: "arrify@npm:2.0.1" - checksum: 067c4c1afd182806a82e4c1cb8acee16ab8b5284fbca1ce29408e6e91281c36bb5b612f6ddfbd40a0f7a7e0c75bf2696eb94c027f6e328d6e9c52465c98e4209 - languageName: node - linkType: hard - "asap@npm:~2.0.6": version: 2.0.6 resolution: "asap@npm:2.0.6" @@ -10830,7 +10809,7 @@ __metadata: languageName: node linkType: hard -"execa@npm:4.1.0, execa@npm:^4.0.0": +"execa@npm:4.1.0": version: 4.1.0 resolution: "execa@npm:4.1.0" dependencies: @@ -10847,7 +10826,7 @@ __metadata: languageName: node linkType: hard -"execa@npm:5.1.1, execa@npm:^5.0.0": +"execa@npm:5.1.1, execa@npm:^5.0.0, execa@npm:^5.1.1": version: 5.1.1 resolution: "execa@npm:5.1.1" dependencies: @@ -12499,12 +12478,12 @@ __metadata: languageName: node linkType: hard -"husky@npm:^8.0.3": - version: 8.0.3 - resolution: "husky@npm:8.0.3" +"husky@npm:^9.0.11": + version: 9.0.11 + resolution: "husky@npm:9.0.11" bin: - husky: lib/bin.js - checksum: 837bc7e4413e58c1f2946d38fb050f5d7324c6f16b0fd66411ffce5703b294bd21429e8ba58711cd331951ee86ed529c5be4f76805959ff668a337dbfa82a1b0 + husky: bin.mjs + checksum: 1aebc3334dc7ac6288ff5e1fb72cfb447cfa474e72cf7ba692e8c5698c573ab725c28c6a5088c9f8e6aca5f47d40fa7261beffbc07a4d307ca21656dc4571f07 languageName: node linkType: hard @@ -12542,13 +12521,20 @@ __metadata: languageName: node linkType: hard -"ignore@npm:^5.1.4, ignore@npm:^5.2.0, ignore@npm:^5.2.4": +"ignore@npm:^5.2.0, ignore@npm:^5.2.4": version: 5.3.0 resolution: "ignore@npm:5.3.0" checksum: 2736da6621f14ced652785cb05d86301a66d70248597537176612bd0c8630893564bd5f6421f8806b09e8472e75c591ef01672ab8059c07c6eb2c09cefe04bf9 languageName: node linkType: hard +"ignore@npm:^5.3.0": + version: 5.3.1 + resolution: "ignore@npm:5.3.1" + checksum: 71d7bb4c1dbe020f915fd881108cbe85a0db3d636a0ea3ba911393c53946711d13a9b1143c7e70db06d571a5822c0a324a6bcde5c9904e7ca5047f01f1bf8cd3 + languageName: node + linkType: hard + "image-size@npm:^0.6.0": version: 0.6.3 resolution: "image-size@npm:0.6.3" @@ -16704,7 +16690,7 @@ __metadata: languageName: node linkType: hard -"mri@npm:^1.1.0, mri@npm:^1.1.5": +"mri@npm:^1.1.0, mri@npm:^1.2.0": version: 1.2.0 resolution: "mri@npm:1.2.0" checksum: 83f515abbcff60150873e424894a2f65d68037e5a7fcde8a9e2b285ee9c13ac581b63cfc1e6826c4732de3aeb84902f7c1e16b7aff46cd3f897a0f757a894e85 @@ -16739,19 +16725,6 @@ __metadata: languageName: node linkType: hard -"multimatch@npm:^4.0.0": - version: 4.0.0 - resolution: "multimatch@npm:4.0.0" - dependencies: - "@types/minimatch": ^3.0.3 - array-differ: ^3.0.0 - array-union: ^2.1.0 - arrify: ^2.0.1 - minimatch: ^3.0.4 - checksum: bdb6a98dad4e919d9a1a2a0db872f44fa2337315f2fd5827d91ae005cf22f4425782bdfa97c10b80d567f0cb3c226c31f4e85f8f6a4a4be4facf9af0de1bb0c2 - languageName: node - linkType: hard - "mz@npm:^2.7.0": version: 2.7.0 resolution: "mz@npm:2.7.0" @@ -17670,6 +17643,13 @@ __metadata: languageName: node linkType: hard +"picomatch@npm:^3.0.1": + version: 3.0.1 + resolution: "picomatch@npm:3.0.1" + checksum: b7fe18174bcc05bbf0ea09cc85623ae395676b3e6bc25636d4c20db79a948586237e429905453bf1ba385bc7a7aa5b56f1b351680e650d2b5c305ceb98dfc914 + languageName: node + linkType: hard + "pidtree@npm:^0.6.0": version: 0.6.0 resolution: "pidtree@npm:0.6.0" @@ -17954,12 +17934,12 @@ __metadata: languageName: node linkType: hard -"prettier@npm:^3.1.1": - version: 3.1.1 - resolution: "prettier@npm:3.1.1" +"prettier@npm:^3.2.5": + version: 3.2.5 + resolution: "prettier@npm:3.2.5" bin: prettier: bin/prettier.cjs - checksum: e386855e3a1af86a748e16953f168be555ce66d6233f4ba54eb6449b88eb0c6b2ca79441b11eae6d28a7f9a5c96440ce50864b9d5f6356d331d39d6bb66c648e + checksum: 2ee4e1417572372afb7a13bb446b34f20f1bf1747db77cf6ccaf57a9be005f2f15c40f903d41a6b79eec3f57fff14d32a20fb6dee1f126da48908926fe43c311 languageName: node linkType: hard @@ -18013,21 +17993,22 @@ __metadata: languageName: node linkType: hard -"pretty-quick@npm:^3.1.3": - version: 3.1.3 - resolution: "pretty-quick@npm:3.1.3" +"pretty-quick@npm:^4.0.0": + version: 4.0.0 + resolution: "pretty-quick@npm:4.0.0" dependencies: - chalk: ^3.0.0 - execa: ^4.0.0 - find-up: ^4.1.0 - ignore: ^5.1.4 - mri: ^1.1.5 - multimatch: ^4.0.0 + execa: ^5.1.1 + find-up: ^5.0.0 + ignore: ^5.3.0 + mri: ^1.2.0 + picocolors: ^1.0.0 + picomatch: ^3.0.1 + tslib: ^2.6.2 peerDependencies: - prettier: ">=2.0.0" + prettier: ^3.0.0 bin: - pretty-quick: bin/pretty-quick.js - checksum: 28bdc32571e6308e049497f58a9245f272275973782b6ed7fbcf98937101cc605a81b3ab48629dba4687b7e86c87a3733febacdc0746ca4da5d1c80a0b88cf45 + pretty-quick: lib/cli.mjs + checksum: 5825513f71feb8d2fb19601e2fc73841ea65c558ebb3cbb05fa30f6e4394efddf796921a57f28b7f3acb12230291853466176c03b25465e48723615963fd5003 languageName: node linkType: hard @@ -18298,7 +18279,7 @@ __metadata: languageName: node linkType: hard -"react-dom@npm:18.2.0, react-dom@npm:^18.2.0": +"react-dom@npm:18.2.0": version: 18.2.0 resolution: "react-dom@npm:18.2.0" dependencies: @@ -18597,7 +18578,7 @@ __metadata: version: 0.0.0-use.local resolution: "react-spring--root@workspace:." dependencies: - "@changesets/cli": ^2.27.1 + "@changesets/cli": ^2.27.3 "@commitlint/cli": ^19.3.0 "@commitlint/config-conventional": ^19.2.2 "@react-three/fiber": ^8.11.9 @@ -18621,15 +18602,15 @@ __metadata: cypress: ^13.6.1 eslint: ^8.55.0 flush-microtasks: ^1.0.1 - husky: ^8.0.3 + husky: ^9.0.11 jest: ^29.7.0 jest-environment-jsdom: ^29.7.0 konva: ^9.2.3 mock-raf: "npm:@react-spring/mock-raf@1.1.1" - prettier: ^3.1.1 - pretty-quick: ^3.1.3 - react: ^18.2.0 - react-dom: ^18.2.0 + prettier: ^3.2.5 + pretty-quick: ^4.0.0 + react: 18.2.0 + react-dom: 18.2.0 react-konva: ^18.2.5 react-native: ^0.71.3 react-zdog: ^1.0.11 @@ -18637,7 +18618,7 @@ __metadata: start-server-and-test: ^2.0.3 three: ^0.150.1 tsup: ^6.7.0 - turbo: ^1.11.1 + turbo: ^1.13.3 typescript: 5.3.3 vite: ^5.2.11 zdog: ^1.1.3 @@ -18742,7 +18723,7 @@ __metadata: languageName: node linkType: hard -"react@npm:18.2.0, react@npm:^18.2.0": +"react@npm:18.2.0": version: 18.2.0 resolution: "react@npm:18.2.0" dependencies: @@ -21174,30 +21155,30 @@ __metadata: languageName: node linkType: hard -"turbo-darwin-64@npm:1.11.1": - version: 1.11.1 - resolution: "turbo-darwin-64@npm:1.11.1" +"turbo-darwin-64@npm:1.13.3": + version: 1.13.3 + resolution: "turbo-darwin-64@npm:1.13.3" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"turbo-darwin-arm64@npm:1.11.1": - version: 1.11.1 - resolution: "turbo-darwin-arm64@npm:1.11.1" +"turbo-darwin-arm64@npm:1.13.3": + version: 1.13.3 + resolution: "turbo-darwin-arm64@npm:1.13.3" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"turbo-linux-64@npm:1.11.1": - version: 1.11.1 - resolution: "turbo-linux-64@npm:1.11.1" +"turbo-linux-64@npm:1.13.3": + version: 1.13.3 + resolution: "turbo-linux-64@npm:1.13.3" conditions: os=linux & cpu=x64 languageName: node linkType: hard -"turbo-linux-arm64@npm:1.11.1": - version: 1.11.1 - resolution: "turbo-linux-arm64@npm:1.11.1" +"turbo-linux-arm64@npm:1.13.3": + version: 1.13.3 + resolution: "turbo-linux-arm64@npm:1.13.3" conditions: os=linux & cpu=arm64 languageName: node linkType: hard @@ -21209,30 +21190,30 @@ __metadata: languageName: node linkType: hard -"turbo-windows-64@npm:1.11.1": - version: 1.11.1 - resolution: "turbo-windows-64@npm:1.11.1" +"turbo-windows-64@npm:1.13.3": + version: 1.13.3 + resolution: "turbo-windows-64@npm:1.13.3" conditions: os=win32 & cpu=x64 languageName: node linkType: hard -"turbo-windows-arm64@npm:1.11.1": - version: 1.11.1 - resolution: "turbo-windows-arm64@npm:1.11.1" +"turbo-windows-arm64@npm:1.13.3": + version: 1.13.3 + resolution: "turbo-windows-arm64@npm:1.13.3" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"turbo@npm:^1.11.1": - version: 1.11.1 - resolution: "turbo@npm:1.11.1" +"turbo@npm:^1.13.3": + version: 1.13.3 + resolution: "turbo@npm:1.13.3" dependencies: - turbo-darwin-64: 1.11.1 - turbo-darwin-arm64: 1.11.1 - turbo-linux-64: 1.11.1 - turbo-linux-arm64: 1.11.1 - turbo-windows-64: 1.11.1 - turbo-windows-arm64: 1.11.1 + turbo-darwin-64: 1.13.3 + turbo-darwin-arm64: 1.13.3 + turbo-linux-64: 1.13.3 + turbo-linux-arm64: 1.13.3 + turbo-windows-64: 1.13.3 + turbo-windows-arm64: 1.13.3 dependenciesMeta: turbo-darwin-64: optional: true @@ -21248,7 +21229,7 @@ __metadata: optional: true bin: turbo: bin/turbo - checksum: e1dc2f73f47a57699d9d88bc4653fdbfdf659082fe94905d9371a7c3b6d39838dda891e0b4da5e5ac2c7e3cabae1d6656d00f666bf7c531a98575b0ba0f7d2a2 + checksum: d00655987e5d2e714d5e5a8d5950624508fb69e8671ca17e8ac7b9316ce01e518308ec4eaa472306950782704caa2eaa3c4fb328192818fcd9fcc05423bc29e7 languageName: node linkType: hard