Skip to content

Commit 28ea935

Browse files
Merge pull request #38811 from typescript-bot/pick/38808/release-3.9
🤖 Pick PR #38808 (Skip default when initially iterati...) into release-3.9
2 parents 4087757 + c34b39b commit 28ea935

21 files changed

+26
-26
lines changed

src/compiler/transformers/module/module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1914,7 +1914,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
19141914
var __importStar = (this && this.__importStar) || function (mod) {
19151915
if (mod && mod.__esModule) return mod;
19161916
var result = {};
1917-
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
1917+
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
19181918
__setModuleDefault(result, mod);
19191919
return result;
19201920
};`

tests/baselines/reference/esModuleInterop.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
3535
var __importStar = (this && this.__importStar) || function (mod) {
3636
if (mod && mod.__esModule) return mod;
3737
var result = {};
38-
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
38+
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
3939
__setModuleDefault(result, mod);
4040
return result;
4141
};

tests/baselines/reference/esModuleInteropImportCall.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
2626
var __importStar = (this && this.__importStar) || function (mod) {
2727
if (mod && mod.__esModule) return mod;
2828
var result = {};
29-
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
29+
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
3030
__setModuleDefault(result, mod);
3131
return result;
3232
};

tests/baselines/reference/esModuleInteropImportNamespace.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
2727
var __importStar = (this && this.__importStar) || function (mod) {
2828
if (mod && mod.__esModule) return mod;
2929
var result = {};
30-
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
30+
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
3131
__setModuleDefault(result, mod);
3232
return result;
3333
};

tests/baselines/reference/esModuleInteropNamedDefaultImports.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
4545
var __importStar = (this && this.__importStar) || function (mod) {
4646
if (mod && mod.__esModule) return mod;
4747
var result = {};
48-
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
48+
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
4949
__setModuleDefault(result, mod);
5050
return result;
5151
};

tests/baselines/reference/esModuleInteropPrettyErrorRelatedInformation.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
2727
var __importStar = (this && this.__importStar) || function (mod) {
2828
if (mod && mod.__esModule) return mod;
2929
var result = {};
30-
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
30+
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
3131
__setModuleDefault(result, mod);
3232
return result;
3333
};

tests/baselines/reference/esModuleInteropUsesExportStarWhenDefaultPlusNames.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
2020
var __importStar = (this && this.__importStar) || function (mod) {
2121
if (mod && mod.__esModule) return mod;
2222
var result = {};
23-
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
23+
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
2424
__setModuleDefault(result, mod);
2525
return result;
2626
};

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
2929
var __importStar = (this && this.__importStar) || function (mod) {
3030
if (mod && mod.__esModule) return mod;
3131
var result = {};
32-
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
32+
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
3333
__setModuleDefault(result, mod);
3434
return result;
3535
};

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
2929
var __importStar = (this && this.__importStar) || function (mod) {
3030
if (mod && mod.__esModule) return mod;
3131
var result = {};
32-
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
32+
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
3333
__setModuleDefault(result, mod);
3434
return result;
3535
};

tests/baselines/reference/esModuleIntersectionCrash.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
2929
var __importStar = (this && this.__importStar) || function (mod) {
3030
if (mod && mod.__esModule) return mod;
3131
var result = {};
32-
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
32+
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
3333
__setModuleDefault(result, mod);
3434
return result;
3535
};

0 commit comments

Comments
 (0)