ts-jest 28.0.0-next.1 → 28.0.0

package/.ts-jest-digest

@@ -1 +1 @@
-7b476847710fa2fbf7328253469857e80f9cf85d
+8fe34073b4722909e5054517258d5da2209f949e

package/CHANGELOG.md

@@ -1,24 +1,4 @@
-# [28.0.0-next.1](https://github.com/kulshekhar/ts-jest/compare/v28.0.0-next.0...v28.0.0-next.1) (2022-04-26)
-
-
-### Features
-
-* mark `ConfigSet` as legacy ([#3456](https://github.com/kulshekhar/ts-jest/issues/3456)) ([a986729](https://github.com/kulshekhar/ts-jest/commit/a98672977a679d1ed882605a3e71ed405432ffdc))
-* mark `TsCompiler` and `TsJestCompiler` as legacy ([#3457](https://github.com/kulshekhar/ts-jest/issues/3457)) ([0f2fe30](https://github.com/kulshekhar/ts-jest/commit/0f2fe306762d8549bd29737becd4aed14a650427))
-* remove `path-mapping` AST transformer ([#3455](https://github.com/kulshekhar/ts-jest/issues/3455)) ([f566869](https://github.com/kulshekhar/ts-jest/commit/f5668698f8fab78b3008d936aa5001f134f530e2))
-* set Jest peer dependencies to v28 ([#3454](https://github.com/kulshekhar/ts-jest/issues/3454)) ([1e880ff](https://github.com/kulshekhar/ts-jest/commit/1e880fffe82bca231d1d23f6508f4ab4bc31e03e))
-
-
-### BREAKING CHANGES
-
-* `path-mapping` AST transformer is no longer shipped in `ts-jest` v28. Please use an alternative one like https://github.com/LeDDGroup/typescript-transform-paths instead.
-* Any imports `ts-jest/dist/compiler/ts-compiler` should change to `ts-jest/dist/legacy/compiler/ts-compiler`
-* Any imports `ts-jest/dist/compiler/ts-jest-compiler` should change to `ts-jest/dist/legacy/compiler/ts-jest-compiler`
-* Any imports `ts-jest/dist/config/config-set` should change to `ts-jest/dist/legacy/config/config-set
-
-
-
-# [28.0.0-next.0](https://github.com/kulshekhar/ts-jest/compare/v27.1.3...v28.0.0-next.0) (2022-04-24)
+# [28.0.0](https://github.com/kulshekhar/ts-jest/compare/v28.0.0-next.3...v28.0.0) (2022-05-02)
 
 
 ### Bug Fixes
@@ -28,6 +8,11 @@
 
 ### Features
 
+* **presets:** add presets for legacy mode ([#3465](https://github.com/kulshekhar/ts-jest/issues/3465)) ([543b4ad](https://github.com/kulshekhar/ts-jest/commit/543b4ad729d20fbd46a2de5cd4660dc50b94ebe7))
+* mark `ConfigSet` as legacy ([#3456](https://github.com/kulshekhar/ts-jest/issues/3456)) ([a986729](https://github.com/kulshekhar/ts-jest/commit/a98672977a679d1ed882605a3e71ed405432ffdc))
+* mark `TsCompiler` and `TsJestCompiler` as legacy ([#3457](https://github.com/kulshekhar/ts-jest/issues/3457)) ([0f2fe30](https://github.com/kulshekhar/ts-jest/commit/0f2fe306762d8549bd29737becd4aed14a650427))
+* remove `path-mapping` AST transformer ([#3455](https://github.com/kulshekhar/ts-jest/issues/3455)) ([f566869](https://github.com/kulshekhar/ts-jest/commit/f5668698f8fab78b3008d936aa5001f134f530e2))
+* set Jest peer dependencies to v28 ([#3454](https://github.com/kulshekhar/ts-jest/issues/3454)) ([1e880ff](https://github.com/kulshekhar/ts-jest/commit/1e880fffe82bca231d1d23f6508f4ab4bc31e03e))
 * **core:** drop support for Node.js 10 ([#3332](https://github.com/kulshekhar/ts-jest/issues/3332)) ([7a9aa61](https://github.com/kulshekhar/ts-jest/commit/7a9aa615ea0be881105676a17d5bd655afdc27f5))
 * **core:** remove `mocked` testing util ([#3333](https://github.com/kulshekhar/ts-jest/issues/3333)) ([2d9017d](https://github.com/kulshekhar/ts-jest/commit/2d9017ddfea39f45aa991876b314d1dbe4a36aad))
 * **core:** remove `ts-jest/utils` sub path export ([#3334](https://github.com/kulshekhar/ts-jest/issues/3334)) ([9f253d3](https://github.com/kulshekhar/ts-jest/commit/9f253d31dfcefa35ae00049d0d2dc4a3fe1b2f34))
@@ -36,23 +21,15 @@
 
 ### BREAKING CHANGES
 
-* Minimum support TypeScript version is now **4.3** since Jest 28 requires it
-* Jest 28 is required
+* `path-mapping` AST transformer is no longer shipped in `ts-jest` v28. Please use an alternative one like https://github.com/LeDDGroup/typescript-transform-paths instead.
+* Any imports `ts-jest/dist/compiler/ts-compiler` should change to `ts-jest/dist/legacy/compiler/ts-compiler`
+* Any imports `ts-jest/dist/compiler/ts-jest-compiler` should change to `ts-jest/dist/legacy/compiler/ts-jest-compiler`
+* Any imports `ts-jest/dist/config/config-set` should change to `ts-jest/dist/legacy/config/config-set`
+* Minimum support `TypeScript` version is now **4.3** since Jest 28 requires it.
+* **Jest 28** is required.
 * **core:** Any imports `ts-jest/utils` should be replaced with `ts-jest`.
 * **core:** Starting from Jest 27.4, `mocked` has been integrated into Jest repo.
-* **core:** Support for Node.js v10 has been removed as Jest drops support for it
-* All presets now will they are preserved for refactored codes. If you wish to use the old codes, please do the following
-* 
-```diff
-// jest.config.js
-module.exports = {
-  // [...]
--    preset: 'ts-jest', // or 'js-with-babel'/'js-with-ts'
-+    transform: {
-        '^.+\\.tsx?$': 'ts-jest/legacy' // or '^.+\\.[tj]sx?$': 'ts-jest' to use legacy codes
-     }
-}
-```
+* **core:** Support for Node.js v10 has been removed as Jest drops support for it.
 
 
 

package/dist/index.d.ts

@@ -1,11 +1,12 @@
-import { TsJestTransformer } from './legacy';
-export * from './legacy';
+import { TsJestTransformer } from './legacy/ts-jest-transformer';
+export * from './config';
 export * from './constants';
 export * from './legacy/compiler';
-export * from './config';
+export * from './legacy/ts-jest-transformer';
+export * from './legacy/config/config-set';
 export * from './presets/create-jest-preset';
-export * from './utils';
 export * from './raw-compiler-options';
+export * from './utils';
 export * from './types';
 declare const _default: {
     createTransformer(): TsJestTransformer;

package/dist/index.js

@@ -14,17 +14,18 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var legacy_1 = require("./legacy");
-__exportStar(require("./legacy"), exports);
+var ts_jest_transformer_1 = require("./legacy/ts-jest-transformer");
+__exportStar(require("./config"), exports);
 __exportStar(require("./constants"), exports);
 __exportStar(require("./legacy/compiler"), exports);
-__exportStar(require("./config"), exports);
+__exportStar(require("./legacy/ts-jest-transformer"), exports);
+__exportStar(require("./legacy/config/config-set"), exports);
 __exportStar(require("./presets/create-jest-preset"), exports);
-__exportStar(require("./utils"), exports);
 __exportStar(require("./raw-compiler-options"), exports);
+__exportStar(require("./utils"), exports);
 __exportStar(require("./types"), exports);
 exports.default = {
     createTransformer: function () {
-        return new legacy_1.TsJestTransformer(true);
+        return new ts_jest_transformer_1.TsJestTransformer();
     },
 };

package/dist/legacy/compiler/compiler-utils.d.ts

@@ -0,0 +1,2 @@
+export declare const SOURCE_MAPPING_PREFIX = "sourceMappingURL=";
+export declare function updateOutput(outputText: string, normalizedFileName: string, sourceMap?: string): string;

package/dist/legacy/compiler/compiler-utils.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateOutput = exports.SOURCE_MAPPING_PREFIX = void 0;
+var utils_1 = require("../../utils");
+exports.SOURCE_MAPPING_PREFIX = 'sourceMappingURL=';
+function updateOutput(outputText, normalizedFileName, sourceMap) {
+    if (sourceMap) {
+        var base64Map = Buffer.from(updateSourceMap(sourceMap, normalizedFileName), 'utf8').toString('base64');
+        var sourceMapContent = "data:application/json;charset=utf-8;base64,".concat(base64Map);
+        return (outputText.slice(0, outputText.lastIndexOf(exports.SOURCE_MAPPING_PREFIX) + exports.SOURCE_MAPPING_PREFIX.length) +
+            sourceMapContent);
+    }
+    return outputText;
+}
+exports.updateOutput = updateOutput;
+var updateSourceMap = function (sourceMapText, normalizedFileName) {
+    var sourceMap = JSON.parse(sourceMapText);
+    sourceMap.file = normalizedFileName;
+    sourceMap.sources = [normalizedFileName];
+    delete sourceMap.sourceRoot;
+    return (0, utils_1.stringify)(sourceMap);
+};

package/dist/legacy/compiler/ts-compiler.js

@@ -57,6 +57,7 @@ var lodash_memoize_1 = __importDefault(require("lodash.memoize"));
 var constants_1 = require("../../constants");
 var utils_1 = require("../../utils");
 var messages_1 = require("../../utils/messages");
+var compiler_utils_1 = require("./compiler-utils");
 var TsCompiler = (function () {
     function TsCompiler(configSet, runtimeCacheFS) {
         var _a;
@@ -146,13 +147,13 @@ var TsCompiler = (function () {
                     file: (0, path_1.basename)(fileName),
                 }));
             }
+            var outputFiles = output.outputFiles;
             return this._compilerOptions.sourceMap
                 ? {
-                    code: output.outputFiles[1].text,
-                    map: output.outputFiles[0].text,
+                    code: (0, compiler_utils_1.updateOutput)(outputFiles[1].text, fileName, outputFiles[0].text),
                 }
                 : {
-                    code: output.outputFiles[0].text,
+                    code: (0, compiler_utils_1.updateOutput)(outputFiles[0].text, fileName),
                 };
         }
         else {
@@ -162,8 +163,7 @@ var TsCompiler = (function () {
                 this.configSet.raiseDiagnostics(result.diagnostics, fileName, this._logger);
             }
             return {
-                code: result.outputText,
-                map: result.sourceMapText,
+                code: (0, compiler_utils_1.updateOutput)(result.outputText, fileName, result.sourceMapText),
             };
         }
     };

package/dist/legacy/config/config-set.js

@@ -10,6 +10,29 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __values = (this && this.__values) || function(o) {
     var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
     if (m) return m.call(o);
@@ -58,6 +81,7 @@ var bs_logger_1 = require("bs-logger");
 var jest_util_1 = require("jest-util");
 var json5_1 = __importDefault(require("json5"));
 var constants_1 = require("../../constants");
+var hoistJestTransformer = __importStar(require("../../transformers/hoist-jest"));
 var utils_1 = require("../../utils");
 var backports_1 = require("../../utils/backports");
 var importer_1 = require("../../utils/importer");
@@ -232,7 +256,13 @@ var ConfigSet = (function () {
         this.parsedTsConfig = this._getAndResolveTsConfig(typeof tsconfigOpt === 'object' ? tsconfigOpt : undefined, configFilePath);
         this.raiseDiagnostics(this.parsedTsConfig.errors, configFilePath);
         this.logger.debug({ tsconfig: this.parsedTsConfig }, 'normalized typescript config via ts-jest option');
-        this.resolvedTransformers.before = [require('../../transformers/hoist-jest')];
+        this.resolvedTransformers.before = [
+            {
+                factory: hoistJestTransformer.factory,
+                name: hoistJestTransformer.name,
+                version: hoistJestTransformer.version,
+            },
+        ];
         var astTransformers = options.astTransformers;
         if (astTransformers) {
             var resolveTransformerFunc_1 = function (transformerPath) {

package/dist/legacy/index.d.ts

@@ -1,5 +1,4 @@
 import { TsJestTransformer } from './ts-jest-transformer';
-export * from './ts-jest-transformer';
 declare const _default: {
     createTransformer: () => TsJestTransformer;
 };

package/dist/legacy/index.js

@@ -1,21 +1,6 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 var ts_jest_transformer_1 = require("./ts-jest-transformer");
-__exportStar(require("./ts-jest-transformer"), exports);
 exports.default = {
     createTransformer: function () { return new ts_jest_transformer_1.TsJestTransformer(); },
 };

package/dist/legacy/ts-jest-transformer.d.ts

@@ -8,7 +8,7 @@ export declare class TsJestTransformer implements SyncTransformer {
     private _transformCfgStr;
     private _depGraphs;
     private _watchMode;
-    constructor(isLegacy?: boolean);
+    constructor();
     private _configsFor;
     protected _createConfigSet(config: ProjectConfigTsJest | undefined): ConfigSet;
     protected _createCompiler(configSet: ConfigSet, cacheFS: Map<string, string>): void;

package/dist/legacy/ts-jest-transformer.js

@@ -88,15 +88,11 @@ var compiler_1 = require("./compiler");
 var config_set_1 = require("./config/config-set");
 exports.CACHE_KEY_EL_SEPARATOR = '\x00';
 var TsJestTransformer = (function () {
-    function TsJestTransformer(isLegacy) {
-        if (isLegacy === void 0) { isLegacy = false; }
+    function TsJestTransformer() {
         this._depGraphs = new Map();
         this._watchMode = false;
         this._logger = utils_1.rootLogger.child({ namespace: 'ts-jest-transformer' });
         version_checkers_1.VersionCheckers.jest.warn();
-        if (isLegacy) {
-            this._logger.warn("Use 'ts-jest' entry point in v28 will resolve in refactored transformer. If you wish to use legacy transformer, please adjust your Jest 'transform' config. For example:\n     module.exports = {\n        transform: {\n           '^.+\\\\.tsx?$': 'ts-jest/legacy'\n        }\n     }\n  ");
-        }
         this.getCacheKey = this.getCacheKey.bind(this);
         this.getCacheKeyAsync = this.getCacheKeyAsync.bind(this);
         this.process = this.process.bind(this);

package/dist/presets/create-jest-preset.d.ts

@@ -1,3 +1,3 @@
 import type { Config } from '@jest/types';
 import type { TsJestPresets } from '../types';
-export declare function createJestPreset(allowJs?: boolean, extraOptions?: Config.InitialOptions): TsJestPresets;
+export declare function createJestPreset(legacy?: boolean, allowJs?: boolean, extraOptions?: Config.InitialOptions): TsJestPresets;

package/dist/presets/create-jest-preset.js

@@ -14,13 +14,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createJestPreset = void 0;
 var utils_1 = require("../utils");
 var logger = utils_1.rootLogger.child({ namespace: 'jest-preset' });
-function createJestPreset(allowJs, extraOptions) {
+function createJestPreset(legacy, allowJs, extraOptions) {
     var _a;
+    if (legacy === void 0) { legacy = false; }
     if (allowJs === void 0) { allowJs = false; }
     if (extraOptions === void 0) { extraOptions = {}; }
     logger.debug({ allowJs: allowJs }, 'creating jest presets', allowJs ? 'handling' : 'not handling', 'JavaScript files');
     var extensionsToTreatAsEsm = extraOptions.extensionsToTreatAsEsm, moduleFileExtensions = extraOptions.moduleFileExtensions, testMatch = extraOptions.testMatch;
     var supportESM = extensionsToTreatAsEsm === null || extensionsToTreatAsEsm === void 0 ? void 0 : extensionsToTreatAsEsm.length;
-    return __assign(__assign(__assign(__assign({}, (extensionsToTreatAsEsm ? { extensionsToTreatAsEsm: extensionsToTreatAsEsm } : undefined)), (moduleFileExtensions ? { moduleFileExtensions: moduleFileExtensions } : undefined)), (testMatch ? { testMatch: testMatch } : undefined)), { transform: __assign(__assign({}, extraOptions.transform), (_a = {}, _a[allowJs ? (supportESM ? '^.+\\.m?[tj]sx?$' : '^.+\\.[tj]sx?$') : '^.+\\.tsx?$'] = 'ts-jest', _a)) });
+    return __assign(__assign(__assign(__assign({}, (extensionsToTreatAsEsm ? { extensionsToTreatAsEsm: extensionsToTreatAsEsm } : undefined)), (moduleFileExtensions ? { moduleFileExtensions: moduleFileExtensions } : undefined)), (testMatch ? { testMatch: testMatch } : undefined)), { transform: __assign(__assign({}, extraOptions.transform), (_a = {}, _a[allowJs ? (supportESM ? '^.+\\.m?[tj]sx?$' : '^.+\\.[tj]sx?$') : '^.+\\.tsx?$'] = legacy
+            ? 'ts-jest/legacy'
+            : 'ts-jest', _a)) });
 }
 exports.createJestPreset = createJestPreset;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-jest",
-  "version": "28.0.0-next.1",
+  "version": "28.0.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "bin": {
@@ -102,7 +102,7 @@
     "@types/lodash.memoize": "4.x",
     "@types/lodash.set": "4.x",
     "@types/micromatch": "4.x",
-    "@types/node": "17.0.27",
+    "@types/node": "17.0.30",
     "@types/node-fetch": "^3.0.3",
     "@types/react": "18.x",
     "@types/rimraf": "^3.0.2",

package/presets/default-esm-legacy/jest-preset.js

@@ -0,0 +1 @@
+module.exports = require('..').defaultsESMLegacy

package/presets/default-legacy/jest-preset.js

@@ -0,0 +1 @@
+module.exports = require('..').defaultsLegacy

package/presets/index.d.ts

@@ -2,10 +2,16 @@ import type { TsJestPresets } from '../dist'
 
 declare const _default: {
     defaults: TsJestPresets;
+    defaultsLegacy: TsJestPresets;
     defaultsESM: TsJestPresets;
+    defaultsESMLegacy: TsJestPresets;
     jsWithTs: TsJestPresets;
+    jsWithTsLegacy: TsJestPresets;
     jsWithTsESM: TsJestPresets;
+    jsWithTsESMLegacy: TsJestPresets;
     jsWithBabel: TsJestPresets;
+    jsWithBabelLegacy: TsJestPresets;
     jsWithBabelESM: TsJestPresets;
+    jsWithBabelESMLegacy: TsJestPresets;
 };
 export = _default;

package/presets/index.js

@@ -5,24 +5,55 @@ module.exports = {
   get defaults() {
     return createJestPreset()
   },
+  get defaultsLegacy() {
+    return createJestPreset(true, false)
+  },
   get defaultsESM() {
-    return createJestPreset(false, { extensionsToTreatAsEsm: TS_EXT_TO_TREAT_AS_ESM })
+    return createJestPreset(false, false, { extensionsToTreatAsEsm: TS_EXT_TO_TREAT_AS_ESM })
+  },
+  get defaultsESMLegacy() {
+    return createJestPreset(true, false, { extensionsToTreatAsEsm: TS_EXT_TO_TREAT_AS_ESM })
   },
   get jsWithTs() {
-    return createJestPreset(true)
+    return createJestPreset(false, true)
+  },
+  get jsWithTsLegacy() {
+    return createJestPreset(true, true)
   },
   get jsWithTsESM() {
-    return createJestPreset(true, { extensionsToTreatAsEsm: [...JS_EXT_TO_TREAT_AS_ESM, ...TS_EXT_TO_TREAT_AS_ESM] })
+    return createJestPreset(false, true, {
+      extensionsToTreatAsEsm: [...JS_EXT_TO_TREAT_AS_ESM, ...TS_EXT_TO_TREAT_AS_ESM],
+    })
+  },
+  get jsWithTsESMLegacy() {
+    return createJestPreset(true, true, {
+      extensionsToTreatAsEsm: [...JS_EXT_TO_TREAT_AS_ESM, ...TS_EXT_TO_TREAT_AS_ESM],
+    })
   },
   get jsWithBabel() {
-    return createJestPreset(false, {
+    return createJestPreset(false, false, {
+      transform: {
+        '^.+\\.jsx?$': 'babel-jest',
+      },
+    })
+  },
+  get jsWithBabelLegacy() {
+    return createJestPreset(true, false, {
       transform: {
         '^.+\\.jsx?$': 'babel-jest',
       },
     })
   },
   get jsWithBabelESM() {
-    return createJestPreset(false, {
+    return createJestPreset(false, false, {
+      extensionsToTreatAsEsm: [...JS_EXT_TO_TREAT_AS_ESM, ...TS_EXT_TO_TREAT_AS_ESM],
+      transform: {
+        '^.+\\.m?[j]sx?$': 'babel-jest',
+      },
+    })
+  },
+  get jsWithBabelESMLegacy() {
+    return createJestPreset(true, false, {
       extensionsToTreatAsEsm: [...JS_EXT_TO_TREAT_AS_ESM, ...TS_EXT_TO_TREAT_AS_ESM],
       transform: {
         '^.+\\.m?[j]sx?$': 'babel-jest',

package/presets/js-with-babel-esm-legacy/jest-preset.js

@@ -0,0 +1 @@
+module.exports = require('..').jsWithBabelESMLegacy

package/presets/js-with-babel-legacy/jest-preset.js

@@ -0,0 +1 @@
+module.exports = require('..').jsWithBabelLegacy

package/presets/js-with-ts-esm-legacy/jest-preset.js

@@ -0,0 +1 @@
+module.exports = require('..').jsWithTsESMLegacy

package/presets/js-with-ts-legacy/jest-preset.js

@@ -0,0 +1 @@
+module.exports = require('..').jsWithTsLegacy