@eik/node-client 2.0.0-next.1 → 2.0.0-next.4

package/CHANGELOG.md

@@ -1,3 +1,38 @@
+# [2.0.0-next.4](https://github.com/eik-lib/node-client/compare/v2.0.0-next.3...v2.0.0-next.4) (2022-08-22)
+
+
+### Features
+
+* Remove support for CJS. ESM only ([#106](https://github.com/eik-lib/node-client/issues/106)) ([d74f8c8](https://github.com/eik-lib/node-client/commit/d74f8c8266b67119d8d110524533a0bd7ce19e7d))
+
+
+### BREAKING CHANGES
+
+* This PR removes the support for CJS in this module. This module is now ESM only.
+
+* feat: Remove CJS support. ESM only.
+* Support for CJS is now removed in this module. It is ESM only.
+
+* ci: use 0.0.0.0 instead of localhost
+
+* fix: remove console.log() statement
+
+Co-authored-by: Trygve Lie <trygve.lie@finn.no>
+
+# [2.0.0-next.3](https://github.com/eik-lib/node-client/compare/v2.0.0-next.2...v2.0.0-next.3) (2022-08-18)
+
+
+### Bug Fixes
+
+* **deps:** update dependency undici to v5.8.2 ([652c0af](https://github.com/eik-lib/node-client/commit/652c0af76d4eff970ba8954d8f287703c30acd73))
+
+# [2.0.0-next.2](https://github.com/eik-lib/node-client/compare/v2.0.0-next.1...v2.0.0-next.2) (2022-08-18)
+
+
+### Features
+
+* Use the new @eik/common-config-loader module ([#104](https://github.com/eik-lib/node-client/issues/104)) ([5de927c](https://github.com/eik-lib/node-client/commit/5de927ca74c461be8d6bbd0048a2afc6812cb085))
+
 # [2.0.0-next.1](https://github.com/eik-lib/node-client/compare/v1.1.28...v2.0.0-next.1) (2022-08-08)
 
 

package/package.json

@@ -1,26 +1,19 @@
 {
   "name": "@eik/node-client",
-  "version": "2.0.0-next.1",
+  "version": "2.0.0-next.4",
   "description": "A node.js client for interacting with a Eik server.",
   "type": "module",
-  "main": "./dist/index.cjs",
-  "exports": {
-    "import": "./src/index.js",
-    "require": "./dist/index.cjs"
-  },
+  "main": "./src/index.js",
   "files": [
     "CHANGELOG.md",
     "package.json",
     "LICENSE",
-    "dist",
     "src"
   ],
   "scripts": {
     "test": "tap --no-coverage",
     "lint:fix": "eslint --fix .",
-    "lint": "eslint .",
-    "prepare": "npm run -s build",
-    "build": "rollup -c"
+    "lint": "eslint ."
   },
   "repository": {
     "type": "git",
@@ -37,9 +30,9 @@
   },
   "homepage": "https://github.com/eik-lib/node-client#readme",
   "dependencies": {
-    "@eik/common": "3.0.1",
+    "@eik/common-config-loader": "4.0.0-next.8",
     "abslog": "2.4.0",
-    "undici": "5.8.1"
+    "undici": "5.8.2"
   },
   "devDependencies": {
     "@semantic-release/changelog": "6.0.1",
@@ -50,7 +43,6 @@
     "eslint-plugin-import": "2.26.0",
     "eslint-plugin-prettier": "4.2.1",
     "prettier": "2.7.1",
-    "rollup": "2.77.2",
     "semantic-release": "19.0.3",
     "tap": "16.3.0",
     "@babel/eslint-parser": "7.18.9"

package/src/index.js

@@ -1,6 +1,6 @@
-import { helpers } from '@eik/common';
 import { request } from 'undici';
 import { join } from 'path';
+import loader from '@eik/common-config-loader';
 import Asset from './asset.js';
 
 const trimSlash = (value = '') => {
@@ -55,7 +55,7 @@ export default class NodeClient {
     }
 
     async load() {
-        this.#config = await helpers.getDefaults(this.#path);
+        this.#config = await loader.getDefaults(this.#path);
         if (this.#loadMaps) {
             this.#maps = await fetchImportMaps(this.#config.map);
         }

package/dist/index.cjs

@@ -1,118 +0,0 @@
-'use strict';
-
-var common = require('@eik/common');
-var undici = require('undici');
-var path = require('path');
-
-class Asset {
-    constructor({
-        value = '',
-    } = {}) {
-        this.integrity = undefined;
-        this.value = value;
-    }
-}
-
-const trimSlash = (value = '') => {
-    if (value.endsWith('/')) return value.substring(0, value.length - 1);
-    return value;
-};
-
-const fetchImportMaps = async (urls = []) => {
-    try{
-        const maps = urls.map(async (map) => {
-            const {
-                statusCode,
-                body
-            } = await undici.request(map, { maxRedirections: 2 });
-            
-            if (statusCode === 404) {
-                throw new Error('Import map could not be found on server');
-            } else if (statusCode >= 400 && statusCode < 500) {
-                throw new Error('Server rejected client request');
-            } else if (statusCode >= 500) {
-                throw new Error('Server error');
-            }
-            return body.json();
-        });
-        return await Promise.all(maps);
-    } catch (err) {
-        throw new Error(
-            `Unable to load import map file from server: ${err.message}`,
-        );
-    }
-};
-
-class NodeClient {
-    #development;
-    #loadMaps;
-    #config;
-    #path;
-    #base;
-    #maps;
-    constructor({
-        development = false,
-        loadMaps = false,
-        base = '',
-        path = process.cwd(),
-    } = {}) {
-        this.#development = development;
-        this.#loadMaps = loadMaps;
-        this.#config = {};
-        this.#path = path;
-        this.#base = trimSlash(base);
-        this.#maps = [];
-    }
-
-    async load() {
-        this.#config = await common.helpers.getDefaults(this.#path);
-        if (this.#loadMaps) {
-            this.#maps = await fetchImportMaps(this.#config.map);
-        }
-    }
-
-    get name() {
-        if (this.#config.name) return this.#config.name;
-        throw new Error('Eik config was not loaded before calling .name');
-    }
-
-    get version() {
-        if (this.#config.version) return this.#config.version;
-        throw new Error('Eik config was not loaded before calling .version');
-    }
-
-    get type() {
-        if (this.#config.type && this.#config.type === 'package') return 'pkg';
-        if (this.#config.type) return this.#config.type;
-        throw new Error('Eik config was not loaded before calling .type');
-    }
-
-    get server() {
-        if (this.#config.server) return this.#config.server;
-        throw new Error('Eik config was not loaded before calling .server');
-    }
-
-    get pathname() {
-        if (this.#config.type && this.#config.name && this.#config.version) return path.join('/', this.type, this.name, this.version);
-        throw new Error('Eik config was not loaded before calling .pathname');
-    }
-
-    base() {
-        if (this.#development) return this.#base;
-        return `${this.server}${this.pathname}`;
-    }
-
-    file(file = '') {
-        const base = this.base();
-        return new Asset({
-            value: `${base}${file}`,
-        });
-    }
-
-    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()');
-    }
-}
-
-module.exports = NodeClient;