Skip to content

Commit

Permalink
[babel 8] Remove useSpread and useBuiltIns jsx options (#12593)
Browse files Browse the repository at this point in the history
* [babel 8] Remove `useSpread` and `useBuiltIns` jsx options

backport of 8cc8696

Co-authored-by: Nicol貌 Ribaudo <nicolo.ribaudo@gmail.com>
Co-authored-by: Brian Ng <bng412@gmail.com>

* Update fixtures (Windows)

Co-authored-by: Hu谩ng J霉nli脿ng <jlhwung@gmail.com>
Co-authored-by: Brian Ng <bng412@gmail.com>
Co-authored-by: Babel Bot <babel-bot@users.noreply.github.com>
  • Loading branch information
4 people committed Jan 8, 2021
1 parent 606c91c commit fce3e71
Show file tree
Hide file tree
Showing 67 changed files with 424 additions and 134 deletions.
6 changes: 5 additions & 1 deletion packages/babel-helper-builder-react-jsx/src/index.js
Expand Up @@ -144,7 +144,11 @@ You can set \`throwIfNamespace: false\` to bypass this warning.`,

let attribs = openingPath.node.attributes;
if (attribs.length) {
attribs = buildOpeningElementAttributes(attribs, file);
if (process.env.BABEL_8_BREAKING) {
attribs = t.objectExpression(attribs.map(convertAttribute));
} else {
attribs = buildOpeningElementAttributes(attribs, file);
}
} else {
attribs = t.nullLiteral();
}
Expand Down
@@ -0,0 +1,10 @@
var x = (
<>
<div>
<div key="1" />
<div key="2" meow="wolf" />
<div key="3" />
<div {...props} key="4" />
</div>
</>
);
@@ -0,0 +1,5 @@
{
"BABEL_8_BREAKING": false,
"plugins": [["transform-react-jsx-development", { "runtime": "classic" }]],
"os": ["linux", "darwin"]
}
@@ -0,0 +1,45 @@
var _jsxFileName = "<CWD>/packages/babel-plugin-transform-react-jsx-development/test/fixtures/linux/classic-runtime-babel-7/input.js";

function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }

var x = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
__self: this,
__source: {
fileName: _jsxFileName,
lineNumber: 3,
columnNumber: 5
}
}, /*#__PURE__*/React.createElement("div", {
key: "1",
__self: this,
__source: {
fileName: _jsxFileName,
lineNumber: 4,
columnNumber: 9
}
}), /*#__PURE__*/React.createElement("div", {
key: "2",
meow: "wolf",
__self: this,
__source: {
fileName: _jsxFileName,
lineNumber: 5,
columnNumber: 9
}
}), /*#__PURE__*/React.createElement("div", {
key: "3",
__self: this,
__source: {
fileName: _jsxFileName,
lineNumber: 6,
columnNumber: 9
}
}), /*#__PURE__*/React.createElement("div", _extends({}, props, {
key: "4",
__self: this,
__source: {
fileName: _jsxFileName,
lineNumber: 7,
columnNumber: 9
}
}))));
@@ -1,4 +1,5 @@
{
"BABEL_8_BREAKING": true,
"plugins": [["transform-react-jsx-development", { "runtime": "classic" }]],
"os": ["linux", "darwin"]
}
@@ -1,7 +1,4 @@
var _jsxFileName = "<CWD>/packages/babel-plugin-transform-react-jsx-development/test/fixtures/linux/classic-runtime/input.js";

function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }

var x = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
__self: this,
__source: {
Expand Down Expand Up @@ -34,12 +31,12 @@ var x = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/Reac
lineNumber: 6,
columnNumber: 9
}
}), /*#__PURE__*/React.createElement("div", _extends({}, props, {
}), /*#__PURE__*/React.createElement("div", { ...props,
key: "4",
__self: this,
__source: {
fileName: _jsxFileName,
lineNumber: 7,
columnNumber: 9
}
}))));
})));
@@ -0,0 +1,10 @@
var x = (
<>
<div>
<div key="1" />
<div key="2" meow="wolf" />
<div key="3" />
<div {...props} key="4" />
</div>
</>
);
@@ -0,0 +1,4 @@
{
"BABEL_8_BREAKING": false,
"plugins": [["transform-react-jsx-development", { "runtime": "classic" }]]
}
@@ -0,0 +1,45 @@
var _jsxFileName = "<CWD>\\packages\\babel-plugin-transform-react-jsx-development\\test\\fixtures\\windows\\classic-runtime-windows-babel-7\\input.js";

function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }

var x = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
__self: this,
__source: {
fileName: _jsxFileName,
lineNumber: 3,
columnNumber: 5
}
}, /*#__PURE__*/React.createElement("div", {
key: "1",
__self: this,
__source: {
fileName: _jsxFileName,
lineNumber: 4,
columnNumber: 7
}
}), /*#__PURE__*/React.createElement("div", {
key: "2",
meow: "wolf",
__self: this,
__source: {
fileName: _jsxFileName,
lineNumber: 5,
columnNumber: 7
}
}), /*#__PURE__*/React.createElement("div", {
key: "3",
__self: this,
__source: {
fileName: _jsxFileName,
lineNumber: 6,
columnNumber: 7
}
}), /*#__PURE__*/React.createElement("div", _extends({}, props, {
key: "4",
__self: this,
__source: {
fileName: _jsxFileName,
lineNumber: 7,
columnNumber: 7
}
}))));
@@ -1,3 +1,4 @@
{
"BABEL_8_BREAKING": true,
"plugins": [["transform-react-jsx-development", { "runtime": "classic" }]]
}
@@ -1,7 +1,4 @@
var _jsxFileName = "<CWD>\\packages\\babel-plugin-transform-react-jsx-development\\test\\fixtures\\windows\\classic-runtime-windows\\input.js";

function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }

var x = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
__self: this,
__source: {
Expand All @@ -15,7 +12,7 @@ var x = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/Reac
__source: {
fileName: _jsxFileName,
lineNumber: 4,
columnNumber: 7
columnNumber: 9
}
}), /*#__PURE__*/React.createElement("div", {
key: "2",
Expand All @@ -24,22 +21,22 @@ var x = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/Reac
__source: {
fileName: _jsxFileName,
lineNumber: 5,
columnNumber: 7
columnNumber: 9
}
}), /*#__PURE__*/React.createElement("div", {
key: "3",
__self: this,
__source: {
fileName: _jsxFileName,
lineNumber: 6,
columnNumber: 7
columnNumber: 9
}
}), /*#__PURE__*/React.createElement("div", _extends({}, props, {
}), /*#__PURE__*/React.createElement("div", { ...props,
key: "4",
__self: this,
__source: {
fileName: _jsxFileName,
lineNumber: 7,
columnNumber: 7
columnNumber: 9
}
}))));
})));

0 comments on commit fce3e71

Please sign in to comment.