Merge branch 'master' of https://github.com/learncodeacademy/react-js-tutorials

willrstern · willrstern · commit 1be5b6bcb7b7 · 2016-02-16T15:45:30.000-06:00
diff --git a/1-basic-react/webpack.config.js b/1-basic-react/webpack.config.js
@@ -9,7 +9,7 @@ module.exports = {
   module: {
     loaders: [
       {
-        test: /\.js?$/,
+        test: /\.jsx?$/,
         exclude: /(node_modules|bower_components)/,
         loader: 'babel-loader',
         query: {
diff --git a/2-react-router/webpack.config.js b/2-react-router/webpack.config.js
@@ -9,7 +9,7 @@ module.exports = {
   module: {
     loaders: [
       {
-        test: /\.js?$/,
+        test: /\.jsx?$/,
         exclude: /(node_modules|bower_components)/,
         loader: 'babel-loader',
         query: {

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ module.exports = {`
`9`	`9`	`module: {`
`10`	`10`	`loaders: [`
`11`	`11`	`{`
`12`		`- test: /\.js?$/,`
	`12`	`+ test: /\.jsx?$/,`
`13`	`13`	`exclude: /(node_modules\|bower_components)/,`
`14`	`14`	`loader: 'babel-loader',`
`15`	`15`	`query: {`