chore: upgrade common to version 4

eik-lib · Jun 30, 2023 · 58046d2 · 58046d2
1 parent 7a82ce8
commit 58046d2
Show file tree

Hide file tree

Showing 4 changed files with 250 additions and 169 deletions.
diff --git a/package.json b/package.json
@@ -37,7 +37,9 @@
   },
   "homepage": "https://github.com/eik-lib/node-client#readme",
   "dependencies": {
-    "@eik/common": "3.0.1",
+    "@eik/common-schemas": "4.0.0-next.11",
+    "@eik/common-utils": "4.0.0-next.11",
+    "@eik/common-config-loader": "4.0.0-next.11",
     "abslog": "2.4.0",
     "undici": "5.22.1"
   },

diff --git a/rollup.config.js b/rollup.config.js
@@ -1,11 +1,6 @@
 export default {
     input: 'src/index.js',
-    external: [
-        '@eik/common',
-        'undici',
-        'abslog',
-        'path',
-    ],
+    external: ['@eik/common-config-loader', 'undici', 'abslog', 'path'],
     output: [
         {
             exports: 'auto',

diff --git a/src/index.js b/src/index.js
@@ -1,21 +1,20 @@
-import { helpers } from '@eik/common';
+import { getDefaults } from '@eik/common-config-loader';
 import { request } from 'undici';
 import { join } from 'path';
 import Asset from './asset.js';
 
 const trimSlash = (value = '') => {
     if (value.endsWith('/')) return value.substring(0, value.length - 1);
     return value;
-}
+};
 
 const fetchImportMaps = async (urls = []) => {
-    try{
+    try {
         const maps = urls.map(async (map) => {
-            const {
-                statusCode,
-                body
-            } = await request(map, { maxRedirections: 2 });
-
+            const { statusCode, body } = await request(map, {
+                maxRedirections: 2,
+            });
+
             if (statusCode === 404) {
                 throw new Error('Import map could not be found on server');
             } else if (statusCode >= 400 && statusCode < 500) {
@@ -31,7 +30,7 @@ const fetchImportMaps = async (urls = []) => {
             `Unable to load import map file from server: ${err.message}`,
         );
     }
-}
+};
 
 export default class NodeClient {
     #development;
@@ -55,7 +54,7 @@ export default class NodeClient {
     }
 
     async load() {
-        this.#config = await helpers.getDefaults(this.#path);
+        this.#config = await getDefaults(this.#path);
         if (this.#loadMaps) {
             this.#maps = await fetchImportMaps(this.#config.map);
         }
@@ -83,7 +82,8 @@ export default class NodeClient {
     }
 
     get pathname() {
-        if (this.#config.type && this.#config.name && this.#config.version) return join('/', this.type, this.name, this.version);
+        if (this.#config.type && this.#config.name && this.#config.version)
+            return join('/', this.type, this.name, this.version);
         throw new Error('Eik config was not loaded before calling .pathname');
     }
 
@@ -101,6 +101,8 @@ export default class NodeClient {
 
     maps() {
         if (this.#config.version && this.#loadMaps) return this.#maps;
-        throw new Error('Eik config was not loaded or "loadMaps" is "false" when calling .maps()');
+        throw new Error(
+            'Eik config was not loaded or "loadMaps" is "false" when calling .maps()',
+        );
     }
 }