Merge pull request #228 from TigerC10/master

Switching to stage-0 support
storybookjs · Jun 6, 2016 · ddb0e2b · ddb0e2b
2 parents 085fc64 + d21dad1
commit ddb0e2b
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,3 +1,3 @@
 {
-  "presets": ["es2015", "stage-2", "react"]
+  "presets": ["es2015", "stage-0", "react"]
 }
diff --git a/dist/server/config.js b/dist/server/config.js
@@ -38,7 +38,7 @@ exports.default = function (configType, baseConfig, configDir) {
   // So, we need to add them here, if not specified.
   if (process.env.DEV_BUILD) {
     (function () {
-      var requiredPresets = ['react', 'es2015', 'stage-2'];
+      var requiredPresets = ['react', 'es2015', 'stage-0'];
       var loadedPresets = config.module.loaders[0].query.presets;
       requiredPresets.forEach(function (preset) {
         if (loadedPresets.indexOf(preset) < 0) {

diff --git a/dist/server/webpack.config.js b/dist/server/webpack.config.js
@@ -32,7 +32,7 @@ var config = {
     loaders: [{
       test: /\.jsx?$/,
       loader: 'babel',
-      query: { presets: ['react', 'es2015', 'stage-2'] },
+      query: { presets: ['react', 'es2015', 'stage-0'] },
       exclude: [_path2.default.resolve('./node_modules'), _path2.default.resolve(__dirname, 'node_modules')],
       include: [_path2.default.resolve('./'), __dirname, _path2.default.resolve(__dirname, '../../src')]
     }]

diff --git a/dist/server/webpack.config.prod.js b/dist/server/webpack.config.prod.js
@@ -39,7 +39,7 @@ var config = {
     loaders: [{
       test: /\.jsx?$/,
       loader: 'babel',
-      query: { presets: ['react', 'es2015', 'stage-2'] },
+      query: { presets: ['react', 'es2015', 'stage-0'] },
       exclude: [_path2.default.resolve('./node_modules'), _path2.default.resolve(__dirname, 'node_modules')],
       include: [_path2.default.resolve('./'), __dirname, _path2.default.resolve(__dirname, '../../src')]
     }]

diff --git a/package.json b/package.json
@@ -43,7 +43,7 @@
     "babel-polyfill": "^6.3.15",
     "babel-preset-es2015": "^6.3.13",
     "babel-preset-react": "^6.3.13",
-    "babel-preset-stage-2": "^6.3.13",
+    "babel-preset-stage-0": "^6.3.13",
     "qs": "^6.1.0"
   },
   "peerDependencies": {

diff --git a/scripts/webpack.manager.conf.js b/scripts/webpack.manager.conf.js
@@ -28,7 +28,7 @@ module.exports = {
         loader: 'babel-loader',
         exclude: path.resolve(__dirname, '../node_modules/'),
         query: {
-          presets: ['es2015', 'react', 'stage-2']
+          presets: ['es2015', 'react', 'stage-0']
         }
       }
     ]

diff --git a/src/server/config.js b/src/server/config.js
@@ -75,7 +75,7 @@ export default function (configType, baseConfig, configDir) {
   // Dev build needs some specific babel presets.
   // So, we need to add them here, if not specified.
   if (process.env.DEV_BUILD) {
-    const requiredPresets = ['react', 'es2015', 'stage-2'];
+    const requiredPresets = ['react', 'es2015', 'stage-0'];
     const loadedPresets = config.module.loaders[0].query.presets;
     requiredPresets.forEach((preset) => {
       if (loadedPresets.indexOf(preset) < 0) {

diff --git a/src/server/webpack.config.js b/src/server/webpack.config.js
@@ -31,7 +31,7 @@ const config = {
       {
         test: /\.jsx?$/,
         loader: 'babel',
-        query: { presets: ['react', 'es2015', 'stage-2'] },
+        query: { presets: ['react', 'es2015', 'stage-0'] },
         exclude: [path.resolve('./node_modules'), path.resolve(__dirname, 'node_modules')],
         include: [path.resolve('./'), __dirname, path.resolve(__dirname, '../../src')],
       },

diff --git a/src/server/webpack.config.prod.js b/src/server/webpack.config.prod.js
@@ -31,7 +31,7 @@ const config = {
       {
         test: /\.jsx?$/,
         loader: 'babel',
-        query: { presets: ['react', 'es2015', 'stage-2'] },
+        query: { presets: ['react', 'es2015', 'stage-0'] },
         exclude: [path.resolve('./node_modules'), path.resolve(__dirname, 'node_modules')],
         include: [path.resolve('./'), __dirname, path.resolve(__dirname, '../../src')],
       },