Skip to content

Commit

Permalink
Merge branch 'release-next'
Browse files Browse the repository at this point in the history
  • Loading branch information
brophdawg11 committed Jun 6, 2023
2 parents 06d198c + 6c0bbb1 commit 610ce6e
Show file tree
Hide file tree
Showing 29 changed files with 1,594 additions and 826 deletions.
14 changes: 9 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,15 @@
"jest": {
"projects": [
"<rootDir>/packages/*"
],
"reporters": [
"default"
]
},
"resolutions": {
"@types/react": "^18.0.0",
"@types/react-dom": "^18.0.0"
"@types/react-dom": "^18.0.0",
"jsdom": "22.0.0"
},
"dependencies": {
"@ampproject/filesize": "^4.3.0",
Expand Down Expand Up @@ -108,16 +112,16 @@
"none": "45 kB"
},
"packages/react-router/dist/react-router.production.min.js": {
"none": "13.3 kB"
"none": "13.4 kB"
},
"packages/react-router/dist/umd/react-router.production.min.js": {
"none": "15.6 kB"
"none": "15.8 kB"
},
"packages/react-router-dom/dist/react-router-dom.production.min.js": {
"none": "11.8 kB"
"none": "12.0 kB"
},
"packages/react-router-dom/dist/umd/react-router-dom.production.min.js": {
"none": "17.7 kB"
"none": "18.0 kB"
}
}
}
8 changes: 8 additions & 0 deletions packages/react-router-dom-v5-compat/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# `react-router-dom-v5-compat`

## 6.12.0

### Patch Changes

- Updated dependencies:
- `react-router-dom@6.12.0`
- `react-router@6.12.0`

## 6.11.2

### Patch Changes
Expand Down
1 change: 0 additions & 1 deletion packages/react-router-dom-v5-compat/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,4 @@ module.exports = {
"^react-router$": "<rootDir>/../react-router/index.ts",
"^react-router-dom-v5-compat$": "<rootDir>/index.ts",
},
reporters: ["default"],
};
4 changes: 2 additions & 2 deletions packages/react-router-dom-v5-compat/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-router-dom-v5-compat",
"version": "6.11.2",
"version": "6.12.0",
"description": "Migration path to React Router v6 from v4/5",
"keywords": [
"react",
Expand All @@ -24,7 +24,7 @@
"types": "./dist/index.d.ts",
"dependencies": {
"history": "^5.3.0",
"react-router": "6.11.2"
"react-router": "6.12.0"
},
"peerDependencies": {
"react": ">=16.8",
Expand Down
13 changes: 13 additions & 0 deletions packages/react-router-dom/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# `react-router-dom`

## 6.12.0

### Minor Changes

- Wrap internal router state updates with `React.startTransition` if it exists ([#10438](https://github.com/remix-run/react-router/pull/10438))

### Patch Changes

- Re-throw `DOMException` (`DataCloneError`) when attempting to perform a `PUSH` navigation with non-serializable state. ([#10427](https://github.com/remix-run/react-router/pull/10427))
- Updated dependencies:
- `@remix-run/router@1.6.3`
- `react-router@6.12.0`

## 6.11.2

### Patch Changes
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import * as React from "react";

export default function LazyComponent() {
return <h1>Lazy</h1>;
}

0 comments on commit 610ce6e

Please sign in to comment.