@eik/rollup-plugin 4.0.67 → 5.0.0

package/CHANGELOG.md

@@ -1,3 +1,23 @@
+# [5.0.0](https://github.com/eik-lib/rollup-plugin/compare/v4.0.68...v5.0.0) (2025-05-08)
+
+
+### Bug Fixes
+
+* update eik/common to use shared fetchImportMap ([#234](https://github.com/eik-lib/rollup-plugin/issues/234)) ([78d25cd](https://github.com/eik-lib/rollup-plugin/commit/78d25cdb12ca9d16b3001c410fd190611a643ce6))
+
+
+### BREAKING CHANGES
+
+* The option maxRedirections was removed.
+Drop support for Node 18.
+
+## [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/dist/plugin.cjs

@@ -2,54 +2,12 @@
 
 var rollupPluginImportMap = require('rollup-plugin-import-map');
 var common = require('@eik/common');
-var undici = require('undici');
 
 /**
  * @typedef {object} ImportMap
  * @property {Record<string, string>} imports
  */
 
-/**
- * @param {string[]} urls
- * @returns {Promise<ImportMap[]>}
- */
-const fetchImportMaps = async (urls = []) => {
-	try {
-		const maps = urls.map(async (map) => {
-			const response = await undici.request(map, {
-				maxRedirections: 2,
-			});
-
-			if (response.statusCode === 404) {
-				throw new Error("Import map could not be found on server");
-			} else if (response.statusCode >= 400 && response.statusCode < 500) {
-				throw new Error("Server rejected client request");
-			} else if (response.statusCode >= 500) {
-				throw new Error("Server error");
-			}
-
-			let contentType = response.headers["content-type"];
-			if (!Array.isArray(contentType)) contentType = [contentType];
-
-			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: ${content}`);
-			}
-
-			const json = await response.body.json();
-			return /** @type {ImportMap}*/ (json);
-		});
-		return await Promise.all(maps);
-	} catch (err) {
-		throw new Error(
-			`Unable to load import map file from server: ${err.message}`,
-		);
-	}
-};
-
 /**
  * @typedef {object} PluginOptions
  * @property {string} [path=process.cwd()] Path to `eik.json`.
@@ -86,12 +44,15 @@ function esmImportToUrl({
 		 */
 		async buildStart(options) {
 			// Load eik config from eik.json or package.json
-			const config = await common.helpers.getDefaults(path);
+			const config = common.helpers.getDefaults(path);
 			this.debug(`Loaded eik config ${JSON.stringify(config, null, 2)}`);
 
 			// Fetch import maps from the server
 			try {
-				const fetched = await fetchImportMaps([...config.map, ...pUrls]);
+				const fetched = await common.helpers.fetchImportMaps([
+					...config.map,
+					...pUrls,
+				]);
 				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": "5.0.0",
   "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",
@@ -63,8 +63,11 @@
     "typescript": "5.6.3"
   },
   "dependencies": {
-    "@eik/common": "3.0.1",
+    "@eik/common": "5.1.0",
     "rollup-plugin-import-map": "3.0.0",
-    "undici": "5.29.0"
+    "undici": "7.8.0"
+  },
+  "engines": {
+    "node": ">=20"
   }
 }

package/src/plugin.js

@@ -1,53 +1,11 @@
 import { rollupImportMapPlugin as importMapPlugin } from "rollup-plugin-import-map";
 import { helpers } from "@eik/common";
-import { request } from "undici";
 
 /**
  * @typedef {object} ImportMap
  * @property {Record<string, string>} imports
  */
 
-/**
- * @param {string[]} urls
- * @returns {Promise<ImportMap[]>}
- */
-const fetchImportMaps = async (urls = []) => {
-	try {
-		const maps = urls.map(async (map) => {
-			const response = await request(map, {
-				maxRedirections: 2,
-			});
-
-			if (response.statusCode === 404) {
-				throw new Error("Import map could not be found on server");
-			} else if (response.statusCode >= 400 && response.statusCode < 500) {
-				throw new Error("Server rejected client request");
-			} else if (response.statusCode >= 500) {
-				throw new Error("Server error");
-			}
-
-			let contentType = response.headers["content-type"];
-			if (!Array.isArray(contentType)) contentType = [contentType];
-
-			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: ${content}`);
-			}
-
-			const json = await response.body.json();
-			return /** @type {ImportMap}*/ (json);
-		});
-		return await Promise.all(maps);
-	} catch (err) {
-		throw new Error(
-			`Unable to load import map file from server: ${err.message}`,
-		);
-	}
-};
-
 /**
  * @typedef {object} PluginOptions
  * @property {string} [path=process.cwd()] Path to `eik.json`.
@@ -84,12 +42,15 @@ export default function esmImportToUrl({
 		 */
 		async buildStart(options) {
 			// Load eik config from eik.json or package.json
-			const config = await helpers.getDefaults(path);
+			const config = helpers.getDefaults(path);
 			this.debug(`Loaded eik config ${JSON.stringify(config, null, 2)}`);
 
 			// Fetch import maps from the server
 			try {
-				const fetched = await fetchImportMaps([...config.map, ...pUrls]);
+				const fetched = await helpers.fetchImportMaps([
+					...config.map,
+					...pUrls,
+				]);
 				for (const map of fetched) {
 					this.debug(`Fetched import map ${JSON.stringify(map, null, 2)}`);
 				}

package/types/plugin.d.ts

@@ -1,3 +1,7 @@
+/**
+ * @typedef {object} ImportMap
+ * @property {Record<string, string>} imports
+ */
 /**
  * @typedef {object} PluginOptions
  * @property {string} [path=process.cwd()] Path to `eik.json`.
@@ -15,6 +19,9 @@
  * @returns {Plugin}
  */
 export default function esmImportToUrl({ path, maps, urls, }?: PluginOptions): Plugin;
+export type ImportMap = {
+    imports: Record<string, string>;
+};
 export type PluginOptions = {
     /**
      * Path to `eik.json`.
@@ -34,6 +41,3 @@ export type Plugin = {
     buildStart: (options?: unknown) => Promise<void>;
     resolveId: (importee?: string) => string;
 };
-export type ImportMap = {
-    imports: Record<string, string>;
-};