Merge pull request #36 from relay-tools/update-deps

Update dev dependencies

Author: taion

karma.conf.js

@@ -14,8 +14,8 @@ module.exports = (config) => {
 
     webpack: {
       module: {
-        loaders: [
-          { test: /\.js$/, exclude: /node_modules/, loader: 'babel' },
+        rules: [
+          { test: /\.js$/, exclude: /node_modules/, use: 'babel-loader' },
         ],
       },
       plugins: [

package.json

@@ -35,41 +35,40 @@
     "react-relay": ">=0.8.0"
   },
   "devDependencies": {
-    "babel-cli": "^6.18.0",
-    "babel-core": "^6.18.2",
-    "babel-eslint": "^7.1.1",
-    "babel-loader": "^6.2.8",
+    "babel-cli": "^6.24.1",
+    "babel-core": "^6.24.1",
+    "babel-eslint": "^7.2.3",
+    "babel-loader": "^7.0.0",
     "babel-plugin-add-module-exports": "^0.2.1",
-    "babel-polyfill": "^6.16.0",
-    "babel-preset-es2015": "^6.18.0",
-    "babel-preset-latest": "^6.16.0",
-    "babel-preset-react": "^6.16.0",
-    "babel-preset-stage-2": "^6.18.0",
-    "babel-relay-plugin": "^0.9.3",
+    "babel-plugin-relay": "^1.0.1",
+    "babel-polyfill": "^6.23.0",
+    "babel-preset-es2015": "^6.24.1",
+    "babel-preset-latest": "^6.24.1",
+    "babel-preset-react": "^6.24.1",
+    "babel-preset-stage-2": "^6.24.1",
     "chai": "^3.5.0",
-    "eslint": "^3.10.2",
-    "eslint-config-4catalyzer-react": "^0.1.3",
-    "eslint-plugin-import": "^1.16.0",
+    "eslint": "^3.19.0",
+    "eslint-config-4catalyzer-react": "^0.2.0",
+    "eslint-plugin-import": "^2.3.0",
     "eslint-plugin-jsx-a11y": "^2.2.3",
     "eslint-plugin-react": "^6.7.1",
-    "graphql": "^0.8.2",
-    "graphql-relay": "^0.4.4",
-    "karma": "^1.3.0",
-    "karma-chrome-launcher": "^2.0.0",
-    "karma-firefox-launcher": "^1.0.0",
+    "graphql": "^0.10.1",
+    "graphql-relay": "^0.5.1",
+    "karma": "^1.7.0",
+    "karma-chrome-launcher": "^2.1.1",
+    "karma-firefox-launcher": "^1.0.1",
     "karma-mocha": "^1.3.0",
-    "karma-mocha-reporter": "^2.2.1",
-    "karma-sinon-chai": "^1.2.4",
+    "karma-mocha-reporter": "^2.2.3",
+    "karma-sinon-chai": "^1.3.1",
     "karma-sourcemap-loader": "^0.3.7",
-    "karma-webpack": "^1.8.0",
-    "mocha": "^3.1.2",
-    "react": "^15.4.0",
-    "react-addons-test-utils": "^15.4.0",
-    "react-dom": "^15.4.0",
-    "react-relay": "^0.9.3",
-    "rimraf": "^2.5.4",
-    "sinon": "^1.17.6",
-    "sinon-chai": "^2.8.0",
-    "webpack": "^1.13.3"
+    "karma-webpack": "^2.0.3",
+    "mocha": "^3.4.2",
+    "react": "^15.5.4",
+    "react-dom": "^15.5.4",
+    "react-relay": "^1.0.0",
+    "rimraf": "^2.6.1",
+    "sinon": "^2.3.2",
+    "sinon-chai": "^2.10.0",
+    "webpack": "^2.6.1"
   }
 }

src/NetworkLayer.js

@@ -20,7 +20,7 @@ export default class NetworkLayer {
 
   sendQueries(queryRequests) {
     return Promise.all(queryRequests.map(queryRequest =>
-      this.executeRequest('query', queryRequest)
+      this.executeRequest('query', queryRequest),
     ));
   }
 
@@ -30,7 +30,7 @@ export default class NetworkLayer {
       request.getQueryString(),
       this.rootValue,
       this.context,
-      request.getVariables()
+      request.getVariables(),
     ).then((payload) => {
       if (payload.errors) {
         request.reject(createRequestError(request, requestType, payload));

src/__forks__/createRequestError.js

@@ -1,3 +1,5 @@
+/* eslint-disable */
+
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
  * All rights reserved.

test/.babelrc

@@ -7,6 +7,6 @@
     "react"
   ],
   "plugins": [
-    "./fixtures/babelRelayPlugin"
+    ["relay", { "schema": "test/fixtures/schema.graphql" }]
   ]
 }

test/NetworkLayer.test.js

@@ -1,7 +1,7 @@
 import React from 'react';
-import ReactTestUtils from 'react-addons-test-utils';
 import ReactDOM from 'react-dom';
-import Relay from 'react-relay';
+import ReactTestUtils from 'react-dom/test-utils';
+import Relay from 'react-relay/classic';
 
 import RelayLocalSchema from '../src';
 
@@ -13,7 +13,7 @@ describe('NetworkLayer', () => {
   beforeEach(() => {
     environment = new Relay.Environment();
     environment.injectNetworkLayer(
-      new RelayLocalSchema.NetworkLayer({ schema })
+      new RelayLocalSchema.NetworkLayer({ schema }),
     );
 
     resetData();
@@ -155,7 +155,7 @@ describe('NetworkLayer', () => {
           const { relay, widget } = this.props;
 
           relay.commitUpdate(
-            new SetWidgetNameMutation({ widget, name: 'bar' })
+            new SetWidgetNameMutation({ widget, name: 'bar' }),
           );
         }
 

test/fixtures/.gitignore

@@ -0,0 +1,41 @@
+type Mutation {
+  setWidgetName(input: SetWidgetNameInput!): SetWidgetNamePayload
+}
+
+# An object with an ID
+interface Node {
+  # The id of the object.
+  id: ID!
+}
+
+type Query {
+  # Fetches an object given its ID
+  node(
+    # The ID of an object
+    id: ID!
+  ): Node
+
+  # Fetches objects given their IDs
+  nodes(
+    # The IDs of objects
+    ids: [ID!]!
+  ): [Node]!
+  widget: Widget
+  invalid: Widget
+}
+
+input SetWidgetNameInput {
+  name: String!
+  clientMutationId: String
+}
+
+type SetWidgetNamePayload {
+  widget: Widget
+  clientMutationId: String
+}
+
+type Widget implements Node {
+  # The ID of an object
+  id: ID!
+  name: String
+}

test/fixtures/babelRelayPlugin.js

@@ -12,8 +12,8 @@ export function resetData() {
 }
 
 /* eslint-disable no-use-before-define */
-const { nodeInterface, nodeField } = nodeDefinitions(
-  () => widget, () => Widget
+const { nodeInterface, nodeField, nodesField } = nodeDefinitions(
+  () => widget, () => Widget,
 );
 /* eslint-enable */
 
@@ -32,6 +32,7 @@ const query = new GraphQLObjectType({
   name: 'Query',
   fields: {
     node: nodeField,
+    nodes: nodesField,
     widget: {
       type: Widget,
       resolve: () => widget,