Skip to content

Commit

Permalink
chore(~): migrate to babel 6
Browse files Browse the repository at this point in the history
  • Loading branch information
dtinth committed Jan 31, 2016
1 parent 36a881a commit 5bdabb4
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 22 deletions.
16 changes: 8 additions & 8 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"stage": 0,
"presets": [
"es2015",
"react",
"stage-2"
],
"plugins": [
"babel-plugin-espower"
],
"env": {
"development": {
"plugins": [
"react-display-name",
"react-transform"
],
"extra": {
"react-transform": {
[ "react-transform", {
"transforms": [
{
"transform": "react-transform-hmr",
Expand All @@ -22,8 +22,8 @@
"imports": ["react", "redbox-react"]
}
]
}
}
} ]
]
}
}
}
2 changes: 1 addition & 1 deletion config/webpack.js
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ function applyKarmaConfig (config) {
include: [path('src')],
exclude: [
path('src', 'test'),
path('src', 'polyfill'),
path('src', 'bootstrap'),
path('src', 'boot', 'loader.js'),
],
loader: 'isparta-instrumenter',
Expand Down
3 changes: 2 additions & 1 deletion node-environment.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@

require('dotenv').load()
require('babel-core/register')
require('babel-register')
require('babel-polyfill')
global.Promise = require('bluebird')
17 changes: 11 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,17 @@
"homepage": "https://github.com/spacetme/bemuse",
"devDependencies": {
"autoprefixer-loader": "^3.0.0",
"babel-core": "^5.8.20",
"babel-core": "^6.4.5",
"babel-eslint": "^4.0.5",
"babel-loader": "^5.3.2",
"babel-plugin-espower": "^1.1.0",
"babel-loader": "^6.2.1",
"babel-plugin-espower": "^2.1.1",
"babel-plugin-react-display-name": "^2.0.0",
"babel-plugin-react-transform": "^1.1.1",
"babel-plugin-react-transform": "^2.0.0",
"babel-polyfill": "^6.3.14",
"babel-preset-es2015": "^6.3.13",
"babel-preset-react": "^6.3.13",
"babel-preset-stage-2": "^6.3.13",
"babel-register": "^6.4.3",
"body-parser": "^1.10.0",
"brfs": "^1.4.0",
"bundle-loader": "^0.5.2",
Expand Down Expand Up @@ -80,7 +85,7 @@
"node-notifier": "^4.0.3",
"node-sass": "^3.3.3",
"pegjs-loader": "^0.1.1",
"react-transform-catch-errors": "^1.0.0",
"react-transform-catch-errors": "^1.0.1",
"react-transform-hmr": "^1.0.1",
"redbox-react": "^1.2.0",
"sass-loader": "^3.0.0",
Expand All @@ -104,7 +109,7 @@
"bemuse-indexer": "^2.1.0",
"bluebird": "^2.9.10",
"bms": "^2.0.0",
"bmson": "^2.0.0",
"bmson": "^3.0.0",
"bytes": "^2.1.0",
"classnames": "^2.1.3",
"co": "^4.3.1",
Expand Down
2 changes: 1 addition & 1 deletion src/app/song-loader/worker.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import 'bemuse/polyfill'
import 'bemuse/bootstrap'

import indexer from 'bemuse-indexer'
import Promise from 'bluebird'
Expand Down
2 changes: 1 addition & 1 deletion src/boot/environment.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

import 'jquery'
import 'bemuse/polyfill'
import 'bemuse/bootstrap'
import FastClick from 'fastclick'
import React from 'react'

Expand Down
6 changes: 3 additions & 3 deletions src/polyfill/index.js → src/bootstrap/index.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

// :doc:
// Polyfills the environment with:
// Bootstraps the environment with:
//
// - `ES6 Runtime`_ (provided by Babel_)
// - `babel-polyfill`_
// - `debug`_
// - `Bluebird`_ (with `extended Promise API`_)
//
Expand All @@ -12,7 +12,7 @@
// .. _bluebird: https://github.com/petkaantonov/bluebird
// .. _Extended Promise API: https://github.com/petkaantonov/bluebird/blob/master/API.md

import 'babel-core/polyfill'
import 'babel-polyfill'
import debug from 'debug'
import Bluebird from 'bluebird'

Expand Down
2 changes: 1 addition & 1 deletion src/test/karma.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import 'bemuse/polyfill'
import 'bemuse/bootstrap'

import prepareTestEnvironment from './prepareTestEnvironment'
import loadSpecs from './loadSpecs'
Expand Down

0 comments on commit 5bdabb4

Please sign in to comment.