Skip to content

Commit

Permalink
Merge branch 'master' into abhi/fix/tracing-timing
Browse files Browse the repository at this point in the history
  • Loading branch information
AbhiPrasad committed Jul 23, 2020
2 parents b3fa2cd + 82abd33 commit 9d54db5
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -3,6 +3,7 @@
## Unreleased

- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
- [react] feat: Add instrumentation for React Router v3 (#2759)

## 5.20.0

Expand Down
2 changes: 1 addition & 1 deletion packages/react/package.json
Expand Up @@ -32,7 +32,7 @@
"@testing-library/react-hooks": "^3.3.0",
"@types/hoist-non-react-statics": "^3.3.1",
"@types/react": "^16.9.35",
"@types/react-router-3": "npm:@types/react-router@^3.2.0",
"@types/react-router-3": "npm:@types/react-router@3.0.20",
"jest": "^24.7.1",
"jsdom": "^16.2.2",
"npm-run-all": "^4.1.2",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Expand Up @@ -1590,10 +1590,10 @@
resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.3.tgz#7ee330ba7caafb98090bece86a5ee44115904c2c"
integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==

"@types/react-router-3@npm:@types/react-router@^3.2.0":
version "3.0.23"
resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-3.0.23.tgz#86612ce051244c60306724942cc0de24225a0653"
integrity sha512-1JrVSk4hVdZOmrD1Me1UuxdgMxjQC8o+7b6aG90GKypo9f2gzbYaJ9w92v+8XRtsU5yVnfcPhuZLoWdZc38OsQ==
"@types/react-router-3@npm:@types/react-router@3.0.20":
version "3.0.20"
resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-3.0.20.tgz#a711682475ccef70ad9ad9e459859380221e6ee6"
integrity sha512-0sx2ThGYgblXPf8we/c+umFzP3RCbBp1bbFmd3pO1UaOYnTDno82iql3MQTVqB09rhopKORNfakDU/9xZ4QR6g==
dependencies:
"@types/history" "^3"
"@types/react" "*"
Expand Down

0 comments on commit 9d54db5

Please sign in to comment.