Skip to content

Commit a7ddc9e

Browse files
committed
Merge pull request #7 from ianbjorndilling/babel6-support
Transpile Typewriter with Babel 6
2 parents 440dd01 + 0ab8240 commit a7ddc9e

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

package.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,12 @@
2727
"react": "^0.14.7"
2828
},
2929
"devDependencies": {
30-
"babel": "^5.6.14",
31-
"babel-core": "^5.6.15",
30+
"babel-core": "^6.5.2",
3231
"babel-eslint": "^3.1.20",
33-
"babel-loader": "^5.2.2",
32+
"babel-loader": "^6.2.3",
33+
"babel-plugin-transform-object-rest-spread": "^6.5.0",
34+
"babel-preset-es2015": "^6.5.0",
35+
"babel-preset-react": "^6.5.0",
3436
"eslint": "^0.24.0",
3537
"eslint-plugin-react": "^2.6.4",
3638
"node-libs-browser": "^0.5.2",

webpack.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ module.exports = {
2121
loaders: [{
2222
test: /\.jsx?$/,
2323
exclude: /(node_modules)/,
24-
loader: 'babel?stage=1'
24+
loader: 'babel?presets[]=react,presets[]=es2015,plugins[]=transform-object-rest-spread'
2525
}]
2626
}
2727
};

0 commit comments

Comments
 (0)