@eik/rollup-plugin 4.0.68 → 5.0.0

package/CHANGELOG.md

@@ -1,3 +1,16 @@
+# [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)
 
 

package/README.md

@@ -143,12 +143,11 @@ 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.                          |
-| maxRedirections   | `2`            | `number`   | `false`    | Maximum number of redirects when retrieving import maps. |
+| 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.         |
 
 ## Note on the rollup external option
 

package/dist/plugin.cjs

@@ -1,7 +1,6 @@
 'use strict';
 
 var rollupPluginImportMap = require('rollup-plugin-import-map');
-var undici = require('undici');
 var common = require('@eik/common');
 
 /**
@@ -9,63 +8,11 @@ var common = require('@eik/common');
  * @property {Record<string, string>} imports
  */
 
-/**
- * @param {string[]} urls
- * @param {object} options
- * @param {number} options.maxRedirections - undici option for limiting redirects
- * @returns {Promise<ImportMap[]>}
- */
-const fetchImportMaps = async (urls = [], options) => {
-	try {
-		const maps = urls.map(async (map) => {
-			const response = await undici.request(map, {
-				dispatcher: new undici.Agent().compose(
-					undici.interceptors.redirect({
-						maxRedirections: options.maxRedirections,
-					}),
-				),
-			});
-
-			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. HTTP status: ${response.statusCode}`,
-					);
-				}
-				throw new Error(
-					`${map} did not return JSON, got: ${content}. HTTP status: ${response.statusCode}`,
-				);
-			}
-
-			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`.
  * @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.
  */
 
 /**
@@ -83,7 +30,6 @@ function esmImportToUrl({
 	path = process.cwd(),
 	maps = [],
 	urls = [],
-	maxRedirections = 2,
 } = {}) {
 	const pMaps = Array.isArray(maps) ? maps : [maps];
 	const pUrls = Array.isArray(urls) ? urls : [urls];
@@ -98,14 +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], {
-					maxRedirections,
-				});
+				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.68",
+  "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": "7.8.0"
+  },
+  "engines": {
+    "node": ">=20"
   }
 }

package/src/plugin.js

@@ -1,5 +1,4 @@
 import { rollupImportMapPlugin as importMapPlugin } from "rollup-plugin-import-map";
-import { request, Agent, interceptors } from "undici";
 import { helpers } from "@eik/common";
 
 /**
@@ -7,63 +6,11 @@ import { helpers } from "@eik/common";
  * @property {Record<string, string>} imports
  */
 
-/**
- * @param {string[]} urls
- * @param {object} options
- * @param {number} options.maxRedirections - undici option for limiting redirects
- * @returns {Promise<ImportMap[]>}
- */
-const fetchImportMaps = async (urls = [], options) => {
-	try {
-		const maps = urls.map(async (map) => {
-			const response = await request(map, {
-				dispatcher: new Agent().compose(
-					interceptors.redirect({
-						maxRedirections: options.maxRedirections,
-					}),
-				),
-			});
-
-			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. HTTP status: ${response.statusCode}`,
-					);
-				}
-				throw new Error(
-					`${map} did not return JSON, got: ${content}. HTTP status: ${response.statusCode}`,
-				);
-			}
-
-			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`.
  * @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.
  */
 
 /**
@@ -81,7 +28,6 @@ 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];
@@ -96,14 +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], {
-					maxRedirections,
-				});
+				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,9 +1,12 @@
+/**
+ * @typedef {object} ImportMap
+ * @property {Record<string, string>} imports
+ */
 /**
  * @typedef {object} PluginOptions
  * @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
@@ -15,7 +18,10 @@
  * @param {PluginOptions} options
  * @returns {Plugin}
  */
-export default function esmImportToUrl({ path, maps, urls, maxRedirections, }?: PluginOptions): Plugin;
+export default function esmImportToUrl({ path, maps, urls, }?: PluginOptions): Plugin;
+export type ImportMap = {
+    imports: Record<string, string>;
+};
 export type PluginOptions = {
     /**
      * Path to `eik.json`.
@@ -29,16 +35,9 @@ 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;
     buildStart: (options?: unknown) => Promise<void>;
     resolveId: (importee?: string) => string;
 };
-export type ImportMap = {
-    imports: Record<string, string>;
-};