Skip to content

Update to 2.8.4 and bump LKG #24053

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 11, 2018
+33 −13
Merged

Update to 2.8.4 and bump LKG #24053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
850cfc5
Bump version to 2.8.4
billti May 11, 2018
22715da
Update LKG
billti May 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions lib/tsc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ var ts;
var ts;
(function (ts) {
ts.versionMajorMinor = "2.8";
ts.version = ts.versionMajorMinor + ".3";
ts.version = ts.versionMajorMinor + ".4";
})(ts || (ts = {}));
(function (ts) {
function isExternalModuleNameRelative(moduleName) {
Expand Down Expand Up @@ -21074,6 +21074,10 @@ var ts;
var sourceInitializer = ts.getJSInitializerSymbol(source);
var targetInitializer = ts.getJSInitializerSymbol(target);
if (sourceInitializer !== source || targetInitializer !== target) {
if (!(targetInitializer.flags & 33554432)) {
var mergedInitializer = getMergedSymbol(targetInitializer);
targetInitializer = mergedInitializer === targetInitializer ? cloneSymbol(targetInitializer) : mergedInitializer;
}
mergeSymbol(targetInitializer, sourceInitializer);
}
}
Expand Down Expand Up @@ -34944,7 +34948,7 @@ var ts;
checkGrammarForGenerator(node);
}
var links = getNodeLinks(node);
var type = getTypeOfSymbol(node.symbol);
var type = getTypeOfSymbol(getMergedSymbol(node.symbol));
if (!(links.flags & 1024)) {
var contextualSignature = getContextualSignature(node);
if (!(links.flags & 1024)) {
Expand Down
8 changes: 6 additions & 2 deletions lib/tsserver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1366,7 +1366,7 @@ var ts;
var ts;
(function (ts) {
ts.versionMajorMinor = "2.8";
ts.version = ts.versionMajorMinor + ".3";
ts.version = ts.versionMajorMinor + ".4";
})(ts || (ts = {}));
(function (ts) {
function isExternalModuleNameRelative(moduleName) {
Expand Down Expand Up @@ -22510,6 +22510,10 @@ var ts;
var sourceInitializer = ts.getJSInitializerSymbol(source);
var targetInitializer = ts.getJSInitializerSymbol(target);
if (sourceInitializer !== source || targetInitializer !== target) {
if (!(targetInitializer.flags & 33554432)) {
var mergedInitializer = getMergedSymbol(targetInitializer);
targetInitializer = mergedInitializer === targetInitializer ? cloneSymbol(targetInitializer) : mergedInitializer;
}
mergeSymbol(targetInitializer, sourceInitializer);
}
}
Expand Down Expand Up @@ -36380,7 +36384,7 @@ var ts;
checkGrammarForGenerator(node);
}
var links = getNodeLinks(node);
var type = getTypeOfSymbol(node.symbol);
var type = getTypeOfSymbol(getMergedSymbol(node.symbol));
if (!(links.flags & 1024)) {
var contextualSignature = getContextualSignature(node);
if (!(links.flags & 1024)) {
Expand Down
8 changes: 6 additions & 2 deletions lib/tsserverlibrary.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1605,7 +1605,7 @@ var ts;
// If changing the text in this section, be sure to test `configureNightly` too.
ts.versionMajorMinor = "2.8";
/** The version of the TypeScript compiler release */
ts.version = ts.versionMajorMinor + ".3";
ts.version = ts.versionMajorMinor + ".4";
})(ts || (ts = {}));
(function (ts) {
function isExternalModuleNameRelative(moduleName) {
Expand Down Expand Up @@ -28268,6 +28268,10 @@ var ts;
var sourceInitializer = ts.getJSInitializerSymbol(source);
var targetInitializer = ts.getJSInitializerSymbol(target);
if (sourceInitializer !== source || targetInitializer !== target) {
if (!(targetInitializer.flags & 33554432 /* Transient */)) {
var mergedInitializer = getMergedSymbol(targetInitializer);
targetInitializer = mergedInitializer === targetInitializer ? cloneSymbol(targetInitializer) : mergedInitializer;
}
mergeSymbol(targetInitializer, sourceInitializer);
}
}
Expand Down Expand Up @@ -44665,7 +44669,7 @@ var ts;
checkGrammarForGenerator(node);
}
var links = getNodeLinks(node);
var type = getTypeOfSymbol(node.symbol);
var type = getTypeOfSymbol(getMergedSymbol(node.symbol));
// Check if function expression is contextually typed and assign parameter types if so.
if (!(links.flags & 1024 /* ContextChecked */)) {
var contextualSignature = getContextualSignature(node);
Expand Down
8 changes: 6 additions & 2 deletions lib/typescript.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1605,7 +1605,7 @@ var ts;
// If changing the text in this section, be sure to test `configureNightly` too.
ts.versionMajorMinor = "2.8";
/** The version of the TypeScript compiler release */
ts.version = ts.versionMajorMinor + ".3";
ts.version = ts.versionMajorMinor + ".4";
})(ts || (ts = {}));
(function (ts) {
function isExternalModuleNameRelative(moduleName) {
Expand Down Expand Up @@ -26231,6 +26231,10 @@ var ts;
var sourceInitializer = ts.getJSInitializerSymbol(source);
var targetInitializer = ts.getJSInitializerSymbol(target);
if (sourceInitializer !== source || targetInitializer !== target) {
if (!(targetInitializer.flags & 33554432 /* Transient */)) {
var mergedInitializer = getMergedSymbol(targetInitializer);
targetInitializer = mergedInitializer === targetInitializer ? cloneSymbol(targetInitializer) : mergedInitializer;
}
mergeSymbol(targetInitializer, sourceInitializer);
}
}
Expand Down Expand Up @@ -42628,7 +42632,7 @@ var ts;
checkGrammarForGenerator(node);
}
var links = getNodeLinks(node);
var type = getTypeOfSymbol(node.symbol);
var type = getTypeOfSymbol(getMergedSymbol(node.symbol));
// Check if function expression is contextually typed and assign parameter types if so.
if (!(links.flags & 1024 /* ContextChecked */)) {
var contextualSignature = getContextualSignature(node);
Expand Down
8 changes: 6 additions & 2 deletions lib/typescriptServices.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1605,7 +1605,7 @@ var ts;
// If changing the text in this section, be sure to test `configureNightly` too.
ts.versionMajorMinor = "2.8";
/** The version of the TypeScript compiler release */
ts.version = ts.versionMajorMinor + ".3";
ts.version = ts.versionMajorMinor + ".4";
})(ts || (ts = {}));
(function (ts) {
function isExternalModuleNameRelative(moduleName) {
Expand Down Expand Up @@ -26231,6 +26231,10 @@ var ts;
var sourceInitializer = ts.getJSInitializerSymbol(source);
var targetInitializer = ts.getJSInitializerSymbol(target);
if (sourceInitializer !== source || targetInitializer !== target) {
if (!(targetInitializer.flags & 33554432 /* Transient */)) {
var mergedInitializer = getMergedSymbol(targetInitializer);
targetInitializer = mergedInitializer === targetInitializer ? cloneSymbol(targetInitializer) : mergedInitializer;
}
mergeSymbol(targetInitializer, sourceInitializer);
}
}
Expand Down Expand Up @@ -42628,7 +42632,7 @@ var ts;
checkGrammarForGenerator(node);
}
var links = getNodeLinks(node);
var type = getTypeOfSymbol(node.symbol);
var type = getTypeOfSymbol(getMergedSymbol(node.symbol));
// Check if function expression is contextually typed and assign parameter types if so.
if (!(links.flags & 1024 /* ContextChecked */)) {
var contextualSignature = getContextualSignature(node);
Expand Down
2 changes: 1 addition & 1 deletion lib/typingsInstaller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ var ts;
var ts;
(function (ts) {
ts.versionMajorMinor = "2.8";
ts.version = ts.versionMajorMinor + ".3";
ts.version = ts.versionMajorMinor + ".4";
})(ts || (ts = {}));
(function (ts) {
function isExternalModuleNameRelative(moduleName) {
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "typescript",
"author": "Microsoft Corp.",
"homepage": "http://typescriptlang.org/",
"version": "2.8.3",
"version": "2.8.4",
"license": "Apache-2.0",
"description": "TypeScript is a language for application scale JavaScript development",
"keywords": [
Expand Down
2 changes: 1 addition & 1 deletion src/compiler/core.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ namespace ts {
// If changing the text in this section, be sure to test `configureNightly` too.
export const versionMajorMinor = "2.8";
/** The version of the TypeScript compiler release */
export const version = `${versionMajorMinor}.3`;
export const version = `${versionMajorMinor}.4`;
}

namespace ts {
Expand Down