Remove extra polyfills and use polyfills from babel

dist/client/preview/render.js

@@ -7,8 +7,6 @@ exports.renderError = renderError;
 exports.renderMain = renderMain;
 exports.default = renderPreview;
 
-require('airbnb-js-shims');
-
 var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);

dist/server/config/babel.js

@@ -35,8 +35,8 @@ module.exports = {
   require.resolve('babel-plugin-transform-regenerator'),
   // Polyfills the runtime needed for async/await and generators
   [require.resolve('babel-plugin-transform-runtime'), {
-    helpers: false,
-    polyfill: false,
+    helpers: true,
+    polyfill: true,
     regenerator: true
   }]]
 };

dist/server/config/babel.prod.js

@@ -32,8 +32,8 @@ module.exports = {
   require.resolve('babel-plugin-transform-regenerator'),
   // Polyfills the runtime needed for async/await and generators
   [require.resolve('babel-plugin-transform-runtime'), {
-    helpers: false,
-    polyfill: false,
+    helpers: true,
+    polyfill: true,
     regenerator: true
   }],
   // Optimization: hoist JSX that never changes out of render()

dist/server/config/webpack.config.js

@@ -23,8 +23,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 var config = {
   devtool: '#cheap-module-eval-source-map',
   entry: {
-    manager: [require.resolve('./polyfills'), require.resolve('../../client/manager')],
-    preview: [require.resolve('./polyfills'), require.resolve('./error_enhancements'), require.resolve('webpack-hot-middleware/client') + '?noInfo=true']
+    manager: [require.resolve('../../client/manager')],
+    preview: [require.resolve('./error_enhancements'), require.resolve('webpack-hot-middleware/client') + '?noInfo=true']
   },
   output: {
     path: _path2.default.join(__dirname, 'dist'),

dist/server/config/webpack.config.prod.js

@@ -17,8 +17,8 @@ var _utils = require('./utils');
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var entries = {
-  preview: [_path2.default.resolve(__dirname, './polyfills')],
-  manager: [_path2.default.resolve(__dirname, './polyfills'), _path2.default.resolve(__dirname, '../../client/manager')]
+  preview: [],
+  manager: [_path2.default.resolve(__dirname, '../../client/manager')]
 };
 
 var config = {

package.json

@@ -27,7 +27,6 @@
     "@kadira/storybook-addons": "^1.3.1",
     "@kadira/storybook-channel-pagebus": "^2.0.2",
     "@kadira/storybook-ui": "^3.3.1",
-    "airbnb-js-shims": "^1.0.0",
     "autoprefixer": "^6.3.7",
     "babel-core": "^6.11.4",
     "babel-loader": "^6.2.4",
@@ -47,7 +46,6 @@
     "commander": "^2.9.0",
     "configstore": "^2.0.0",
     "css-loader": "0.23.1",
-    "es6-shim": "^0.35.1",
     "express": "^4.13.3",
     "file-loader": "^0.9.0",
     "json-loader": "^0.5.4",

src/client/preview/render.js

@@ -1,4 +1,3 @@
-import 'airbnb-js-shims';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import ErrorDisplay from './error_display';

src/server/config/babel.js

@@ -34,8 +34,8 @@ module.exports = {
     require.resolve('babel-plugin-transform-regenerator'),
     // Polyfills the runtime needed for async/await and generators
     [require.resolve('babel-plugin-transform-runtime'), {
-      helpers: false,
-      polyfill: false,
+      helpers: true,
+      polyfill: true,
       regenerator: true,
     }],
   ],

src/server/config/babel.prod.js

@@ -31,8 +31,8 @@ module.exports = {
     require.resolve('babel-plugin-transform-regenerator'),
     // Polyfills the runtime needed for async/await and generators
     [require.resolve('babel-plugin-transform-runtime'), {
-      helpers: false,
-      polyfill: false,
+      helpers: true,
+      polyfill: true,
       regenerator: true,
     }],
     // Optimization: hoist JSX that never changes out of render()

src/server/config/webpack.config.js

@@ -7,11 +7,9 @@ const config = {
   devtool: '#cheap-module-eval-source-map',
   entry: {
     manager: [
-      require.resolve('./polyfills'),
       require.resolve('../../client/manager'),
     ],
     preview: [
-      require.resolve('./polyfills'),
       require.resolve('./error_enhancements'),
       `${require.resolve('webpack-hot-middleware/client')}?noInfo=true`,
     ],

src/server/config/webpack.config.prod.js

@@ -3,11 +3,8 @@ import webpack from 'webpack';
 import { OccurenceOrderPlugin, includePaths, excludePaths } from './utils';
 
 const entries = {
-  preview: [
-    path.resolve(__dirname, './polyfills'),
-  ],
+  preview: [],
   manager: [
-    path.resolve(__dirname, './polyfills'),
     path.resolve(__dirname, '../../client/manager'),
   ],
 };