Merge pull request #154 from relay-tools/update

Update dependencies
relay-tools · Sep 10, 2018 · a0fcb9d · a0fcb9d
2 parents 53cd216 + 5e9f225
commit a0fcb9d
Show file tree

Hide file tree

Showing 13 changed files with 1,390 additions and 1,426 deletions.
diff --git a/package.json b/package.json
@@ -64,10 +64,10 @@
   "dependencies": {
     "babel-runtime": "^6.26.0",
     "is-promise": "^2.1.0",
-    "lodash": "^4.17.4",
-    "prop-types": "^15.6.0",
-    "prop-types-extra": "^1.0.1",
-    "warning": "^3.0.0"
+    "lodash": "^4.17.10",
+    "prop-types": "^15.6.2",
+    "prop-types-extra": "^1.1.0",
+    "warning": "^4.0.2"
   },
   "peerDependencies": {
     "found": ">=0.3.8",
@@ -76,40 +76,40 @@
   },
   "devDependencies": {
     "babel-cli": "^6.26.0",
-    "babel-eslint": "^7.2.3",
-    "babel-jest": "^22.0.4",
+    "babel-eslint": "^8.2.6",
+    "babel-jest": "^23.6.0",
     "babel-plugin-add-module-exports": "^0.2.1",
     "babel-plugin-dev-expression": "^0.2.1",
-    "babel-plugin-relay": "^1.4.1",
+    "babel-plugin-relay": "^1.6.2",
     "babel-plugin-transform-runtime": "^6.23.0",
     "babel-polyfill": "^6.26.0",
-    "babel-preset-env": "^1.6.1",
+    "babel-preset-env": "^1.7.0",
     "babel-preset-react": "^6.24.1",
     "babel-preset-stage-1": "^6.24.1",
-    "codecov": "^3.0.0",
-    "delay": "^3.0.0",
+    "codecov": "^3.1.0",
+    "delay": "^4.0.1",
     "doctoc": "^1.3.1",
-    "eslint": "^4.14.0",
-    "eslint-config-4catalyzer-react": "^0.3.3",
-    "eslint-config-prettier": "^2.9.0",
-    "eslint-plugin-import": "^2.8.0",
-    "eslint-plugin-jsx-a11y": "^5.1.1",
-    "eslint-plugin-prettier": "^2.4.0",
-    "eslint-plugin-react": "^7.5.1",
-    "farce": "^0.2.4",
-    "found": "^0.3.8",
-    "graphql": "^0.12.3",
+    "eslint": "^4.19.1",
+    "eslint-config-4catalyzer-react": "^0.4.4",
+    "eslint-config-prettier": "^3.0.1",
+    "eslint-plugin-import": "^2.14.0",
+    "eslint-plugin-jsx-a11y": "^6.1.1",
+    "eslint-plugin-prettier": "^2.6.2",
+    "eslint-plugin-react": "^7.11.1",
+    "farce": "^0.2.6",
+    "found": "^0.3.14",
+    "graphql": "^0.13.2",
     "husky": "^0.14.3",
-    "jest": "^22.0.4",
-    "lint-staged": "^6.0.0",
+    "jest": "^23.6.0",
+    "lint-staged": "^7.2.2",
     "p-defer": "^1.0.0",
-    "prettier": "^1.9.2",
-    "react": "^16.2.0",
-    "react-dom": "^16.2.0",
-    "react-relay": "^1.4.1",
-    "relay-compiler": "^1.4.1",
-    "relay-local-schema": "^0.6.2",
-    "relay-runtime": "^1.4.1",
+    "prettier": "^1.14.2",
+    "react": "^16.5.0",
+    "react-dom": "^16.5.0",
+    "react-relay": "^1.6.2",
+    "relay-compiler": "^1.6.2",
+    "relay-local-schema": "^0.7.0",
+    "relay-runtime": "^1.6.2",
     "rimraf": "^2.6.2"
   }
 }
