Merge branch 'master' into subscriptions

package.json

@@ -7,7 +7,7 @@
     "postinstall": "./bin/cli plugins reconcile --skip-remote",
     "start": "./bin/cli serve -j -w",
     "dev-start": "nodemon -w . -w bin/cli -w bin/cli-serve --config .nodemon.json --exec \"./bin/cli -c .env serve -j -w\"",
-    "build": "NODE_ENV=production webpack --progress -p --config webpack.config.js --bail",
+    "build": "NODE_ENV=production webpack -p --config webpack.config.js --bail",
     "build-watch": "NODE_ENV=development webpack --progress --config webpack.config.js --watch",
     "lint": "eslint bin/* .",
     "lint-fix": "eslint bin/* . --fix",
@@ -93,7 +93,7 @@
     "parse-duration": "^0.1.1",
     "passport": "^0.3.2",
     "passport-local": "^1.0.0",
-    "react-apollo": "^1.0.0-rc.3",
+    "react-apollo": "^1.0.0",
     "react-recaptcha": "^2.2.6",
     "redis": "^2.7.1",
     "uuid": "^3.0.1",
@@ -102,8 +102,9 @@
     "semver": "^5.3.0"
   },
   "devDependencies": {
-    "apollo-client": "^0.8.3",
+    "apollo-client": "^1.0.0",
     "autoprefixer": "^6.5.2",
+    "babel-cli": "^6.24.0",
     "babel-core": "^6.24.0",
     "babel-eslint": "^7.2.1",
     "babel-jest": "^19.0.0",
@@ -117,10 +118,12 @@
     "babel-plugin-transform-react-jsx": "^6.23.0",
     "babel-polyfill": "^6.23.0",
     "babel-preset-es2015": "^6.24.0",
+    "babel-preset-react": "^6.23.0",
     "babel-preset-stage-0": "^6.16.0",
     "chai": "^3.5.0",
     "chai-as-promised": "^6.0.0",
     "chai-http": "^3.0.0",
+    "common-tags": "^1.4.0",
     "copy-webpack-plugin": "^4.0.0",
     "css-loader": "^0.27.3",
     "dialog-polyfill": "^0.4.4",