Use es6-shim directly into webpack config. (#355)

storybookjs · Aug 5, 2016 · 9f402a6 · 9f402a6
1 parent 7ff9f74
commit 9f402a6
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 11 deletions.
diff --git a/dist/client/manager/index.js b/dist/client/manager/index.js
@@ -1,7 +1,5 @@
 'use strict';
 
-require('es6-shim');
-
 var _storybookUi = require('@kadira/storybook-ui');
 
 var _storybookUi2 = _interopRequireDefault(_storybookUi);

diff --git a/dist/client/preview/index.js b/dist/client/preview/index.js
@@ -9,8 +9,6 @@ var _assign = require('babel-runtime/core-js/object/assign');
 
 var _assign2 = _interopRequireDefault(_assign);
 
-require('es6-shim');
-
 var _story_store = require('./story_store');
 
 var _story_store2 = _interopRequireDefault(_story_store);

diff --git a/dist/server/config/polyfills.js b/dist/server/config/polyfills.js
@@ -0,0 +1,3 @@
+'use strict';
+
+require('es6-shim');
diff --git a/dist/server/config/webpack.config.js b/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: [_path2.default.resolve(__dirname, '../../client/manager')],
-    preview: [_path2.default.resolve(__dirname, './error_enhancements'), 'webpack-hot-middleware/client?noInfo=true']
+    manager: [_path2.default.resolve(__dirname, './polyfills'), _path2.default.resolve(__dirname, '../../client/manager')],
+    preview: [_path2.default.resolve(__dirname, './polyfills'), _path2.default.resolve(__dirname, './error_enhancements'), 'webpack-hot-middleware/client?noInfo=true']
   },
   output: {
     path: _path2.default.join(__dirname, 'dist'),

diff --git a/dist/server/config/webpack.config.prod.js b/dist/server/config/webpack.config.prod.js
@@ -17,8 +17,8 @@ var _paths = require('./paths');
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var entries = {
-  preview: [],
-  manager: [_path2.default.resolve(__dirname, '../../client/manager')]
+  preview: [_path2.default.resolve(__dirname, './polyfills')],
+  manager: [_path2.default.resolve(__dirname, './polyfills'), _path2.default.resolve(__dirname, '../../client/manager')]
 };
 
 var config = {

diff --git a/src/client/manager/index.js b/src/client/manager/index.js
@@ -1,4 +1,3 @@
-import 'es6-shim';
 import renderStorybookUI from '@kadira/storybook-ui';
 import Provider from './provider';
 

diff --git a/src/client/preview/index.js b/src/client/preview/index.js
@@ -1,4 +1,3 @@
-import 'es6-shim';
 import StoryStore from './story_store';
 import ClientApi from './client_api';
 import ConfigApi from './config_api';

diff --git a/src/server/config/polyfills.js b/src/server/config/polyfills.js
@@ -0,0 +1 @@
+import 'es6-shim';
diff --git a/src/server/config/webpack.config.js b/src/server/config/webpack.config.js
@@ -7,9 +7,11 @@ const config = {
   devtool: '#cheap-module-eval-source-map',
   entry: {
     manager: [
+      path.resolve(__dirname, './polyfills'),
       path.resolve(__dirname, '../../client/manager'),
     ],
     preview: [
+      path.resolve(__dirname, './polyfills'),
       path.resolve(__dirname, './error_enhancements'),
       'webpack-hot-middleware/client?noInfo=true',
     ],

diff --git a/src/server/config/webpack.config.prod.js b/src/server/config/webpack.config.prod.js
@@ -3,8 +3,11 @@ import webpack from 'webpack';
 import { includePaths, excludePaths } from './paths';
 
 const entries = {
-  preview: [],
+  preview: [
+    path.resolve(__dirname, './polyfills'),
+  ],
   manager: [
+    path.resolve(__dirname, './polyfills'),
     path.resolve(__dirname, '../../client/manager'),
   ],
 };