Use babel-loader instead of jsx-loader

mjackson · mjackson · commit 0d5353c588d7 · 2015-02-24T10:38:36.000-08:00
diff --git a/examples/webpack.config.js b/examples/webpack.config.js
@@ -28,7 +28,7 @@ module.exports = {
 
   module: {
     loaders: [
-      { test: /\.js$/, loader: 'jsx-loader?harmony' }
+      { test: /\.js$/, loader: 'babel-loader' }
     ]
   },
 
diff --git a/karma.conf.js b/karma.conf.js
@@ -23,7 +23,7 @@ module.exports = function (config) {
       devtool: 'inline-source-map',
       module: {
         loaders: [
-          { test: /\.js$/, loader: 'jsx-loader?harmony' }
+          { test: /\.js$/, loader: 'babel-loader' }
         ]
       },
       plugins: [
diff --git a/package.json b/package.json
@@ -22,10 +22,11 @@
   "license": "MIT",
   "devDependencies": {
     "babel": "^4.4.5",
+    "babel-core": "^4.4.6",
+    "babel-loader": "^4.0.0",
     "bundle-loader": "^0.5.2",
     "events": "1.0.2",
     "expect": "^1.1.0",
-    "jsx-loader": "^0.12.2",
     "jsxhint": "^0.8.1",
     "karma": "^0.12.28",
     "karma-chrome-launcher": "^0.1.7",
diff --git a/webpack.config.js b/webpack.config.js
@@ -36,7 +36,7 @@ module.exports = {
 
   module: {
     loaders: [
-      { test: /\.js$/, loader: 'jsx-loader?harmony' }
+      { test: /\.js$/, loader: 'babel-loader' }
     ]
   },
 

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ module.exports = {`
`28`	`28`
`29`	`29`	`module: {`
`30`	`30`	`loaders: [`
`31`		`- { test: /\.js$/, loader: 'jsx-loader?harmony' }`
	`31`	`+ { test: /\.js$/, loader: 'babel-loader' }`
`32`	`32`	`]`
`33`	`33`	`},`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ module.exports = function (config) {`
`23`	`23`	`devtool: 'inline-source-map',`
`24`	`24`	`module: {`
`25`	`25`	`loaders: [`
`26`		`- { test: /\.js$/, loader: 'jsx-loader?harmony' }`
	`26`	`+ { test: /\.js$/, loader: 'babel-loader' }`
`27`	`27`	`]`
`28`	`28`	`},`
`29`	`29`	`plugins: [`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ module.exports = {`
`36`	`36`
`37`	`37`	`module: {`
`38`	`38`	`loaders: [`
`39`		`- { test: /\.js$/, loader: 'jsx-loader?harmony' }`
	`39`	`+ { test: /\.js$/, loader: 'babel-loader' }`
`40`	`40`	`]`
`41`	`41`	`},`
`42`	`42`