Skip to content

Commit

Permalink
Merge pull request #3440 from marmelab/fix-dependencies
Browse files Browse the repository at this point in the history
[RFR] Fix dependencies to 3.0.0
  • Loading branch information
djhi authored Jul 21, 2019
2 parents 3add867 + 199af52 commit d9251a1
Show file tree
Hide file tree
Showing 13 changed files with 35 additions and 27 deletions.
14 changes: 7 additions & 7 deletions examples/demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
"fakerest": "~2.1.0",
"fetch-mock": "~6.3.0",
"json-graphql-server": "~2.1.3",
"ra-data-fakerest": "^2.0.0",
"ra-data-graphql-simple": "^2.0.0",
"ra-data-simple-rest": "^2.0.0",
"ra-input-rich-text": "^2.0.0",
"ra-language-english": "^2.0.0",
"ra-language-french": "^2.0.0",
"ra-data-fakerest": "^3.0.0-alpha.0",
"ra-data-graphql-simple": "^3.0.0-alpha.0",
"ra-data-simple-rest": "^3.0.0-alpha.0",
"ra-input-rich-text": "^3.0.0-alpha.0",
"ra-language-english": "^3.0.0-alpha.0",
"ra-language-french": "^3.0.0-alpha.0",
"react": "~16.8.0",
"react-admin": "^2.0.0",
"react-admin": "^3.0.0-alpha.0",
"react-app-polyfill": "^0.1.3",
"react-dom": "~16.8.0",
"react-redux": "^7.1.0",
Expand Down
18 changes: 9 additions & 9 deletions examples/simple/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,16 @@
"@babel/polyfill": "^7.0.0",
"@material-ui/core": "^4.0.0-beta.2",
"@material-ui/icons": "^4.0.0-beta.0",
"ra-data-fakerest": "^2.0.0",
"ra-input-rich-text": "^2.0.0",
"ra-language-english": "^2.0.0",
"ra-language-french": "^2.0.0",
"ra-tree-core": "^2.0.0",
"ra-tree-language-english": "^2.0.0",
"ra-tree-language-french": "^2.0.0",
"ra-tree-ui-materialui": "^2.0.0",
"ra-data-fakerest": "^3.0.0-alpha.0",
"ra-input-rich-text": "^3.0.0-alpha.0",
"ra-language-english": "^3.0.0-alpha.0",
"ra-language-french": "^3.0.0-alpha.0",
"ra-tree-core": "^3.0.0-alpha.0",
"ra-tree-language-english": "^3.0.0-alpha.0",
"ra-tree-language-french": "^3.0.0-alpha.0",
"ra-tree-ui-materialui": "^3.0.0-alpha.0",
"react": "~16.8.0",
"react-admin": "^2.0.0",
"react-admin": "^3.0.0-alpha.0",
"react-dom": "~16.8.0"
}
}
4 changes: 2 additions & 2 deletions examples/tutorial/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"private": true,
"dependencies": {
"@material-ui/core": "^4.0.0-beta.2",
"ra-data-json-server": "^2.0.0",
"ra-data-json-server": "^3.0.0-alpha.0",
"react": "~16.8.0",
"react-admin": "^2.0.0",
"react-admin": "^3.0.0-alpha.0",
"react-dom": "~16.8.0",
"react-scripts": "^3.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/ra-data-fakerest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@
"rimraf": "^2.6.3"
},
"peerDependencies": {
"ra-core": "^2.5.0"
"ra-core": "^3.0.0-alpha.0"
}
}
2 changes: 1 addition & 1 deletion packages/ra-data-graphcool/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
},
"peerDependencies": {
"graphql": "^0.13.2",
"ra-core": "^2.5.0"
"ra-core": "^3.0.0-alpha.0"
},
"devDependencies": {
"cross-env": "^5.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/ra-data-graphql-simple/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
},
"peerDependencies": {
"graphql": "^0.13.2",
"ra-core": "^2.5.0"
"ra-core": "^3.0.0-alpha.0"
},
"devDependencies": {
"cross-env": "^5.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/ra-data-graphql/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
},
"peerDependencies": {
"graphql": "^0.13.2",
"ra-core": "^2.5.0"
"ra-core": "^3.0.0-alpha.0"
},
"devDependencies": {
"cross-env": "^5.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/ra-input-rich-text/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"watch": "rimraf ./lib && tsc --watch"
},
"peerDependencies": {
"ra-core": "^2.5.0",
"ra-core": "^3.0.0-alpha.0",
"react": "^16.8.0",
"react-dom": "^16.8.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/ra-realtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
},
"peerDependencies": {
"connected-react-router": "^6.4.0",
"ra-core": "^2.5.0",
"ra-core": "^3.0.0-alpha.0",
"react-admin": "^2.5.3",
"react-router": "^4.2.0",
"redux-saga": "^1.0.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/ra-tree-language-english/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ra-tree-language-english",
"version": "2.3.0",
"version": "3.0.0-alpha.0",
"description": "English messages for ra-tree, an addon providing tree components for react-admin, the frontend framework for building admin applications on top of REST/GraphQL services",
"main": "index.js",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion packages/ra-tree-language-french/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ra-tree-language-french",
"version": "2.3.0",
"version": "3.0.0-alpha.0",
"description": "French messages for ra-tree, an addon providing tree components for react-admin, the frontend framework for building admin applications on top of REST/GraphQL services",
"main": "index.js",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion packages/ra-tree-ui-materialui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"watch": "rimraf ./lib && tsc --watch"
},
"peerDependencies": {
"ra-core": "^2.5.0",
"ra-core": "^3.0.0-alpha.0",
"ra-ui-materialui": "^2.5.0",
"react": "^16.8.0",
"react-dom": "^16.8.0"
Expand Down
8 changes: 8 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6132,6 +6132,14 @@ dashdash@^1.12.0:
dependencies:
assert-plus "^1.0.0"

data-generator-retail@^2.7.0:
version "2.9.5"
resolved "https://registry.yarnpkg.com/data-generator-retail/-/data-generator-retail-2.9.5.tgz#9a1a541f7bc19c00b633b0d17e6b39837e398976"
integrity sha512-scx3c91hhTMxFIvNgAO2Y2Xor4eIR8FfZ7LBCHVlsUt7DEIUvH6juHIVjT6ytzQjwBuR03UzEOlZpIMim1+KqQ==
dependencies:
date-fns "~1.29.0"
faker "^4.1.0"

data-urls@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-1.0.1.tgz#d416ac3896918f29ca84d81085bc3705834da579"
Expand Down

0 comments on commit d9251a1

Please sign in to comment.