Merge pull request #3091 from claudiopro/master

Fixes @jsx pragma detection + tests

packages/babel-plugin-transform-react-jsx/src/index.js

@@ -1,5 +1,5 @@
 export default function ({ types: t }) {
-  let JSX_ANNOTATION_REGEX = /^\*\s*@jsx\s+([^\s]+)/;
+  let JSX_ANNOTATION_REGEX = /\*?\s*@jsx\s+([^\s]+)/;
 
   let visitor = require("babel-helper-builder-react-jsx")({
     pre(state) {

packages/babel-plugin-transform-react-jsx/test/fixtures/react/throw-if-custom-jsx-comment-sets-react-dom-multiline/actual.js

@@ -0,0 +1,10 @@
+/**
+ * @jsx React.DOM
+ */
+
+<Foo></Foo>;
+
+var profile = <div>
+  <img src="avatar.png" className="profile" />
+  <h3>{[user.firstName, user.lastName].join(" ")}</h3>
+</div>;

packages/babel-plugin-transform-react-jsx/test/fixtures/react/throw-if-custom-jsx-comment-sets-react-dom-multiline/options.json

@@ -0,0 +1,3 @@
+{
+  "throws": "The @jsx React.DOM pragma has been deprecated as of React 0.12"
+}

packages/babel-plugin-transform-react-jsx/test/fixtures/react/throw-if-custom-jsx-comment-sets-react-dom-simple/actual.js

@@ -0,0 +1,8 @@
+/* @jsx React.DOM */
+
+<Foo></Foo>;
+
+var profile = <div>
+  <img src="avatar.png" className="profile" />
+  <h3>{[user.firstName, user.lastName].join(" ")}</h3>
+</div>;

packages/babel-plugin-transform-react-jsx/test/fixtures/react/throw-if-custom-jsx-comment-sets-react-dom-simple/options.json

@@ -0,0 +1,3 @@
+{
+  "throws": "The @jsx React.DOM pragma has been deprecated as of React 0.12"
+}

packages/babel-plugin-transform-react-jsx/test/fixtures/react/throw-if-custom-jsx-comment-sets-react-dom-singleline/actual.js

@@ -0,0 +1,8 @@
+// @jsx React.DOM
+
+<Foo></Foo>;
+
+var profile = <div>
+  <img src="avatar.png" className="profile" />
+  <h3>{[user.firstName, user.lastName].join(" ")}</h3>
+</div>;

packages/babel-plugin-transform-react-jsx/test/fixtures/react/throw-if-custom-jsx-comment-sets-react-dom-singleline/options.json

@@ -0,0 +1,3 @@
+{
+  "throws": "The @jsx React.DOM pragma has been deprecated as of React 0.12"
+}

packages/babel-plugin-transform-react-jsx/test/fixtures/react/throw-if-custom-jsx-comment-sets-react-dom/actual.js

@@ -0,0 +1,8 @@
+/** @jsx React.DOM */
+
+<Foo></Foo>;
+
+var profile = <div>
+  <img src="avatar.png" className="profile" />
+  <h3>{[user.firstName, user.lastName].join(" ")}</h3>
+</div>;

packages/babel-plugin-transform-react-jsx/test/fixtures/react/throw-if-custom-jsx-comment-sets-react-dom/options.json

@@ -0,0 +1,3 @@
+{
+  "throws": "The @jsx React.DOM pragma has been deprecated as of React 0.12"
+}