Skip to content

Commit

Permalink
Merge pull request #3763 from kopax/improve-peer-dependencies-1683
Browse files Browse the repository at this point in the history
[RFR] move stateful to peer dependencies and devDependencies within modules, add them to react-admin as dependencies
  • Loading branch information
fzaninotto authored Oct 4, 2019
2 parents 3a294ad + ed31897 commit de85301
Show file tree
Hide file tree
Showing 4 changed files with 75 additions and 35 deletions.
28 changes: 18 additions & 10 deletions packages/ra-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,45 +27,53 @@
"watch": "rimraf ./lib && tsc --watch"
},
"devDependencies": {
"@testing-library/react": "^8.0.7",
"@redux-saga/testing-utils": "^1.0.2",
"@types/history": "^4.7.2",
"@types/node-polyglot": "^0.4.31",
"@types/react-redux": "^7.1.1",
"@types/react-router": "^5.1.0",
"@types/react-router-dom": "^5.1.0",
"@types/recompose": "^0.27.0",
"connected-react-router": "^6.5.2",
"cross-env": "^5.2.0",
"enzyme": "~3.9.0",
"enzyme-adapter-react-16": "~1.12.1",
"final-form": "^4.18.5",
"history": "^4.7.2",
"ignore-styles": "~5.0.1",
"react": "^16.9.0",
"react-dom": "^16.9.0",
"react-final-form": "^6.3.0",
"react-test-renderer": "^16.9.0",
"react-redux": "^7.1.0",
"react-router": "^5.1.0",
"react-router-dom": "^5.1.0",
"redux": "^3.7.2 || ^4.0.3",
"redux-saga": "^1.0.0",
"rimraf": "^2.6.3"
},
"peerDependencies": {
"connected-react-router": "^6.5.2",
"final-form": "^4.18.5",
"react": "^16.9.0",
"react-dom": "^16.9.0"
"react-dom": "^16.9.0",
"react-final-form": "^6.3.0",
"react-redux": "^7.1.0",
"react-router": "^5.1.0",
"react-router-dom": "^5.1.0",
"redux": "^3.7.2 || ^4.0.3",
"redux-saga": "^1.0.0"
},
"dependencies": {
"@testing-library/react": "^8.0.7",
"classnames": "~2.2.5",
"connected-react-router": "^6.5.2",
"date-fns": "^1.29.0",
"eventemitter3": "^3.0.0",
"final-form": "^4.18.5",
"inflection": "~1.12.0",
"lodash": "~4.17.5",
"prop-types": "^15.6.1",
"query-string": "~5.1.1",
"react-final-form": "^6.3.0",
"react-redux": "^7.1.0",
"react-router": "^5.1.0",
"react-router-dom": "^5.1.0",
"recompose": "~0.26.0",
"redux": "^3.7.2 || ^4.0.3",
"redux-saga": "^1.0.0",
"reselect": "~3.0.0"
}
}
27 changes: 17 additions & 10 deletions packages/ra-tree-ui-materialui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,23 +36,30 @@
"build-esm": "rimraf ./esm && tsc --outDir esm --module es2015",
"watch": "rimraf ./lib && tsc --watch"
},
"devDependencies": {
"cross-env": "^5.2.0",
"final-form": "^4.18.4",
"ra-core": "^3.0.0-beta.0",
"ra-tree-core": "^3.0.0-beta.0",
"ra-ui-materialui": "^3.0.0-beta.0",
"react-final-form": "^6.3.0",
"react": "^16.9.0",
"react-dom": "^16.9.0",
"rimraf": "^2.6.3"
},
"peerDependencies": {
"final-form": "^4.18.4",
"ra-core": "^3.0.0-alpha.0",
"ra-ui-materialui": "^2.5.0",
"ra-tree-core": "^3.0.0-beta.0",
"ra-ui-materialui": "^3.0.0-beta.0",
"react": "^16.9.0",
"react-dom": "^16.9.0"
"react-dom": "^16.9.0",
"react-final-form": "^6.3.0"
},
"dependencies": {
"final-form": "^4.18.4",
"lodash": "^4.17.10",
"prop-types": "^15.6.1",
"ra-tree-core": "^3.0.0-beta.0",
"react-dnd": "^5.0.0",
"react-dnd-touch-backend": "^0.5.1",
"react-final-form": "^6.3.0"
},
"devDependencies": {
"cross-env": "^5.2.0",
"rimraf": "^2.6.3"
"react-dnd-touch-backend": "^0.5.1"
}
}
40 changes: 26 additions & 14 deletions packages/ra-ui-materialui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,45 +26,57 @@
"watch": "rimraf ./lib && tsc --watch"
},
"devDependencies": {
"@material-ui/core": "^4.3.3",
"@material-ui/icons": "^4.2.1",
"@material-ui/styles": "^4.3.3",
"@testing-library/react": "^8.0.7",
"cross-env": "^5.2.0",
"enzyme": "~3.9.0",
"enzyme-adapter-react-16": "~1.12.1",
"final-form": "^4.18.5",
"final-form-arrays": "^3.0.1",
"file-api": "~0.10.4",
"ignore-styles": "~5.0.1",
"ra-core": "^3.0.0-beta.0",
"react": "^16.9.0",
"react-dom": "^16.9.0",
"react-final-form": "^6.3.0",
"react-final-form-arrays": "^3.1.1",
"react-test-renderer": "~16.8.6",
"react-redux": "^7.1.0",
"react-router": "^5.1.0",
"react-router-dom": "^5.1.0",
"redux": "^3.7.2 || ^4.0.3",
"rimraf": "^2.6.3"
},
"peerDependencies": {
"react": "^16.9.0",
"react-dom": "^16.9.0"
},
"dependencies": {
"@material-ui/core": "^4.3.3",
"@material-ui/icons": "^4.2.1",
"@material-ui/styles": "^4.3.3",
"final-form": "^4.18.5",
"final-form-arrays": "^3.0.1",
"ra-core": "^3.0.0-beta.0",
"react": "^16.9.0",
"react-dom": "^16.9.0",
"react-final-form": "^6.3.0",
"react-final-form-arrays": "^3.1.1",
"react-redux": "^7.1.0",
"react-router": "^5.1.0",
"react-router-dom": "^5.1.0",
"redux": "^3.7.2 || ^4.0.3"
},
"dependencies": {
"autosuggest-highlight": "^3.1.1",
"classnames": "~2.2.5",
"connected-react-router": "^6.5.2",
"css-mediaquery": "^0.1.2",
"downshift": "3.2.7",
"final-form": "^4.18.5",
"final-form-arrays": "^3.0.1",
"inflection": "~1.12.0",
"jsonexport": "^2.4.1",
"lodash": "~4.17.5",
"prop-types": "^15.6.1",
"ra-core": "^3.0.0-beta.0",
"react-dropzone": "^10.1.7",
"react-final-form": "^6.3.0",
"react-final-form-arrays": "^3.1.1",
"react-redux": "^7.1.0",
"react-router": "^5.1.0",
"react-router-dom": "^5.1.0",
"react-transition-group": "^2.2.1",
"recompose": "~0.26.0",
"redux": "^3.7.2 || ^4.0.3"
"recompose": "~0.26.0"
}
}
15 changes: 14 additions & 1 deletion packages/react-admin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,22 @@
"react-dom": "^16.9.0"
},
"dependencies": {
"@material-ui/core": "^4.3.3",
"@material-ui/icons": "^4.2.1",
"@material-ui/styles": "^4.3.3",
"connected-react-router": "^6.5.2",
"final-form": "^4.18.5",
"final-form-arrays": "^3.0.1",
"ra-core": "^3.0.0-beta.0",
"ra-i18n-polyglot": "^3.0.0-beta.0",
"ra-language-english": "^3.0.0-beta.0",
"ra-ui-materialui": "^3.0.0-beta.0"
"ra-ui-materialui": "^3.0.0-beta.0",
"react-final-form": "^6.3.0",
"react-final-form-arrays": "^3.1.1",
"react-redux": "^7.1.0",
"react-router": "^5.1.0",
"react-router-dom": "^5.1.0",
"redux": "^3.7.2 || ^4.0.3",
"redux-saga": "^1.0.0"
}
}

0 comments on commit de85301

Please sign in to comment.