Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: kulshekhar/ts-jest
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v23.10.5
Choose a base ref
...
head repository: kulshekhar/ts-jest
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v24.0.0
Choose a head ref

Commits on Nov 25, 2018

  1. Update README.md (#887)

    Use npx for running examples with npm
    maniator authored and GeeWee committed Nov 25, 2018
    Copy the full SHA
    35611a3 View commit details
  2. build(deps-dev): bump npm-run-all from 4.1.3 to 4.1.5 (#886)

    Bumps [npm-run-all](https://github.com/mysticatea/npm-run-all) from 4.1.3 to 4.1.5.
    - [Release notes](https://github.com/mysticatea/npm-run-all/releases)
    - [Commits](mysticatea/npm-run-all@v4.1.3...v4.1.5)
    
    Signed-off-by: dependabot[bot] <support@dependabot.com>
    dependabot[bot] authored and ahnpnl committed Nov 25, 2018
    Copy the full SHA
    7a310c7 View commit details

Commits on Nov 29, 2018

  1. build(deps-dev): bump @types/babel__core from 7.0.2 to 7.0.4 (#893)

    Bumps [@types/babel__core](https://github.com/DefinitelyTyped/DefinitelyTyped) from 7.0.2 to 7.0.4.
    - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
    - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits)
    
    Signed-off-by: dependabot[bot] <support@dependabot.com>
    dependabot[bot] authored and ahnpnl committed Nov 29, 2018
    Copy the full SHA
    984eb85 View commit details

Commits on Dec 1, 2018

  1. build(deps-dev): bump prettier from 1.15.2 to 1.15.3 (#897)

    Bumps [prettier](https://github.com/prettier/prettier) from 1.15.2 to 1.15.3.
    - [Release notes](https://github.com/prettier/prettier/releases)
    - [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md)
    - [Commits](prettier/prettier@1.15.2...1.15.3)
    
    Signed-off-by: dependabot[bot] <support@dependabot.com>
    dependabot[bot] authored and ahnpnl committed Dec 1, 2018
    Copy the full SHA
    99356ee View commit details

Commits on Dec 2, 2018

  1. build(deps-dev): bump @types/node from 10.12.10 to 10.12.11 (#896)

    Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped) from 10.12.10 to 10.12.11.
    - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
    - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits)
    
    Signed-off-by: dependabot[bot] <support@dependabot.com>
    dependabot[bot] authored and ahnpnl committed Dec 2, 2018
    Copy the full SHA
    17040c2 View commit details
  2. build(deps-dev): bump @types/jest from 23.3.8 to 23.3.10 (#892)

    Bumps [@types/jest](https://github.com/DefinitelyTyped/DefinitelyTyped) from 23.3.8 to 23.3.10.
    - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
    - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits)
    
    Signed-off-by: dependabot[bot] <support@dependabot.com>
    dependabot[bot] authored and ahnpnl committed Dec 2, 2018
    Copy the full SHA
    552666d View commit details

Commits on Dec 4, 2018

  1. build(deps-dev): bump @types/node from 10.12.11 to 10.12.12 (#900)

    Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped) from 10.12.11 to 10.12.12.
    - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
    - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits)
    
    Signed-off-by: dependabot[bot] <support@dependabot.com>
    dependabot[bot] authored and ahnpnl committed Dec 4, 2018
    Copy the full SHA
    5b9b30a View commit details

Commits on Dec 8, 2018

  1. build(deps-dev): bump eslint from 5.9.0 to 5.10.0 (#905)

    Bumps [eslint](https://github.com/eslint/eslint) from 5.9.0 to 5.10.0.
    - [Release notes](https://github.com/eslint/eslint/releases)
    - [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
    - [Commits](eslint/eslint@v5.9.0...v5.10.0)
    
    Signed-off-by: dependabot[bot] <support@dependabot.com>
    dependabot[bot] authored and ahnpnl committed Dec 8, 2018
    Copy the full SHA
    d399a38 View commit details

Commits on Dec 14, 2018

  1. build(deps-dev): bump @types/node from 10.12.12 to 10.12.15 (#911)

    Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped) from 10.12.12 to 10.12.15.
    - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
    - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits)
    
    Signed-off-by: dependabot[bot] <support@dependabot.com>
    dependabot[bot] authored and ahnpnl committed Dec 14, 2018
    Copy the full SHA
    1235ffe View commit details

Commits on Jan 19, 2019

  1. Copy the full SHA
    20b90ad View commit details
  2. Merge pull request #951 from kulshekhar/kulshekhar-patch-1

    Fix nokogiri version to address CVE-2018-14404
    kulshekhar authored Jan 19, 2019
    Copy the full SHA
    81f3936 View commit details

Commits on Jan 26, 2019

  1. feat(jest): bump to 24

    thymikee committed Jan 26, 2019
    Copy the full SHA
    defcb77 View commit details

Commits on Feb 6, 2019

  1. Copy the full SHA
    afe3cdf View commit details

Commits on Feb 14, 2019

  1. revert @types/jest change

    thymikee committed Feb 14, 2019
    Copy the full SHA
    b327450 View commit details
  2. fix: some tests

    thymikee committed Feb 14, 2019
    Copy the full SHA
    d0f2231 View commit details
  3. fix: cli test

    thymikee committed Feb 14, 2019
    Copy the full SHA
    1d67101 View commit details
  4. fix: test command

    thymikee committed Feb 14, 2019
    Copy the full SHA
    8372b5e View commit details

Commits on Feb 15, 2019

  1. Copy the full SHA
    999f889 View commit details

Commits on Feb 16, 2019

  1. Copy the full SHA
    d8f0de0 View commit details
  2. Copy the full SHA
    6092020 View commit details
  3. Copy the full SHA
    a0da54c View commit details
  4. Copy the full SHA
    9ff4f88 View commit details
  5. Merge pull request #978 from kulshekhar/fix-updates

    Fix dependencies
    kulshekhar authored Feb 16, 2019
    Copy the full SHA
    fb53685 View commit details
  6. chore: merge master

    kulshekhar committed Feb 16, 2019
    Copy the full SHA
    16fd6b5 View commit details
  7. Copy the full SHA
    108b08b View commit details
  8. Copy the full SHA
    6824ac4 View commit details
  9. Copy the full SHA
    eb2fc8a View commit details
  10. Copy the full SHA
    0a2f533 View commit details

Commits on Feb 18, 2019

  1. Merge pull request #957 from thymikee/feat/jest24

    feat(jest): bump to 24
    kulshekhar authored Feb 18, 2019
    Copy the full SHA
    61d31b4 View commit details
  2. chore: changelog

    kulshekhar committed Feb 18, 2019
    Copy the full SHA
    1ac501a View commit details
Showing with 7,044 additions and 23,059 deletions.
  1. +18 −2 CHANGELOG.md
  2. +2 −2 README.md
  3. +3 −3 docs/Gemfile.lock
  4. +1 −1 e2e/__cases__/deep/src/Button/click.ts
  5. +2 −0 e2e/__cases__/deep/src/tsconfig.base.json
  6. +1 −1 e2e/__cases__/module-kinds/ts-jest-tools.spec.ts
  7. +2 −15 e2e/__helpers__/templates.ts
  8. +3 −1 e2e/__helpers__/test-case/runtime.ts
  9. +1,257 −1,936 e2e/__templates__/default/package-lock.json
  10. +1 −1 e2e/__templates__/default/package.json
  11. +0 −5 e2e/__templates__/with-babel-6/jest.config.js
  12. +0 −5,943 e2e/__templates__/with-babel-6/package-lock.json
  13. +0 −19 e2e/__templates__/with-babel-6/package.json
  14. +0 −8 e2e/__templates__/with-babel-6/tsconfig.json
  15. +1,120 −2,069 e2e/__templates__/with-babel-7/package-lock.json
  16. +3 −3 e2e/__templates__/with-babel-7/package.json
  17. +0 −6 e2e/__templates__/with-jest-22/jest.config.js
  18. +0 −5,446 e2e/__templates__/with-jest-22/package-lock.json
  19. +0 −17 e2e/__templates__/with-jest-22/package.json
  20. +0 −8 e2e/__templates__/with-jest-22/tsconfig.json
  21. +1,257 −1,936 e2e/__templates__/with-typescript-2-7/package-lock.json
  22. +1 −1 e2e/__templates__/with-typescript-2-7/package.json
  23. +1,257 −1,936 e2e/__templates__/with-unsupported-version/package-lock.json
  24. +1 −1 e2e/__templates__/with-unsupported-version/package.json
  25. +0 −51 e2e/__tests__/__snapshots__/allow-js.test.ts.snap
  26. +4 −50 e2e/__tests__/__snapshots__/coverage.test.ts.snap
  27. +1 −124 e2e/__tests__/__snapshots__/deep-path.test.ts.snap
  28. +0 −90 e2e/__tests__/__snapshots__/diagnostics.test.ts.snap
  29. +0 −151 e2e/__tests__/__snapshots__/hoisting.test.ts.snap
  30. +0 −34 e2e/__tests__/__snapshots__/isolated-modules.test.ts.snap
  31. +3 −88 e2e/__tests__/__snapshots__/logger.test.ts.snap
  32. +0 −172 e2e/__tests__/__snapshots__/source-map.test.ts.snap
  33. +1 −1 e2e/jest.config.js
  34. +2 −2 jest.config.js
  35. +2,064 −2,627 package-lock.json
  36. +11 −7 package.json
  37. +12 −15 src/cli/cli.spec.ts
  38. +0 −1 src/cli/config/init.ts
  39. +2 −2 src/cli/config/migrate.ts
  40. +1 −2 src/config/config-set.spec.ts
  41. +1 −1 src/config/config-set.ts
  42. +0 −32 src/config/create-jest-preset.spec.ts
  43. +5 −22 src/config/create-jest-preset.ts
  44. +0 −47 src/config/jest-config-resolver.ts
  45. +0 −2 src/shims.d.ts
  46. +0 −83 src/util/hacks.spec.ts
  47. +0 −43 src/util/hacks.ts
  48. +3 −23 src/util/importer.spec.ts
  49. +1 −16 src/util/importer.ts
  50. +0 −1 src/util/messages.ts
  51. +2 −8 src/util/version-checkers.spec.ts
  52. +2 −4 src/util/version-checkers.ts
20 changes: 18 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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))



4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -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

6 changes: 3 additions & 3 deletions docs/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -74,7 +74,7 @@ GEM
listen (= 3.1.5)
mercenary (~> 0.3)
minima (= 2.5.0)
nokogiri (>= 1.8.2, < 2.0)
nokogiri (>= 1.8.5, < 2.0)
rouge (= 2.2.1)
terminal-table (~> 1.4)
github-pages-health-check (1.8.1)
@@ -85,7 +85,7 @@ GEM
typhoeus (~> 1.3)
html-pipeline (2.8.4)
activesupport (>= 2)
nokogiri (>= 1.4)
nokogiri (>= 1.8.5)
http_parser.rb (0.6.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
@@ -214,7 +214,7 @@ GEM
jekyll-seo-tag (~> 2.1)
minitest (5.11.3)
multipart-post (2.0.0)
nokogiri (1.8.4)
nokogiri (1.8.5)
mini_portile2 (~> 2.3.0)
octokit (4.11.0)
sawyer (~> 0.8.0, >= 0.5.3)
2 changes: 1 addition & 1 deletion e2e/__cases__/deep/src/Button/click.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as mod from './mod'
import mod from './mod'

export function click(foo: string) {
return `clicked ${mod(foo)}`
2 changes: 2 additions & 0 deletions e2e/__cases__/deep/src/tsconfig.base.json
Original file line number Diff line number Diff line change
@@ -5,6 +5,8 @@
"forceConsistentCasingInFileNames": true,
"experimentalDecorators": true,
"emitDecoratorMetadata": true,
"allowSyntheticDefaultImports": true,
"esModuleInterop": true,
"strict": true
}
}
2 changes: 1 addition & 1 deletion e2e/__cases__/module-kinds/ts-jest-tools.spec.ts
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ import * as presets from 'ts-jest/presets'
import * as utils from 'ts-jest/utils'

test('presets', () => {
const presetKeys = ['transform', 'testMatch', 'moduleFileExtensions']
const presetKeys = ['transform']
expect(Object.keys(presets.defaults)).toEqual(presetKeys)
expect(presets.defaults).toEqual(require('ts-jest/presets/default/jest-preset'))
expect(presets.defaults).toEqual(require('ts-jest/jest-preset'))
17 changes: 2 additions & 15 deletions e2e/__helpers__/templates.ts
Original file line number Diff line number Diff line change
@@ -1,22 +1,9 @@
export enum PackageSets {
default = 'default',
babel6 = 'with-babel-6',
babel7 = 'with-babel-7',
jest22 = 'with-jest-22',
typescript2_7 = 'with-typescript-2-7',
// invalid
unsupportedVersion = 'with-unsupported-version',
}
export const allValidPackageSets = [
PackageSets.default,
PackageSets.babel6,
PackageSets.babel7,
PackageSets.jest22,
PackageSets.typescript2_7,
]
export const allPackageSetsWithPreset = [
PackageSets.default,
PackageSets.babel6,
PackageSets.babel7,
PackageSets.typescript2_7,
]
export const allValidPackageSets = [PackageSets.default, PackageSets.babel7, PackageSets.typescript2_7]
export const allPackageSetsWithPreset = [PackageSets.default, PackageSets.babel7, PackageSets.typescript2_7]
4 changes: 3 additions & 1 deletion e2e/__helpers__/test-case/runtime.ts
Original file line number Diff line number Diff line change
@@ -228,7 +228,9 @@ export function prepareTest(name: string, template: string, options: RunTestOpti

// link the node_modules dir if the template has one
if (existsSync(tmplModulesDir)) {
symlinkSync(tmplModulesDir, caseModulesDir)
// It's important to mark this symlink as 'dir' or tests fail
// with permission issues on windows.
symlinkSync(tmplModulesDir, caseModulesDir, 'dir')
}

// copy files from the template to the case dir
Loading