Skip to content

Commit 6992c8d

Browse files
author
Søren Brokær
committed
Merge pull request #3 from podio/react0.12.0
Upgrade to React 0.12.0
2 parents 6a6ae48 + e717db7 commit 6992c8d

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

bower.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "requirejs-react-jsx",
3-
"version": "0.1.2",
3+
"version": "0.12.0",
44
"homepage": "https://github.com/podio/requirejs-react-jsx",
55
"authors": [
66
"Søren Brokær <[email protected]>"
@@ -25,7 +25,7 @@
2525
"tests"
2626
],
2727
"dependencies": {
28-
"react": "~0.11.2",
29-
"requirejs-text": "~2.0.12"
28+
"react": ">=0.11.2",
29+
"requirejs-text": ">=2.0.12"
3030
}
3131
}

jsx.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ define(function () {
2121
var content = fs.readFileSync(path, {encoding: 'utf8'});
2222

2323
try {
24-
compiled = ReactTools.transform(ensureJSXPragma(content), options);
24+
compiled = ReactTools.transform(ensureJSXPragma(content, config), options);
2525
} catch (err) {
2626
throw new Error('jsx.js - Error while running JSXTransformer on ' + path + '\n' + err.message);
2727
}
@@ -48,7 +48,7 @@ define(function () {
4848

4949
var onLoad = function(content, JSXTransformer) {
5050
try {
51-
content = JSXTransformer.transform(ensureJSXPragma(content), options).code;
51+
content = JSXTransformer.transform(ensureJSXPragma(content, config), options).code;
5252
} catch (err) {
5353
onLoadNative.error(err);
5454
}
@@ -77,8 +77,8 @@ define(function () {
7777
return name;
7878
}
7979

80-
function ensureJSXPragma(content){
81-
if (-1 === content.indexOf('@jsx React.DOM')) {
80+
function ensureJSXPragma(content, config){
81+
if (config.usePragma && -1 === content.indexOf('@jsx React.DOM')) {
8282
content = "/** @jsx React.DOM */\n" + content;
8383
}
8484

readme.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ require.config({
6868
transformOptions: {
6969
harmony: true,
7070
stripTypes: false
71-
}
71+
},
72+
usePragma: false
7273
}
7374
});
7475

0 commit comments

Comments
 (0)