From 7c0bcddff14c050c201d6f68ff28d3ccb3744a95 Mon Sep 17 00:00:00 2001
From: jackwanders <jack@webs.com>
Date: Tue, 28 Oct 2014 21:55:43 -0400
Subject: [PATCH] Update grunt-react to use react-tools v0.12.0 Because React's
 update from 0.11 to 0.12 contains breaking changes, grunt-react should update
 its version accordingly. Tests have been updated to reflect update React
 functionality: - /** @jsx React.DOM **/ annotation no longer used - js files
 will be transformed if valid React code is encountered

---
 package.json                        | 4 ++--
 test/expected/browserify            | 6 +-----
 test/expected/default_options       | 6 +-----
 test/expected/extension_option      | 6 +-----
 test/expected/multiple_jsx_files    | 8 ++------
 test/expected/vanilla_js            | 9 +++++++++
 test/fixtures/browserify/module.jsx | 4 ----
 test/fixtures/js/fixture-jsx.js     | 4 ----
 test/fixtures/jsx/fixture.jsx       | 4 ----
 test/react_test.js                  | 4 ++--
 10 files changed, 18 insertions(+), 37 deletions(-)
 create mode 100644 test/expected/vanilla_js

diff --git a/package.json b/package.json
index e9e2fb8..2a0c53d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "grunt-react",
   "description": "Grunt task for compiling Facebook React's JSX templates into JavaScript",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "homepage": "https://github.com/ericclemmons/grunt-react",
   "author": {
     "name": "Eric Clemmons",
@@ -29,7 +29,7 @@
     "test": "./node_modules/.bin/grunt"
   },
   "dependencies": {
-    "react-tools": "^0.11.0",
+    "react-tools": "^0.12.0",
     "through": "~2.3.4"
   },
   "devDependencies": {
diff --git a/test/expected/browserify b/test/expected/browserify
index 3d71f84..78daf6d 100644
--- a/test/expected/browserify
+++ b/test/expected/browserify
@@ -1,12 +1,8 @@
 (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);throw new Error("Cannot find module '"+o+"'")}var f=n[o]={exports:{}};t[o][0].call(f.exports,function(e){var n=t[o][1][e];return s(n?n:e)},f,f.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
-/**
- * @jsx React.DOM
- */
-
 var ModuleComponent = React.createClass({displayName: 'ModuleComponent',
   render: function() {
     return (
-      React.DOM.p(null, "Module")
+      React.createElement("p", null, "Module")
     );
   }
 });
diff --git a/test/expected/default_options b/test/expected/default_options
index de7590f..ad1cb1e 100644
--- a/test/expected/default_options
+++ b/test/expected/default_options
@@ -1,7 +1,3 @@
-/**
- * @jsx React.DOM
- */
-
 (function(greeting) {
   return greeting;
-})(React.DOM.p(null, "Howdy"));
+})(React.createElement("p", null, "Howdy"));
diff --git a/test/expected/extension_option b/test/expected/extension_option
index 61e1f6a..b1d2438 100644
--- a/test/expected/extension_option
+++ b/test/expected/extension_option
@@ -1,11 +1,7 @@
-/**
- * @jsx React.DOM
- */
-
 var FixtureComponent = React.createClass({displayName: 'FixtureComponent',
   render: function() {
     return (
-      React.DOM.p(null, "Howdy")
+      React.createElement("p", null, "Howdy")
     );
   }
 });
diff --git a/test/expected/multiple_jsx_files b/test/expected/multiple_jsx_files
index 3468cf4..0664263 100644
--- a/test/expected/multiple_jsx_files
+++ b/test/expected/multiple_jsx_files
@@ -1,11 +1,7 @@
-/**
- * @jsx React.DOM
- */
-
 var FixtureComponent = React.createClass({displayName: 'FixtureComponent',
   render: function() {
     return (
-      React.DOM.p(null, "Howdy")
+      React.createElement("p", null, "Howdy")
     );
   }
 });
@@ -14,7 +10,7 @@ var FixtureComponent = React.createClass({displayName: 'FixtureComponent',
  * Plain JS File with .jsx extension
  */
 
-var FixtureComponent = React.createClass({
+var FixtureComponent = React.createClass({displayName: 'FixtureComponent',
   render: function() {
     return '<p>Howdy</p>';
   }
diff --git a/test/expected/vanilla_js b/test/expected/vanilla_js
new file mode 100644
index 0000000..1026f7e
--- /dev/null
+++ b/test/expected/vanilla_js
@@ -0,0 +1,9 @@
+/**
+ * Plain JS File with .jsx extension
+ */
+
+var FixtureComponent = React.createClass({displayName: 'FixtureComponent',
+  render: function() {
+    return '<p>Howdy</p>';
+  }
+});
diff --git a/test/fixtures/browserify/module.jsx b/test/fixtures/browserify/module.jsx
index 2d0ed89..ddd7fb5 100644
--- a/test/fixtures/browserify/module.jsx
+++ b/test/fixtures/browserify/module.jsx
@@ -1,7 +1,3 @@
-/**
- * @jsx React.DOM
- */
-
 var ModuleComponent = React.createClass({
   render: function() {
     return (
diff --git a/test/fixtures/js/fixture-jsx.js b/test/fixtures/js/fixture-jsx.js
index 864ee45..3c69d28 100644
--- a/test/fixtures/js/fixture-jsx.js
+++ b/test/fixtures/js/fixture-jsx.js
@@ -1,7 +1,3 @@
-/**
- * @jsx React.DOM
- */
-
 (function(greeting) {
   return greeting;
 })(<p>Howdy</p>);
diff --git a/test/fixtures/jsx/fixture.jsx b/test/fixtures/jsx/fixture.jsx
index c6d27d1..f5231ba 100644
--- a/test/fixtures/jsx/fixture.jsx
+++ b/test/fixtures/jsx/fixture.jsx
@@ -1,7 +1,3 @@
-/**
- * @jsx React.DOM
- */
-
 var FixtureComponent = React.createClass({
   render: function() {
     return (
diff --git a/test/react_test.js b/test/react_test.js
index 10534a5..2ffcd3c 100644
--- a/test/react_test.js
+++ b/test/react_test.js
@@ -31,9 +31,9 @@ exports.react = {
     test.expect(1);
 
     var actual    = grunt.file.read('tmp/jsx/nested/fixture-js.js');
-    var expected  = grunt.file.read('test/fixtures/jsx/nested/fixture-js.jsx');
+    var expected  = grunt.file.read('test/expected/vanilla_js');
 
-    test.equal(actual, expected, 'should leave vanilla JS alone');
+    test.equal(actual, expected, 'should convert even vanilla JS');
     test.done();
   },