Bump version to 3.9.7 and LKG

microsoft · Jul 15, 2020 · a7d8011 · a7d8011
1 parent 761a9ed
commit a7d8011
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 19 deletions.
diff --git 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.9";
-    ts.version = "3.9.6";
+    ts.version = "3.9.7";
     function tryGetNativeMap() {
         return typeof Map !== "undefined" && "entries" in Map.prototype ? Map : undefined;
     }
@@ -2114,6 +2114,7 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
+    var _a;
     var nullLogger = {
         logEvent: ts.noop,
         logErrEvent: ts.noop,
@@ -2138,7 +2139,8 @@ var ts;
     };
     var etwModule;
     try {
-        etwModule = require("@microsoft/typescript-etw");
+        var etwModulePath = (_a = process.env.TS_ETW_MODULE_PATH) !== null && _a !== void 0 ? _a : "./node_modules/@microsoft/typescript-etw";
+        etwModule = require(etwModulePath);
     }
     catch (e) {
         etwModule = undefined;

diff --git 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 = "3.9";
     /** The version of the TypeScript compiler release */
-    ts.version = "3.9.6";
+    ts.version = "3.9.7";
     /**
      * Returns the native Map implementation if it is available and compatible (i.e. supports iteration).
      */
@@ -2527,6 +2527,7 @@ var ts;
 /* @internal */
 var ts;
 (function (ts) {
+    var _a;
     var nullLogger = {
         logEvent: ts.noop,
         logErrEvent: ts.noop,
@@ -2553,9 +2554,10 @@ var ts;
     // See https://github.com/microsoft/typescript-etw for more information
     var etwModule;
     try {
-        // require() will throw an exception if the module is not installed
+        var etwModulePath = (_a = process.env.TS_ETW_MODULE_PATH) !== null && _a !== void 0 ? _a : "./node_modules/@microsoft/typescript-etw";
+        // require() will throw an exception if the module is not found
         // It may also return undefined if not installed properly
-        etwModule = require("@microsoft/typescript-etw");
+        etwModule = require(etwModulePath);
     }
     catch (e) {
         etwModule = undefined;

diff --git 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 `configurePrerelease` too.
     ts.versionMajorMinor = "3.9";
     /** The version of the TypeScript compiler release */
-    ts.version = "3.9.6";
+    ts.version = "3.9.7";
     /**
      * Returns the native Map implementation if it is available and compatible (i.e. supports iteration).
      */
@@ -2677,6 +2677,7 @@ var ts;
 /* @internal */
 var ts;
 (function (ts) {
+    var _a;
     var nullLogger = {
         logEvent: ts.noop,
         logErrEvent: ts.noop,
@@ -2703,9 +2704,10 @@ var ts;
     // See https://github.com/microsoft/typescript-etw for more information
     var etwModule;
     try {
-        // require() will throw an exception if the module is not installed
+        var etwModulePath = (_a = process.env.TS_ETW_MODULE_PATH) !== null && _a !== void 0 ? _a : "./node_modules/@microsoft/typescript-etw";
+        // require() will throw an exception if the module is not found
         // It may also return undefined if not installed properly
-        etwModule = require("@microsoft/typescript-etw");
+        etwModule = require(etwModulePath);
     }
     catch (e) {
         etwModule = undefined;

diff --git a/lib/typescript.js b/lib/typescript.js
@@ -244,7 +244,7 @@ var ts;
     // If changing the text in this section, be sure to test `configurePrerelease` too.
     ts.versionMajorMinor = "3.9";
     /** The version of the TypeScript compiler release */
-    ts.version = "3.9.6";
+    ts.version = "3.9.7";
     /**
      * Returns the native Map implementation if it is available and compatible (i.e. supports iteration).
      */
@@ -2677,6 +2677,7 @@ var ts;
 /* @internal */
 var ts;
 (function (ts) {
+    var _a;
     var nullLogger = {
         logEvent: ts.noop,
         logErrEvent: ts.noop,
@@ -2703,9 +2704,10 @@ var ts;
     // See https://github.com/microsoft/typescript-etw for more information
     var etwModule;
     try {
-        // require() will throw an exception if the module is not installed
+        var etwModulePath = (_a = process.env.TS_ETW_MODULE_PATH) !== null && _a !== void 0 ? _a : "./node_modules/@microsoft/typescript-etw";
+        // require() will throw an exception if the module is not found
         // It may also return undefined if not installed properly
-        etwModule = require("@microsoft/typescript-etw");
+        etwModule = require(etwModulePath);
     }
     catch (e) {
         etwModule = undefined;

diff --git a/lib/typescriptServices.js b/lib/typescriptServices.js
@@ -244,7 +244,7 @@ var ts;
     // If changing the text in this section, be sure to test `configurePrerelease` too.
     ts.versionMajorMinor = "3.9";
     /** The version of the TypeScript compiler release */
-    ts.version = "3.9.6";
+    ts.version = "3.9.7";
     /**
      * Returns the native Map implementation if it is available and compatible (i.e. supports iteration).
      */
@@ -2677,6 +2677,7 @@ var ts;
 /* @internal */
 var ts;
 (function (ts) {
+    var _a;
     var nullLogger = {
         logEvent: ts.noop,
         logErrEvent: ts.noop,
@@ -2703,9 +2704,10 @@ var ts;
     // See https://github.com/microsoft/typescript-etw for more information
     var etwModule;
     try {
-        // require() will throw an exception if the module is not installed
+        var etwModulePath = (_a = process.env.TS_ETW_MODULE_PATH) !== null && _a !== void 0 ? _a : "./node_modules/@microsoft/typescript-etw";
+        // require() will throw an exception if the module is not found
         // It may also return undefined if not installed properly
-        etwModule = require("@microsoft/typescript-etw");
+        etwModule = require(etwModulePath);
     }
     catch (e) {
         etwModule = undefined;

diff --git 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 = "3.9";
     /** The version of the TypeScript compiler release */
-    ts.version = "3.9.6";
+    ts.version = "3.9.7";
     /**
      * Returns the native Map implementation if it is available and compatible (i.e. supports iteration).
      */
@@ -2516,6 +2516,7 @@ var ts;
 /* @internal */
 var ts;
 (function (ts) {
+    var _a;
     var nullLogger = {
         logEvent: ts.noop,
         logErrEvent: ts.noop,
@@ -2542,9 +2543,10 @@ var ts;
     // See https://github.com/microsoft/typescript-etw for more information
     var etwModule;
     try {
-        // require() will throw an exception if the module is not installed
+        var etwModulePath = (_a = process.env.TS_ETW_MODULE_PATH) !== null && _a !== void 0 ? _a : "./node_modules/@microsoft/typescript-etw";
+        // require() will throw an exception if the module is not found
         // It may also return undefined if not installed properly
-        etwModule = require("@microsoft/typescript-etw");
+        etwModule = require(etwModulePath);
     }
     catch (e) {
         etwModule = undefined;

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "3.9.6",
+    "version": "3.9.7",
     "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
@@ -3,7 +3,7 @@ namespace ts {
     // If changing the text in this section, be sure to test `configurePrerelease` too.
     export const versionMajorMinor = "3.9";
     /** The version of the TypeScript compiler release */
-    export const version = "3.9.6" as string;
+    export const version = "3.9.7" as string;
 
     /**
      * Type of objects whose values are all of the same type.