From 4718367a194129bdc63316afbadd12a545e2b630 Mon Sep 17 00:00:00 2001
From: gormanchi <gormanchi@gmail.com>
Date: Fri, 16 May 2014 22:16:11 -0600
Subject: [PATCH 1/6] Adding repository info to package.json.

---
 package.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c3c0bb0..8364f65 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,10 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "repository": "",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/petehunt/jsx-loader"
+  },
   "keywords": [
     "webpack",
     "jsx"

From 3f8de12694391b6b1882f6e530d2ff74782bb64a Mon Sep 17 00:00:00 2001
From: Ben Alpert <spicyjalapeno@gmail.com>
Date: Thu, 17 Jul 2014 16:34:59 -0700
Subject: [PATCH 2/6] Bump react-tools version and package version

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 8364f65..9de24f1 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,10 @@
 {
   "name": "jsx-loader",
-  "version": "0.10.2",
+  "version": "0.11.0",
   "description": "JSX loader for webpack",
   "main": "index.js",
   "dependencies": {
-    "react-tools": "^0.10.0",
+    "react-tools": "^0.11.0",
     "loader-utils": "^0.2.2"
   },
   "scripts": {

From 0f564a99c71b960ca8c241ba8659a05180555cce Mon Sep 17 00:00:00 2001
From: Jake Riesterer <jake@impossibleventures.com>
Date: Mon, 25 Aug 2014 21:46:24 -0500
Subject: [PATCH 3/6] Implement sourcemaps

---
 index.js | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/index.js b/index.js
index 1ad88fc..f5cb93f 100644
--- a/index.js
+++ b/index.js
@@ -4,16 +4,23 @@ var loaderUtils = require('loader-utils');
 module.exports = function(source) {
   this.cacheable && this.cacheable();
 
-  var filename = loaderUtils.getRemainingRequest(this);
   var query = loaderUtils.parseQuery(this.query);
-
   if (query.insertPragma) {
-    source = '/** @jsx ' + query.insertPragma + ' */' + source;
+    source = '/** @jsx ' + query.insertPragma + ' */\n' + source;
   }
 
-  return reactTools.transform(source, {
+  var result = reactTools.transformWithDetails(source, {
     harmony: query.harmony,
-    sourceMap: query.sourceMap,
-    sourceFilename: filename
+    sourceMap: query.sourceMap
   });
-};
+
+  if (result.sourceMap) {
+    result.sourceMap.sources = [this.resourcePath];
+    result.sourceMap.sourcesContent = [source];
+  }
+
+  var code = result.code;
+  var map = result.sourceMap ? JSON.stringify(result.sourceMap) : void 0;
+
+  this.callback(null, code, map);
+};
\ No newline at end of file

From f4fa87c08761c8a1bb5a5e20e13a150134732362 Mon Sep 17 00:00:00 2001
From: Jake Riesterer <jake@impossibleventures.com>
Date: Tue, 26 Aug 2014 22:46:07 -0500
Subject: [PATCH 4/6] Document sourceMap query parameter

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6935c63..8474590 100644
--- a/README.md
+++ b/README.md
@@ -6,4 +6,4 @@
 {..., loader: 'jsx-loader'}
 ```
 
-To enable ES6 features, use `?harmony` in your loader config. To auto insert the pragma required to process the file use the insertPragma parameter e.g. `?insertPragma=React.DOM`.
+To enable ES6 features, use `?harmony` in your loader config. To auto insert the pragma required to process the file use the insertPragma parameter e.g. `?insertPragma=React.DOM`. To generate source maps, use `?sourceMap`.

From 2fe3fba8d80068fe566c6321ee3b896758ddb04a Mon Sep 17 00:00:00 2001
From: Jake Riesterer <jake@impossibleventures.com>
Date: Wed, 27 Aug 2014 09:46:48 -0500
Subject: [PATCH 5/6] Remove sourceMap flag and instead always emit them

---
 README.md | 2 +-
 index.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 8474590..6935c63 100644
--- a/README.md
+++ b/README.md
@@ -6,4 +6,4 @@
 {..., loader: 'jsx-loader'}
 ```
 
-To enable ES6 features, use `?harmony` in your loader config. To auto insert the pragma required to process the file use the insertPragma parameter e.g. `?insertPragma=React.DOM`. To generate source maps, use `?sourceMap`.
+To enable ES6 features, use `?harmony` in your loader config. To auto insert the pragma required to process the file use the insertPragma parameter e.g. `?insertPragma=React.DOM`.
diff --git a/index.js b/index.js
index f5cb93f..6ae296d 100644
--- a/index.js
+++ b/index.js
@@ -11,7 +11,7 @@ module.exports = function(source) {
 
   var result = reactTools.transformWithDetails(source, {
     harmony: query.harmony,
-    sourceMap: query.sourceMap
+    sourceMap: true
   });
 
   if (result.sourceMap) {

From 1872ede02bfa2bdc31ed3e596613d9c5cba4005f Mon Sep 17 00:00:00 2001
From: Jake Riesterer <jake@impossibleventures.com>
Date: Thu, 28 Aug 2014 09:35:19 -0500
Subject: [PATCH 6/6] Read new `sourceMap` flag exposed in webpack 1.4.0-beta1

---
 index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.js b/index.js
index 6ae296d..7d505ed 100644
--- a/index.js
+++ b/index.js
@@ -11,7 +11,7 @@ module.exports = function(source) {
 
   var result = reactTools.transformWithDetails(source, {
     harmony: query.harmony,
-    sourceMap: true
+    sourceMap: this.sourceMap
   });
 
   if (result.sourceMap) {