Skip to content

Commit

Permalink
Merge branch 'master' into zetlen/pwadevserver-optional-features
Browse files Browse the repository at this point in the history
  • Loading branch information
zetlen authored Aug 11, 2018
2 parents 9918327 + 0473fdb commit f774fcf
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 44 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"babel-eslint": "^8.2.3",
"babel-plugin-syntax-dynamic-import": "^6.18.0",
"coveralls": "^3.0.1",
"danger": "^3.7.18",
"danger": "^3.8.3",
"eslint": "^5.2.0",
"eslint-plugin-babel": "^5.1.0",
"eslint-plugin-jsx-a11y": "^6.0.3",
Expand Down
70 changes: 35 additions & 35 deletions packages/peregrine/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions packages/peregrine/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
"dependencies": {},
"peerDependencies": {
"babel-runtime": "^6.0.0",
"react": "^16.2.0",
"react-dom": "^16.2.0",
"react": "^16.4.2",
"react-dom": "^16.4.2",
"react-redux": "^5.0.6",
"react-router-dom": "^4.2.2",
"redux": "^3.7.2"
Expand All @@ -42,16 +42,16 @@
"babel-plugin-transform-react-jsx": "^6.24.1",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-preset-env": "^1.6.1",
"danger": "^3.4.5",
"danger": "^3.8.3",
"enzyme": "^3.3.0",
"enzyme-adapter-react-16": "^1.1.1",
"execa": "^0.10.0",
"intl": "^1.2.5",
"jest-fetch-mock": "^1.4.1",
"npm-merge-driver": "^2.3.5",
"prop-types": "^15.6.0",
"react": "^16.2.0",
"react-dom": "^16.2.0",
"react": "^16.4.2",
"react-dom": "^16.4.2",
"react-redux": "^5.0.6",
"react-router-dom": "^4.2.2",
"redux": "^4.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/pwa-buildpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"memory-fs": "^0.4.1",
"nock": "^9.2.5",
"npm-run-all": "^4.1.2",
"react": "^16.1.1",
"react": "^16.4.2",
"rimraf": "^2.6.2",
"strip-ansi": "^4.0.0",
"supertest": "^3.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/venia-concept/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
"graphql-tag": "^2.9.2",
"lodash.debounce": "^4.0.8",
"memoize-one": "^4.0.0",
"react": "^16.2.0",
"react": "^16.4.2",
"react-apollo": "^2.1.5",
"react-dom": "^16.2.0",
"react-dom": "^16.4.2",
"react-redux": "^5.0.6",
"react-router-dom": "^4.2.2",
"redux": "^4.0.0"
Expand Down

0 comments on commit f774fcf

Please sign in to comment.