From ad8c6c7e418bb1fff79da2f1c10a17ee4bdf339a Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Wed, 10 Feb 2021 12:09:30 -0800 Subject: [PATCH] Pin Node for Volta, bump version to 3.1.8, update LKG --- lib/tsc.js | 2 +- lib/tsserver.js | 6 +++--- lib/tsserverlibrary.js | 6 +++--- lib/typescript.js | 2 +- lib/typescriptServices.js | 2 +- lib/typingsInstaller.js | 2 +- package.json | 9 ++++++--- src/compiler/core.ts | 2 +- 8 files changed, 17 insertions(+), 14 deletions(-) diff --git a/lib/tsc.js b/lib/tsc.js index 7ee199c51f5..8dce77fb242 100644 --- a/lib/tsc.js +++ b/lib/tsc.js @@ -60,7 +60,7 @@ var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cook var ts; (function (ts) { ts.versionMajorMinor = "3.1"; - ts.version = ts.versionMajorMinor + ".7"; + ts.version = ts.versionMajorMinor + ".8"; })(ts || (ts = {})); (function (ts) { ts.emptyArray = []; diff --git a/lib/tsserver.js b/lib/tsserver.js index a1a65afa370..2f888b18b48 100644 --- a/lib/tsserver.js +++ b/lib/tsserver.js @@ -88,7 +88,7 @@ var ts; // If changing the text in this section, be sure to test `configureNightly` too. ts.versionMajorMinor = "3.1"; /** The version of the TypeScript compiler release */ - ts.version = ts.versionMajorMinor + ".7"; + ts.version = ts.versionMajorMinor + ".8"; })(ts || (ts = {})); (function (ts) { /* @internal */ @@ -118952,8 +118952,8 @@ var ts; Project.prototype.enablePlugin = function (pluginConfigEntry, searchPaths, pluginConfigOverrides) { var _this = this; this.projectService.logger.info("Enabling plugin " + pluginConfigEntry.name + " from candidate paths: " + searchPaths.join(",")); - if (ts.parsePackageName(pluginConfigEntry.name).rest) { - this.projectService.logger.info("kipped loading plugin " + pluginConfigEntry.name + " because only package name is allowed plugin name"); + if (!pluginConfigEntry.name || ts.parsePackageName(pluginConfigEntry.name).rest) { + this.projectService.logger.info("Skipped loading plugin " + (pluginConfigEntry.name || JSON.stringify(pluginConfigEntry)) + " because only package name is allowed plugin name"); return; } var log = function (message) { diff --git a/lib/tsserverlibrary.js b/lib/tsserverlibrary.js index 40e4f1e1bf6..87337d682e8 100644 --- a/lib/tsserverlibrary.js +++ b/lib/tsserverlibrary.js @@ -84,7 +84,7 @@ var ts; // If changing the text in this section, be sure to test `configureNightly` too. ts.versionMajorMinor = "3.1"; /** The version of the TypeScript compiler release */ - ts.version = ts.versionMajorMinor + ".7"; + ts.version = ts.versionMajorMinor + ".8"; })(ts || (ts = {})); (function (ts) { /* @internal */ @@ -119126,8 +119126,8 @@ var ts; Project.prototype.enablePlugin = function (pluginConfigEntry, searchPaths, pluginConfigOverrides) { var _this = this; this.projectService.logger.info("Enabling plugin " + pluginConfigEntry.name + " from candidate paths: " + searchPaths.join(",")); - if (ts.parsePackageName(pluginConfigEntry.name).rest) { - this.projectService.logger.info("kipped loading plugin " + pluginConfigEntry.name + " because only package name is allowed plugin name"); + if (!pluginConfigEntry.name || ts.parsePackageName(pluginConfigEntry.name).rest) { + this.projectService.logger.info("Skipped loading plugin " + (pluginConfigEntry.name || JSON.stringify(pluginConfigEntry)) + " because only package name is allowed plugin name"); return; } var log = function (message) { diff --git a/lib/typescript.js b/lib/typescript.js index a32b15bd61b..ec2c6e4ba7e 100644 --- a/lib/typescript.js +++ b/lib/typescript.js @@ -75,7 +75,7 @@ var ts; // If changing the text in this section, be sure to test `configureNightly` too. ts.versionMajorMinor = "3.1"; /** The version of the TypeScript compiler release */ - ts.version = ts.versionMajorMinor + ".7"; + ts.version = ts.versionMajorMinor + ".8"; })(ts || (ts = {})); (function (ts) { /* @internal */ diff --git a/lib/typescriptServices.js b/lib/typescriptServices.js index a32b15bd61b..ec2c6e4ba7e 100644 --- a/lib/typescriptServices.js +++ b/lib/typescriptServices.js @@ -75,7 +75,7 @@ var ts; // If changing the text in this section, be sure to test `configureNightly` too. ts.versionMajorMinor = "3.1"; /** The version of the TypeScript compiler release */ - ts.version = ts.versionMajorMinor + ".7"; + ts.version = ts.versionMajorMinor + ".8"; })(ts || (ts = {})); (function (ts) { /* @internal */ diff --git a/lib/typingsInstaller.js b/lib/typingsInstaller.js index b8f83896e98..50cdca6993f 100644 --- a/lib/typingsInstaller.js +++ b/lib/typingsInstaller.js @@ -88,7 +88,7 @@ var ts; // If changing the text in this section, be sure to test `configureNightly` too. ts.versionMajorMinor = "3.1"; /** The version of the TypeScript compiler release */ - ts.version = ts.versionMajorMinor + ".7"; + ts.version = ts.versionMajorMinor + ".8"; })(ts || (ts = {})); (function (ts) { /* @internal */ diff --git a/package.json b/package.json index 71230f17737..0975c89d80a 100644 --- a/package.json +++ b/package.json @@ -2,8 +2,8 @@ "name": "typescript", "author": "Microsoft Corp.", "homepage": "http://typescriptlang.org/", - "version": "3.1.7", - "license": "Apache-2.0", + "version": "3.1.8", + "license": "Apache-2.0", "description": "TypeScript is a language for application scale JavaScript development", "keywords": [ "TypeScript", @@ -113,5 +113,8 @@ "os": false, "path": false }, - "dependencies": {} + "dependencies": {}, + "volta": { + "node": "10.23.3" + } } \ No newline at end of file diff --git a/src/compiler/core.ts b/src/compiler/core.ts index ca48c21e8e9..e5b0e0d7b20 100644 --- a/src/compiler/core.ts +++ b/src/compiler/core.ts @@ -3,7 +3,7 @@ namespace ts { // If changing the text in this section, be sure to test `configureNightly` too. export const versionMajorMinor = "3.1"; /** The version of the TypeScript compiler release */ - export const version = `${versionMajorMinor}.7`; + export const version = `${versionMajorMinor}.8`; } namespace ts {