Merge pull request #21 from eik-lib/fix_eik_common

fix: replace broken usage of old eik common module
eik-lib · Apr 19, 2023 · c360258 · c360258
2 parents c43cebe + 72473fa
commit c360258
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/lib/generate-notes.js b/lib/generate-notes.js
@@ -1,5 +1,5 @@
 const { join } = require("path");
-const common = require("@eik/common");
+const { typeSlug } = require("@eik/common-utils");
 
 /**
  * Semantic Release "generate notes" hook
@@ -17,7 +17,7 @@ module.exports = async function generateNotes(options, context, state) {
   const version = state.versionToPublish;
   const date = new Date();
   const dateString = `${date.getFullYear()}-${date.getMonth()}-${date.getDate()}`;
-  const slug = common.helpers.typeSlug(type);
+  const slug = typeSlug(type);
   const versionURL = new URL(join(slug, name, version), server).href;
   const nameURL = new URL(join(slug, name), server).href;
 

diff --git a/lib/success.js b/lib/success.js
@@ -1,6 +1,6 @@
 const { join } = require("path");
-const fetch = require("node-fetch");
-const common = require("@eik/common");
+const { default: fetch } = require("node-fetch");
+const { typeSlug } = require("@eik/common-utils");
 
 const PUBLISH_SUCCESS =
   "Publish: ✅ Successfully published package %s (v%s) to %s.";
@@ -20,9 +20,9 @@ module.exports = async function success(options, context, state) {
   if (!state.publishNeeded) return;
   const { logger } = context;
   const { server, name, type } = state.eikJSON;
-  const slug = common.helpers.typeSlug(type);
+  const slug = typeSlug(type);
   const url = new URL(join(slug, name, state.versionToPublish), server);
-  url.searchParams.set("ts", Date.now());
+  url.searchParams.set("ts", `${Date.now()}`);
   const result = await fetch(url);
   if (result.ok) {
     logger.log(PUBLISH_SUCCESS, name, state.versionToPublish, url.href);

diff --git a/lib/verify-conditions.js b/lib/verify-conditions.js
@@ -1,6 +1,6 @@
 const AggregateError = require("aggregate-error");
 const eik = require("@eik/cli");
-const common = require("@eik/common");
+const { configStore } = require("@eik/common-config-loader");
 
 const E_TOKEN_MISSING = "Verify: ❌ EIK_TOKEN environment variable not found";
 const E_LEVEL_INVALID =
@@ -30,7 +30,7 @@ module.exports = async function verifyConditions(options, context, state) {
 
   // verify existance of and validity of eik.json file AND read contents
   try {
-    state.eikJSON = common.helpers.configStore.findInDirectory(context.cwd);
+    state.eikJSON = configStore.findInDirectory(context.cwd);
   } catch (err) {
     errors.push(err);
   }

diff --git a/package.json b/package.json
@@ -15,7 +15,8 @@
   "license": "MIT",
   "dependencies": {
     "@eik/cli": "^2.0.0-next.6",
-    "@eik/common": "^4.0.0-next.4",
+    "@eik/common-config-loader": "^0.0.1-next.2",
+    "@eik/common-utils": "^0.0.1-next.1",
     "aggregate-error": "^3.0.0",
     "execa": "^5.1.1",
     "node-fetch": "^2.6.1"