aberlaas-release 2.22.1 → 2.22.3

package/lib/ensureCorrectPublishedFiles.js

@@ -20,6 +20,12 @@ export async function ensureCorrectPublishedFiles(releaseData) {
 }
 
 __ = {
+  /**
+   * Ensures that npm and yarn publish the same files for a package
+   * @param {object} packageData - The package data object containing package information
+   * @returns {Promise<boolean>} True if npm and yarn publish the same files
+   * @throws {Error} Throws an error if published files differ between npm and yarn
+   */
   async ensureSameFilesPublishedWithYarnOrNpm(packageData) {
     const packageName = packageData.content.name;
     const npmFiles = await __.getNpmPublishedFiles(packageData);

package/lib/ensureNpmLogin.js

@@ -3,16 +3,13 @@ import {
   consoleInfo,
   consoleWarn,
   env,
-  exists,
   prompt,
-  read,
   readJson,
   run,
   sleep,
-  write,
 } from 'firost';
-import { hostGitPath, hostPackagePath } from 'aberlaas-helper';
-import { parse as parseEnvrc, stringify as stringifyEnvrc } from 'envfile';
+import { hostPackagePath } from 'aberlaas-helper';
+import { getNpmAuthToken, setNpmAuthToken } from './helper.js';
 
 export let __;
 
@@ -33,13 +30,18 @@ __ = {
   ensureNpmLogin,
   /**
    * Checks if the user is authenticated with npm by running 'yarn npm whoami' command
-   * @returns {Promise<boolean>} Promise that resolves to true if authenticated, false otherwise
+   * @returns {boolean} Promise that resolves to true if authenticated, false otherwise
    */
   async isAuthenticated() {
+    const npmAuthToken = await __.getNpmAuthToken();
+
     try {
       await __.run('yarn npm whoami', {
         stderr: false,
         stdout: false,
+        env: {
+          ABERLAAS_RELEASE_NPM_AUTH_TOKEN: npmAuthToken,
+        },
       });
       return true;
     } catch (_err) {
@@ -143,20 +145,14 @@ __ = {
   },
 
   /**
-   * Saves the npm token to .envrc file
+   * Saves the npm token to .env file
    */
   async saveNpmToken() {
-    // TODO: replace with keyleth
-    const envrcPath = hostGitPath('.envrc');
-    const envrcAsJson = (await exists(envrcPath))
-      ? parseEnvrc(await read(envrcPath))
-      : {};
-
     const npmToken = await __.prompt('Enter you new token here:');
-    envrcAsJson.ABERLAAS_RELEASE_NPM_AUTH_TOKEN = npmToken;
-
-    await write(stringifyEnvrc(envrcAsJson), envrcPath);
+    await __.setNpmAuthToken(npmToken);
   },
+  getNpmAuthToken,
+  setNpmAuthToken,
   run,
   env,
   prompt,

package/lib/getReleaseData.js

@@ -3,8 +3,39 @@ import { glob, readJson } from 'firost';
 import { hostGitPath, hostGitRoot } from 'aberlaas-helper';
 import { getGitDiff, parseCommits } from 'changelogen';
 import semver from 'semver';
+import { getLastReleasePoint } from './helper.js';
 
-export const __ = {
+export let __;
+
+/**
+ * Gathers all release information from CLI arguments
+ * @param {object} cliArgs - CLI arguments from minimist
+ * @returns {object} Release data containing bumpType, allPackages, currentVersion, newVersion, changelog
+ */
+export async function getReleaseData(cliArgs) {
+  // Default options: changelog enabled unless explicitly disabled via CLI
+  const options = {
+    changelog: true,
+    ...cliArgs,
+  };
+
+  const allPackages = await __.getAllPackagesToRelease();
+  const currentVersion = allPackages[0].content.version;
+
+  const bumpType = await __.getBumpType(cliArgs, currentVersion);
+
+  const newVersion = semver.inc(currentVersion, bumpType);
+
+  return {
+    bumpType,
+    allPackages,
+    currentVersion,
+    newVersion,
+    changelog: options.changelog,
+  };
+}
+
+__ = {
   /**
    * Gets all packages that need to be released
    * @returns {Array<{filepath: string, content: object}>} Array of packages with their filepath and content
@@ -60,12 +91,14 @@ export const __ = {
       return argFromCli;
     }
 
-    // Getting all commits since last version tag
+    // Find all commits since last publish
+    const lastReleasePoint = await getLastReleasePoint(currentVersion);
     const rawCommits = await getGitDiff(
-      `v${currentVersion}`,
+      lastReleasePoint,
       'HEAD',
       hostGitRoot(),
     );
+
     // This is the minimal object required by changelogen
     const minimalConfig = { scopeMap: {} };
     const commits = parseCommits(rawCommits, minimalConfig);
@@ -86,31 +119,3 @@ export const __ = {
     return 'patch';
   },
 };
-
-/**
- * Gathers all release information from CLI arguments
- * @param {object} cliArgs - CLI arguments from minimist
- * @returns {object} Release data containing bumpType, allPackages, currentVersion, newVersion, changelog
- */
-export async function getReleaseData(cliArgs) {
-  // Default options: changelog enabled unless explicitly disabled via CLI
-  const options = {
-    changelog: true,
-    ...cliArgs,
-  };
-
-  const allPackages = await __.getAllPackagesToRelease();
-  const currentVersion = allPackages[0].content.version;
-
-  const bumpType = await __.getBumpType(cliArgs, currentVersion);
-
-  const newVersion = semver.inc(currentVersion, bumpType);
-
-  return {
-    bumpType,
-    allPackages,
-    currentVersion,
-    newVersion,
-    changelog: options.changelog,
-  };
-}

package/lib/helper.js

@@ -0,0 +1,36 @@
+import { hostGitRoot } from 'aberlaas-helper';
+import Gilmore from 'gilmore';
+import { getKey, setKey } from 'keyleth';
+
+/**
+ * Finds the last release point for git diff operations
+ * @param {string} version - Current version number (e.g., '1.2.3')
+ * @returns {Promise<string|null>} Tag name if exists (e.g., 'v1.2.3'), or null to search from repo beginning
+ */
+export async function getLastReleasePoint(version) {
+  const repo = new Gilmore(hostGitRoot());
+
+  const tagName = `v${version}`;
+  const tagExists = await repo.tagExists(tagName);
+  return tagExists ? tagName : null;
+}
+
+/**
+ * Retrieves the npm authentication token from .env file
+ * @returns {string} The npm auth token, or null if not found
+ */
+export async function getNpmAuthToken() {
+  return await getKey('ABERLAAS_RELEASE_NPM_AUTH_TOKEN', {
+    cwd: hostGitRoot(),
+  });
+}
+
+/**
+ * Saves the npm authentication token to .env file
+ * @param {string} token - The npm auth token to save
+ */
+export async function setNpmAuthToken(token) {
+  await setKey('ABERLAAS_RELEASE_NPM_AUTH_TOKEN', token, {
+    cwd: hostGitRoot(),
+  });
+}

package/lib/publishToNpm.js

@@ -1,6 +1,7 @@
 import path from 'node:path';
 import { pMap } from 'golgoth';
 import { firostError, run, spinner } from 'firost';
+import { getNpmAuthToken } from './helper.js';
 
 export let __;
 
@@ -33,6 +34,7 @@ export async function publishToNpm(releaseData) {
 __ = {
   async publishPackage(packageData) {
     const { filepath, content } = packageData;
+    const npmAuthToken = await __.getNpmAuthToken();
 
     try {
       // Note:
@@ -42,6 +44,9 @@ __ = {
         cwd: path.dirname(filepath),
         stdout: false,
         stderr: false,
+        env: {
+          ABERLAAS_RELEASE_NPM_AUTH_TOKEN: npmAuthToken,
+        },
       });
       return true;
     } catch (err) {
@@ -52,6 +57,7 @@ __ = {
       );
     }
   },
+  getNpmAuthToken,
   run,
   spinner,
 };

package/lib/updateChangelog.js

@@ -11,8 +11,27 @@ import {
 import { hostGitPath, hostGitRoot } from 'aberlaas-helper';
 import { generateMarkDown, getGitDiff, parseCommits } from 'changelogen';
 import cliMarkdown from 'cli-markdown';
+import { getLastReleasePoint } from './helper.js';
 
-export const __ = {
+export let __;
+
+/**
+ * Update the CHANGELOG.md file with new additions
+ * @param {object} releaseData - Release data containing currentVersion, newVersion, and changeLog
+ * @param {boolean} [releaseData.changelog=true] Generate changelog
+ */
+export async function updateChangelog(releaseData) {
+  if (!releaseData.changelog) {
+    return;
+  }
+
+  const suggestedChangelog = await __.generateChangelogFromGit(releaseData);
+  const approvedChangelog = await __.confirmOrEditChangelog(suggestedChangelog);
+
+  await __.addToExistingChangelogFile(approvedChangelog);
+}
+
+__ = {
   /**
    * Generate changelog markdown from git commits between two versions
    * @param {object} releaseData - Release data containing currentVersion, newVersion, and changeLog
@@ -20,12 +39,12 @@ export const __ = {
    */
   async generateChangelogFromGit(releaseData) {
     const { currentVersion, newVersion } = releaseData;
-    const gitRoot = hostGitRoot();
-    const currentVersionTag = `v${currentVersion}`;
+
+    const lastReleasePoint = await getLastReleasePoint(currentVersion);
 
     // Get config
     const config = {
-      from: currentVersionTag,
+      from: lastReleasePoint,
       to: 'HEAD',
       newVersion,
       noAuthors: true,
@@ -42,7 +61,11 @@ export const __ = {
       scopeMap: {},
     };
 
-    const rawCommits = await getGitDiff(currentVersionTag, 'HEAD', gitRoot);
+    const rawCommits = await getGitDiff(
+      lastReleasePoint,
+      'HEAD',
+      hostGitRoot(),
+    );
     const commits = parseCommits(rawCommits, config);
 
     // Filter commits to only keep user-facing types
@@ -132,20 +155,5 @@ export const __ = {
   select,
   cliMarkdown,
   run,
+  getLastReleasePoint,
 };
-
-/**
- * Update the CHANGELOG.md file with new additions
- * @param {object} releaseData - Release data containing currentVersion, newVersion, and changeLog
- * @param {boolean} [releaseData.changelog=true] Generate changelog
- */
-export async function updateChangelog(releaseData) {
-  if (!releaseData.changelog) {
-    return;
-  }
-
-  const suggestedChangelog = await __.generateChangelogFromGit(releaseData);
-  const approvedChangelog = await __.confirmOrEditChangelog(suggestedChangelog);
-
-  await __.addToExistingChangelogFile(approvedChangelog);
-}

package/lib/updateGitRepo.js

@@ -4,7 +4,24 @@ import { hostGitRoot } from 'aberlaas-helper';
 import Gilmore from 'gilmore';
 import { updateChangelog } from './updateChangelog.js';
 
-export const __ = {
+export let __;
+
+/**
+ * Update git repository with all changes for the release
+ * @param {object} releaseData - Release data containing currentVersion, newVersion, skipChangelog, and allPackages
+ */
+export async function updateGitRepo(releaseData) {
+  // Update CHANGELOG.md
+  await __.updateChangelog(releaseData);
+
+  // Update all .version keys in packages
+  await __.bumpAllPackageVersions(releaseData);
+
+  // Commit and push to remote
+  await __.commitTagAndPush(releaseData);
+}
+
+__ = {
   /**
    * Bumps the version of all packages to the new version
    * @param {object} releaseData - Release data containing allPackages and newVersion
@@ -47,18 +64,3 @@ export const __ = {
   consoleInfo,
   updateChangelog,
 };
-
-/**
- * Update git repository with all changes for the release
- * @param {object} releaseData - Release data containing currentVersion, newVersion, skipChangelog, and allPackages
- */
-export async function updateGitRepo(releaseData) {
-  // Update CHANGELOG.md
-  await __.updateChangelog(releaseData);
-
-  // Update all .version keys in packages
-  await __.bumpAllPackageVersions(releaseData);
-
-  // Commit and push to remote
-  await __.commitTagAndPush(releaseData);
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aberlaas-release",
-  "version": "2.22.1",
+  "version": "2.22.3",
   "type": "module",
   "description": "aberlaas release command: Release and publish new versions",
   "author": "Tim Carry <tim@pixelastic.com>",
@@ -18,20 +18,17 @@
     ".": "./lib/main.js"
   },
   "main": "./lib/main.js",
-  "devDependencies": {
-    "aberlaas-versions": "2.22.1"
-  },
   "dependencies": {
-    "aberlaas-helper": "2.22.1",
-    "aberlaas-lint": "2.22.1",
-    "aberlaas-test": "2.22.1",
+    "aberlaas-helper": "2.22.3",
+    "aberlaas-lint": "2.22.3",
+    "aberlaas-test": "2.22.3",
     "changelogen": "0.6.2",
     "cli-markdown": "3.5.1",
-    "envfile": "7.1.0",
     "firost": "5.5.1",
     "gilmore": "1.2.0",
     "golgoth": "3.1.0",
-    "semver": "7.7.3"
+    "keyleth": "0.2.0",
+    "semver": "7.7.4"
   },
   "scripts": {
     "build": "cd ../docs && yarn run build",