Merge pull request #61 from pactflow/deps/update

Deps/update
pactflow · Oct 4, 2024 · e4af25d · e4af25d
2 parents a08ac4c + 0ae0875
commit e4af25d
Show file tree

Hide file tree

Showing 11 changed files with 3,058 additions and 3,967 deletions.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -11,14 +11,14 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        node-version: [16.x, 18.x]
+        node-version: [18.x, 20.x, 22.x]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
       - run: ./scripts/build.sh
@@ -28,14 +28,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [16.x, 18.x]
+        node-version: [18.x, 20.x, 22.x]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
       - run: ./scripts/build.sh

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -10,7 +10,7 @@ jobs:
     if: ${{ github.event.client_payload.release_type == 'major' }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: fregante/setup-git-user@v1
@@ -30,11 +30,11 @@ jobs:
     if: ${{ github.event.client_payload.release_type == 'minor' }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: fregante/setup-git-user@v1
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: 18
           registry-url: 'https://registry.npmjs.org'
@@ -50,11 +50,11 @@ jobs:
     if: ${{ github.event.client_payload.release_type == 'patch' }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: fregante/setup-git-user@v1
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: 18
           registry-url: 'https://registry.npmjs.org'

diff --git a/eslint.config.js b/eslint.config.js
@@ -0,0 +1,41 @@
+import tseslint from 'typescript-eslint';
+import eslintConfigPrettier from "eslint-config-prettier";
+
+import { includeIgnoreFile } from "@eslint/compat";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+import eslint from "@eslint/js";
+const gitignorePath = path.resolve(__dirname, ".gitignore");
+
+export default tseslint.config(
+    includeIgnoreFile(gitignorePath),
+    eslintConfigPrettier,
+    {
+        ignores: [
+          "**/test/*",
+          "commitlint.config.cjs",
+          "gulpfile.cjs"
+        ],
+      },{
+    extends: [
+      eslint.configs.recommended,
+      ...tseslint.configs.recommended,
+      tseslint.configs.eslintRecommended,
+    ],
+    rules: {
+        '@typescript-eslint/no-explicit-any': ['warn'],
+        '@typescript-eslint/no-unused-vars': [
+            'warn',
+            {
+                args: 'after-used',
+                argsIgnorePattern: '_',
+                ignoreRestSiblings: false,
+                vars: 'all',
+            },
+        ],
+    },
+  },
+);
diff --git a/lib/swagger-mock-validator/common/traverse-json-schema.ts b/lib/swagger-mock-validator/common/traverse-json-schema.ts
@@ -1,11 +1,10 @@
 import _ from 'lodash';
-import {isBoolean, isUndefined} from 'util';
 import {ParsedSpecJsonSchema, ParsedSpecJsonSchemaCore} from '../spec-parser/parsed-spec';
 
 export type JsonSchemaVisitor = (mutableSchema: ParsedSpecJsonSchemaCore) => void;
 
 export const traverseJsonSchema = (mutableSchema: ParsedSpecJsonSchema | undefined, visitor: JsonSchemaVisitor) => {
-    if (isBoolean(mutableSchema) || isUndefined(mutableSchema)) {
+    if (typeof mutableSchema === "boolean" || mutableSchema == undefined) {
         return;
     }
 

diff --git a/lib/swagger-mock-validator/spec-parser/openapi3/is-openapi3-content.ts b/lib/swagger-mock-validator/spec-parser/openapi3/is-openapi3-content.ts
@@ -1,6 +1,5 @@
-import {isString} from 'util';
 
 export const isOpenApi3Content = (specContent: any): boolean => {
     const openapiProperty = specContent.openapi;
-    return isString(openapiProperty) && openapiProperty.indexOf('3.') === 0;
+    return typeof openapiProperty === "string" && openapiProperty.indexOf('3.') === 0;
 };
diff --git a/lib/swagger-mock-validator/validate-spec-and-mock/validate-mock-value-against-spec.ts b/lib/swagger-mock-validator/validate-spec-and-mock/validate-mock-value-against-spec.ts
@@ -1,5 +1,4 @@
 import _ from 'lodash';
-import {isObject} from 'util';
 import {ValidationResultCode} from '../../api-types';
 import {ParsedMockInteraction, ParsedMockValue} from '../mock-parser/parsed-mock';
 import {result} from '../result';
@@ -43,7 +42,7 @@ const getCollectionSeparator = (parsedSpecCollectionFormat?: ParsedSpecCollectio
 };
 
 const isParsedSpecJsonSchemaCore = (schema?: ParsedSpecJsonSchema): schema is ParsedSpecJsonSchemaCore =>
-    isObject(schema);
+    schema !== null && typeof schema === "object";
 
 const expandArrays = (
     parsedMockValue: string,

diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
   "scripts": {
     "prettier": "prettier --check .",
     "prettier:fix": "prettier --cache --write .",
-    "lint": "eslint --ignore-path .gitignore lib test",
+    "lint": "eslint",
     "test": "jasmine --config=jasmine.json \"test/unit/**/*.ts\"",
     "test:e2e": "jasmine --config=jasmine.json \"test/e2e/**/*.ts\"",
     "build": "rm -rf dist && rollup -c",
@@ -34,56 +34,58 @@
   },
   "type": "module",
   "devDependencies": {
-    "@babel/core": "^7.22.10",
-    "@babel/preset-env": "^7.22.10",
-    "@babel/preset-typescript": "^7.22.5",
-    "@babel/register": "^7.22.5",
-    "@commitlint/cli": "^17.7.1",
-    "@commitlint/config-conventional": "^17.7.0",
-    "@rollup/plugin-babel": "^6.0.3",
-    "@rollup/plugin-commonjs": "^25.0.4",
-    "@rollup/plugin-json": "^6.0.0",
-    "@rollup/plugin-node-resolve": "^15.2.0",
-    "@types/body-parser": "^1.19.2",
-    "@types/express": "^4.17.17",
-    "@types/jasmine": "^4.3.5",
-    "@types/js-yaml": "^4.0.5",
-    "@types/lodash": "^4.14.197",
-    "@types/node": "^20.5.1",
-    "@types/verror": "^1.10.6",
-    "@typescript-eslint/eslint-plugin": "^6.4.0",
-    "@typescript-eslint/parser": "^6.4.0",
+    "@babel/core": "^7.25.7",
+    "@babel/preset-env": "^7.25.7",
+    "@babel/preset-typescript": "^7.25.7",
+    "@babel/register": "^7.25.7",
+    "@commitlint/cli": "^19.5.0",
+    "@commitlint/config-conventional": "^19.5.0",
+    "@eslint/compat": "^1.1.1",
+    "@eslint/js": "^9.11.1",
+    "@rollup/plugin-babel": "^6.0.4",
+    "@rollup/plugin-commonjs": "^28.0.0",
+    "@rollup/plugin-json": "^6.1.0",
+    "@rollup/plugin-node-resolve": "^15.3.0",
+    "@types/body-parser": "^1.19.5",
+    "@types/eslint__js": "^8.42.3",
+    "@types/express": "^5.0.0",
+    "@types/jasmine": "^5.1.4",
+    "@types/js-yaml": "^4.0.9",
+    "@types/lodash": "^4.17.10",
+    "@types/node": "^20.16.10",
+    "@types/verror": "^1.10.10",
     "ansi-colors": "^4.1.3",
-    "body-parser": "^1.20.2",
-    "conventional-changelog": "^4.0.0",
-    "eslint": "^8.47.0",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-jest": "^27.2.3",
-    "express": "^4.18.2",
-    "gulp": "^4.0.2",
+    "body-parser": "^2.0.1",
+    "conventional-changelog": "^6.0.0",
+    "eslint": "^9.11.1",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-jest": "^28.8.3",
+    "express": "^5.0.0",
+    "gulp": "^5.0.0",
     "gulp-bump": "^3.2.0",
-    "gulp-cli": "^2.3.0",
-    "gulp-conventional-changelog": "^3.0.0",
-    "gulp-git": "^2.10.1",
-    "husky": "^8.0.3",
-    "jasmine": "^5.1.0",
+    "gulp-cli": "^3.0.0",
+    "gulp-conventional-changelog": "^5.0.0",
+    "gulp-git": "^2.11.0",
+    "husky": "^9.1.6",
+    "jasmine": "^5.3.0",
     "minimist": "^1.2.8",
-    "prettier": "^3.0.2",
-    "rollup": "^3.28.0",
-    "typescript": "^5.1.6"
+    "prettier": "^3.3.3",
+    "rollup": "^4.24.0",
+    "typescript": "^5.6.2",
+    "typescript-eslint": "^8.8.0"
   },
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.1.0",
-    "ajv": "^8.12.0",
-    "ajv-formats": "^2.1.1",
-    "axios": "^1.4.0",
-    "commander": "^11.0.0",
+    "ajv": "^8.17.1",
+    "ajv-formats": "^3.0.1",
+    "axios": "^1.7.7",
+    "commander": "^12.1.0",
     "js-yaml": "^4.1.0",
     "jsonpointer": "^5.0.1",
     "lodash": "^4.17.21",
     "openapi-types": "^12.1.3",
     "patch-package": "^8.0.0",
-    "uuidjs": "^5.0.1",
+    "uuidjs": "^5.1.0",
     "verror": "^1.10.1"
   },
   "types": "lib/api-types.d.ts"

diff --git a/patches/ajv+8.12.0.patch → patches/ajv+8.17.1.patch b/patches/ajv+8.12.0.patch → patches/ajv+8.17.1.patch
diff --git a/test/e2e/cli.spec.ts b/test/e2e/cli.spec.ts
@@ -67,7 +67,7 @@ describe('swagger-mock-validator/cli', () => {
 
         const expressApp = express();
 
-        expressApp.get('/*', (request, _, next) => {
+        expressApp.get(/(.*)/, (request, _, next) => {
             mockPactBroker.get(request.headers, request.url);
             next();
         });