[FEAT] sync typescript versions

package.json

@@ -35,7 +35,7 @@
     "chai": "4.3.6",
     "react": "17",
     "sinon": "10.0.0",
-    "typescript": "4.3.2",
+    "typescript": "5.0.4",
     "validate-commit-msg": "2.14.0"
   },
   "config": {

packages/sui-mock/package.json

@@ -2,12 +2,11 @@
   "name": "@s-ui/mock",
   "version": "1.2.0",
   "main": "lib/index.js",
-  "description": "mock provider",
-  "types": "lib/index",
+  "description": "Mock provider",
   "scripts": {
     "lib": "babel --presets sui ./src --out-dir ./lib",
     "prepublishOnly": "npm run lib",
-    "test": "npm run test:client && npm run test:server",
+    "test": "npm run test:browser && npm run test:server",
     "test:browser": "npx @s-ui/test browser -P './test/browser/**/*Spec.js'",
     "test:browser:watch": "npm run test:client -- --watch",
     "test:server": "npx @s-ui/test server -P './test/server/**/*Spec.js'",
@@ -17,7 +16,7 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "msw": "0.47.4"
+    "msw": "1.2.1"
   },
   "repository": {
     "type": "git",

packages/sui-mock/src/browser.js

@@ -5,8 +5,13 @@ export const getBrowserMocker = async (handlers = []) => {
   const worker = setup(...handlers)
 
   return {
-    ...worker,
-    listen: worker.start,
-    close: worker.stop
+    start: worker.start.bind(worker),
+    stop: worker.stop.bind(worker),
+    listen: worker.start.bind(worker),
+    close: worker.stop.bind(worker),
+    use: worker.use.bind(worker),
+    resetHandlers: worker.resetHandlers.bind(worker),
+    restoreHandlers: worker.restoreHandlers.bind(worker),
+    printHandlers: worker.printHandlers.bind(worker)
   }
 }

packages/sui-mock/src/index.js

@@ -10,4 +10,4 @@ const isNode =
 
 const setupMocker = isNode ? getServerMocker : getBrowserMocker
 
-export {setupMocker, rest}
+export {rest, setupMocker}

packages/sui-mock/src/server.js

@@ -1,12 +1,17 @@
 export {rest} from 'msw'
 
 export const getServerMocker = async (handlers = []) => {
-  const {setupServer} = require('msw/node')
+  const setupServer = await import('msw/node').then(pkg => pkg.setupServer)
   const worker = setupServer(...handlers)
 
   return {
-    ...worker,
-    start: worker.listen,
-    stop: worker.close
+    start: worker.listen.bind(worker),
+    stop: worker.close.bind(worker),
+    listen: worker.listen.bind(worker),
+    close: worker.close.bind(worker),
+    use: worker.use.bind(worker),
+    resetHandlers: worker.resetHandlers.bind(worker),
+    restoreHandlers: worker.restoreHandlers.bind(worker),
+    printHandlers: worker.printHandlers.bind(worker)
   }
 }

packages/sui-test-contract/package.json

@@ -17,8 +17,8 @@
   },
   "dependencies": {
     "@pact-foundation/pact": "9.18.1",
-    "@pactflow/pact-msw-adapter": "1.2.1",
-    "@s-ui/mock": "1",
+    "@pactflow/pact-msw-adapter": "2.0.0",
+    "@s-ui/mock": "beta",
     "commander": "8.3.0",
     "headers-polyfill": "3.1.2"
   },

packages/sui-test-contract/src/setup/utils.js

@@ -1,6 +1,6 @@
 import {stringify} from 'qs'
 
-import {writeData2File} from '@pactflow/pact-msw-adapter/dist/utils/utils.js'
+import {createWriter} from '@pactflow/pact-msw-adapter/dist/utils/utils.js'
 
 const flatEntries = (input, prefix = '') =>
   Object.entries(input).flatMap(([key, value]) => {
@@ -61,7 +61,7 @@ export const writerFactory = providers => (path, data) => {
   })
 
   console.log(`Writing the Pact file "${path}"`) // eslint-disable-line
-  writeData2File(path, data)
+  createWriter()(path, data)
 }
 
 export const mapProviders = providers =>

packages/sui-test-contract/test/server/setupSpec.js

@@ -1,11 +1,12 @@
 import {expect} from 'chai'
 
 import {FetcherFactory} from '@s-ui/domain'
-import {rest} from '@s-ui/mock'
+import mock from '@s-ui/mock'
 
 import {setupContractTests} from '../../src/index.js'
 import {getContractFileData, removeContractFiles} from '../utils.js'
 
+const {rest} = mock
 const fetcher = FetcherFactory.httpFetcher({config: {}})
 const consumer = 'test-consumer'
 const fujiAppleResponse = {color: 'red', type: 'Fuji'}