Skip to content

Commit 6b21c37

Browse files
billtibillti
authored
Merge pull request #24053 from Microsoft/dev/billti/update-to-2.8.4
Update to 2.8.4 and bump LKG
2 parents 92b18d8 + 22715da commit 6b21c37

File tree

8 files changed

+33
-13
lines changed

8 files changed

+33
-13
lines changed

‎lib/tsc.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ var ts;
170170
var ts;
171171
(function (ts) {
172172
ts.versionMajorMinor = "2.8";
173-
ts.version = ts.versionMajorMinor + ".3";
173+
ts.version = ts.versionMajorMinor + ".4";
174174
})(ts || (ts = {}));
175175
(function (ts) {
176176
function isExternalModuleNameRelative(moduleName) {
@@ -21074,6 +21074,10 @@ var ts;
2107421074
var sourceInitializer = ts.getJSInitializerSymbol(source);
2107521075
var targetInitializer = ts.getJSInitializerSymbol(target);
2107621076
if (sourceInitializer !== source || targetInitializer !== target) {
21077+
if (!(targetInitializer.flags & 33554432)) {
21078+
var mergedInitializer = getMergedSymbol(targetInitializer);
21079+
targetInitializer = mergedInitializer === targetInitializer ? cloneSymbol(targetInitializer) : mergedInitializer;
21080+
}
2107721081
mergeSymbol(targetInitializer, sourceInitializer);
2107821082
}
2107921083
}
@@ -34944,7 +34948,7 @@ var ts;
3494434948
checkGrammarForGenerator(node);
3494534949
}
3494634950
var links = getNodeLinks(node);
34947-
var type = getTypeOfSymbol(node.symbol);
34951+
var type = getTypeOfSymbol(getMergedSymbol(node.symbol));
3494834952
if (!(links.flags & 1024)) {
3494934953
var contextualSignature = getContextualSignature(node);
3495034954
if (!(links.flags & 1024)) {

‎lib/tsserver.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1366,7 +1366,7 @@ var ts;
13661366
var ts;
13671367
(function (ts) {
13681368
ts.versionMajorMinor = "2.8";
1369-
ts.version = ts.versionMajorMinor + ".3";
1369+
ts.version = ts.versionMajorMinor + ".4";
13701370
})(ts || (ts = {}));
13711371
(function (ts) {
13721372
function isExternalModuleNameRelative(moduleName) {
@@ -22510,6 +22510,10 @@ var ts;
2251022510
var sourceInitializer = ts.getJSInitializerSymbol(source);
2251122511
var targetInitializer = ts.getJSInitializerSymbol(target);
2251222512
if (sourceInitializer !== source || targetInitializer !== target) {
22513+
if (!(targetInitializer.flags & 33554432)) {
22514+
var mergedInitializer = getMergedSymbol(targetInitializer);
22515+
targetInitializer = mergedInitializer === targetInitializer ? cloneSymbol(targetInitializer) : mergedInitializer;
22516+
}
2251322517
mergeSymbol(targetInitializer, sourceInitializer);
2251422518
}
2251522519
}
@@ -36380,7 +36384,7 @@ var ts;
3638036384
checkGrammarForGenerator(node);
3638136385
}
3638236386
var links = getNodeLinks(node);
36383-
var type = getTypeOfSymbol(node.symbol);
36387+
var type = getTypeOfSymbol(getMergedSymbol(node.symbol));
3638436388
if (!(links.flags & 1024)) {
3638536389
var contextualSignature = getContextualSignature(node);
3638636390
if (!(links.flags & 1024)) {

‎lib/tsserverlibrary.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1605,7 +1605,7 @@ var ts;
16051605
// If changing the text in this section, be sure to test `configureNightly` too.
16061606
ts.versionMajorMinor = "2.8";
16071607
/** The version of the TypeScript compiler release */
1608-
ts.version = ts.versionMajorMinor + ".3";
1608+
ts.version = ts.versionMajorMinor + ".4";
16091609
})(ts || (ts = {}));
16101610
(function (ts) {
16111611
function isExternalModuleNameRelative(moduleName) {
@@ -28268,6 +28268,10 @@ var ts;
2826828268
var sourceInitializer = ts.getJSInitializerSymbol(source);
2826928269
var targetInitializer = ts.getJSInitializerSymbol(target);
2827028270
if (sourceInitializer !== source || targetInitializer !== target) {
28271+
if (!(targetInitializer.flags & 33554432 /* Transient */)) {
28272+
var mergedInitializer = getMergedSymbol(targetInitializer);
28273+
targetInitializer = mergedInitializer === targetInitializer ? cloneSymbol(targetInitializer) : mergedInitializer;
28274+
}
2827128275
mergeSymbol(targetInitializer, sourceInitializer);
2827228276
}
2827328277
}
@@ -44665,7 +44669,7 @@ var ts;
4466544669
checkGrammarForGenerator(node);
4466644670
}
4466744671
var links = getNodeLinks(node);
44668-
var type = getTypeOfSymbol(node.symbol);
44672+
var type = getTypeOfSymbol(getMergedSymbol(node.symbol));
4466944673
// Check if function expression is contextually typed and assign parameter types if so.
4467044674
if (!(links.flags & 1024 /* ContextChecked */)) {
4467144675
var contextualSignature = getContextualSignature(node);

‎lib/typescript.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1605,7 +1605,7 @@ var ts;
16051605
// If changing the text in this section, be sure to test `configureNightly` too.
16061606
ts.versionMajorMinor = "2.8";
16071607
/** The version of the TypeScript compiler release */
1608-
ts.version = ts.versionMajorMinor + ".3";
1608+
ts.version = ts.versionMajorMinor + ".4";
16091609
})(ts || (ts = {}));
16101610
(function (ts) {
16111611
function isExternalModuleNameRelative(moduleName) {
@@ -26231,6 +26231,10 @@ var ts;
2623126231
var sourceInitializer = ts.getJSInitializerSymbol(source);
2623226232
var targetInitializer = ts.getJSInitializerSymbol(target);
2623326233
if (sourceInitializer !== source || targetInitializer !== target) {
26234+
if (!(targetInitializer.flags & 33554432 /* Transient */)) {
26235+
var mergedInitializer = getMergedSymbol(targetInitializer);
26236+
targetInitializer = mergedInitializer === targetInitializer ? cloneSymbol(targetInitializer) : mergedInitializer;
26237+
}
2623426238
mergeSymbol(targetInitializer, sourceInitializer);
2623526239
}
2623626240
}
@@ -42628,7 +42632,7 @@ var ts;
4262842632
checkGrammarForGenerator(node);
4262942633
}
4263042634
var links = getNodeLinks(node);
42631-
var type = getTypeOfSymbol(node.symbol);
42635+
var type = getTypeOfSymbol(getMergedSymbol(node.symbol));
4263242636
// Check if function expression is contextually typed and assign parameter types if so.
4263342637
if (!(links.flags & 1024 /* ContextChecked */)) {
4263442638
var contextualSignature = getContextualSignature(node);

‎lib/typescriptServices.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1605,7 +1605,7 @@ var ts;
16051605
// If changing the text in this section, be sure to test `configureNightly` too.
16061606
ts.versionMajorMinor = "2.8";
16071607
/** The version of the TypeScript compiler release */
1608-
ts.version = ts.versionMajorMinor + ".3";
1608+
ts.version = ts.versionMajorMinor + ".4";
16091609
})(ts || (ts = {}));
16101610
(function (ts) {
16111611
function isExternalModuleNameRelative(moduleName) {
@@ -26231,6 +26231,10 @@ var ts;
2623126231
var sourceInitializer = ts.getJSInitializerSymbol(source);
2623226232
var targetInitializer = ts.getJSInitializerSymbol(target);
2623326233
if (sourceInitializer !== source || targetInitializer !== target) {
26234+
if (!(targetInitializer.flags & 33554432 /* Transient */)) {
26235+
var mergedInitializer = getMergedSymbol(targetInitializer);
26236+
targetInitializer = mergedInitializer === targetInitializer ? cloneSymbol(targetInitializer) : mergedInitializer;
26237+
}
2623426238
mergeSymbol(targetInitializer, sourceInitializer);
2623526239
}
2623626240
}
@@ -42628,7 +42632,7 @@ var ts;
4262842632
checkGrammarForGenerator(node);
4262942633
}
4263042634
var links = getNodeLinks(node);
42631-
var type = getTypeOfSymbol(node.symbol);
42635+
var type = getTypeOfSymbol(getMergedSymbol(node.symbol));
4263242636
// Check if function expression is contextually typed and assign parameter types if so.
4263342637
if (!(links.flags & 1024 /* ContextChecked */)) {
4263442638
var contextualSignature = getContextualSignature(node);

‎lib/typingsInstaller.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ var ts;
180180
var ts;
181181
(function (ts) {
182182
ts.versionMajorMinor = "2.8";
183-
ts.version = ts.versionMajorMinor + ".3";
183+
ts.version = ts.versionMajorMinor + ".4";
184184
})(ts || (ts = {}));
185185
(function (ts) {
186186
function isExternalModuleNameRelative(moduleName) {

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "typescript",
33
"author": "Microsoft Corp.",
44
"homepage": "http://typescriptlang.org/",
5-
"version": "2.8.3",
5+
"version": "2.8.4",
66
"license": "Apache-2.0",
77
"description": "TypeScript is a language for application scale JavaScript development",
88
"keywords": [

‎src/compiler/core.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace ts {
66
// If changing the text in this section, be sure to test `configureNightly` too.
77
export const versionMajorMinor = "2.8";
88
/** The version of the TypeScript compiler release */
9-
export const version = `${versionMajorMinor}.3`;
9+
export const version = `${versionMajorMinor}.4`;
1010
}
1111

1212
namespace ts {

0 commit comments

Comments
 (0)