@eik/rollup-plugin 4.0.65 → 4.0.67

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [4.0.67](https://github.com/eik-lib/rollup-plugin/compare/v4.0.66...v4.0.67) (2025-05-07)
+
+
+### Bug Fixes
+
+* improve logging for non-JSON responses ([#232](https://github.com/eik-lib/rollup-plugin/issues/232)) ([27004b0](https://github.com/eik-lib/rollup-plugin/commit/27004b0fe9c043a8fbfe441d1426e12425bd0584))
+
+## [4.0.66](https://github.com/eik-lib/rollup-plugin/compare/v4.0.65...v4.0.66) (2025-03-24)
+
+
+### Bug Fixes
+
+* **deps:** update dependency undici to v5.29.0 ([#226](https://github.com/eik-lib/rollup-plugin/issues/226)) ([b19ad9d](https://github.com/eik-lib/rollup-plugin/commit/b19ad9d3ea2e5b1f244ce9c10d5654d61c0bcc2d))
+
 ## [4.0.65](https://github.com/eik-lib/rollup-plugin/compare/v4.0.64...v4.0.65) (2025-01-20)
 
 

package/dist/plugin.cjs

@@ -16,18 +16,31 @@ var undici = require('undici');
 const fetchImportMaps = async (urls = []) => {
 	try {
 		const maps = urls.map(async (map) => {
-			const { statusCode, body } = await undici.request(map, {
+			const response = await undici.request(map, {
 				maxRedirections: 2,
 			});
 
-			if (statusCode === 404) {
+			if (response.statusCode === 404) {
 				throw new Error("Import map could not be found on server");
-			} else if (statusCode >= 400 && statusCode < 500) {
+			} else if (response.statusCode >= 400 && response.statusCode < 500) {
 				throw new Error("Server rejected client request");
-			} else if (statusCode >= 500) {
+			} else if (response.statusCode >= 500) {
 				throw new Error("Server error");
 			}
-			return /** @type {Promise<ImportMap>} */ (body.json());
+
+			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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eik/rollup-plugin",
-  "version": "4.0.65",
+  "version": "4.0.67",
   "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",
@@ -48,11 +48,11 @@
   },
   "homepage": "https://github.com/eik-lib/rollup-plugin#readme",
   "devDependencies": {
-    "@eik/eslint-config": "1.0.7",
+    "@eik/eslint-config": "1.0.13",
     "@eik/prettier-config": "1.0.1",
-    "@eik/semantic-release-config": "1.0.0",
+    "@eik/semantic-release-config": "1.0.2",
     "@eik/typescript-config": "1.0.0",
-    "eslint": "9.16.0",
+    "eslint": "9.25.1",
     "fastify": "4.28.1",
     "npm-run-all2": "5.0.2",
     "prettier": "3.4.2",
@@ -65,6 +65,6 @@
   "dependencies": {
     "@eik/common": "3.0.1",
     "rollup-plugin-import-map": "3.0.0",
-    "undici": "5.28.5"
+    "undici": "5.29.0"
   }
 }

package/src/plugin.js

@@ -14,18 +14,31 @@ import { request } from "undici";
 const fetchImportMaps = async (urls = []) => {
 	try {
 		const maps = urls.map(async (map) => {
-			const { statusCode, body } = await request(map, {
+			const response = await request(map, {
 				maxRedirections: 2,
 			});
 
-			if (statusCode === 404) {
+			if (response.statusCode === 404) {
 				throw new Error("Import map could not be found on server");
-			} else if (statusCode >= 400 && statusCode < 500) {
+			} else if (response.statusCode >= 400 && response.statusCode < 500) {
 				throw new Error("Server rejected client request");
-			} else if (statusCode >= 500) {
+			} else if (response.statusCode >= 500) {
 				throw new Error("Server error");
 			}
-			return /** @type {Promise<ImportMap>} */ (body.json());
+
+			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) {