fix: Add Jest@28 to the peer dependencies (and fix a few other issues) (#211)

* fix: Improve robustness by importing types from the root of pact-js, introduced in pact@9.12.2

* build(deps): Reduce deprecation warnings by bumping several versions

* fix: Add jest ^28.0.0 to peer dependencies

* build(deps): Bump husky devDep version to address vulnerability warning

* fix: Fixed a race condition where the extended timeout sometimes wasn't applied during pact setup

Author: TimothyJones

package.json

@@ -39,29 +39,29 @@
   "devDependencies": {
     "@commitlint/cli": "^10.0.0",
     "@commitlint/config-conventional": "^10.0.0",
-    "@pact-foundation/pact": "9.12.2",
+    "@pact-foundation/pact": "9.17.3",
     "@pact-foundation/pact-js-prettier-config": "^1.0.0",
     "@types/jest": "^27.1.3",
     "@types/supertest": "2.0.8",
-    "coveralls": "3.0.9",
+    "coveralls": "3.1.1",
     "cross-env": "7.0.2",
-    "husky": "4.2.3",
-    "jest": "^27.1.3",
-    "jest-junit": "10.0.0",
+    "husky": "^4.3.8",
+    "jest": "^28.1.0",
+    "jest-junit": "13.2.0",
     "lint-staged": "10.2.2",
     "prettier": "2.0.5",
     "rimraf": "3.0.2",
     "standard-version": "^9.0.0",
-    "supertest": "4.0.2",
-    "ts-jest": "^27.1.3",
+    "supertest": "6.2.3",
+    "ts-jest": "^28.0.1",
     "ts-node": "8.6.2",
     "tslint": "5.20.1",
     "tslint-config-prettier": "1.18.0",
-    "typescript": "3.8.3"
+    "typescript": "4.6.4"
   },
   "peerDependencies": {
     "@pact-foundation/pact": "^9.12.2",
-    "jest": "^24.0.0 || ^25.0.0 || ^26.0.0 || ^27.0.0"
+    "jest": "^24.0.0 || ^25.0.0 || ^26.0.0 || ^27.0.0 || ^28.0.0"
   },
   "lint-staged": {
     "src/**/*.ts": [

src/internal/config.ts

@@ -1,5 +1,5 @@
 import { PactfileWriteMode } from '@pact-foundation/pact';
-import { LogLevel } from '@pact-foundation/pact/dsl/options';
+import { LogLevel } from '@pact-foundation/pact';
 import * as path from 'path';
 import { JestMessageConsumerOptions, JestPactOptions } from '../types';
 

src/internal/scaffold.ts

@@ -1,7 +1,4 @@
-import {
-  MessageConsumerOptions,
-  PactOptions,
-} from '@pact-foundation/pact/dsl/options';
+import { MessageConsumerOptions, PactOptions } from '@pact-foundation/pact';
 import { ConsumerOptions, WrapperFn, WrapperWithOnlyAndSkip } from './types';
 
 const describeString = (options: PactOptions | MessageConsumerOptions) =>

src/internal/withTimeout.ts

@@ -8,29 +8,29 @@ export const withTimeout = (
 ): void => {
   const pactTestTimeout = options.timeout || 30000;
 
-  describe(`with ${pactTestTimeout} ms timeout for Pact`, () => {
-    let originalTimeout: number;
+  let originalTimeout: number;
 
-    beforeAll(() => {
-      // Jest's default timeout is 5000, and jest doesn't provide a way of
-      // asking what the current timeout is. In Jest 24 and 25, Jasmine was probably
-      // the test runner, so we can ask Jasmine if it is there. In later versions of
-      // Jest (eg 26 and up), Jasmine may not be defined.
-      // See https://github.com/pact-foundation/jest-pact/issues/197 for discussion
-      //
-      // For now, we just assume that 5000 was the original timeout.
-      // The impact is likely to be small, as `jest.setTimeout()` only works for the
-      // current test file
-      originalTimeout = global.jasmine
-        ? global.jasmine.DEFAULT_TIMEOUT_INTERVAL
-        : 5000;
-      jest.setTimeout(pactTestTimeout);
-    });
+  beforeAll(() => {
+    // Jest's default timeout is 5000, and jest doesn't provide a way of
+    // asking what the current timeout is. In Jest 24 and 25, Jasmine was probably
+    // the test runner, so we can ask Jasmine if it is there. In later versions of
+    // Jest (eg 26 and up), Jasmine may not be defined.
+    // See https://github.com/pact-foundation/jest-pact/issues/197 for discussion
+    //
+    // For now, we just assume that 5000 was the original timeout.
+    // The impact is likely to be small, as `jest.setTimeout()` only works for the
+    // current test file
+    originalTimeout = global.jasmine
+      ? global.jasmine.DEFAULT_TIMEOUT_INTERVAL
+      : 5000;
+    jest.setTimeout(pactTestTimeout);
+  });
 
-    afterAll(() => {
-      jest.setTimeout(originalTimeout);
-    });
+  afterAll(() => {
+    jest.setTimeout(originalTimeout);
+  });
 
+  describe(`with ${pactTestTimeout} ms timeout for Pact`, () => {
     tests();
   });
 };