diff --git a/src/modern/QuerySubscription.js b/src/modern/QuerySubscription.js
@@ -59,35 +59,41 @@ export default class QuerySubscription {
       resolve();
     };
 
+    const onError = error => {
+      this.updateReadyState({
+        error,
+        props: null,
+        // FIXME: Use default readyState when retrying.
+        retry: this.retry,
+      });
+
+      resolve();
+    };
+
     const useStoreSnapshot =
       !this.retrying &&
       (this.dataFrom === 'STORE_THEN_NETWORK' ||
         this.dataFrom === 'STORE_OR_NETWORK') &&
       this.environment.check(this.operation.root);
 
     if (!(this.dataFrom === 'STORE_OR_NETWORK' && useStoreSnapshot)) {
-      this.pendingRequest = this.environment
-        .execute({
-          operation: this.operation,
-          cacheConfig: this.cacheConfig,
-        })
-        .finally(() => {
-          this.pendingRequest = null;
-        })
-        .subscribe({
-          next: onSnapshot,
-
-          error: error => {
-            this.updateReadyState({
-              error,
-              props: null,
-              // FIXME: Use default readyState when retrying.
-              retry: this.retry,
-            });
-
-            resolve();
-          },
-        });
+      try {
+        this.pendingRequest = this.environment
+          .execute({
+            operation: this.operation,
+            cacheConfig: this.cacheConfig,
+          })
+          .finally(() => {
+            this.pendingRequest = null;
+          })
+          .subscribe({
+            next: onSnapshot,
+            error: onError,
+          });
+      } catch (error) {
+        onError(error);
+        return;
+      }
     }
 
     // Only use the store snapshot if the network layer doesn't synchronously

