ts-jest 23.10.5 → 24.0.0

package/.ts-jest-digest

@@ -1 +1 @@
-3fe12324700b93d3377a5957ccfc2f339524ce17
+a088f4bb81d7f5f72d2907fcf9d998cc1aa136a8

package/CHANGELOG.md

@@ -1,5 +1,21 @@
-<a name="23.10.5"></a>
-## [23.10.5](https://github.com/kulshekhar/ts-jest/compare/v23.10.4...v23.10.5) (2018-11-22)
+<a name="24.0.0"></a>
+# [24.0.0](https://github.com/kulshekhar/ts-jest/compare/v23.10.5...v24.0.0) (2019-02-18)
+
+
+### Bug Fixes
+
+* cli test ([1d67101](https://github.com/kulshekhar/ts-jest/commit/1d67101))
+* module tests and some snapshots ([999f889](https://github.com/kulshekhar/ts-jest/commit/999f889))
+* remove unused snapshots ([108b08b](https://github.com/kulshekhar/ts-jest/commit/108b08b))
+* some tests ([d0f2231](https://github.com/kulshekhar/ts-jest/commit/d0f2231))
+* test command ([8372b5e](https://github.com/kulshekhar/ts-jest/commit/8372b5e))
+* test path for windows (attempt 1) ([6824ac4](https://github.com/kulshekhar/ts-jest/commit/6824ac4))
+* test path for windows (attempt 2) ([eb2fc8a](https://github.com/kulshekhar/ts-jest/commit/eb2fc8a))
+
+
+### Features
+
+* **jest:** bump to 24 ([defcb77](https://github.com/kulshekhar/ts-jest/commit/defcb77))
 
 
 

package/README.md

@@ -31,8 +31,8 @@ These instructions will get you setup to use `ts-jest` in your project. For more
 |---:|---|---|
 | **Prerequisites** | `npm i -D jest typescript` | `yarn add --dev jest typescript` |
 | **Installing** | `npm i -D ts-jest @types/jest` | `yarn add --dev ts-jest @types/jest` |
-| **Creating config** | `node_modules/.bin/ts-jest config:init` | `yarn ts-jest config:init` |
-| **Running tests** | `npm t` or `node_modules/.bin/jest` | `yarn test` or `yarn jest` |
+| **Creating config** | `npx ts-jest config:init` | `yarn ts-jest config:init` |
+| **Running tests** | `npm t` or `npx jest` | `yarn test` or `yarn jest` |
 
 ## Built With
 

package/dist/cli/config/migrate.js

@@ -131,7 +131,7 @@ exports.run = function (args) { return __awaiter(_this, void 0, void 0, function
         if (preset)
             migratedConfig.preset = preset.name;
         if (migratedConfig.moduleFileExtensions && migratedConfig.moduleFileExtensions.length && preset) {
-            presetValue = dedupSort(preset.value.moduleFileExtensions).join('::');
+            presetValue = dedupSort(preset.value.moduleFileExtensions || []).join('::');
             migratedValue = dedupSort(migratedConfig.moduleFileExtensions).join('::');
             if (presetValue === migratedValue) {
                 delete migratedConfig.moduleFileExtensions;
@@ -141,7 +141,7 @@ exports.run = function (args) { return __awaiter(_this, void 0, void 0, function
             migratedConfig.testMatch = null;
         }
         else if (migratedConfig.testMatch && migratedConfig.testMatch.length && preset) {
-            presetValue = dedupSort(preset.value.testMatch).join('::');
+            presetValue = dedupSort(preset.value.testMatch || []).join('::');
             migratedValue = dedupSort(migratedConfig.testMatch).join('::');
             if (presetValue === migratedValue) {
                 delete migratedConfig.testMatch;

package/dist/config/config-set.js

@@ -271,7 +271,7 @@ var ConfigSet = (function () {
         get: function () {
             var modules = ['jest', this.tsJest.compiler];
             if (this.tsJest.babelConfig) {
-                modules.push('@babel/core', 'babel-core', 'babel-jest');
+                modules.push('@babel/core', 'babel-jest');
             }
             return modules.reduce(function (map, name) {
                 map[name] = get_package_version_1.getPackageVersion(name) || '-';

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

@@ -1,8 +1,8 @@
 /// <reference types="jest" />
 export interface TsJestPresets {
     transform: Record<string, string>;
-    testMatch: string[];
-    moduleFileExtensions: string[];
+    testMatch?: string[];
+    moduleFileExtensions?: string[];
 }
 export interface CreateJestPresetOptions {
     allowJs?: boolean;

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

@@ -10,48 +10,14 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
-var __spread = (this && this.__spread) || function () {
-    for (var ar = [], i = 0; i < arguments.length; i++) ar = ar.concat(__read(arguments[i]));
-    return ar;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 var logger_1 = require("../util/logger");
-var jest_config_resolver_1 = require("./jest-config-resolver");
 var logger = logger_1.rootLogger.child({ namespace: 'jest-preset' });
-var jestConfigPkg = jest_config_resolver_1.getJestConfigPkg(logger);
-var defaults = jestConfigPkg.defaults || {
-    transform: null,
-    testMatch: ['**/__tests__/**/*.js?(x)', '**/?(*.)+(spec|test).js?(x)'],
-    moduleFileExtensions: ['js', 'json', 'jsx', 'node'],
-};
 function createJestPreset(_a, from) {
     var _b = (_a === void 0 ? {} : _a).allowJs, allowJs = _b === void 0 ? false : _b;
+    if (from === void 0) { from = {}; }
     var _c;
     logger.debug({ allowJs: allowJs }, 'creating jest presets', allowJs ? 'handling' : 'not handling', 'JavaScript files');
-    from = __assign({}, defaults, from);
-    return {
-        transform: __assign({}, from.transform, (_c = {}, _c[allowJs ? '^.+\\.[tj]sx?$' : '^.+\\.tsx?$'] = 'ts-jest', _c)),
-        testMatch: dedup(__spread((from.testMatch || []), ['**/__tests__/**/*.ts?(x)', '**/?(*.)+(spec|test).ts?(x)'])),
-        moduleFileExtensions: dedup(__spread((from.moduleFileExtensions || []), ['ts', 'tsx'])),
-    };
+    return __assign({ transform: __assign({}, from.transform, (_c = {}, _c[allowJs ? '^.+\\.[tj]sx?$' : '^.+\\.tsx?$'] = 'ts-jest', _c)) }, (from.testMatch ? { testMatch: from.testMatch } : undefined), (from.moduleFileExtensions ? { moduleFileExtensions: from.moduleFileExtensions } : undefined));
 }
 exports.createJestPreset = createJestPreset;
-function dedup(array) {
-    return array.filter(function (e, i, a) { return a.indexOf(e) === i; });
-}

package/dist/util/importer.js

@@ -36,15 +36,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 __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var hacks = __importStar(require("./hacks"));
 var logger_1 = require("./logger");
 var memoize_1 = require("./memoize");
 var messages_1 = require("./messages");
@@ -63,7 +55,6 @@ var Importer = (function () {
         get: function () {
             logger.debug('creating Importer singleton');
             return new Importer({
-                'babel-core': [passThru(version_checkers_1.VersionCheckers.babelCoreLegacy.warn), hacks.patchBabelCore_githubIssue6577],
                 '@babel/core': [passThru(version_checkers_1.VersionCheckers.babelCore.warn)],
                 'babel-jest': [passThru(version_checkers_1.VersionCheckers.babelJest.warn)],
                 typescript: [passThru(version_checkers_1.VersionCheckers.typescript.warn)],
@@ -74,20 +65,10 @@ var Importer = (function () {
         configurable: true
     });
     Importer.prototype.babelJest = function (why) {
-        this.tryThese('babel-core');
         return this._import(why, 'babel-jest');
     };
     Importer.prototype.babelCore = function (why) {
-        return this._import(why, 'babel-core', {
-            alternatives: ['@babel/core'],
-            installTip: [
-                {
-                    label: 'for Babel 7',
-                    module: "babel-jest 'babel-core@^7.0.0-0' @babel/core",
-                },
-                { label: 'for Babel 6', module: 'babel-jest babel-core' },
-            ],
-        });
+        return this._import(why, '@babel/core');
     };
     Importer.prototype.typescript = function (why, which) {
         return this._import(why, which);

package/dist/util/messages.js

@@ -14,7 +14,6 @@ var Errors;
     Errors["NotMappingMultiStarPath"] = "Not mapping \"{{path}}\" because it has more than one star (`*`).";
     Errors["NotMappingPathWithEmptyMap"] = "Not mapping \"{{path}}\" because it has no target.";
     Errors["MappingOnlyFirstTargetOfPath"] = "Mapping only to first target of \"{{path}}\" because it has more than one ({{count}}).";
-    Errors["CannotPatchBabelCore6"] = "Error while trying to patch babel-core/lib/transformation/file: {{error}}";
     Errors["GotJsFileButAllowJsFalse"] = "Got a `.js` file to compile while `allowJs` option is not set to `true` (file: {{path}}). To fix this:\n  - if you want TypeScript to process JS files, set `allowJs` to `true` in your TypeScript config (usually tsconfig.json)\n  - if you do not want TypeScript to process your `.js` files, in your Jest config change the `transform` key which value is `ts-jest` so that it does not match `.js` files anymore";
     Errors["GotUnknownFileTypeWithoutBabel"] = "Got a unknown file type to compile (file: {{path}}). To fix this, in your Jest config change the `transform` key which value is `ts-jest` so that it does not match this kind of files anymore.";
     Errors["GotUnknownFileTypeWithBabel"] = "Got a unknown file type to compile (file: {{path}}). To fix this, in your Jest config change the `transform` key which value is `ts-jest` so that it does not match this kind of files anymore. If you still want Babel to process it, add another entry to the `transform` option with value `babel-jest` which key matches this type of files.";

package/dist/util/version-checkers.js

@@ -7,17 +7,15 @@ var messages_1 = require("./messages");
 var logger = logger_1.rootLogger.child({ namespace: 'versions' });
 var ExpectedVersions;
 (function (ExpectedVersions) {
-    ExpectedVersions["Jest"] = ">=22 <24";
+    ExpectedVersions["Jest"] = ">=24 <25";
     ExpectedVersions["TypeScript"] = ">=2.7 <4";
-    ExpectedVersions["BabelJest"] = ">=22 <24";
-    ExpectedVersions["BabelCoreLegacy"] = ">=6 <7 || 7.0.0-bridge.0";
+    ExpectedVersions["BabelJest"] = ">=24 <25";
     ExpectedVersions["BabelCore"] = ">=7.0.0-beta.0 <8";
 })(ExpectedVersions = exports.ExpectedVersions || (exports.ExpectedVersions = {}));
 exports.VersionCheckers = {
     jest: createVersionChecker('jest', ExpectedVersions.Jest),
     typescript: createVersionChecker('typescript', ExpectedVersions.TypeScript),
     babelJest: createVersionChecker('babel-jest', ExpectedVersions.BabelJest),
-    babelCoreLegacy: createVersionChecker('babel-core', ExpectedVersions.BabelCoreLegacy),
     babelCore: createVersionChecker('@babel/core', ExpectedVersions.BabelCore),
 };
 function checkVersion(name, expectedRange, action) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-jest",
-  "version": "23.10.5",
+  "version": "24.0.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "bin": "cli.js",
@@ -32,9 +32,6 @@
     "changelog": "node_modules/.bin/conventional-changelog -p angular -i CHANGELOG.md -s -r 0",
     "prepare": "npm run build",
     "prepublishOnly": "npm run test",
-    "commitmsg": "node_modules/.bin/commitlint -E GIT_PARAMS",
-    "precommit": "node_modules/.bin/lint-staged",
-    "postcommit": "git reset",
     "preversion": "npm run test",
     "version": "npm run changelog && git add CHANGELOG.md"
   },
@@ -70,7 +67,14 @@
     "yargs-parser": "10.x"
   },
   "peerDependencies": {
-    "jest": ">=22 <24"
+    "jest": ">=24 <25"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged",
+      "commit-msg": "commitlint -E HUSKY_GIT_PARAMS",
+      "post-commit": "git reset"
+    }
   },
   "devDependencies": {
     "@commitlint/cli": "7.x",
@@ -95,8 +99,8 @@
     "eslint": "latest",
     "fs-extra": "latest",
     "glob-gitignore": "latest",
-    "husky": "0.x",
-    "jest": "23.x",
+    "husky": "1.x",
+    "jest": "24.x",
     "js-yaml": "latest",
     "lint-staged": "latest",
     "lodash.memoize": "4.x",

package/dist/config/jest-config-resolver.d.ts

@@ -1,2 +0,0 @@
-import { Logger } from 'bs-logger';
-export declare function getJestConfigPkg<TJestConfig>(logger: Logger): TJestConfig;

package/dist/config/jest-config-resolver.js

@@ -1,43 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var fs_1 = require("fs");
-var path_1 = require("path");
-var resolve_1 = require("resolve");
-var messages_1 = require("../util/messages");
-function getJestConfigPkg(logger) {
-    try {
-        var jestPath = resolvePackagePath('jest', __dirname);
-        var jestCliPath = resolvePackagePath('jest-cli', jestPath);
-        var jestConfigPath = resolvePackagePath('jest-config', jestCliPath);
-        var jestConfigPackageJson = require(path_1.join(jestConfigPath, 'package.json'));
-        var jestConfigMainPath = path_1.resolve(jestConfigPath, jestConfigPackageJson.main);
-        return require(jestConfigMainPath);
-    }
-    catch (error) {
-        logger.error({ error: error }, messages_1.Errors.UnableToResolveJestConfig);
-        return {};
-    }
-}
-exports.getJestConfigPkg = getJestConfigPkg;
-function resolvePackagePath(packageName, baseDir) {
-    var packageJsonPath = resolve_1.sync(packageName, {
-        basedir: baseDir,
-        packageFilter: function (packageJson) {
-            packageJson.main = 'package.json';
-            return packageJson;
-        },
-        readFileSync: fs_1.readFileSync,
-        isFile: isFile,
-    });
-    var realPackageJsonPath = fs_1.realpathSync(packageJsonPath);
-    return path_1.dirname(realPackageJsonPath);
-}
-function isFile(filePath) {
-    if (fs_1.existsSync(filePath)) {
-        var stats = fs_1.statSync(filePath);
-        return stats.isFile();
-    }
-    else {
-        return false;
-    }
-}

package/dist/util/hacks.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/util/hacks.js

@@ -1,38 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-var semver_1 = __importDefault(require("semver"));
-var logger_1 = require("./logger");
-var messages_1 = require("./messages");
-var logger = logger_1.rootLogger.child({ namespace: 'hacks' });
-exports.patchBabelCore_githubIssue6577 = function (babel) {
-    if (typeof babel.version !== 'string')
-        return babel;
-    var version = semver_1.default.coerce(babel.version);
-    if (version && version.major === 6) {
-        var flag = Symbol.for('ts-jest:patchBabelCore_githubIssue6577');
-        try {
-            var File = require('babel-core/lib/transformation/file').File;
-            if (File.prototype.initOptions[flag])
-                return babel;
-            File.prototype.initOptions = (function (original) {
-                return function initOptions(opt) {
-                    var before = opt.sourceMaps;
-                    var result = original.apply(this, arguments);
-                    if (before && before !== result.sourceMaps) {
-                        result.sourceMaps = before;
-                    }
-                    return result;
-                };
-            })(File.prototype.initOptions);
-            Object.defineProperty(File.prototype.initOptions, flag, { value: true });
-            logger.info('patched babel-core/lib/transformation/file');
-        }
-        catch (error) {
-            logger.warn({ error: error }, messages_1.interpolate(messages_1.Errors.CannotPatchBabelCore6, { error: error.message }));
-        }
-    }
-    return babel;
-};