Merge branch 'fix/update-node-fetch' of https://github.com/RishikeshDarandale/unfetch into RishikeshDarandale-fix/update-node-fetch

developit · developit · commit 5d6342b905ca · 2022-12-30T18:55:52.000-05:00
diff --git a/packages/isomorphic-unfetch/index.js b/packages/isomorphic-unfetch/index.js
@@ -1,6 +1,7 @@
 function r(m){return m && m.default || m;}
 module.exports = global.fetch = global.fetch || (
 	typeof process=='undefined' ? r(require('unfetch')) : (function(url, opts) {
-		return r(require('node-fetch'))(String(url).replace(/^\/\//g,'https://'), opts);
+		const fetch = (...args) => import('node-fetch').then(({default: fetch}) => fetch(...args));
+		return r(fetch)(String(url).replace(/^\/\//g,'https://'), opts);
 	})
 );
diff --git a/packages/isomorphic-unfetch/package.json b/packages/isomorphic-unfetch/package.json
@@ -13,7 +13,7 @@
   "main": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "node-fetch": "^2.6.1",
+    "node-fetch": "^3.2.0",
     "unfetch": "^4.2.0"
   }
 }
diff --git a/packages/isomorphic-unfetch/readme.md b/packages/isomorphic-unfetch/readme.md
@@ -6,6 +6,8 @@ Switches between [unfetch](https://github.com/developit/unfetch) & [node-fetch](
 
 This project uses [node](http://nodejs.org) and [npm](https://npmjs.com). Go check them out if you don't have them locally installed.
 
+> **Note:** This module uses node-fetch 3.x, which is ES Module and requires Node >= 12.20.0.
+
 ```sh
 $ npm i isomorphic-unfetch
 ```
@@ -14,36 +16,36 @@ Then with a module bundler like [rollup](http://rollupjs.org/) or [webpack](http
 
 ```javascript
 // using ES6 modules
-import fetch from 'isomorphic-unfetch'
+import fetch from "isomorphic-unfetch";
 
 // using CommonJS modules
-const fetch = require('isomorphic-unfetch')
+const fetch = require("isomorphic-unfetch");
 ```
 
 ## Usage
 
 As a [**ponyfill**](https://ponyfill.com):
 
 ```js
-import fetch from 'isomorphic-unfetch';
+import fetch from "isomorphic-unfetch";
 
-fetch('/foo.json')
-  .then( r => r.json() )
-  .then( data => {
+fetch("/foo.json")
+  .then((r) => r.json())
+  .then((data) => {
     console.log(data);
   });
 ```
 
 Globally, as a [**polyfill**](https://ponyfill.com/#polyfill):
 
 ```js
-import 'isomorphic-unfetch';
+import "isomorphic-unfetch";
 
 // "fetch" is now installed globally if it wasn't already available
 
-fetch('/foo.json')
-  .then( r => r.json() )
-  .then( data => {
+fetch("/foo.json")
+  .then((r) => r.json())
+  .then((data) => {
     console.log(data);
   });
 ```
diff --git a/test/isomorphic.js b/test/isomorphic.js
@@ -112,7 +112,15 @@ describe('isomorphic-unfetch', () => {
 			sandbox.global.process = sandbox.process;
 			sandbox.module = { exports: sandbox.exports };
 			let filename = require.resolve('../packages/isomorphic-unfetch');
-			vm.runInNewContext(fs.readFileSync(filename), sandbox, filename);
+			vm.runInNewContext(fs.readFileSync(filename), sandbox, {
+				filename,
+				importModuleDynamically: () => {
+					const module = new vm.SyntheticModule(['node-fetch'], function() {
+						this.setExport('default', 'I AM NODE-FETCH');
+					  });
+					return module;
+				}
+			});
 
 			expect(sandbox.module.exports('/')).toBe(modules['node-fetch']('/'));
 		});

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`"main": "index.js",`
`14`	`14`	`"types": "index.d.ts",`
`15`	`15`	`"dependencies": {`
`16`		`- "node-fetch": "^2.6.1",`
	`16`	`+ "node-fetch": "^3.2.0",`
`17`	`17`	`"unfetch": "^4.2.0"`
`18`	`18`	`}`
`19`	`19`	`}`