@eik/esbuild-plugin 1.0.4 → 1.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eik/esbuild-plugin",
-  "version": "1.0.4",
+  "version": "1.1.2",
   "description": "ESBuild 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": "./src/plugin.js",
@@ -9,7 +9,7 @@
   ],
   "scripts": {
     "test": "tap --no-coverage",
-    "test:snapshot": "TAP_SNAPSHOT=1 tap --no-esm test/*.js --no-coverage",
+    "test:snapshot": "TAP_SNAPSHOT=1 tap test/*.js --no-coverage",
     "lint": "eslint . --ext=js",
     "lint:fix": "eslint . --fix --ext=js"
   },
@@ -35,22 +35,19 @@
   },
   "homepage": "https://github.com/eik-lib/esbuild-plugin#readme",
   "devDependencies": {
-    "@semantic-release/changelog": "5.0.1",
-    "@semantic-release/commit-analyzer": "8.0.1",
-    "@semantic-release/git": "9.0.1",
-    "@semantic-release/github": "7.2.3",
-    "@semantic-release/npm": "7.1.3",
-    "@semantic-release/release-notes-generator": "9.0.3",
-    "esbuild": "0.9.0",
-    "eslint": "7.32.0",
-    "eslint-config-airbnb-base": "14.2.1",
-    "eslint-plugin-import": "2.24.0",
-    "fastify": "3.13.0",
-    "semantic-release": "17.4.7",
-    "tap": "15.0.5"
+    "@semantic-release/changelog": "6.0.1",
+    "@semantic-release/git": "10.0.1",
+    "esbuild": "0.14.13",
+    "eslint": "8.7.0",
+    "eslint-config-airbnb-base": "15.0.0",
+    "eslint-plugin-import": "2.25.4",
+    "fastify": "3.27.0",
+    "semantic-release": "19.0.2",
+    "tap": "15.1.6"
   },
   "dependencies": {
+    "@eik/common": "3.0.0",
     "esbuild-plugin-import-map": "2.1.0",
-    "node-fetch": "2.6.5"
+    "undici": "4.12.2"
   }
 }

package/src/plugin.js

@@ -1,55 +1,45 @@
 /* eslint-disable no-restricted-syntax */
 
 import * as importMapPlugin from 'esbuild-plugin-import-map';
-import { join } from 'path';
-import fetch from 'node-fetch';
-import fs from 'fs';
+import { helpers } from '@eik/common';
+import { request } from 'undici';
 
-async function readEikJSONMaps(eikJSONPath) {
+const fetchImportMaps = async (urls = []) => {
     try {
-        const contents = await fs.promises.readFile(eikJSONPath);
-        const eikJSON = JSON.parse(contents);
-        if (typeof eikJSON['import-map'] === 'string') return [eikJSON['import-map']];
-        return eikJSON['import-map'] || [];
-    } catch (err) {
-        return [];
-    }
-}
+        const maps = urls.map(async (map) => {
+            const {
+                statusCode,
+                body,
+            } = await request(map, { maxRedirections: 2 });
 
-async function fetchImportMaps(urls = []) {
-    try {
-        const maps = urls.map((map) => fetch(map).then((result) => {
-            if (result.status === 404) {
+            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 async function load({
-    path = join(process.cwd(), 'eik.json'),
+    path = process.cwd(),
     maps = [],
     urls = [],
 } = {}) {
     const pMaps = Array.isArray(maps) ? maps : [maps];
     const pUrls = Array.isArray(urls) ? urls : [urls];
 
-    const importMapUrls = await readEikJSONMaps(path);
-    for (const map of importMapUrls) {
-        pUrls.push(map);
-    }
+    const config = await helpers.getDefaults(path);
 
-    const fetched = await fetchImportMaps(pUrls);
+    const fetched = await fetchImportMaps([...config.map, ...pUrls]);
     const mappings = pMaps.concat(fetched);
 
     await importMapPlugin.load(mappings);