ts-jest 26.1.0 → 26.1.1

package/.ts-jest-digest

@@ -1 +1 @@
-eeca777d22e47cf3d4ed72c46ec92618ae5691f9
+5e9f319e512fe352ff9b9947c24dd3a512e4be3f

package/CHANGELOG.md

@@ -1,3 +1,14 @@
+<a name="26.1.1"></a>
+## [26.1.1](https://github.com/kulshekhar/ts-jest/compare/v26.1.0...v26.1.1) (2020-06-21)
+
+
+### Bug Fixes
+
+* **compiler:** generate source map correctly when tsconfig `mapRoot` is set ([#1741](https://github.com/kulshekhar/ts-jest/issues/1741)) ([01ac417](https://github.com/kulshekhar/ts-jest/commit/01ac417)), closes [#1718](https://github.com/kulshekhar/ts-jest/issues/1718)
+* **config:** show version warning when using ts-jest without babel ([#1729](https://github.com/kulshekhar/ts-jest/issues/1729)) ([e512bc0](https://github.com/kulshekhar/ts-jest/commit/e512bc0)), fixes [#1678-issuecomment-641930332](https://github.com//github.com/kulshekhar/ts-jest/pull/1678/issues/issuecomment-641930332), [#1678-issuecomment-639528993](https://github.com//github.com/kulshekhar/ts-jest/pull/1678/issues/issuecomment-639528993)
+
+
+
 <a name="26.1.0"></a>
 # [26.1.0](https://github.com/kulshekhar/ts-jest/compare/v26.0.0...v26.1.0) (2020-05-30)
 

package/dist/compiler/instance.js

@@ -30,16 +30,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCompilerInstance = void 0;
 var fs_1 = require("fs");
 var mkdirp = require("mkdirp");
-var path_1 = require("path");
 var compiler_utils_1 = require("./compiler-utils");
 var language_service_1 = require("./language-service");
 var transpiler_1 = require("./transpiler");
-function updateOutput(outputText, normalizedFileName, sourceMap, getExtension) {
-    var base = path_1.basename(normalizedFileName);
+var SOURCE_MAPPING_PREFIX = 'sourceMappingURL=';
+function updateOutput(outputText, normalizedFileName, sourceMap) {
     var base64Map = Buffer.from(updateSourceMap(sourceMap, normalizedFileName), 'utf8').toString('base64');
     var sourceMapContent = "data:application/json;charset=utf-8;base64," + base64Map;
-    var sourceMapLength = (base + ".map").length + (getExtension(normalizedFileName).length - path_1.extname(normalizedFileName).length);
-    return outputText.slice(0, -sourceMapLength) + sourceMapContent;
+    return (outputText.slice(0, outputText.lastIndexOf(SOURCE_MAPPING_PREFIX) + SOURCE_MAPPING_PREFIX.length) + sourceMapContent);
 }
 var updateSourceMap = function (sourceMapText, normalizedFileName) {
     var sourceMap = JSON.parse(sourceMapText);
@@ -48,10 +46,10 @@ var updateSourceMap = function (sourceMapText, normalizedFileName) {
     delete sourceMap.sourceRoot;
     return JSON.stringify(sourceMap);
 };
-var compileAndCacheResult = function (memoryCache, compileFn, getExtension, logger) { return function (code, fileName, lineOffset) {
+var compileAndCacheResult = function (memoryCache, compileFn, logger) { return function (code, fileName, lineOffset) {
     logger.debug({ fileName: fileName }, 'compileAndCacheResult(): get compile output');
     var _a = __read(compileFn(code, fileName, lineOffset), 2), value = _a[0], sourceMap = _a[1];
-    var output = updateOutput(value, fileName, sourceMap, getExtension);
+    var output = updateOutput(value, fileName, sourceMap);
     memoryCache.files.set(fileName, __assign(__assign({}, memoryCache.files.get(fileName)), { output: output }));
     return output;
 }; };
@@ -59,7 +57,6 @@ exports.createCompilerInstance = function (configs) {
     var logger = configs.logger.child({ namespace: 'ts-compiler' });
     var compilerOptions = configs.parsedTsConfig.options, tsJest = configs.tsJest;
     var cacheDir = configs.tsCacheDir;
-    var ts = configs.compilerModule;
     var extensions = ['.ts', '.tsx'];
     var memoryCache = {
         files: new Map(),
@@ -82,9 +79,6 @@ exports.createCompilerInstance = function (configs) {
             version: 0,
         });
     });
-    var getExtension = compilerOptions.jsx === ts.JsxEmit.Preserve
-        ? function (path) { return (/\.[tj]sx$/.test(path) ? '.jsx' : '.js'); }
-        : function (_) { return '.js'; };
     var compilerInstance;
     if (!tsJest.isolatedModules) {
         compilerInstance = language_service_1.initializeLanguageServiceInstance(configs, memoryCache, logger);
@@ -92,6 +86,6 @@ exports.createCompilerInstance = function (configs) {
     else {
         compilerInstance = transpiler_1.initializeTranspilerInstance(configs, memoryCache, logger);
     }
-    var compile = compileAndCacheResult(memoryCache, compilerInstance.compileFn, getExtension, logger);
+    var compile = compileAndCacheResult(memoryCache, compilerInstance.compileFn, logger);
     return { cwd: configs.cwd, compile: compile, program: compilerInstance.program };
 };

package/dist/config/config-set.js

@@ -47,6 +47,7 @@ var __spread = (this && this.__spread) || function () {
     for (var ar = [], i = 0; i < arguments.length; i++) ar = ar.concat(__read(arguments[i]));
     return ar;
 };
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConfigSet = exports.TS_JEST_OUT_DIR = exports.IGNORE_DIAGNOSTIC_CODES = exports.MATCH_NOTHING = void 0;
 var bs_logger_1 = require("bs-logger");
@@ -77,6 +78,12 @@ exports.IGNORE_DIAGNOSTIC_CODES = [
     18003,
 ];
 exports.TS_JEST_OUT_DIR = '$$ts-jest$$';
+var TARGET_TO_VERSION_MAPPING = (_a = {},
+    _a[typescript_1.ScriptTarget.ES2018] = 'es2018',
+    _a[typescript_1.ScriptTarget.ES2019] = 'es2019',
+    _a[typescript_1.ScriptTarget.ES2020] = 'es2020',
+    _a[typescript_1.ScriptTarget.ESNext] = 'ESNext',
+    _a);
 var normalizeRegex = function (pattern) {
     return pattern ? (typeof pattern === 'string' ? pattern : pattern.source) : undefined;
 };
@@ -316,8 +323,8 @@ var ConfigSet = (function () {
     Object.defineProperty(ConfigSet.prototype, "_parsedTsConfig", {
         get: function () {
             var tsConfig = this.tsJest.tsConfig;
-            var configFilePath = tsConfig && tsConfig.kind === 'file' ? tsConfig.value : undefined;
-            var result = this.readTsConfig(tsConfig && tsConfig.kind === 'inline' ? tsConfig.value : undefined, configFilePath, tsConfig == null);
+            var configFilePath = (tsConfig === null || tsConfig === void 0 ? void 0 : tsConfig.kind) === 'file' ? tsConfig.value : undefined;
+            var result = this.readTsConfig((tsConfig === null || tsConfig === void 0 ? void 0 : tsConfig.kind) === 'inline' ? tsConfig.value : undefined, configFilePath, tsConfig == null);
             this.raiseDiagnostics(result.errors, configFilePath);
             this.logger.debug({ tsconfig: result }, 'normalized typescript config');
             return result;
@@ -604,6 +611,7 @@ var ConfigSet = (function () {
     };
     ConfigSet.prototype.readTsConfig = function (compilerOptions, resolvedConfigFile, noProject) {
         var e_2, _a;
+        var _b;
         var config = { compilerOptions: Object.create(null) };
         var basePath = normalize_slashes_1.normalizeSlashes(this.rootDir);
         var configFileName;
@@ -648,8 +656,8 @@ var ConfigSet = (function () {
             finalOptions.outDir = exports.TS_JEST_OUT_DIR;
         }
         try {
-            for (var _b = __values(Object.keys(forcedOptions)), _c = _b.next(); !_c.done; _c = _b.next()) {
-                var key = _c.value;
+            for (var _c = __values(Object.keys(forcedOptions)), _d = _c.next(); !_d.done; _d = _c.next()) {
+                var key = _d.value;
                 var val = forcedOptions[key];
                 if (val === undefined) {
                     delete finalOptions[key];
@@ -662,17 +670,18 @@ var ConfigSet = (function () {
         catch (e_2_1) { e_2 = { error: e_2_1 }; }
         finally {
             try {
-                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
             }
             finally { if (e_2) throw e_2.error; }
         }
         var nodeJsVer = process.version;
         var compilationTarget = result.options.target;
-        if ((nodeJsVer.startsWith('v10') && compilationTarget > typescript_1.ScriptTarget.ES2018) ||
-            (nodeJsVer.startsWith('v12') && compilationTarget > typescript_1.ScriptTarget.ES2019)) {
+        if (!this.tsJest.babelConfig &&
+            ((nodeJsVer.startsWith('v10') && compilationTarget > typescript_1.ScriptTarget.ES2018) ||
+                (nodeJsVer.startsWith('v12') && compilationTarget > typescript_1.ScriptTarget.ES2019))) {
             var message = messages_1.interpolate("There is a mismatch between your NodeJs version {{nodeJsVer}} and your TypeScript target {{compilationTarget}}. This might lead to some unexpected errors when running tests with `ts-jest`. To fix this, you can check https://github.com/microsoft/TypeScript/wiki/Node-Target-Mapping", {
                 nodeJsVer: process.version,
-                compilationTarget: config.compilerOptions.target,
+                compilationTarget: (_b = config.compilerOptions.target) !== null && _b !== void 0 ? _b : TARGET_TO_VERSION_MAPPING[compilationTarget],
             });
             logger.warn(message);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-jest",
-  "version": "26.1.0",
+  "version": "26.1.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "bin": "cli.js",