cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2352 from spicyj/jsx-xss

Browse Source 
Include $$typeof on inlined React elements
This commit is contained in:
Sebastian McKenzie 2015-09-10 20:03:42 +01:00
commit ade747eb9c
17 changed files with 71 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/babel/src/transformation/file/index.js
View File

@ -92,6 +92,7 @@ export default class File {
"temporal-undefined",
"temporal-assert-defined",
"self-global",
"typeof-react-element",
"default-props",
"instanceof",

1
packages/babel/src/transformation/templates/helper-typeof-react-element.js Normal file
View File

@ -0,0 +1 @@
(typeof Symbol === "function" && Symbol.for && Symbol.for("react.element")) || 0xeac7

14
packages/babel/src/transformation/transformers/optimisation/react.inline-elements.js
View File

@ -60,10 +60,6 @@ export var visitor = {
objProps.push(t.property("init", key, value));
}
// metadata
pushElemProp("type", type);
pushElemProp("ref", t.literal(null));
if (node.children.length) {
var children = react.buildChildren(node);
children = children.length === 1 ? children[0] : t.arrayExpression(children);
@ -84,10 +80,14 @@ export var visitor = {
props = t.callExpression(file.addHelper("default-props"), [t.memberExpression(type, t.identifier("defaultProps")), props]);
}
pushElemProp("props", props);
// key
// metadata
pushElemProp("$$typeof", file.addHelper("typeof-react-element"));
pushElemProp("type", type);
pushElemProp("key", key);
pushElemProp("ref", t.literal(null));
pushElemProp("props", props);
pushElemProp("_owner", t.literal(null));
return obj;
}

12
packages/babel/test/fixtures/transformation/optimisation.react.constant-elements/inline-elements/expected.js vendored
View File

@ -1,10 +1,14 @@
"use strict";
var _typeofReactElement = typeof Symbol === "function" && Symbol["for"] && Symbol["for"]("react.element") || 60103;
var _ref = {
$$typeof: _typeofReactElement,
type: "foo",
key: null,
ref: null,
props: {},
key: null
_owner: null
};
function render() {
return _ref;
@ -13,14 +17,16 @@ function render() {
function render() {
var text = getText();
var _ref2 = {
$$typeof: _typeofReactElement,
type: "foo",
key: null,
ref: null,
props: {
children: text
},
key: null
_owner: null
};
return function () {
return _ref2;
};
}
}

6
packages/babel/test/fixtures/transformation/optimisation.react.inline-elements/component-with-props/expected.js vendored
View File

@ -1,10 +1,12 @@
"use strict";
({
$$typeof: babelHelpers.typeofReactElement,
type: Baz,
key: null,
ref: null,
props: babelHelpers.defaultProps(Baz.defaultProps, {
foo: "bar"
}),
key: null
});
_owner: null
});

6
packages/babel/test/fixtures/transformation/optimisation.react.inline-elements/component/expected.js vendored
View File

@ -1,8 +1,10 @@
"use strict";
({
$$typeof: babelHelpers.typeofReactElement,
type: Baz,
key: null,
ref: null,
props: babelHelpers.defaultProps(Baz.defaultProps, {}),
key: null
});
_owner: null
});

6
packages/babel/test/fixtures/transformation/optimisation.react.inline-elements/html-element-with-props/expected.js vendored
View File

@ -1,10 +1,12 @@
"use strict";
({
$$typeof: babelHelpers.typeofReactElement,
type: "foo",
key: null,
ref: null,
props: {
bar: "foo"
},
key: null
});
_owner: null
});

6
packages/babel/test/fixtures/transformation/optimisation.react.inline-elements/html-element/expected.js vendored
View File

@ -1,8 +1,10 @@
"use strict";
({
$$typeof: babelHelpers.typeofReactElement,
type: "foo",
key: null,
ref: null,
props: {},
key: null
});
_owner: null
});

