Merge pull request #456 from gladly-team/kevin/upgrade-relay

Upgrade Relay
gladly-team · Jan 29, 2019 · b7e4b6c · b7e4b6c
2 parents 8d2bbc2 + f0fe21c
commit b7e4b6c
Show file tree

Hide file tree

Showing 4 changed files with 187 additions and 405 deletions.
diff --git a/graphql/package.json b/graphql/package.json
@@ -12,7 +12,7 @@
     "dotenv-extended": "^2.3.0",
     "dynogels": "^9.0.0",
     "graphql": "^14.1.1",
-    "graphql-relay": "^0.5.5",
+    "graphql-relay": "^0.6.0",
     "joi": "^14.3.1",
     "lodash": "^4.17.11",
     "moment": "^2.23.0",

diff --git a/graphql/yarn.lock b/graphql/yarn.lock
@@ -3672,10 +3672,12 @@ graphlib@^2.1.1:
   dependencies:
     lodash "^4.11.1"
 
-graphql-relay@^0.5.5:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/graphql-relay/-/graphql-relay-0.5.5.tgz#d6815e6edd618e878d5d921c13fc66033ec867e2"
-  integrity sha1-1oFebt1hjoeNXZIcE/xmAz7IZ+I=
+graphql-relay@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/graphql-relay/-/graphql-relay-0.6.0.tgz#18ec36b772cfcb3dbb9bd369c3f8004cf42c7b93"
+  integrity sha512-OVDi6C9/qOT542Q3KxZdXja3NrDvqzbihn1B44PH8P/c5s0Q90RyQwT6guhGqXqbYEH6zbeLJWjQqiYvcg2vVw==
+  dependencies:
+    prettier "^1.16.0"
 
 graphql@^14.1.1:
   version "14.1.1"
@@ -6358,6 +6360,11 @@ prettier@1.15.3:
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.15.3.tgz#1feaac5bdd181237b54dbe65d874e02a1472786a"
   integrity sha512-gAU9AGAPMaKb3NNSUUuhhFAS7SCO4ALTN4nRIn6PJ075Qd28Yn2Ig2ahEJWdJwJmlEBTUfC7mMUSFy8MwsOCfg==
 
+prettier@^1.16.0:
+  version "1.16.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.1.tgz#534c2c9d7853f8845e5e078384e71973bd74089f"
+  integrity sha512-XXUITwIkGb3CPJ2hforHah/zTINRyie5006Jd2HKy2qz7snEJXl0KLfsJZW/wst9g6R2rFvqba3VpNYdu1hDcA==
+
 pretty-format@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-23.6.0.tgz#5eaac8eeb6b33b987b7fe6097ea6a8a146ab5760"

diff --git a/web/package.json b/web/package.json
@@ -4,7 +4,7 @@
   "description": "Web app for Tab for a Cause.",
   "private": true,
   "devDependencies": {
-    "babel-plugin-relay": "^2.0.0-rc.1",
+    "babel-plugin-relay": "^2.0.0",
     "chromedriver": "^2.45.0",
     "codecov": "^3.1.0",
     "cross-env": "^5.2.0",
@@ -22,8 +22,8 @@
     "patch-package": "6.0.0-11",
     "prettier": "1.15.3",
     "react-scripts": "^2.1.3",
-    "relay-compiler": "^1.6.2",
-    "relay-runtime": "^1.6.2",
+    "relay-compiler": "^2.0.0",
+    "relay-runtime": "^2.0.0",
     "selenium-webdriver": "^3.4.0",
     "serverless": "^1.36.1"
   },
@@ -51,7 +51,7 @@
     "react-helmet": "^5.2.0",
     "react-joyride": "2.0.2",
     "react-measure": "2.1.3",
-    "react-relay": "^1.6.2",
+    "react-relay": "^2.0.0",
     "react-router": "^4.3.1",
     "react-router-dom": "^4.3.1",
     "react-sparkle": "^1.0.4",
@@ -64,7 +64,7 @@
   "scripts": {
     "start": "yarn run relay && nodemon --watch data/schema.graphql --exec yarn run start:react-app & yarn run relay:watch",
     "start:react-app": "cross-env NODE_PATH=src/ react-scripts start",
-    "build": "yarn run relay && cross-env NODE_PATH=src/ react-scripts build",
+    "build": "yarn run relay --watchman false && cross-env NODE_PATH=src/ react-scripts build",
     "eject": "react-scripts eject",
     "postinstall": "patch-package",
     "deploy": "npm-run-all -s build sls:s3sync sls:deploy",