Merge pull request #231 from pactflow/deps/cypress_axios

deps

Author: YOU54F

.github/workflows/build-and-test.yml

@@ -12,13 +12,13 @@ jobs:
     strategy:
       matrix:
         os: [macos-latest, ubuntu-latest, windows-latest]
-        node-version: [18.x, 19.x, 20.x]
+        node-version: [18.x, 20.x, 22.x]
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
       - run: yarn install

.github/workflows/publish.yml

@@ -10,10 +10,10 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: 18
           registry-url: 'https://registry.npmjs.org'
@@ -23,7 +23,7 @@ jobs:
           NODE_AUTH_TOKEN: ${{secrets.NPM_AUTOMATION_TOKEN}}
       - name: Create Release
         id: create_release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
         with:

examples/react/cypress.config.js

@@ -0,0 +1,13 @@
+const { defineConfig } = require('cypress')
+
+module.exports = defineConfig({
+  retries: 3,
+  e2e: {
+    // We've imported your old cypress plugins here.
+    // You may want to clean this up later by importing these.
+    setupNodeEvents(on, config) {
+      return require('./cypress/plugins/index.js')(on, config)
+    },
+    baseUrl: 'http://localhost:3000',
+  },
+})

examples/react/cypress.json

@@ -73,7 +73,7 @@ describe('Tests setupPactMswAdapter with msw works', async () => {
     pactMswAdapter.clear();
   });
 
-  it('should record a msw interaction and turn it into a back', () => {
+  it('should record a msw interaction and turn it into a pact', () => {
     // Filter to the product we want
     cy.get('#input-product-search').type('Gem Visa');
     cy.get('.btn').click();

examples/react/cypress/integration/pactFromMswWorker.spec.js renamed to examples/react/cypress/e2e/pactFromMswWorker.cy.js

@@ -12,11 +12,15 @@ module.exports = {
         "^@bundled-es-modules/js-levenshtein$": "js-levenshtein",
         "^@bundled-es-modules/statuses$": "statuses",
         "^@bundled-es-modules/cookie$": "cookie",
+        "^@bundled-es-modules/tough-cookie$": "tough-cookie",
     },
     setupFiles: [
         ...config.setupFiles,
         '<rootDir>/jest/jest.polyfills.js'
     ],
+    "transformIgnorePatterns": [
+        "node_modules/(?!(axios)/)"
+      ]
 }
 
 

examples/react/cypress/support/index.js renamed to examples/react/cypress/support/e2e.js

@@ -2,14 +2,14 @@
   "name": "pact-consumer-example",
   "version": "0.1.0",
   "dependencies": {
-    "axios": "^0.28.0",
+    "axios": "^1.7.9",
     "prop-types": "15.8.1",
-    "react": "^16.12.0",
-    "react-dom": "^16.12.0",
+    "react": "^16.14.0",
+    "react-dom": "^16.14.0",
     "react-router": "5.3.4",
     "react-router-dom": "^5.3.4",
     "react-scripts": "5.0.1",
-    "spectre.css": "^0.5.8"
+    "spectre.css": "^0.5.9"
   },
   "scripts": {
     "start": "cross-env GENERATE_SOURCEMAP=false react-scripts start",
@@ -37,27 +37,27 @@
     ]
   },
   "devDependencies": {
-    "@testing-library/jest-dom": "^4.2.4",
-    "@types/axios": "^0.14.0",
-    "@types/react": "^17.0.53",
-    "@types/react-dom": "^17.0.19",
+    "@babel/runtime": "^7.26.0",
+    "@testing-library/jest-dom": "^6.6.3",
+    "@types/react": "^17.0.83",
+    "@types/react-dom": "^17.0.26",
     "@types/react-router-dom": "^5.3.3",
-    "@typescript-eslint/eslint-plugin": "^2.34.0",
+    "@typescript-eslint/eslint-plugin": "^8.18.0",
     "@typescript-eslint/parser": "^2.34.0",
-    "babel-eslint": "^10.0.3",
+    "babel-eslint": "^10.1.0",
     "babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",
     "cross-env": "^7.0.3",
-    "cypress": "^9.5.1",
+    "cypress": "13.16.1",
     "cypress-log-to-output": "^1.1.2",
     "eslint": "^6.8.0",
-    "eslint-config-react-app": "^5.2.1",
+    "eslint-config-react-app": "^7.0.1",
     "eslint-plugin-flowtype": "^8.0.3",
-    "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-jsx-a11y": "^6.7.1",
-    "eslint-plugin-react": "^7.32.2",
-    "eslint-plugin-react-hooks": "^4.6.0",
+    "eslint-plugin-import": "^2.31.0",
+    "eslint-plugin-jsx-a11y": "^6.10.2",
+    "eslint-plugin-react": "^7.37.2",
+    "eslint-plugin-react-hooks": "^4.6.2",
     "js-levenshtein": "^1.1.6",
-    "start-server-and-test": "^1.14.0",
+    "start-server-and-test": "^1.15.5",
     "undici": "^5.28.4"
   },
   "msw": {

examples/react/jest.config.js

@@ -2,13 +2,13 @@
 /* tslint:disable */
 
 /**
- * Mock Service Worker (2.0.2).
+ * Mock Service Worker (2.0.14).
  * @see https://github.com/mswjs/msw
  * - Please do NOT modify this file.
  * - Please do NOT serve this file on production.
  */
 
-const INTEGRITY_CHECKSUM = '0877fcdc026242810f5bfde0d7178db4'
+const INTEGRITY_CHECKSUM = 'c5f7f8e188b673ea4e677df7ea3c5a39'
 const IS_MOCKED_RESPONSE = Symbol('isMockedResponse')
 const activeClientIds = new Set()
 
@@ -121,11 +121,6 @@ async function handleRequest(event, requestId) {
   if (client && activeClientIds.has(client.id)) {
     ;(async function () {
       const responseClone = response.clone()
-      // When performing original requests, response body will
-      // always be a ReadableStream, even for 204 responses.
-      // But when creating a new Response instance on the client,
-      // the body for a 204 response must be null.
-      const responseBody = response.status === 204 ? null : responseClone.body
 
       sendToClient(
         client,
@@ -137,11 +132,11 @@ async function handleRequest(event, requestId) {
             type: responseClone.type,
             status: responseClone.status,
             statusText: responseClone.statusText,
-            body: responseBody,
+            body: responseClone.body,
             headers: Object.fromEntries(responseClone.headers.entries()),
           },
         },
-        [responseBody],
+        [responseClone.body],
       )
     })()
   }