Update to Babel 6 + GraphiQL 0.10.2/GraphQL 0.10.1

Author: Adam Miskiewicz

.babelrc

@@ -1,3 +1,17 @@
 {
-  "stage": 0
+  "presets": [
+    ["env", {
+      "targets": {
+        "electron": "0.36",
+        "uglify": true
+      }
+    }],
+    "stage-1",
+    "stage-2",
+    "stage-3",
+    "react"
+  ],
+  "plugins": [
+    "transform-runtime"
+  ]
 }

app/components/App.js

@@ -326,7 +326,8 @@ const _storages = {};
 function _makeStorage(storageKey) {
   return {
     setItem: (key, val) => window.localStorage.setItem(`${storageKey}${key}`, val),
-    getItem: (key) => window.localStorage.getItem(`${storageKey}${key}`)
+    getItem: (key) => window.localStorage.getItem(`${storageKey}${key}`),
+    removeItem: (key) => window.localStorage.removeItem(`${storageKey}${key}`)
   };
 }
 

package.json

@@ -26,36 +26,44 @@
     "url": "http://github.com/skevy/graphiql-app.git"
   },
   "dependencies": {
-    "graphiql": "^0.8.1",
-    "graphql": "^0.8.2",
+    "graphiql": "^0.10.2",
+    "graphql": "^0.10.1",
     "isomorphic-fetch": "^2.1.1",
     "lodash": "^3.10.1",
     "mousetrap": "^1.5.3",
     "object-assign": "^4.0.1",
     "radium": "^0.14.1",
-    "react": "^15.1.0",
-    "react-dom": "^15.1.0",
-    "react-modal": "^1.3.0",
-    "uuid": "^2.0.2"
+    "react": "^15.6.1",
+    "react-dom": "^15.6.1",
+    "react-modal": "^2.0.2",
+    "uuid": "^3.1.0"
   },
   "devDependencies": {
-    "asar": "^0.8.0",
-    "babel-core": "^5.8.25",
-    "babel-loader": "^5.3.2",
-    "babel-runtime": "^5.8.25",
+    "asar": "^0.13.0",
+    "babel-core": "^6.25.0",
+    "babel-loader": "^6.4.1",
+    "babel-plugin-transform-runtime": "^6.23.0",
+    "babel-preset-env": "^1.5.2",
+    "babel-preset-flow": "^6.23.0",
+    "babel-preset-react": "^6.24.1",
+    "babel-preset-stage-1": "^6.24.1",
+    "babel-preset-stage-2": "^6.24.1",
+    "babel-preset-stage-3": "^6.24.1",
+    "babel-runtime": "^6.23.0",
     "chai": "^3.5.0",
     "chai-as-promised": "^5.3.0",
     "css-loader": "^0.19.0",
     "del": "^2.0.2",
-    "electron-packager": "^7.0.2",
+    "electron-packager": "^8.7.1",
     "electron-prebuilt": "^1.2.0",
-    "electron-rebuild": "^1.0.0",
+    "electron-rebuild": "^1.5.11",
     "electron-release": "^2.2.0",
     "eslint-plugin-react": "^5.2.2",
     "extract-text-webpack-plugin": "^0.8.2",
     "file-loader": "^0.8.4",
     "github-latest-release": "^0.1.1",
     "html-loader": "^0.3.0",
+    "ignore-loader": "^0.1.2",
     "json-loader": "^0.5.3",
     "loaders-by-extension": "^1.0.0",
     "minimist": "^1.2.0",

webpack/make-webpack-config.js

@@ -16,9 +16,9 @@ module.exports = function(opts) {
 
 
   var loaders = {
-    'jsx': opts.hotComponents ? [ 'react-hot-loader', 'babel-loader?optional=runtime' ] : 'babel-loader?optional=runtime',
+    'jsx': opts.hotComponents ? [ 'react-hot-loader', 'babel-loader' ] : 'babel-loader',
     'js': {
-      loader: 'babel-loader?optional=runtime',
+      loader: 'babel-loader',
       include: appRoot
     },
     'json': 'json-loader',
@@ -41,7 +41,7 @@ module.exports = function(opts) {
   };
 
   var additionalLoaders = [
-    // { test: /some-reg-exp$/, loader: 'any-loader' }
+    { test: /\.js.flow$/, loader: 'ignore-loader' }
   ];
 
   var alias = {
@@ -162,7 +162,7 @@ module.exports = function(opts) {
     output: output,
     externals: externals,
     module: {
-      loaders: [].concat(loadersByExtension(loaders)).concat(loadersByExtension(stylesheetLoaders)).concat(additionalLoaders)
+      loaders: [].concat(loadersByExtension(loaders)).concat(loadersByExtension(stylesheetLoaders)).concat(additionalLoaders),
     },
     devtool: opts.devtool,
     debug: opts.debug,