Skip to content

Commit

Permalink
Fix objectSpread2 backward compatibility (#10170)
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolo-ribaudo committed Jul 6, 2019
1 parent bff79e1 commit 24dde2e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion packages/babel-helpers/src/helpers.js
Expand Up @@ -406,7 +406,7 @@ helpers.objectSpread = helper("7.0.0-beta.0")`
}
`;

helpers.objectSpread2 = helper("7.0.0-beta.0")`
helpers.objectSpread2 = helper("7.5.0")`
import defineProperty from "defineProperty";
export default function _objectSpread2(target) {
Expand Down
Expand Up @@ -452,7 +452,13 @@ export default declare((api, opts) => {
if (loose) {
helper = getExtendsHelper(file);
} else {
helper = file.addHelper("objectSpread2");
try {
helper = file.addHelper("objectSpread2");
} catch {
// objectSpread2 has been introduced in v7.5.0
// We have to maintain backward compatibility.
helper = file.addHelper("objectSpread");
}
}

path.replaceWith(t.callExpression(helper, args));
Expand Down

0 comments on commit 24dde2e

Please sign in to comment.