Skip to content

Commit 6a5508b

Browse files
authored
Update __exportStar helper to skip default and __esModule members (microsoft#37236)
* Update __exportStar helper to skip default and __esModule * Accept new baselines * Remove esmodule check from helper
1 parent eb569a5 commit 6a5508b

File tree

50 files changed

+89
-89
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+89
-89
lines changed

src/compiler/transformers/module/module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1886,7 +1886,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
18861886
priority: 2,
18871887
text: `
18881888
var __exportStar = (this && this.__exportStar) || function(m, exports) {
1889-
for (var p in m) if (!exports.hasOwnProperty(p)) __createBinding(exports, m, p);
1889+
for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
18901890
}`
18911891
};
18921892

tests/baselines/reference/ambientShorthand_reExport.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
3838
o[k2] = m[k];
3939
}));
4040
var __exportStar = (this && this.__exportStar) || function(m, exports) {
41-
for (var p in m) if (!exports.hasOwnProperty(p)) __createBinding(exports, m, p);
41+
for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
4242
}
4343
exports.__esModule = true;
4444
__exportStar(require("jquery"), exports);

tests/baselines/reference/declarationEmitAliasExportStar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
2222
o[k2] = m[k];
2323
}));
2424
var __exportStar = (this && this.__exportStar) || function(m, exports) {
25-
for (var p in m) if (!exports.hasOwnProperty(p)) __createBinding(exports, m, p);
25+
for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
2626
}
2727
exports.__esModule = true;
2828
__exportStar(require("./thingB"), exports);

tests/baselines/reference/declarationEmitReexportedSymlinkReference.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
5959
o[k2] = m[k];
6060
}));
6161
var __exportStar = (this && this.__exportStar) || function(m, exports) {
62-
for (var p in m) if (!exports.hasOwnProperty(p)) __createBinding(exports, m, p);
62+
for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
6363
}
6464
Object.defineProperty(exports, "__esModule", { value: true });
6565
__exportStar(require("./keys"), exports);

tests/baselines/reference/declarationEmitReexportedSymlinkReference2.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
6262
o[k2] = m[k];
6363
}));
6464
var __exportStar = (this && this.__exportStar) || function(m, exports) {
65-
for (var p in m) if (!exports.hasOwnProperty(p)) __createBinding(exports, m, p);
65+
for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
6666
}
6767
Object.defineProperty(exports, "__esModule", { value: true });
6868
__exportStar(require("./keys"), exports);

tests/baselines/reference/declarationEmitReexportedSymlinkReference3.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
5959
o[k2] = m[k];
6060
}));
6161
var __exportStar = (this && this.__exportStar) || function(m, exports) {
62-
for (var p in m) if (!exports.hasOwnProperty(p)) __createBinding(exports, m, p);
62+
for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
6363
}
6464
Object.defineProperty(exports, "__esModule", { value: true });
6565
__exportStar(require("./keys"), exports);

tests/baselines/reference/doubleUnderscoreExportStarConflict.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
3333
o[k2] = m[k];
3434
}));
3535
var __exportStar = (this && this.__exportStar) || function(m, exports) {
36-
for (var p in m) if (!exports.hasOwnProperty(p)) __createBinding(exports, m, p);
36+
for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
3737
}
3838
exports.__esModule = true;
3939
__exportStar(require("./b"), exports);

tests/baselines/reference/es6ExportAllInEs5.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
4040
o[k2] = m[k];
4141
}));
4242
var __exportStar = (this && this.__exportStar) || function(m, exports) {
43-
for (var p in m) if (!exports.hasOwnProperty(p)) __createBinding(exports, m, p);
43+
for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
4444
}
4545
Object.defineProperty(exports, "__esModule", { value: true });
4646
__exportStar(require("./server"), exports);

tests/baselines/reference/es6ExportEqualsInterop.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
217217
o[k2] = m[k];
218218
}));
219219
var __exportStar = (this && this.__exportStar) || function(m, exports) {
220-
for (var p in m) if (!exports.hasOwnProperty(p)) __createBinding(exports, m, p);
220+
for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
221221
}
222222
exports.__esModule = true;
223223
var z2 = require("variable");

tests/baselines/reference/esModuleInteropWithExportStar(target=es3).js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
3434
return result;
3535
};
3636
var __exportStar = (this && this.__exportStar) || function(m, exports) {
37-
for (var p in m) if (!exports.hasOwnProperty(p)) __createBinding(exports, m, p);
37+
for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
3838
}
3939
exports.__esModule = true;
4040
var fs = __importStar(require("./fs"));

0 commit comments

Comments
 (0)