update docs regarding babelrc

yyx990803 · yyx990803 · commit fe37d75e630d · 2015-12-18T12:41:29.000-05:00
diff --git a/docs/features/es2015.md b/docs/features/es2015.md
@@ -55,6 +55,8 @@ module.exports = {
 }
 ```
 
+Alternatively, you can add a `.babelrc` file at the root of your project.
+
 ### Compiling `.js` Files with Babel
 
 Since we are already using Babel, most likely you'll want to compile your normal `.js` files too! Here's how to do it in your Webpack config:
diff --git a/lib/loader.js b/lib/loader.js
@@ -36,7 +36,7 @@ module.exports = function (content) {
 
   // respect user babel options
   if (this.options.babel) {
-    defaultLoaders.js = 'babel'
+    defaultLoaders.js = 'babel-loader'
   }
 
   // check if there are custom loaders specified with

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,8 @@ module.exports = {`
`55`	`55`	`}`
`56`	`56`	```
`57`	`57`
	`58`	+Alternatively, you can add a `.babelrc` file at the root of your project.
	`59`	`+`
`58`	`60`	### Compiling `.js` Files with Babel
`59`	`61`
`60`	`62`	Since we are already using Babel, most likely you'll want to compile your normal `.js` files too! Here's how to do it in your Webpack config:
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ module.exports = function (content) {`
`36`	`36`
`37`	`37`	`// respect user babel options`
`38`	`38`	`if (this.options.babel) {`
`39`		`- defaultLoaders.js = 'babel'`
	`39`	`+ defaultLoaders.js = 'babel-loader'`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`// check if there are custom loaders specified with`