ff-stream-web

git clone git://archive.git.mtrnord.blog/MTRNord/ff-stream-web.git
Log | Files | Refs | README | LICENSE

commit 8f2ec81f27b4f5f77b672887251b68e4bb1c9871
parent d9126bfbd6a59496585fab9bdf856edf521bb30d
Author: Konstantin Tarkus <hello@tarkus.me>
Date:   Tue, 17 Feb 2015 09:00:25 +0300

Update `babel` npm module (formerly known as 6to5)

Diffstat:
Mpackage.json | 6+++---
Mpreprocessor.js | 6+++---
Msrc/app.js | 2+-
Mwebpack.config.js | 2+-
4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json @@ -10,7 +10,7 @@ "npm": ">= 2.1" }, "dependencies": { - "6to5": "3.5.3", + "babel": "^4.0.2", "bootstrap": "3.3.2", "eventemitter3": "0.1.6", "express": "4.11.2", @@ -22,9 +22,9 @@ "superagent": "0.21.0" }, "devDependencies": { - "6to5-core": "^3.5.3", - "6to5-loader": "^3.0.0", "autoprefixer-loader": "^1.1.0", + "babel-core": "^4.0.2", + "babel-loader": "^4.0.0", "browser-sync": "^2.0.1", "css-loader": "^0.9.1", "del": "^1.1.1", diff --git a/preprocessor.js b/preprocessor.js @@ -1,16 +1,16 @@ 'use strict'; -var to5 = require('6to5-core'); +var babel = require('babel-core'); module.exports = { process: function(src, filename) { // Ignore files other than .js, .es, .jsx or .es6 - if (!to5.canCompile(filename)) { + if (!babel.canCompile(filename)) { return ''; } // Ignore all files within node_modules if (filename.indexOf('node_modules') === -1) { - return to5.transform(src, { filename: filename }).code; + return babel.transform(src, { filename: filename }).code; } return src; } diff --git a/src/app.js b/src/app.js @@ -8,7 +8,7 @@ 'use strict'; -import '6to5/polyfill'; +import 'babel/polyfill'; import React from 'react'; import emptyFunction from 'react/lib/emptyFunction'; diff --git a/webpack.config.js b/webpack.config.js @@ -78,7 +78,7 @@ var config = { { test: /\.jsx?$/, exclude: /node_modules/, - loader: '6to5-loader' + loader: 'babel-loader?experimental' } ] }