diff --git a/test/classic/Resolver.test.js b/test/classic/Resolver.test.js
@@ -131,6 +131,7 @@ describe('Resolver', () => {
       });
 
       class InstrumentedResolver extends Resolver {
+        // eslint-disable-next-line require-await
         async *resolveElements(match) {
           yield* super.resolveElements(match);
           done();

diff --git a/test/compat/smoke-warnings.test.js b/test/compat/smoke-warnings.test.js
@@ -9,20 +9,22 @@ import { Resolver } from '../../src';
 
 import { createEnvironment } from '../modern/helpers';
 
+const query = graphql`
+  query smokeWarnings_Query {
+    widget {
+      name
+    }
+  }
+`;
+
 describe('smoke', () => {
   it('should warn on missing component', async () => {
     await getFarceResult({
       url: '/',
       routeConfig: [
         {
           path: '/',
-          query: graphql`
-            query smokeWarnings_Query {
-              widget {
-                name
-              }
-            }
-          `,
+          query,
         },
       ],
       resolver: new Resolver(createEnvironment()),
@@ -42,13 +44,7 @@ describe('smoke', () => {
       routeConfig: [
         {
           path: '/',
-          getQuery: () => graphql`
-            query smokeWarnings_Query {
-              widget {
-                name
-              }
-            }
-          `,
+          getQuery: () => query,
         },
       ],
       resolver: new Resolver(createEnvironment()),

diff --git a/test/fixtures/schema.graphql b/test/fixtures/schema.graphql
@@ -1,4 +1,5 @@
 type Query {
+  id: ID
   widget: Widget
   widgetByArg(name: String!): Widget
   error: String

diff --git a/test/fixtures/schema.js b/test/fixtures/schema.js
@@ -1,4 +1,5 @@
 import {
+  GraphQLID,
   GraphQLNonNull,
   GraphQLObjectType,
   GraphQLSchema,
@@ -8,15 +9,18 @@ import {
 const Widget = new GraphQLObjectType({
   name: 'Widget',
   fields: {
-    name: {
-      type: GraphQLString,
-    },
+    name: { type: GraphQLString },
   },
 });
 
 const query = new GraphQLObjectType({
   name: 'Query',
   fields: {
+    // XXX: relay-compiler chokes unless at least one type has an ID.
+    id: {
+      type: GraphQLID,
+      resolve: () => 'query',
+    },
     widget: {
       type: Widget,
       resolve: () => ({ name: 'foo' }),

diff --git a/test/modern/dataFrom.test.js b/test/modern/dataFrom.test.js
@@ -13,6 +13,14 @@ import {
   InstrumentedResolver,
 } from './helpers';
 
+const query = graphql`
+  query dataFrom_default_Query {
+    widget {
+      name
+    }
+  }
+`;
+
 function createRecords() {
   return {
     'client:root': {
@@ -49,13 +57,7 @@ describe('dataFrom', () => {
         routeConfig: [
           {
             path: '/',
-            query: graphql`
-              query dataFrom_Query {
-                widget {
-                  name
-                }
-              }
-            `,
+            query,
             render: renderSpy,
           },
         ],
@@ -107,13 +109,7 @@ describe('dataFrom', () => {
         routeConfig: [
           {
             path: '/',
-            query: graphql`
-              query dataFrom_Query {
-                widget {
-                  name
-                }
-              }
-            `,
+            query,
             render: renderSpy,
             dataFrom: 'STORE_THEN_NETWORK',
           },
@@ -222,13 +218,7 @@ describe('dataFrom', () => {
         routeConfig: [
           {
             path: '/',
-            query: graphql`
-              query dataFrom_Query {
-                widget {
-                  name
-                }
-              }
-            `,
+            query,
             render: renderSpy,
             dataFrom: 'STORE_OR_NETWORK',
           },

diff --git a/test/modern/helpers.js b/test/modern/helpers.js
@@ -39,6 +39,7 @@ export class InstrumentedResolver extends Resolver {
     this.done = new Promise(() => {});
   }
 
+  // eslint-disable-next-line require-await
   async *resolveElements(match) {
     let resolveDone;
     this.done = new Promise(resolve => {

diff --git a/test/modern/render-warnings.test.js b/test/modern/render-warnings.test.js
@@ -11,6 +11,14 @@ import { Resolver } from '../../src';
 
 import { createEnvironment } from './helpers';
 
+const query = graphql`
+  query renderWarnings_Query {
+    widget {
+      name
+    }
+  }
+`;
+
 describe('render', () => {
   let environment;
 
@@ -24,13 +32,7 @@ describe('render', () => {
       routeConfig: [
         {
           path: '/',
-          query: graphql`
-            query renderWarnings_Query {
-              widget {
-                name
-              }
-            }
-          `,
+          query,
         },
       ],
       resolver: new Resolver(environment),
@@ -50,13 +52,7 @@ describe('render', () => {
       routeConfig: [
         {
           path: '/',
-          getQuery: () => graphql`
-            query renderWarnings_Query {
-              widget {
-                name
-              }
-            }
-          `,
+          getQuery: () => query,
         },
       ],
       resolver: new Resolver(environment),
@@ -88,13 +84,7 @@ describe('render', () => {
           children: [
             {
               Component: Widget,
-              query: graphql`
-                query renderWarnings_Query {
-                  widget {
-                    name
-                  }
-                }
-              `,
+              query,
             },
           ],
         },
@@ -135,13 +125,7 @@ describe('render', () => {
           children: [
             {
               Component: Widget,
-              getQuery: () => graphql`
-                query renderWarnings_Query {
-                  widget {
-                    name
-                  }
-                }
-              `,
+              getQuery: () => query,
             },
           ],
         },

diff --git a/test/modern/render.test.js b/test/modern/render.test.js
@@ -110,7 +110,7 @@ describe('render', () => {
         {
           path: '/',
           query: graphql`
-            query render_Query {
+            query render_error_Query {
               widget {
                 name
               }
@@ -146,7 +146,7 @@ describe('render', () => {
         {
           path: '/',
           query: graphql`
-            query render_Query {
+            query render_redirect_Query {
               widget {
                 name
               }