@eik/rollup-plugin 4.0.67 → 4.0.68

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [4.0.68](https://github.com/eik-lib/rollup-plugin/compare/v4.0.67...v4.0.68) (2025-05-07)
+
+
+### Bug Fixes
+
+* fixing redirect issue with node v24 ([#233](https://github.com/eik-lib/rollup-plugin/issues/233)) ([8bc43ca](https://github.com/eik-lib/rollup-plugin/commit/8bc43caa1188d1bc3ec4107776908d9760498c47))
+
 ## [4.0.67](https://github.com/eik-lib/rollup-plugin/compare/v4.0.66...v4.0.67) (2025-05-07)
 
 

package/README.md

@@ -143,11 +143,12 @@ import { LitElement, html, css } from "https://cdn.eik.dev/lit-element/v2";
 
 This plugin takes an [import map](https://github.com/WICG/import-maps) as options:
 
-| option | default        | type     | required | details                                 |
-| ------ | -------------- | -------- | -------- | --------------------------------------- |
-| path   | `cwd/eik.json` | `string` | `false`  | Path to eik.json file.                  |
-| urls   | `[]`           | `array`  | `false`  | Array of import map URLs to fetch from. |
-| maps   | `[]`           | `array`  | `false`  | Array of import map as objects.         |
+| option            | default        | type       | required   | details                                                  |
+|-------------------|----------------|------------|------------|----------------------------------------------------------|
+| path              | `cwd/eik.json` | `string`   | `false`    | Path to eik.json file.                                   |
+| urls              | `[]`           | `array`    | `false`    | Array of import map URLs to fetch from.                  |
+| maps              | `[]`           | `array`    | `false`    | Array of import map as objects.                          |
+| maxRedirections   | `2`            | `number`   | `false`    | Maximum number of redirects when retrieving import maps. |
 
 ## Note on the rollup external option
 

package/dist/plugin.cjs

@@ -1,8 +1,8 @@
 'use strict';
 
 var rollupPluginImportMap = require('rollup-plugin-import-map');
-var common = require('@eik/common');
 var undici = require('undici');
+var common = require('@eik/common');
 
 /**
  * @typedef {object} ImportMap
@@ -11,13 +11,19 @@ var undici = require('undici');
 
 /**
  * @param {string[]} urls
+ * @param {object} options
+ * @param {number} options.maxRedirections - undici option for limiting redirects
  * @returns {Promise<ImportMap[]>}
  */
-const fetchImportMaps = async (urls = []) => {
+const fetchImportMaps = async (urls = [], options) => {
 	try {
 		const maps = urls.map(async (map) => {
 			const response = await undici.request(map, {
-				maxRedirections: 2,
+				dispatcher: new undici.Agent().compose(
+					undici.interceptors.redirect({
+						maxRedirections: options.maxRedirections,
+					}),
+				),
 			});
 
 			if (response.statusCode === 404) {
@@ -34,9 +40,13 @@ const fetchImportMaps = async (urls = []) => {
 			if (!contentType.find((type) => type.startsWith("application/json"))) {
 				const content = await response.body.text();
 				if (content.length === 0) {
-					throw new Error(`${map} did not return JSON, got an empty response`);
+					throw new Error(
+						`${map} did not return JSON, got an empty response. HTTP status: ${response.statusCode}`,
+					);
 				}
-				throw new Error(`${map} did not return JSON, got: ${content}`);
+				throw new Error(
+					`${map} did not return JSON, got: ${content}. HTTP status: ${response.statusCode}`,
+				);
 			}
 
 			const json = await response.body.json();
@@ -55,6 +65,7 @@ const fetchImportMaps = async (urls = []) => {
  * @property {string} [path=process.cwd()] Path to `eik.json`.
  * @property {string[]} [urls=[]] URLs to import maps hosted on an Eik server. Takes precedence over `eik.json`.
  * @property {ImportMap[]} [maps=[]] Inline import maps that should be used. Takes precedence over `urls` and `eik.json`.
+ * @property {number} [maxRedirections=2] Maximum number of redirects when looking up URLs.
  */
 
 /**
@@ -72,6 +83,7 @@ function esmImportToUrl({
 	path = process.cwd(),
 	maps = [],
 	urls = [],
+	maxRedirections = 2,
 } = {}) {
 	const pMaps = Array.isArray(maps) ? maps : [maps];
 	const pUrls = Array.isArray(urls) ? urls : [urls];
@@ -91,7 +103,9 @@ function esmImportToUrl({
 
 			// Fetch import maps from the server
 			try {
-				const fetched = await fetchImportMaps([...config.map, ...pUrls]);
+				const fetched = await fetchImportMaps([...config.map, ...pUrls], {
+					maxRedirections,
+				});
 				for (const map of fetched) {
 					this.debug(`Fetched import map ${JSON.stringify(map, null, 2)}`);
 				}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eik/rollup-plugin",
-  "version": "4.0.67",
+  "version": "4.0.68",
   "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",
@@ -65,6 +65,6 @@
   "dependencies": {
     "@eik/common": "3.0.1",
     "rollup-plugin-import-map": "3.0.0",
-    "undici": "5.29.0"
+    "undici": "7.8.0"
   }
 }

package/src/plugin.js

@@ -1,6 +1,6 @@
 import { rollupImportMapPlugin as importMapPlugin } from "rollup-plugin-import-map";
+import { request, Agent, interceptors } from "undici";
 import { helpers } from "@eik/common";
-import { request } from "undici";
 
 /**
  * @typedef {object} ImportMap
@@ -9,13 +9,19 @@ import { request } from "undici";
 
 /**
  * @param {string[]} urls
+ * @param {object} options
+ * @param {number} options.maxRedirections - undici option for limiting redirects
  * @returns {Promise<ImportMap[]>}
  */
-const fetchImportMaps = async (urls = []) => {
+const fetchImportMaps = async (urls = [], options) => {
 	try {
 		const maps = urls.map(async (map) => {
 			const response = await request(map, {
-				maxRedirections: 2,
+				dispatcher: new Agent().compose(
+					interceptors.redirect({
+						maxRedirections: options.maxRedirections,
+					}),
+				),
 			});
 
 			if (response.statusCode === 404) {
@@ -32,9 +38,13 @@ const fetchImportMaps = async (urls = []) => {
 			if (!contentType.find((type) => type.startsWith("application/json"))) {
 				const content = await response.body.text();
 				if (content.length === 0) {
-					throw new Error(`${map} did not return JSON, got an empty response`);
+					throw new Error(
+						`${map} did not return JSON, got an empty response. HTTP status: ${response.statusCode}`,
+					);
 				}
-				throw new Error(`${map} did not return JSON, got: ${content}`);
+				throw new Error(
+					`${map} did not return JSON, got: ${content}. HTTP status: ${response.statusCode}`,
+				);
 			}
 
 			const json = await response.body.json();
@@ -53,6 +63,7 @@ const fetchImportMaps = async (urls = []) => {
  * @property {string} [path=process.cwd()] Path to `eik.json`.
  * @property {string[]} [urls=[]] URLs to import maps hosted on an Eik server. Takes precedence over `eik.json`.
  * @property {ImportMap[]} [maps=[]] Inline import maps that should be used. Takes precedence over `urls` and `eik.json`.
+ * @property {number} [maxRedirections=2] Maximum number of redirects when looking up URLs.
  */
 
 /**
@@ -70,6 +81,7 @@ export default function esmImportToUrl({
 	path = process.cwd(),
 	maps = [],
 	urls = [],
+	maxRedirections = 2,
 } = {}) {
 	const pMaps = Array.isArray(maps) ? maps : [maps];
 	const pUrls = Array.isArray(urls) ? urls : [urls];
@@ -89,7 +101,9 @@ export default function esmImportToUrl({
 
 			// Fetch import maps from the server
 			try {
-				const fetched = await fetchImportMaps([...config.map, ...pUrls]);
+				const fetched = await fetchImportMaps([...config.map, ...pUrls], {
+					maxRedirections,
+				});
 				for (const map of fetched) {
 					this.debug(`Fetched import map ${JSON.stringify(map, null, 2)}`);
 				}

package/types/plugin.d.ts

@@ -3,6 +3,7 @@
  * @property {string} [path=process.cwd()] Path to `eik.json`.
  * @property {string[]} [urls=[]] URLs to import maps hosted on an Eik server. Takes precedence over `eik.json`.
  * @property {ImportMap[]} [maps=[]] Inline import maps that should be used. Takes precedence over `urls` and `eik.json`.
+ * @property {number} [maxRedirections=2] Maximum number of redirects when looking up URLs.
  */
 /**
  * @typedef {object} Plugin
@@ -14,7 +15,7 @@
  * @param {PluginOptions} options
  * @returns {Plugin}
  */
-export default function esmImportToUrl({ path, maps, urls, }?: PluginOptions): Plugin;
+export default function esmImportToUrl({ path, maps, urls, maxRedirections, }?: PluginOptions): Plugin;
 export type PluginOptions = {
     /**
      * Path to `eik.json`.
@@ -28,6 +29,10 @@ export type PluginOptions = {
      * Inline import maps that should be used. Takes precedence over `urls` and `eik.json`.
      */
     maps?: ImportMap[];
+    /**
+     * Maximum number of redirects when looking up URLs.
+     */
+    maxRedirections?: number;
 };
 export type Plugin = {
     name: string;