Merge pull request #22 from relay-tools/chore

Update tooling

Author: taion

.babelrc

@@ -1,7 +1,4 @@
 {
-  "stage": 0,
-  "loose": "all",
-  "optional": [
-    "runtime"
-  ]
+  "presets": ["es2015-loose", "stage-1"],
+  "plugins": ["add-module-exports"]
 }

.eslintrc

@@ -1,4 +1,4 @@
 {
-  "extends": "airbnb",
+  "extends": "airbnb-base",
   "parser": "babel-eslint"
 }

karma.conf.babel.js

@@ -1,2 +1,52 @@
-require('babel-core/register');
-module.exports = require('./karma.conf.babel.js');
+const webpack = require('webpack');
+
+module.exports = config => {
+  const { env } = process;
+
+  const isCi = env.CONTINUOUS_INTEGRATION === 'true';
+
+  config.set({
+    frameworks: ['mocha', 'sinon-chai'],
+
+    files: ['test/index.js'],
+
+    preprocessors: {
+      'test/index.js': ['webpack', 'sourcemap'],
+    },
+
+    webpack: {
+      module: {
+        loaders: [
+          { test: /\.js$/, exclude: /node_modules/, loader: 'babel' },
+        ],
+      },
+      plugins: [
+        new webpack.DefinePlugin({
+          'process.env.NODE_ENV': JSON.stringify('test'),
+        }),
+      ],
+      devtool: 'cheap-module-inline-source-map',
+    },
+
+    webpackMiddleware: {
+      noInfo: true,
+    },
+
+    reporters: ['mocha'],
+
+    mochaReporter: {
+      output: 'autowatch',
+    },
+
+    customLaunchers: {
+      ChromeCi: {
+        base: 'Chrome',
+        flags: ['--no-sandbox'],
+      },
+    },
+
+    browsers: env.BROWSER ? env.BROWSER.split(',') : ['Chrome'],
+
+    singleRun: isCi,
+  });
+};

karma.conf.js

@@ -11,7 +11,8 @@
     "build-fixtures": "babel-node test/fixtures/updateSchema.js",
     "lint": "eslint src test *.js",
     "prepublish": "npm run build",
-    "test": "npm run lint && npm run build-fixtures && karma start"
+    "test": "npm run build-fixtures && npm run lint && npm run testonly",
+    "testonly": "karma start"
   },
   "repository": {
     "type": "git",
@@ -28,41 +29,48 @@
     "url": "https://github.com/relay-tools/relay-local-schema/issues"
   },
   "homepage": "https://github.com/relay-tools/relay-local-schema#readme",
