From aace53f7d71af11e4b89dd074a1657964a22d0b4 Mon Sep 17 00:00:00 2001 From: TypeScript Bot Date: Wed, 10 Feb 2021 00:22:08 +0000 Subject: [PATCH] Bump version to 4.1.5 and 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 | 2 +- src/compiler/corePublic.ts | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/tsc.js b/lib/tsc.js index bc2ac1fc08c1d..8abe56b22a74c 100644 --- a/lib/tsc.js +++ b/lib/tsc.js @@ -67,7 +67,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) { var ts; (function (ts) { ts.versionMajorMinor = "4.1"; - ts.version = "4.1.4"; + ts.version = "4.1.5"; var NativeCollections; (function (NativeCollections) { function tryGetNativeMap() { diff --git a/lib/tsserver.js b/lib/tsserver.js index f444af5048a53..e8afc692648bb 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 `configurePrerelease` too. ts.versionMajorMinor = "4.1"; /** The version of the TypeScript compiler release */ - ts.version = "4.1.4"; + ts.version = "4.1.5"; /* @internal */ var Comparison; (function (Comparison) { @@ -151959,8 +151959,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 04dcc8cde21c6..f1e50768d9709 100644 --- a/lib/tsserverlibrary.js +++ b/lib/tsserverlibrary.js @@ -288,7 +288,7 @@ var ts; // If changing the text in this section, be sure to test `configurePrerelease` too. ts.versionMajorMinor = "4.1"; /** The version of the TypeScript compiler release */ - ts.version = "4.1.4"; + ts.version = "4.1.5"; /* @internal */ var Comparison; (function (Comparison) { @@ -152153,8 +152153,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 d38f648bd45e8..d644aea385de1 100644 --- a/lib/typescript.js +++ b/lib/typescript.js @@ -288,7 +288,7 @@ var ts; // If changing the text in this section, be sure to test `configurePrerelease` too. ts.versionMajorMinor = "4.1"; /** The version of the TypeScript compiler release */ - ts.version = "4.1.4"; + ts.version = "4.1.5"; /* @internal */ var Comparison; (function (Comparison) { diff --git a/lib/typescriptServices.js b/lib/typescriptServices.js index 25cec70942c51..5de94cc871fd9 100644 --- a/lib/typescriptServices.js +++ b/lib/typescriptServices.js @@ -288,7 +288,7 @@ var ts; // If changing the text in this section, be sure to test `configurePrerelease` too. ts.versionMajorMinor = "4.1"; /** The version of the TypeScript compiler release */ - ts.version = "4.1.4"; + ts.version = "4.1.5"; /* @internal */ var Comparison; (function (Comparison) { diff --git a/lib/typingsInstaller.js b/lib/typingsInstaller.js index 17ed2e3ad23b6..efc7337b2c7fb 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 `configurePrerelease` too. ts.versionMajorMinor = "4.1"; /** The version of the TypeScript compiler release */ - ts.version = "4.1.4"; + ts.version = "4.1.5"; /* @internal */ var Comparison; (function (Comparison) { diff --git a/package.json b/package.json index 4a92cb6b1063b..7e90d946609b1 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "typescript", "author": "Microsoft Corp.", "homepage": "https://www.typescriptlang.org/", - "version": "4.1.4", + "version": "4.1.5", "license": "Apache-2.0", "description": "TypeScript is a language for application scale JavaScript development", "keywords": [ diff --git a/src/compiler/corePublic.ts b/src/compiler/corePublic.ts index eb6e65e8c6b44..c98c2aa9b4204 100644 --- a/src/compiler/corePublic.ts +++ b/src/compiler/corePublic.ts @@ -3,7 +3,7 @@ namespace ts { // If changing the text in this section, be sure to test `configurePrerelease` too. export const versionMajorMinor = "4.1"; /** The version of the TypeScript compiler release */ - export const version = "4.1.4" as string; + export const version = "4.1.5" as string; /** * Type of objects whose values are all of the same type.