Skip to content

Commit

Permalink
[cjs] Skip duplicate reexported bindings in namespace reexports (#11739)
Browse files Browse the repository at this point in the history
  • Loading branch information
@mischnic
mischnic committed Sep 28, 2020
1 parent 39a1267 commit a080c82
Show file tree
Hide file tree
Showing 17 changed files with 26 additions and 1 deletion.
10 changes: 9 additions & 1 deletion packages/babel-helper-module-transforms/src/index.js
View file
Expand Up @@ -236,14 +236,22 @@ function buildNamespaceReexport(metadata, namespace, loose) {
Object.keys(NAMESPACE).forEach(function(key) {
if (key === "default" || key === "__esModule") return;
VERIFY_NAME_LIST;
if (key in EXPORTS && EXPORTS[key] === NAMESPACE[key]) return;
EXPORTS[key] = NAMESPACE[key];
});
`
: template.statement`
: // Also skip already assigned bindings if they are strictly equal
// to be somewhat more spec-compliant when a file has multiple
// namespace re-exports that would cause a binding to be exported
// multiple times. However, multiple bindings of the same name that
// export the same primitive value are silently skipped
// (the spec requires an "ambigous bindings" early error here).
template.statement`
Object.keys(NAMESPACE).forEach(function(key) {
if (key === "default" || key === "__esModule") return;
VERIFY_NAME_LIST;
if (key in EXPORTS && EXPORTS[key] === NAMESPACE[key]) return;
Object.defineProperty(EXPORTS, key, {
enumerable: true,
Expand Down
1 change: 1 addition & 0 deletions packages/babel-plugin-transform-modules-amd/test/fixtures/amd/export-from/output.js
View file
Expand Up @@ -6,6 +6,7 @@ define(["exports", "foo"], function (_exports, _foo) {
});
Object.keys(_foo).forEach(function (key) {
if (key === "default" || key === "__esModule") return;
if (key in _exports && _exports[key] === _foo[key]) return;
Object.defineProperty(_exports, key, {
enumerable: true,
get: function () {
Expand Down
1 change: 1 addition & 0 deletions packages/babel-plugin-transform-modules-amd/test/fixtures/loose/export-from/output.js
View file
Expand Up @@ -4,6 +4,7 @@ define(["exports", "foo"], function (_exports, _foo) {
_exports.__esModule = true;
Object.keys(_foo).forEach(function (key) {
if (key === "default" || key === "__esModule") return;
if (key in _exports && _exports[key] === _foo[key]) return;
_exports[key] = _foo[key];
});
});
1 change: 1 addition & 0 deletions ...babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/export-from/output.js
View file
Expand Up @@ -6,5 +6,6 @@ var _foo = require("foo");

Object.keys(_foo).forEach(function (key) {
if (key === "default" || key === "__esModule") return;
if (key in exports && exports[key] === _foo[key]) return;
exports[key] = _foo[key];
});
1 change: 1 addition & 0 deletions packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/export-all/output.js
View file
Expand Up @@ -11,6 +11,7 @@ var _react = babelHelpers.interopRequireWildcard(require("react"));
Object.keys(_react).forEach(function (key) {
if (key === "default" || key === "__esModule") return;
if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
if (key in exports && exports[key] === _react[key]) return;
Object.defineProperty(exports, key, {
enumerable: true,
get: function () {
Expand Down
1 change: 1 addition & 0 deletions packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/export-from/output.js
View file
Expand Up @@ -8,6 +8,7 @@ var _foo = require("foo");

Object.keys(_foo).forEach(function (key) {
if (key === "default" || key === "__esModule") return;
if (key in exports && exports[key] === _foo[key]) return;
Object.defineProperty(exports, key, {
enumerable: true,
get: function () {
Expand Down
1 change: 1 addition & 0 deletions ...ges/babel-plugin-transform-modules-commonjs/test/fixtures/lazy-dep/reexport-all/output.js
View file
Expand Up @@ -8,6 +8,7 @@ var _foo = require("foo");

Object.keys(_foo).forEach(function (key) {
if (key === "default" || key === "__esModule") return;
if (key in exports && exports[key] === _foo[key]) return;
Object.defineProperty(exports, key, {
enumerable: true,
get: function () {
Expand Down
1 change: 1 addition & 0 deletions ...s/babel-plugin-transform-modules-commonjs/test/fixtures/lazy-local/reexport-all/output.js
View file
Expand Up @@ -8,6 +8,7 @@ var _foo = require("./foo");

Object.keys(_foo).forEach(function (key) {
if (key === "default" || key === "__esModule") return;
if (key in exports && exports[key] === _foo[key]) return;
Object.defineProperty(exports, key, {
enumerable: true,
get: function () {
Expand Down
2 changes: 2 additions & 0 deletions ...bel-plugin-transform-modules-commonjs/test/fixtures/lazy-whitelist/reexport-all/output.js
View file
Expand Up @@ -8,6 +8,7 @@ var _white = require("white");

Object.keys(_white).forEach(function (key) {
if (key === "default" || key === "__esModule") return;
if (key in exports && exports[key] === _white[key]) return;
Object.defineProperty(exports, key, {
enumerable: true,
get: function () {
Expand All @@ -20,6 +21,7 @@ var _black = require("black");

Object.keys(_black).forEach(function (key) {
if (key === "default" || key === "__esModule") return;
if (key in exports && exports[key] === _black[key]) return;
Object.defineProperty(exports, key, {
enumerable: true,
get: function () {
Expand Down
1 change: 1 addition & 0 deletions packages/babel-plugin-transform-modules-commonjs/test/fixtures/regression/T7165/output.js
View file
Expand Up @@ -10,6 +10,7 @@ var _bar = require("bar");

Object.keys(_bar).forEach(function (key) {
if (key === "default" || key === "__esModule") return;
if (key in exports && exports[key] === _bar[key]) return;
Object.defineProperty(exports, key, {
enumerable: true,
get: function () {
Expand Down
1 change: 1 addition & 0 deletions packages/babel-plugin-transform-modules-commonjs/test/fixtures/strict/export-all/output.js
View file
Expand Up @@ -27,6 +27,7 @@ var _mod = require("mod");
Object.keys(_mod).forEach(function (key) {
if (key === "default" || key === "__esModule") return;
if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
if (key in exports && exports[key] === _mod[key]) return;
Object.defineProperty(exports, key, {
enumerable: true,
get: function () {
Expand Down
1 change: 1 addition & 0 deletions packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-from-6/output.js
View file
Expand Up @@ -16,6 +16,7 @@
_exports.__esModule = true;
Object.keys(_foo).forEach(function (key) {
if (key === "default" || key === "__esModule") return;
if (key in _exports && _exports[key] === _foo[key]) return;
_exports[key] = _foo[key];
});
});
1 change: 1 addition & 0 deletions packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-from-6/output.js
View file
Expand Up @@ -18,6 +18,7 @@
});
Object.keys(_foo).forEach(function (key) {
if (key === "default" || key === "__esModule") return;
if (key in _exports && _exports[key] === _foo[key]) return;
Object.defineProperty(_exports, key, {
enumerable: true,
get: function () {
Expand Down
1 change: 1 addition & 0 deletions packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/modules/output.js
View file
Expand Up @@ -16,6 +16,7 @@ var _mod = require("mod");

_Object$keys(_mod).forEach(function (key) {
if (key === "default" || key === "__esModule") return;
if (key in exports && exports[key] === _mod[key]) return;

_Object$defineProperty(exports, key, {
enumerable: true,
Expand Down
1 change: 1 addition & 0 deletions ...ages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules-loose/output.js
View file
Expand Up @@ -23,6 +23,7 @@ var _mod = require("mod");
_forEachInstanceProperty(_context = _Object$keys(_mod)).call(_context, function (key) {
if (key === "default" || key === "__esModule") return;
if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
if (key in exports && exports[key] === _mod[key]) return;
exports[key] = _mod[key];
});

Expand Down
1 change: 1 addition & 0 deletions packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules/output.js
View file
Expand Up @@ -28,6 +28,7 @@ var _mod = require("mod");
_forEachInstanceProperty(_context = _Object$keys(_mod)).call(_context, function (key) {
if (key === "default" || key === "__esModule") return;
if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
if (key in exports && exports[key] === _mod[key]) return;

_Object$defineProperty(exports, key, {
enumerable: true,
Expand Down
1 change: 1 addition & 0 deletions packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules/output.js
View file
Expand Up @@ -12,6 +12,7 @@ var _mod = require("mod");

Object.keys(_mod).forEach(function (key) {
if (key === "default" || key === "__esModule") return;
if (key in exports && exports[key] === _mod[key]) return;
Object.defineProperty(exports, key, {
enumerable: true,
get: function () {
Expand Down

0 comments on commit a080c82

Please sign in to comment.