Skip to content

Commit

Permalink
Merge pull request #2212 from framer/fix/update-changelog
Browse files Browse the repository at this point in the history
Update changelog for 10.12.18
  • Loading branch information
mergetron[bot] authored Jun 30, 2023
2 parents 8b60e0a + 89f82f3 commit 3bfb2e8
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 12 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ Framer Motion adheres to [Semantic Versioning](http://semver.org/).

Undocumented APIs should be considered internal and may change without warning.

## [10.12.18] 2023-06-30

### Fixed

- When layout animation is forced to be instant via `useInstantTransition`, ignore the delay option.

## [10.12.17] 2023-06-23

### Fixed
Expand Down
6 changes: 3 additions & 3 deletions dev/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "framer-motion--dev",
"version": "10.12.16",
"version": "10.12.18-alpha.0",
"private": true,
"scripts": {
"dev": "webpack serve --config ./webpack/config.js --hot"
},
"dependencies": {
"@react-three/drei": "^7.27.3",
"@react-three/fiber": "^8.2.2",
"framer-motion": "^10.12.16",
"framer-motion-3d": "^10.12.16",
"framer-motion": "^10.12.18-alpha.0",
"framer-motion-3d": "^10.12.18-alpha.0",
"path-browserify": "^1.0.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "10.12.16",
"version": "10.12.18-alpha.0",
"packages": [
"packages/*"
],
Expand Down
4 changes: 2 additions & 2 deletions packages/framer-motion-3d/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "framer-motion-3d",
"version": "10.12.16",
"version": "10.12.18-alpha.0",
"description": "A simple and powerful React animation library for @react-three/fiber",
"main": "dist/cjs/index.js",
"module": "dist/es/index.mjs",
Expand Down Expand Up @@ -46,7 +46,7 @@
"postpublish": "git push --tags"
},
"dependencies": {
"framer-motion": "^10.12.16",
"framer-motion": "^10.12.18-alpha.0",
"react-merge-refs": "^2.0.1"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/framer-motion/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "framer-motion",
"version": "10.12.16",
"version": "10.12.18-alpha.0",
"description": "A simple and powerful React and JavaScript animation library",
"main": "dist/cjs/index.js",
"module": "dist/es/index.mjs",
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7844,8 +7844,8 @@ __metadata:
cache-loader: ^1.2.5
convert-tsconfig-paths-to-webpack-aliases: ^0.9.2
fork-ts-checker-webpack-plugin: ^6.2.0
framer-motion: ^10.12.16
framer-motion-3d: ^10.12.16
framer-motion: ^10.12.18-alpha.0
framer-motion-3d: ^10.12.18-alpha.0
path-browserify: ^1.0.1
react: ^18.2.0
react-dom: ^18.2.0
Expand Down Expand Up @@ -7911,14 +7911,14 @@ __metadata:
languageName: unknown
linkType: soft

"framer-motion-3d@^10.12.16, framer-motion-3d@workspace:packages/framer-motion-3d":
"framer-motion-3d@^10.12.18-alpha.0, framer-motion-3d@workspace:packages/framer-motion-3d":
version: 0.0.0-use.local
resolution: "framer-motion-3d@workspace:packages/framer-motion-3d"
dependencies:
"@react-three/fiber": ^8.2.2
"@react-three/test-renderer": ^9.0.0
"@rollup/plugin-commonjs": ^22.0.1
framer-motion: ^10.12.16
framer-motion: ^10.12.18-alpha.0
react-merge-refs: ^2.0.1
peerDependencies:
"@react-three/fiber": ^8.2.2
Expand All @@ -7928,7 +7928,7 @@ __metadata:
languageName: unknown
linkType: soft

"framer-motion@^10.12.16, framer-motion@workspace:packages/framer-motion":
"framer-motion@^10.12.18-alpha.0, framer-motion@workspace:packages/framer-motion":
version: 0.0.0-use.local
resolution: "framer-motion@workspace:packages/framer-motion"
dependencies:
Expand Down

0 comments on commit 3bfb2e8

Please sign in to comment.