Skip to content

Commit

Permalink
Merge branch 'master' into feature/serviceworker
Browse files Browse the repository at this point in the history
  • Loading branch information
manueliglesias authored May 15, 2018
2 parents c33b051 + efd9fcf commit 8caaf5c
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
3 changes: 3 additions & 0 deletions packages/aws-amplify-react-native/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
"axios": "^0.17.1",
"babel-preset-es2015": "^6.24.1"
},
"peerDependencies": {
"graphql": "0.13.0"
},
"repository": {
"type": "git",
"url": "git+https://github.com/aws/aws-amplify.git"
Expand Down
3 changes: 3 additions & 0 deletions packages/aws-amplify-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@
}
}
},
"peerDependencies": {
"graphql": "0.13.0"
},
"dependencies": {
"qrcode.react": "^0.8.0",
"regenerator-runtime": "^0.11.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-amplify-react/src/API/GraphQL/Connect.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import regeneratorRuntime from 'regenerator-runtime/runtime';
import 'regenerator-runtime/runtime';
import React, { Component } from 'react';
import { parse } from 'graphql/language/parser';

Expand Down

0 comments on commit 8caaf5c

Please sign in to comment.