-  "dependencies": {
-    "babel-runtime": "^5.8.38"
-  },
   "peerDependencies": {
     "graphql": "^0.5.0 || ^0.6.0",
     "react-relay": ">=0.8.0"
   },
   "devDependencies": {
-    "babel": "^5.8.38",
-    "babel-core": "^5.8.38",
-    "babel-eslint": "^4.1.8",
-    "babel-loader": "^5.4.0",
-    "babel-relay-plugin": "^0.8.0",
+    "babel-cli": "^6.10.1",
+    "babel-core": "^6.10.4",
+    "babel-eslint": "^6.1.2",
+    "babel-loader": "^6.2.4",
+    "babel-plugin-add-module-exports": "^0.2.1",
+    "babel-polyfill": "^6.9.1",
+    "babel-preset-es2015": "^6.9.0",
+    "babel-preset-es2015-loose": "^7.0.0",
+    "babel-preset-react": "^6.11.1",
+    "babel-preset-stage-0": "^6.5.0",
+    "babel-preset-stage-1": "^6.5.0",
+    "babel-relay-plugin": "^0.9.2",
     "chai": "^3.5.0",
-    "eslint": "^1.10.3",
-    "eslint-config-airbnb": "^5.0.1",
-    "eslint-plugin-react": "^3.16.1",
-    "graphql": "^0.6.0",
+    "eslint": "^2.13.1",
+    "eslint-config-airbnb": "^9.0.1",
+    "eslint-config-airbnb-base": "^3.0.1",
+    "eslint-plugin-import": "^1.10.2",
+    "eslint-plugin-jsx-a11y": "^1.5.5",
+    "eslint-plugin-react": "^5.2.2",
+    "graphql": "^0.6.1",
     "graphql-relay": "^0.4.2",
-    "karma": "^0.13.22",
-    "karma-chrome-launcher": "^0.2.3",
-    "karma-firefox-launcher": "^0.1.7",
-    "karma-mocha": "^0.2.2",
-    "karma-mocha-reporter": "^2.0.0",
-    "karma-sinon-chai": "^1.2.0",
+    "karma": "^1.1.1",
+    "karma-chrome-launcher": "^1.0.1",
+    "karma-firefox-launcher": "^1.0.0",
+    "karma-mocha": "^1.1.1",
+    "karma-mocha-reporter": "^2.0.4",
+    "karma-sinon-chai": "^1.2.3",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-webpack": "^1.7.0",
-    "lolex": "^1.4.0",
-    "mocha": "^2.4.5",
-    "react": "^15.0.1",
-    "react-dom": "^15.0.1",
-    "react-relay": "^0.8.0",
-    "rimraf": "^2.5.2",
-    "sinon": "^1.17.3",
+    "mocha": "^2.5.3",
+    "react": "^15.2.1",
+    "react-addons-test-utils": "^15.2.1",
+    "react-dom": "^15.2.1",
+    "react-relay": "^0.9.2",
+    "rimraf": "^2.5.3",
+    "sinon": "^1.17.4",
     "sinon-chai": "^2.8.0",
-    "webpack": "^1.12.15"
+    "webpack": "^1.13.1"
   }
 }

package.json

@@ -4,32 +4,32 @@ import formatRequestErrors from './__forks__/formatRequestErrors';
 
 export default class NetworkLayer {
   constructor({ schema, rootValue, contextValue, onError }) {
-    this._schema = schema;
-    this._rootValue = rootValue;
-    this._contextValue = contextValue;
-    this._onError = onError;
+    this.schema = schema;
+    this.rootValue = rootValue;
+    this.context = contextValue;
+    this.onError = onError;
   }
 
   sendMutation(mutationRequest) {
     if (mutationRequest.getFiles()) {
       throw new Error('uploading files not supported');
     }
 
-    return this._executeRequest('mutation', mutationRequest);
+    return this.executeRequest('mutation', mutationRequest);
   }
 
   sendQueries(queryRequests) {
     return Promise.all(queryRequests.map(queryRequest =>
-      this._executeRequest('query', queryRequest)
+      this.executeRequest('query', queryRequest)
     ));
   }
 
-  async _executeRequest(requestType, request) {
+  async executeRequest(requestType, request) {
     const { data, errors } = await graphql(
-      this._schema,
+      this.schema,
       request.getQueryString(),
-      this._rootValue,
-      this._contextValue,
+      this.rootValue,
+      this.context,
       request.getVariables()
     );
 
@@ -38,9 +38,10 @@ export default class NetworkLayer {
         `Failed to execute ${requestType} \`${request.getDebugName()}\` for ` +
         `the following reasons:\n\n${formatRequestErrors(request, errors)}`
       ));
-      if (this._onError) {
-        this._onError(errors, request);
+      if (this.onError) {
+        this.onError(errors, request);
       }
+
       return;
     }
 

src/NetworkLayer.js

@@ -0,0 +1,12 @@
+{
+  "passPerPreset": true,
+  "presets": [
+    { "plugins": ["./fixtures/babelRelayPlugin"] },
+    "react",
+    "es2015-loose",
+
+    // FIXME: Workaround for https://phabricator.babeljs.io/T7274. This should
+    // be stage-1.
+    "stage-0"
+  ]
+}

test/.babelrc

@@ -1,4 +1,5 @@
 {
+  "extends": "airbnb",
   "env": {
     "mocha": true
   },