From 30734a05e2287250587ffb7b8f4a7a20af89de10 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Wed, 10 Feb 2021 12:15:13 -0800 Subject: [PATCH] Pin Node for Volta, bump version to 3.7.7, 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 | 7 +++++-- src/compiler/core.ts | 2 +- 8 files changed, 16 insertions(+), 13 deletions(-) diff --git a/lib/tsc.js b/lib/tsc.js index e8450b644dc..9cc960512da 100644 --- a/lib/tsc.js +++ b/lib/tsc.js @@ -67,7 +67,7 @@ var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cook var ts; (function (ts) { ts.versionMajorMinor = "3.7"; - ts.version = ts.versionMajorMinor + ".6"; + ts.version = ts.versionMajorMinor + ".7"; })(ts || (ts = {})); (function (ts) { function tryGetNativeMap() { diff --git a/lib/tsserver.js b/lib/tsserver.js index c7df50379a4..adb58d48ee9 100644 --- a/lib/tsserver.js +++ b/lib/tsserver.js @@ -94,7 +94,7 @@ var ts; // If changing the text in this section, be sure to test `configureNightly` too. ts.versionMajorMinor = "3.7"; /** The version of the TypeScript compiler release */ - ts.version = ts.versionMajorMinor + ".6"; + ts.version = ts.versionMajorMinor + ".7"; })(ts || (ts = {})); (function (ts) { /* @internal */ @@ -135468,8 +135468,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) { return _this.projectService.logger.info(message); }; diff --git a/lib/tsserverlibrary.js b/lib/tsserverlibrary.js index 4d8e6f63fba..e1703f11955 100644 --- a/lib/tsserverlibrary.js +++ b/lib/tsserverlibrary.js @@ -244,7 +244,7 @@ var ts; // If changing the text in this section, be sure to test `configureNightly` too. ts.versionMajorMinor = "3.7"; /** The version of the TypeScript compiler release */ - ts.version = ts.versionMajorMinor + ".6"; + ts.version = ts.versionMajorMinor + ".7"; })(ts || (ts = {})); (function (ts) { /* @internal */ @@ -135618,8 +135618,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) { return _this.projectService.logger.info(message); }; diff --git a/lib/typescript.js b/lib/typescript.js index 4e6263df5e6..5df73fa4fd6 100644 --- a/lib/typescript.js +++ b/lib/typescript.js @@ -233,7 +233,7 @@ var ts; // If changing the text in this section, be sure to test `configureNightly` too. ts.versionMajorMinor = "3.7"; /** The version of the TypeScript compiler release */ - ts.version = ts.versionMajorMinor + ".6"; + ts.version = ts.versionMajorMinor + ".7"; })(ts || (ts = {})); (function (ts) { /* @internal */ diff --git a/lib/typescriptServices.js b/lib/typescriptServices.js index 9c9c765d585..a5c6fbca869 100644 --- a/lib/typescriptServices.js +++ b/lib/typescriptServices.js @@ -233,7 +233,7 @@ var ts; // If changing the text in this section, be sure to test `configureNightly` too. ts.versionMajorMinor = "3.7"; /** The version of the TypeScript compiler release */ - ts.version = ts.versionMajorMinor + ".6"; + ts.version = ts.versionMajorMinor + ".7"; })(ts || (ts = {})); (function (ts) { /* @internal */ diff --git a/lib/typingsInstaller.js b/lib/typingsInstaller.js index a70a5372a90..149823c6999 100644 --- a/lib/typingsInstaller.js +++ b/lib/typingsInstaller.js @@ -83,7 +83,7 @@ var ts; // If changing the text in this section, be sure to test `configureNightly` too. ts.versionMajorMinor = "3.7"; /** The version of the TypeScript compiler release */ - ts.version = ts.versionMajorMinor + ".6"; + ts.version = ts.versionMajorMinor + ".7"; })(ts || (ts = {})); (function (ts) { /* @internal */ diff --git a/package.json b/package.json index 2059df67f9c..5864d13dcab 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "typescript", "author": "Microsoft Corp.", "homepage": "https://www.typescriptlang.org/", - "version": "3.7.6", + "version": "3.7.7", "license": "Apache-2.0", "description": "TypeScript is a language for application scale JavaScript development", "keywords": [ @@ -130,5 +130,8 @@ "source-map-support": false, "inspector": false }, - "dependencies": {} + "dependencies": {}, + "volta": { + "node": "14.15.5" + } } diff --git a/src/compiler/core.ts b/src/compiler/core.ts index 94179cc745b..e35a080c4dd 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.7"; /** The version of the TypeScript compiler release */ - export const version = `${versionMajorMinor}.6`; + export const version = `${versionMajorMinor}.7`; } namespace ts {