Merge pull request #186 from taion/chore

Update tooling

.babelrc

@@ -1,14 +1,14 @@
 {
-  "presets": ["react"],
+  "presets": [
+    "./tools/es2015Preset",
+    "stage-1",
+    "react"
+  ],
   "plugins": ["dev-expression", "transform-runtime"],
 
   "env": {
     "cjs": {
-      "presets": ["es2015-loose", "stage-1"],
       "plugins": ["add-module-exports"]
-    },
-    "es": {
-      "presets": ["es2015-loose-native-modules", "stage-1"]
     }
   }
 }

karma.conf.js

@@ -3,8 +3,6 @@ const webpack = require('webpack'); // eslint-disable-line import/no-extraneous-
 module.exports = config => {
   const { env } = process;
 
-  const isCi = env.CONTINUOUS_INTEGRATION === 'true';
-
   config.set({
     frameworks: ['mocha', 'sinon-chai'],
 
@@ -23,6 +21,7 @@ module.exports = config => {
       plugins: [
         new webpack.DefinePlugin({
           'process.env.NODE_ENV': JSON.stringify('test'),
+          __DEV__: true,
         }),
       ],
       devtool: 'cheap-module-inline-source-map',
@@ -46,7 +45,5 @@ module.exports = config => {
     },
 
     browsers: env.BROWSER ? env.BROWSER.split(',') : ['Chrome'],
-
-    singleRun: isCi,
   });
 };

package.json

@@ -7,6 +7,7 @@
     "lib"
   ],
   "main": "lib/index.js",
+  "module": "es/index.js",
   "jsnext:main": "es/index.js",
   "scripts": {
     "build": "npm run build-cjs && npm run build-es",
@@ -15,8 +16,9 @@
     "build-fixtures": "babel-node test/fixtures/updateSchema.js",
     "lint": "eslint src test *.js",
     "prepublish": "npm run build",
+    "tdd": "cross-env NODE_ENV=test karma start",
     "test": "npm run build-fixtures && npm run lint && npm run testonly",
-    "testonly": "cross-env BABEL_ENV=cjs karma start"
+    "testonly": "npm run tdd -- --single-run"
   },
   "repository": {
     "type": "git",
@@ -45,19 +47,17 @@
   },
   "devDependencies": {
     "babel-cli": "^6.11.4",
-    "babel-core": "^6.11.4",
+    "babel-core": "^6.13.2",
     "babel-eslint": "^6.1.2",
     "babel-loader": "^6.2.4",
     "babel-plugin-add-module-exports": "^0.2.1",
     "babel-plugin-dev-expression": "^0.2.1",
     "babel-plugin-transform-runtime": "^6.12.0",
-    "babel-polyfill": "^6.9.1",
-    "babel-preset-es2015": "^6.9.0",
-    "babel-preset-es2015-loose": "^7.0.0",
-    "babel-preset-es2015-loose-native-modules": "^1.0.0",
+    "babel-polyfill": "^6.13.0",
+    "babel-preset-es2015": "^6.13.2",
     "babel-preset-react": "^6.11.1",
     "babel-preset-stage-0": "^6.5.0",
-    "babel-preset-stage-1": "^6.5.0",
+    "babel-preset-stage-1": "^6.13.0",
     "babel-register": "^6.11.6",
     "babel-relay-plugin": "^0.9.2",
     "chai": "^3.5.0",

test/.babelrc

@@ -1,5 +1,9 @@
 {
-  "presets": ["es2015-loose", "stage-1", "react"],
+  "presets": [
+    ["es2015", { "loose": true }],
+    "stage-1",
+    "react"
+  ],
   "plugins": [
     "./fixtures/babelRelayPlugin"
   ]

test/fixtures/.babelrc

@@ -1,3 +1,6 @@
 {
-  "presets": ["es2015-loose", "stage-1"]
+  "presets": [
+    ["es2015", { "loose": true }],
+    "stage-1"
+  ]
 }

tools/.eslintrc

@@ -0,0 +1,7 @@
+{
+  "rules": {
+    "import/no-extraneous-dependencies": [2, {
+      "devDependencies": true
+    }]
+  }
+}

tools/es2015Preset.js

@@ -0,0 +1,12 @@
+const { buildPreset } = require('babel-preset-es2015');
+
+const { BABEL_ENV } = process.env;
+
+module.exports = {
+  presets: [
+    [buildPreset, {
+      loose: true,
+      modules: BABEL_ENV === 'es' ? false : 'commonjs',
+    }],
+  ],
+};