Skip to content

Commit

Permalink
Merge pull request react-bootstrap#2162 from taion/update-babel
Browse files Browse the repository at this point in the history
Upgrade Babel
  • Loading branch information
taion authored Aug 20, 2016
2 parents c7a4228 + 181bbdf commit e8fcfa3
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 10 deletions.
6 changes: 5 additions & 1 deletion .babelrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
"presets": ["es2015-loose", "stage-1", "react"],
"presets": [
["es2015", { "loose": true }],
"stage-1",
"react"
],
"plugins": [
"dev-expression",
"transform-runtime",
Expand Down
1 change: 1 addition & 0 deletions docs/src/ReactPlayground.js
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ const ReactPlayground = React.createClass({
return {
transformer(code) {
return transform(code, {
// TODO: Use preset options once babel-standalone v6.13 is released.
presets: ['es2015-loose', 'react', 'stage-1']
}).code;
}
Expand Down
15 changes: 7 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"tdd": "karma start",
"test": "npm run lint && npm run test-browser && npm run test-node",
"test-browser": "cross-env NODE_ENV=test karma start --single-run",
"test-node": "mocha --compilers js:babel-core/register test/server/*Spec.js"
"test-node": "mocha --compilers js:babel-register test/server/*Spec.js"
},
"main": "lib/index.js",
"jsnext:main": "es/index.js",
Expand All @@ -43,20 +43,19 @@
},
"devDependencies": {
"babel-cli": "^6.11.4",
"babel-eslint": "^6.1.0",
"babel-loader": "^6.2.4",
"babel-core": "^6.13.2",
"babel-eslint": "^6.1.2",
"babel-loader": "^6.2.5",
"babel-plugin-add-module-exports": "^0.2.1",
"babel-plugin-dev-expression": "^0.2.1",
"babel-plugin-istanbul": "^1.0.3",
"babel-plugin-transform-es3-member-expression-literals": "^6.8.0",
"babel-plugin-transform-es3-property-literals": "^6.8.0",
"babel-plugin-transform-runtime": "^6.12.0",
"babel-preset-es2015": "^6.9.0",
"babel-preset-es2015-loose": "^7.0.0",
"babel-preset-es2015-webpack": "^6.4.2",
"babel-preset-es2015-webpack-loose": "^6.3.14",
"babel-preset-es2015": "^6.13.2",
"babel-preset-react": "^6.11.1",
"babel-preset-stage-1": "^6.5.0",
"babel-preset-stage-1": "^6.13.0",
"babel-register": "^6.11.6",
"babel-standalone": "^6.12.0",
"bootstrap": "^3.3.6",
"brfs": "^1.4.3",
Expand Down
6 changes: 5 additions & 1 deletion tools/es/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ export default function BuildES() {
.then(() => fsp.mkdirs(esRoot))
.then(() => buildBabel(srcRoot, esRoot, {
babelrc: false,
presets: ['es2015-webpack-loose', 'react', 'stage-1'],
presets: [
['es2015', { loose: true, modules: false }],
'stage-1',
'react'
],
plugins: [
'dev-expression',
'transform-runtime',
Expand Down

0 comments on commit e8fcfa3

Please sign in to comment.