Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[RFR] Update dependencies #1722

Merged
merged 2 commits into from
Apr 4, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions examples/demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"dependencies": {
"data-generator": "^0.1.0",
"json-graphql-server": "~2.1.1",
"fakerest": "~1.2.1",
"fetch-mock": "~5.5.0",
"fakerest": "~2.1.0",
"fetch-mock": "~6.3.0",
"material-ui": "1.0.0-beta.40",
"material-ui-icons": "1.0.0-beta.36",
"ra-data-fakerest": "^2.0.0-beta2",
Expand All @@ -15,14 +15,14 @@
"ra-input-rich-text": "^2.0.0-beta2",
"ra-language-english": "^2.0.0-beta2",
"ra-language-french": "^2.0.0-beta2",
"react": "~16.0.0",
"react": "~16.3.1",
"react-admin": "~2.0.0-beta2",
"react-dom": "~16.0.0",
"react-redux": "~5.0.4",
"react-dom": "~16.3.1",
"react-redux": "~5.0.7",
"react-router-dom": "~4.2.2",
"react-scripts": "1.1.0",
"recompose": "~0.25.0",
"redux-form": "~7.0.3",
"react-scripts": "1.1.4",
"recompose": "~0.26.0",
"redux-form": "~7.3.0",
"redux-saga": "~0.16.0"
},
"scripts": {
Expand Down
3 changes: 3 additions & 0 deletions examples/demo/src/dataProvider/graphql.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ export default () => {
case 'customers':
return 'Customer';

case 'categories':
return 'Category';

case 'commands':
return 'Command';

Expand Down
2 changes: 1 addition & 1 deletion examples/demo/src/fakeServer/graphql.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ export default () => {
const restServer = JsonGraphqlServer({ data });
const handler = restServer.getHandler();

fetchMock.mock('^http://localhost:4000', handler);
fetchMock.mock('begin:http://localhost:4000', handler);
return () => fetchMock.restore();
};
2 changes: 1 addition & 1 deletion examples/demo/src/fakeServer/rest.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ export default () => {
const restServer = new FakeRest.FetchServer('http://localhost:4000');
restServer.init(data);
restServer.toggleLogging(); // logging is off by default, enable it
fetchMock.mock('^http://localhost:4000', restServer.getHandler());
fetchMock.mock('begin:http://localhost:4000', restServer.getHandler());
return () => fetchMock.restore();
};
13 changes: 6 additions & 7 deletions examples/graphcool-demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,20 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"fetch-mock": "~5.5.0",
"material-ui": "1.0.0-beta.40",
"material-ui-icons": "1.0.0-beta.36",
"ra-data-graphcool": "~2.0.0-beta2",
"ra-input-rich-text": "^2.0.0-beta2",
"ra-language-english": "^2.0.0-beta2",
"ra-language-french": "^2.0.0-beta2",
"react": "~16.0.0",
"react": "~16.3.1",
"react-admin": "~2.0.0-beta1",
"react-dom": "~16.0.0",
"react-redux": "~5.0.4",
"react-dom": "~16.3.1",
"react-redux": "~5.0.7",
"react-router-dom": "~4.2.2",
"react-scripts": "1.1.0",
"recompose": "~0.25.0",
"redux-form": "~7.0.3",
"react-scripts": "1.1.4",
"recompose": "~0.26.0",
"redux-form": "~7.3.0",
"redux-saga": "~0.16.0"
},
"scripts": {
Expand Down
15 changes: 7 additions & 8 deletions examples/simple/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,23 @@
"babel-core": "~6.26.0",
"babel-loader": "~7.1.1",
"babel-plugin-transform-react-jsx": "~6.24.1",
"babel-polyfill": "~6.9.1",
"babel-polyfill": "~6.26.0",
"babel-preset-react": "~6.24.1",
"css-loader": "~0.28.4",
"extract-text-webpack-plugin": "~2.1.2",
"html-loader": "~0.5.5",
"html-webpack-plugin": "~3.0.6",
"html-webpack-plugin": "~3.2.0",
"material-ui": "1.0.0-beta.40",
"material-ui-icons": "1.0.0-beta.36",
"ra-data-fakerest": "^2.0.0-beta1",
"ra-input-rich-text": "^2.0.0-beta1",
"ra-language-english": "^2.0.0-beta1",
"ra-language-french": "^2.0.0-beta1",
"react": "~16.0.0",
"react": "~16.3.1",
"react-admin": "^2.0.0-beta1",
"react-dom": "~16.0.0",
"style-loader": "~0.18.2",
"webpack": "~4.1.1",
"webpack-cli": "~2.0.12",
"react-dom": "~16.3.1",
"style-loader": "~0.20.3",
"webpack": "~4.5.0",
"webpack-cli": "~2.0.13",
"webpack-dev-server": "~3.1.1"
}
}
2 changes: 1 addition & 1 deletion examples/simple/src/comments.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ const CommentGrid = withStyles(listStyles)(
translate(({ classes, ids, data, basePath, translate }) => (
<Grid spacing={16} container style={{ padding: '1em' }}>
{ids.map(id => (
<Grid spacing={16} item key={id} sm={12} md={6} lg={4}>
<Grid item key={id} sm={12} md={6} lg={4}>
<Card className={classes.card}>
<CardHeader
title={
Expand Down
6 changes: 3 additions & 3 deletions examples/tutorial/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
"dependencies": {
"material-ui": "1.0.0-beta.40",
"ra-data-json-server": "~2.0.0-beta1",
"react": "~16.0.0",
"react": "~16.3.1",
"react-admin": "~2.0.0-beta1",
"react-dom": "~16.0.0",
"react-scripts": "1.1.0"
"react-dom": "~16.3.1",
"react-scripts": "1.1.4"
},
"scripts": {
"start": "react-scripts start",
Expand Down
8 changes: 3 additions & 5 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
{
"lerna": "2.5.1",
"packages": [
"packages/*"
],
"version": "2.0.0-beta4"
"lerna": "2.9.1",
"packages": ["packages/*"],
"version": "2.0.0-beta4"
}
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"devDependencies": {
"babel-cli": "~6.26.0",
"babel-core": "~6.26.0",
"babel-eslint": "~7.2.2",
"babel-eslint": "~8.2.2",
"babel-plugin-add-module-exports": "~0.2.1",
"babel-plugin-transform-builtin-extend": "~1.1.2",
"babel-plugin-transform-react-jsx": "~6.24.1",
Expand All @@ -21,17 +21,17 @@
"babel-register": "~6.26.0",
"cheerio": "~1.0.0-rc.2",
"chromedriver": "~2.37.0",
"eslint": "~4.6.1",
"eslint-config-prettier": "~2.4.0",
"eslint-plugin-import": "~2.6.1",
"eslint-plugin-prettier": "~2.2.0",
"eslint-plugin-react": "~7.3.0",
"express": "~4.15.2",
"full-icu": "~1.1.3",
"eslint": "~4.19.1",
"eslint-config-prettier": "~2.9.0",
"eslint-plugin-import": "~2.10.0",
"eslint-plugin-prettier": "~2.6.0",
"eslint-plugin-react": "~7.7.0",
"express": "~4.16.3",
"full-icu": "~1.2.1",
"jest": "20.0.4",
"lerna": "~2.5.1",
"lerna": "~2.9.1",
"lolex": "~2.3.2",
"mocha": "~4.0.1",
"mocha": "~5.0.5",
"prettier": "~1.7.0",
"prettier-eslint-cli": "~4.7.1",
"raf": "~3.4.0",
Expand Down
22 changes: 11 additions & 11 deletions packages/ra-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,30 +14,30 @@
"enzyme": "~3.3.0",
"enzyme-adapter-react-16": "~1.1.1",
"ignore-styles": "~5.0.1",
"react": "~16.0.0",
"react-dom": "~16.0.0",
"react-test-renderer": "~16.0.0"
"react": "~16.3.1",
"react-dom": "~16.3.1",
"react-test-renderer": "~16.3.1"
},
"peerDependencies": {
"react": "~16.0.0 || ~16.1.0 || ~16.2.0",
"react-dom": "~16.0.0 || ~16.1.0 || ~16.2.0"
"react": "~16.0.0 || ~16.1.0 || ~16.2.0 || ~16.3.0",
"react-dom": "~16.0.0 || ~16.1.0 || ~16.2.0 || ~16.3.0"
},
"dependencies": {
"babel-runtime": "~6.26.0",
"classnames": "~2.2.5",
"inflection": "~1.12.0",
"lodash": "~4.17.5",
"node-polyglot": "2.2.2",
"prop-types": "~15.5.7",
"query-string": "~5.0.0",
"prop-types": "~15.6.1",
"query-string": "~6.0.0",
"ra-language-english": "^2.0.0-beta4",
"react-redux": "~5.0.4",
"react-redux": "~5.0.7",
"react-router": "~4.2.0",
"react-router-dom": "~4.2.2",
"react-router-redux": "~5.0.0-alpha.6",
"recompose": "~0.25.0",
"react-router-redux": "~5.0.0-alpha.9",
"recompose": "~0.26.0",
"redux": "~3.7.2",
"redux-form": "~7.0.3",
"redux-form": "~7.3.0",
"redux-saga": "~0.16.0",
"reselect": "~3.0.0",
"warning": "~3.0.0"
Expand Down
8 changes: 3 additions & 5 deletions packages/ra-data-graphcool/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@
"url": "https://github.com/marmelab/react-admin/issues"
},
"homepage": "https://github.com/marmelab/react-admin#readme",
"authors": [
"Gildas Garcia"
],
"authors": ["Gildas Garcia"],
"keywords": [
"reactjs",
"react",
Expand All @@ -31,11 +29,11 @@
"ra-data-graphql": "^2.0.0-beta4"
},
"peerDependencies": {
"graphql": "^0.12.3",
"graphql": "^0.13.2",
"react-admin": "^2.0.0-beta4"
},
"devDependencies": {
"graphql": "^0.12.3",
"graphql": "^0.13.2",
"react-admin": "^2.0.0-beta4"
}
}
8 changes: 3 additions & 5 deletions packages/ra-data-graphql-simple/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@
"url": "https://github.com/marmelab/react-admin/issues"
},
"homepage": "https://github.com/marmelab/react-admin#readme",
"authors": [
"Gildas Garcia"
],
"authors": ["Gildas Garcia"],
"keywords": [
"reactjs",
"react",
Expand All @@ -30,11 +28,11 @@
"ra-data-graphql": "^2.0.0-beta4"
},
"peerDependencies": {
"graphql": "^0.12.3",
"graphql": "^0.13.2",
"react-admin": "^2.0.0-beta4"
},
"devDependencies": {
"graphql": "^0.12.3",
"graphql": "^0.13.2",
"react-admin": "^2.0.0-beta4"
}
}
10 changes: 4 additions & 6 deletions packages/ra-data-graphql/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@
"url": "https://github.com/marmelab/react-admin/issues"
},
"homepage": "https://github.com/marmelab/react-admin#readme",
"authors": [
"Gildas Garcia"
],
"authors": ["Gildas Garcia"],
"keywords": [
"reactjs",
"react",
Expand All @@ -24,18 +22,18 @@
],
"license": "MIT",
"dependencies": {
"apollo-client": "^2.1.0",
"apollo-client": "^2.2.8",
"apollo-client-preset": "^1.0.6",
"graphql-tag": "^2.6.1",
"lodash": "~4.17.5",
"pluralize": "~7.0.0"
},
"peerDependencies": {
"graphql": "^0.12.3",
"graphql": "^0.13.2",
"react-admin": "^2.0.0-beta4"
},
"devDependencies": {
"graphql": "^0.12.3",
"graphql": "^0.13.2",
"react-admin": "^2.0.0-beta4"
}
}
12 changes: 3 additions & 9 deletions packages/ra-data-json-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,17 @@
"version": "2.0.0-beta4",
"description": "JSON Server data provider for react-admin",
"main": "lib/index.js",
"files": [
"*.md",
"lib",
"src"
],
"files": ["*.md", "lib", "src"],
"scripts": {
"test": "make test"
},
"authors": [
"François Zaninotto"
],
"authors": ["François Zaninotto"],
"repository": "marmelab/react-admin",
"homepage": "https://github.com/marmelab/react-admin#readme",
"bugs": "https://github.com/marmelab/react-admin/issues",
"license": "MIT",
"dependencies": {
"query-string": "~5.0.0",
"query-string": "~6.0.0",
"react-admin": "^2.0.0-beta4"
}
}
12 changes: 3 additions & 9 deletions packages/ra-data-simple-rest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,17 @@
"version": "2.0.0-beta4",
"description": "Simple REST data provider for react-admin",
"main": "lib/index.js",
"files": [
"*.md",
"lib",
"src"
],
"files": ["*.md", "lib", "src"],
"scripts": {
"test": "make test"
},
"authors": [
"François Zaninotto"
],
"authors": ["François Zaninotto"],
"repository": "marmelab/react-admin",
"homepage": "https://github.com/marmelab/react-admin#readme",
"bugs": "https://github.com/marmelab/react-admin/issues",
"license": "MIT",
"dependencies": {
"query-string": "~5.0.0",
"query-string": "~6.0.0",
"react-admin": "^2.0.0-beta4"
}
}
Loading