@eik/rollup-plugin 4.0.10 → 4.0.11

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [4.0.11](https://github.com/eik-lib/rollup-plugin/compare/v4.0.10...v4.0.11) (2022-01-13)
+
+
+### Bug Fixes
+
+* Fix node-fetch 3.x regression in CJS build ([#70](https://github.com/eik-lib/rollup-plugin/issues/70)) ([16b71c9](https://github.com/eik-lib/rollup-plugin/commit/16b71c97c08c6840ffd6df3b9d1520037dfe3257))
+
 ## [4.0.10](https://github.com/eik-lib/rollup-plugin/compare/v4.0.9...v4.0.10) (2022-01-11)
 
 

package/dist/plugin.cjs

@@ -2,33 +2,34 @@
 
 var rollupPluginImportMap = require('rollup-plugin-import-map');
 var common = require('@eik/common');
-var fetch = require('node-fetch');
-
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var fetch__default = /*#__PURE__*/_interopDefaultLegacy(fetch);
+var undici = require('undici');
 
 /* eslint-disable no-restricted-syntax */
 
-async function fetchImportMaps(urls = []) {
+const fetchImportMaps = async (urls = []) => {
     try {
-        const maps = urls.map((map) => fetch__default['default'](map).then((result) => {
-            if (result.status === 404) {
+        const maps = urls.map(async (map) => {
+            const {
+                statusCode,
+                body,
+            } = await undici.request(map, { maxRedirections: 2 });
+
+            if (statusCode === 404) {
                 throw new Error('Import map could not be found on server');
-            } else if (result.status >= 400 && result.status < 500) {
+            } else if (statusCode >= 400 && statusCode < 500) {
                 throw new Error('Server rejected client request');
-            } else if (result.status >= 500) {
+            } else if (statusCode >= 500) {
                 throw new Error('Server error');
             }
-            return result.json();
-        }));
+            return body.json();
+        });
         return await Promise.all(maps);
     } catch (err) {
         throw new Error(
             `Unable to load import map file from server: ${err.message}`,
         );
     }
-}
+};
 
 function esmImportToUrl({
     path = process.cwd(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eik/rollup-plugin",
-  "version": "4.0.10",
+  "version": "4.0.11",
   "description": "Rollup plugin for loading import maps from a Eik server and applying the mapping to ECMAScript modules in preparation for upload to the same server.",
   "type": "module",
   "main": "./dist/plugin.cjs",
@@ -19,8 +19,8 @@
   },
   "scripts": {
     "prepare": "npm run -s build",
-    "test": "tap --no-esm test/*.js --no-coverage",
-    "test:snapshot": "TAP_SNAPSHOT=1 tap --no-esm test/*.js --no-coverage",
+    "test": "tap --no-coverage",
+    "test:snapshot": "TAP_SNAPSHOT=1 tap --no-coverage",
     "lint": "eslint . --ext=js",
     "lint:fix": "eslint . --fix --ext=js",
     "start": "node --experimental-modules ./example/server.mjs",
@@ -46,22 +46,18 @@
   "homepage": "https://github.com/eik-lib/rollup-plugin#readme",
   "devDependencies": {
     "@semantic-release/changelog": "6.0.1",
-    "@semantic-release/commit-analyzer": "9.0.2",
     "@semantic-release/git": "10.0.1",
-    "@semantic-release/github": "8.0.2",
-    "@semantic-release/npm": "8.0.3",
-    "@semantic-release/release-notes-generator": "10.0.3",
-    "eslint": "7.32.0",
-    "eslint-config-airbnb-base": "14.2.1",
-    "eslint-plugin-import": "2.24.0",
-    "fastify": "3.14.1",
-    "rollup": "2.39.0",
+    "eslint": "8.6.0",
+    "eslint-config-airbnb-base": "15.0.0",
+    "eslint-plugin-import": "2.25.4",
+    "fastify": "3.25.3",
+    "rollup": "2.63.0",
     "semantic-release": "18.0.1",
-    "tap": "14.11.0"
+    "tap": "15.1.6"
   },
   "dependencies": {
     "@eik/common": "3.0.0",
-    "node-fetch": "3.1.0",
+    "undici": "4.12.1",
     "rollup-plugin-import-map": "2.2.2"
   }
 }

package/src/plugin.js

@@ -2,27 +2,32 @@
 
 import { rollupImportMapPlugin as importMapPlugin } from 'rollup-plugin-import-map';
 import { helpers } from '@eik/common';
-import fetch from 'node-fetch';
+import { request } from 'undici';
 
-async function fetchImportMaps(urls = []) {
+const fetchImportMaps = async (urls = []) => {
     try {
-        const maps = urls.map((map) => fetch(map).then((result) => {
-            if (result.status === 404) {
+        const maps = urls.map(async (map) => {
+            const {
+                statusCode,
+                body,
+            } = await request(map, { maxRedirections: 2 });
+
+            if (statusCode === 404) {
                 throw new Error('Import map could not be found on server');
-            } else if (result.status >= 400 && result.status < 500) {
+            } else if (statusCode >= 400 && statusCode < 500) {
                 throw new Error('Server rejected client request');
-            } else if (result.status >= 500) {
+            } else if (statusCode >= 500) {
                 throw new Error('Server error');
             }
-            return result.json();
-        }));
+            return body.json();
+        });
         return await Promise.all(maps);
     } catch (err) {
         throw new Error(
             `Unable to load import map file from server: ${err.message}`,
         );
     }
-}
+};
 
 export default function esmImportToUrl({
     path = process.cwd(),