From fd9708f811d5f3531013a87a6f87ba26a7b0f5db Mon Sep 17 00:00:00 2001 From: Andrea Ascari Date: Fri, 12 Aug 2016 18:28:06 +0200 Subject: [PATCH 1/4] Updated babel and its dependencies. --- package.json | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index c062966d1..667b9d060 100644 --- a/package.json +++ b/package.json @@ -46,9 +46,16 @@ }, "devDependencies": { "axios": "^0.8.1", - "babel": "^5.8.12", + "babel-cli": "^6.11.4", + "babel-core": "^6.13.2", "babel-eslint": "^6.0.4", - "babel-loader": "^5.3.2", + "babel-loader": "^6.2.4", + "babel-plugin-tcomb": "^0.3.10", + "babel-plugin-transform-decorators-legacy": "^1.3.4", + "babel-preset-es2015": "^6.13.2", + "babel-preset-react": "^6.11.1", + "babel-preset-stage-0": "^6.5.0", + "babel-register": "^6.11.6", "component-playground": "^1.2.0", "compression-webpack-plugin": "^0.2.0", "css-loader": "^0.23.1", From dcc028d3a6c551f4c711a856cdfa61d301424fad Mon Sep 17 00:00:00 2001 From: Andrea Ascari Date: Fri, 12 Aug 2016 18:28:29 +0200 Subject: [PATCH 2/4] Created '.babelrc' file. --- .babelrc | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .babelrc diff --git a/.babelrc b/.babelrc new file mode 100644 index 000000000..e2d551400 --- /dev/null +++ b/.babelrc @@ -0,0 +1,14 @@ +{ + "plugins": [ + ["tcomb"], + ["transform-decorators-legacy"], + ["transform-class-properties"], + ["transform-es2015-classes"], + + ], + "presets": [ + "stage-0", + "es2015", + "react" + ] +} From 2716a10ff6e06ffbfcc10d28cbc7731febd3ba00 Mon Sep 17 00:00:00 2001 From: Andrea Ascari Date: Fri, 12 Aug 2016 18:29:10 +0200 Subject: [PATCH 3/4] Used 'babel-register' module for test. --- test/index.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/test/index.js b/test/index.js index fc0d14eca..9b11a9ac1 100644 --- a/test/index.js +++ b/test/index.js @@ -2,11 +2,9 @@ const requireDir = require('require-dir'); const path = require('path'); -require('babel/register')({ +require('babel-register')({ only: [path.resolve('src'), path.resolve('test/tests')], - extensions: ['.js', '.jsx'], - stage: 0, - loose: true + extensions: ['.js', '.jsx'] }); require('require-noop')({ From 47d573cafdcdc77604399c1dacd0e50a0b9cda49 Mon Sep 17 00:00:00 2001 From: Andrea Ascari Date: Fri, 12 Aug 2016 18:29:42 +0200 Subject: [PATCH 4/4] Removed babel params now defined in '.babelrc'. --- examples/webpack.base.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/examples/webpack.base.js b/examples/webpack.base.js index b90f305ff..cb187415a 100644 --- a/examples/webpack.base.js +++ b/examples/webpack.base.js @@ -2,7 +2,6 @@ var path = require('path'); var webpack = require('webpack'); // var ExtractTextPlugin = require('extract-text-webpack-plugin'); - var paths = { SRC: path.resolve(__dirname, '../src'), EXAMPLES: path.resolve(__dirname, '.'), @@ -20,7 +19,7 @@ module.exports = { loaders: [ { test: /\.jsx?$/, - loader: 'babel?stage=0&loose', + loader: 'babel', include: [paths.SRC, paths.EXAMPLES], exclude: /node_modules/ },