nock 13.5.0 → 13.5.2

package/README.md

@@ -9,8 +9,13 @@
 [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)
+> **Notice**
+>
+> We have introduced experimental support for fetch. Please share your feedback with us. You can install it by:
+>
+> ```
+> npm install --save-dev nock@beta
+> ```
 
 HTTP server mocking and expectations library for Node.js
 
@@ -66,6 +71,7 @@ For instance, if a module performs HTTP requests to a CouchDB server or makes HT
   - [.pendingMocks()](#pendingmocks)
   - [.activeMocks()](#activemocks)
   - [.isActive()](#isactive)
+  - [.clone()](#clone)
 - [Restoring](#restoring)
 - [Activating](#activating)
 - [Turning Nock Off (experimental!)](#turning-nock-off-experimental)
@@ -89,6 +95,8 @@ For instance, if a module performs HTTP requests to a CouchDB server or makes HT
     - [Options](#options-1)
       - [Example](#example)
   - [Modes](#modes)
+  - [Verifying recorded fixtures](#verifying-recorded-fixtures)
+    - [Example](#example-1)
 - [Common issues](#common-issues)
   - [Axios](#axios)
   - [Memory issues with Jest](#memory-issues-with-jest)
@@ -1693,6 +1701,10 @@ Thanks goes to these wonderful people ([emoji key](https://github.com/all-contri
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Beretta1979"><img src="https://avatars.githubusercontent.com/u/10073962?v=4?s=100" width="100px;" alt="Sébastien Van Bruaene"/><br /><sub><b>Sébastien Van Bruaene</b></sub></a><br /><a href="https://github.com/nock/nock/commits?author=Beretta1979" title="Code">💻</a> <a href="https://github.com/nock/nock/commits?author=Beretta1979" title="Tests">⚠️</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Uzlopak"><img src="https://avatars.githubusercontent.com/u/5059100?v=4?s=100" width="100px;" alt="Aras Abbasi"/><br /><sub><b>Aras Abbasi</b></sub></a><br /><a href="https://github.com/nock/nock/commits?author=Uzlopak" title="Code">💻</a> <a href="https://github.com/nock/nock/commits?author=Uzlopak" title="Tests">⚠️</a> <a href="#maintenance-Uzlopak" title="Maintenance">🚧</a></td>
     </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/rsaryev"><img src="https://avatars.githubusercontent.com/u/70219513?v=4?s=100" width="100px;" alt="Saryev Rustam"/><br /><sub><b>Saryev Rustam</b></sub></a><br /><a href="https://github.com/nock/nock/commits?author=rsaryev" title="Code">💻</a> <a href="https://github.com/nock/nock/commits?author=rsaryev" title="Tests">⚠️</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/mikicho"><img src="https://avatars.githubusercontent.com/u/11459632?v=4?s=100" width="100px;" alt="Michael Solomon"/><br /><sub><b>Michael Solomon</b></sub></a><br /><a href="#maintenance-mikicho" title="Maintenance">🚧</a> <a href="https://github.com/nock/nock/commits?author=mikicho" title="Code">💻</a> <a href="https://github.com/nock/nock/commits?author=mikicho" title="Documentation">📖</a></td>
+    </tr>
   </tbody>
 </table>
 

package/lib/common.js

@@ -70,10 +70,7 @@ function overrideRequests(newRequest) {
     debug('- overriding request for', proto)
 
     const moduleName = proto // 1 to 1 match of protocol and module is fortunate :)
-    const module = {
-      http: require('http'),
-      https: require('https'),
-    }[moduleName]
+    const module = require(proto)
     const overriddenRequest = module.request
     const overriddenGet = module.get
 

package/lib/intercept.js

@@ -350,7 +350,8 @@ function interceptorScopes() {
   const nestedInterceptors = Object.values(allInterceptors).map(
     i => i.interceptors,
   )
-  return [].concat(...nestedInterceptors).map(i => i.scope)
+  const scopes = new Set([].concat(...nestedInterceptors).map(i => i.scope))
+  return [...scopes]
 }
 
 function isDone() {
@@ -370,8 +371,6 @@ function activate() {
     throw new Error('Nock already active')
   }
 
-  overrideClientRequest()
-
   // ----- Overriding http.request and https.request:
 
   common.overrideRequests(function (proto, overriddenRequest, args) {
@@ -435,6 +434,8 @@ function activate() {
       }
     }
   })
+
+  overrideClientRequest()
 }
 
 module.exports = {

package/package.json

@@ -7,7 +7,7 @@
     "testing",
     "isolation"
   ],
-  "version": "13.5.0",
+  "version": "13.5.2",
   "author": "Pedro Teixeira <pedro.teixeira@gmail.com>",
   "repository": {
     "type": "git",
@@ -41,6 +41,7 @@
     "eslint-plugin-promise": "^6.0.0",
     "form-data": "^4.0.0",
     "got": "^11.3.0",
+    "jest": "^29.7.0",
     "mocha": "^9.1.3",
     "npm-run-all": "^4.1.5",
     "nyc": "^15.0.0",
@@ -60,7 +61,8 @@
     "lint:js:fix": "eslint --cache --cache-location './.cache/eslint' --fix '**/*.js'",
     "lint:ts": "dtslint --expectOnly types",
     "test": "nyc --reporter=lcov --reporter=text mocha --recursive tests",
-    "test:coverage": "open coverage/lcov-report/index.html"
+    "test:coverage": "open coverage/lcov-report/index.html",
+    "test:jest": "jest tests_jest --detectLeaks"
   },
   "license": "MIT",
   "files": [