nock 13.3.0 → 13.3.2

package/README.md

@@ -9,6 +9,9 @@
 [npmjs]: https://www.npmjs.com/package/nock
 [build]: https://travis-ci.org/nock/nock
 
+> **Warning**  
+> nock is currently not compatible with Node's experimental native `fetch` implementation. See [#2397](https://github.com/nock/nock/issues/2397)
+
 HTTP server mocking and expectations library for Node.js
 
 Nock can be used to test modules that perform HTTP requests in isolation.
@@ -1002,7 +1005,7 @@ const scope = nock('http://example.com')
   .reply(200, 'Persisting all the way')
 ```
 
-Note that while a persisted scope will always intercept the requests, it is considered "done" after the first interception.
+Note that while a persisted scope will always intercept the requests, it is considered "done" after the first interception, and they are pushed to the bottom of the stack after consumption.
 
 If you want to stop persisting an individual persisted mock you can call `persist(false)`:
 
@@ -1539,9 +1542,9 @@ import test from 'ava' // You can use any test framework.
 // can't be intercepted by nock. So, configure axios to use the node adapter.
 //
 // References:
-// https://github.com/nock/nock/issues/699#issuecomment-272708264
-// https://github.com/axios/axios/issues/305
-axios.defaults.adapter = require('axios/lib/adapters/http')
+// https://github.com/axios/axios/pull/5277
+
+axios.defaults.adapter = 'http'
 
 test('can fetch test response', async t => {
   // Set up the mock request.
@@ -1559,6 +1562,18 @@ test('can fetch test response', async t => {
 })
 ```
 
+For Nock + Axios + Jest to work, you'll have to also adapt your jest.config.js, like so:
+
+```js
+const config = {
+  moduleNameMapper: {
+    // Force CommonJS build for http adapter to be available.
+    // via https://github.com/axios/axios/issues/5101#issuecomment-1276572468
+    '^axios$': require.resolve('axios'),
+  },
+}
+```
+
 [axios]: https://github.com/axios/axios
 
 ### Memory issues with Jest

package/lib/intercept.js

@@ -110,7 +110,7 @@ function addInterceptor(key, interceptor, scope, scopeOptions, host) {
 }
 
 function remove(interceptor) {
-  if (interceptor.__nock_scope.shouldPersist() || --interceptor.counter > 0) {
+  if (--interceptor.counter > 0) {
     return
   }
 
@@ -122,6 +122,12 @@ function remove(interceptor) {
   // matching instance. I'm also not sure why we couldn't delete _all_
   // matching instances.
   interceptors.some(function (thisInterceptor, i) {
+    if (interceptor.__nock_scope.shouldPersist()) {
+      return thisInterceptor === interceptor
+        ? interceptors.push(interceptors.splice(i, 1)[0])
+        : false
+    }
+
     return thisInterceptor === interceptor ? interceptors.splice(i, 1) : false
   })
 }
@@ -218,7 +224,11 @@ function removeInterceptor(options) {
   ) {
     for (let i = 0; i < allInterceptors[baseUrl].interceptors.length; i++) {
       const interceptor = allInterceptors[baseUrl].interceptors[i]
-      if (interceptor._key === key) {
+      if (
+        options instanceof Interceptor
+          ? interceptor === options
+          : interceptor._key === key
+      ) {
         allInterceptors[baseUrl].interceptors.splice(i, 1)
         interceptor.scope.remove(key, interceptor)
         break

package/lib/socket.js

@@ -40,6 +40,7 @@ module.exports = class Socket extends EventEmitter {
   resume() {}
   ref() {}
   unref() {}
+  write() {}
 
   address() {
     return {

package/package.json

@@ -7,7 +7,7 @@
     "testing",
     "isolation"
   ],
-  "version": "13.3.0",
+  "version": "13.3.2",
   "author": "Pedro Teixeira <pedro.teixeira@gmail.com>",
   "repository": {
     "type": "git",
@@ -28,7 +28,7 @@
     "propagate": "^2.0.0"
   },
   "devDependencies": {
-    "@definitelytyped/dtslint": "^0.0.112",
+    "@definitelytyped/dtslint": "^0.0.163",
     "@sinonjs/fake-timers": "^10.0.0",
     "assert-rejects": "^1.0.0",
     "chai": "^4.1.2",
@@ -45,13 +45,13 @@
     "mocha": "^9.1.3",
     "npm-run-all": "^4.1.5",
     "nyc": "^15.0.0",
-    "prettier": "2.7.1",
+    "prettier": "2.8.8",
     "proxyquire": "^2.1.0",
     "rimraf": "^3.0.0",
-    "semantic-release": "^19.0.2",
+    "semantic-release": "^21.0.2",
     "sinon": "^15.0.1",
     "sinon-chai": "^3.7.0",
-    "typescript": "^4.2.2"
+    "typescript": "^5.0.4"
   },
   "scripts": {
     "format:fix": "prettier --write '**/*.{js,json,md,ts,yml,yaml}'",
@@ -59,7 +59,7 @@
     "lint": "run-p lint:js lint:ts",
     "lint:js": "eslint --cache --cache-location './.cache/eslint' '**/*.js'",
     "lint:js:fix": "eslint --cache --cache-location './.cache/eslint' --fix '**/*.js'",
-    "lint:ts": "dtslint types",
+    "lint:ts": "dtslint --expectOnly types",
     "test": "nyc --reporter=lcov --reporter=text mocha tests",
     "test:coverage": "open coverage/lcov-report/index.html"
   },