4
packages/babel/test/fixtures/transformation/optimisation.react.inline-elements/key/expected.js vendored
View File

@ -1,8 +1,10 @@
"use strict";
({
$$typeof: babelHelpers.typeofReactElement,
type: Foo,
key: "foo",
ref: null,
props: babelHelpers.defaultProps(Foo.defaultProps, {}),
key: "foo"
_owner: null
});

10
packages/babel/test/fixtures/transformation/optimisation.react.inline-elements/nested-components/expected.js vendored
View File

@ -1,16 +1,20 @@
"use strict";
({
$$typeof: babelHelpers.typeofReactElement,
type: Foo,
key: null,
ref: null,
props: babelHelpers.defaultProps(Foo.defaultProps, {
children: [bar, {
$$typeof: babelHelpers.typeofReactElement,
type: Baz,
key: "baz",
ref: null,
props: babelHelpers.defaultProps(Baz.defaultProps, {}),
key: "baz"
_owner: null
}],
className: "foo"
}),
key: null
});
_owner: null
});

6
packages/babel/test/fixtures/transformation/optimisation.react.inline-elements/nested-html-elements/expected.js vendored
View File

@ -1,11 +1,13 @@
"use strict";
({
$$typeof: babelHelpers.typeofReactElement,
type: "div",
key: null,
ref: null,
props: {
children: bar,
className: "foo"
},
key: null
});
_owner: null
});

10
packages/babel/test/fixtures/transformation/optimisation.react.inline-elements/nested/expected.js vendored
View File

@ -1,16 +1,20 @@
"use strict";
({
$$typeof: babelHelpers.typeofReactElement,
type: "div",
key: null,
ref: null,
props: {
children: [bar, {
$$typeof: babelHelpers.typeofReactElement,
type: Baz,
key: "baz",
ref: null,
props: babelHelpers.defaultProps(Baz.defaultProps, {}),
key: "baz"
_owner: null
}],
className: "foo"
},
key: null
});
_owner: null
});

4
packages/babel/test/fixtures/transformation/optimisation.react.inline-elements/self-closing-component-with-props/expected.js vendored
View File

@ -1,10 +1,12 @@
"use strict";
({
$$typeof: babelHelpers.typeofReactElement,
type: Baz,
key: null,
ref: null,
props: babelHelpers.defaultProps(Baz.defaultProps, {
foo: "bar"
}),
key: null
_owner: null
});

4
packages/babel/test/fixtures/transformation/optimisation.react.inline-elements/self-closing-component/expected.js vendored
View File

@ -1,8 +1,10 @@
"use strict";
({
$$typeof: babelHelpers.typeofReactElement,
type: Baz,
key: null,
ref: null,
props: babelHelpers.defaultProps(Baz.defaultProps, {}),
key: null
_owner: null
});

4
packages/babel/test/fixtures/transformation/optimisation.react.inline-elements/self-closing-html-element-with-props/expected.js vendored
View File

@ -1,10 +1,12 @@
"use strict";
({
$$typeof: babelHelpers.typeofReactElement,
type: "foo",
key: null,
ref: null,
props: {
bar: "foo"
},
key: null
_owner: null
});

4
packages/babel/test/fixtures/transformation/optimisation.react.inline-elements/self-closing-html-element/expected.js vendored
View File

@ -1,8 +1,10 @@
"use strict";
({
$$typeof: babelHelpers.typeofReactElement,
type: "foo",
key: null,
ref: null,
props: {},
key: null
_owner: null
});

6
packages/babel/test/fixtures/transformation/optimisation.react.inline-elements/shorthand-attributes/expected.js vendored
View File

@ -1,10 +1,12 @@
"use strict";
({
$$typeof: babelHelpers.typeofReactElement,
type: Foo,
key: null,
ref: null,
props: babelHelpers.defaultProps(Foo.defaultProps, {
bar: true
}),
key: null
});
_owner: null
});