@naturalcycles/dev-lib 20.62.0 → 20.63.1

package/cfg/oxlint.config.js

@@ -467,6 +467,18 @@ export const sharedConfig = {
     ],
     'vitest/max-nested-describe': [0, { max: 4 }], // not good
     'vitest/no-alias-methods': 2,
+    'vitest/no-restricted-vi-methods': [
+      2,
+      {
+        mock: 'vi.mock() is never cleared (isolate: false) and leaks into other test files on the same worker. Spy on the module namespace instead: vi.spyOn(ns, "fn") or vi.spyOn(ns, "constName", "get").',
+        doMock:
+          'vi.doMock() is never cleared (isolate: false) and leaks into other test files on the same worker. Use vi.spyOn() on the module namespace instead.',
+        hoisted:
+          'vi.hoisted() only exists to feed vi.mock() factories, which are banned. Use vi.spyOn() instead.',
+        resetModules:
+          'vi.resetModules() clears the shared module cache for every later test file on this worker (isolate: false).',
+      },
+    ],
     'vue/no-multiple-slot-args': 2,
     'vue/no-deprecated-destroyed-lifecycle': 2,
     'vue/define-emits-declaration': [2, 'type-based'],

package/cfg/vitest.config.js

@@ -77,6 +77,9 @@ export function getSharedConfig(cwd) {
     watch: false,
     // dir: 'src',
     restoreMocks: true,
+    // restoreMocks does not cover vi.stubEnv/vi.stubGlobal
+    unstubEnvs: true,
+    unstubGlobals: true,
     silent,
     setupFiles: getSetupFiles(testType, cwd),
     logHeapUsage: true,

package/dist/release/git.util.d.ts

@@ -16,10 +16,18 @@ export declare function getCurrentBranch(): string;
  */
 export declare function ensureFullGitHistory(repo: RepoInfo): void;
 /**
- * Abort if someone pushed to the branch since this checkout - releasing from a stale HEAD
- * would compute wrong versions/notes. No-op if the branch has no remote counterpart.
+ * Abort if the branch was rewritten since this checkout (e.g. force-pushed) and no longer
+ * contains HEAD: the release tag would land on an orphaned commit, invisible to the next release,
+ * which would then try to publish the same version again.
+ *
+ * A remote that merely moved forward is fine: the plan (version, notes) comes from `lastTag..HEAD`
+ * and the tag goes on HEAD, so commits ahead of HEAD can't affect it - they are released by their
+ * own run. Aborting on them would silently skip releases in repos whose CI runs the release only
+ * when package files change (the newer commits may not trigger a run at all).
+ *
+ * No-op if the branch has no remote counterpart.
  */
-export declare function checkHeadIsUpToDateWithRemote(branch: string, repo: RepoInfo): void;
+export declare function checkHeadIsOnRemoteBranch(branch: string, repo: RepoInfo): void;
 /**
  * All git tags reachable from HEAD.
  * Reachability matters: on a prerelease branch this naturally excludes tags of other

package/dist/release/git.util.js

@@ -56,10 +56,18 @@ export function ensureFullGitHistory(repo) {
     }
 }
 /**
- * Abort if someone pushed to the branch since this checkout - releasing from a stale HEAD
- * would compute wrong versions/notes. No-op if the branch has no remote counterpart.
+ * Abort if the branch was rewritten since this checkout (e.g. force-pushed) and no longer
+ * contains HEAD: the release tag would land on an orphaned commit, invisible to the next release,
+ * which would then try to publish the same version again.
+ *
+ * A remote that merely moved forward is fine: the plan (version, notes) comes from `lastTag..HEAD`
+ * and the tag goes on HEAD, so commits ahead of HEAD can't affect it - they are released by their
+ * own run. Aborting on them would silently skip releases in repos whose CI runs the release only
+ * when package files change (the newer commits may not trigger a run at all).
+ *
+ * No-op if the branch has no remote counterpart.
  */
-export function checkHeadIsUpToDateWithRemote(branch, repo) {
+export function checkHeadIsOnRemoteBranch(branch, repo) {
     const remote = getAuthenticatedRemote(repo);
     let remoteSha;
     try {
@@ -69,13 +77,26 @@ export function checkHeadIsUpToDateWithRemote(branch, repo) {
             ?.trim();
     }
     catch {
-        console.log(dimGrey('git ls-remote failed, skipping up-to-date check'));
+        console.log(dimGrey('git ls-remote failed, skipping remote branch check'));
         return;
     }
     if (!remoteSha)
         return;
     const headSha = exec2.exec('git rev-parse HEAD').trim();
-    _assert(remoteSha === headSha, `Local HEAD (${headSha.slice(0, 7)}) is not up to date with remote ${branch} (${remoteSha.slice(0, 7)}) - aborting release`);
+    if (remoteSha === headSha)
+        return;
+    // The branch moved since checkout: fetch its tip to tell a fast-forward from a rewrite
+    try {
+        exec2.exec(`git fetch --quiet "${remote}" "refs/heads/${branch}"`);
+    }
+    catch {
+        // Sanitized: the original error contains the failed command incl. the token
+        throw new Error(`git fetch of remote ${branch} failed - cannot verify that it still contains HEAD, aborting release`);
+    }
+    const localOnlyCommits = Number(exec2.exec('git rev-list --count FETCH_HEAD..HEAD').trim());
+    _assert(localOnlyCommits === 0, `Remote ${branch} (${remoteSha.slice(0, 7)}) was rewritten and no longer contains HEAD (${headSha.slice(0, 7)}) - aborting release`);
+    const ahead = exec2.exec('git rev-list --count HEAD..FETCH_HEAD').trim();
+    console.log(dimGrey(`Remote ${branch} is ${ahead} commit(s) ahead of HEAD (${headSha.slice(0, 7)}) - releasing from HEAD, the newer commits get their own run`));
 }
 /**
  * All git tags reachable from HEAD.

package/dist/release/release.command.js

@@ -7,7 +7,7 @@ import { fs2 } from '@naturalcycles/nodejs-lib/fs2';
 import picomatch from 'picomatch';
 import { readDevLibConfigIfPresent } from '../config.js';
 import { analyzeCommits, parseCommit } from './commit.util.js';
-import { checkHeadIsUpToDateWithRemote, createAndPushTag, ensureFullGitHistory, getCommitsSince, getCurrentBranch, getReachableTags, getRepoInfo, } from './git.util.js';
+import { checkHeadIsOnRemoteBranch, createAndPushTag, ensureFullGitHistory, getCommitsSince, getCurrentBranch, getReachableTags, getRepoInfo, } from './git.util.js';
 import { GithubApi } from './github.util.js';
 import { generateReleaseNotes } from './notes.util.js';
 import { getLastRelease, getNextVersion, getVersionsFromTags } from './version.util.js';
@@ -51,7 +51,7 @@ export async function releaseCommand() {
     }
     ensureFullGitHistory(repo);
     if (!dryRun) {
-        checkHeadIsUpToDateWithRemote(branch, repo);
+        checkHeadIsOnRemoteBranch(branch, repo);
     }
     const mode = resolveReleaseMode(cfg.mode);
     const packages = discoverReleasePackages(mode, argv.filter);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/dev-lib",
   "type": "module",
-  "version": "20.62.0",
+  "version": "20.63.1",
   "dependencies": {
     "prompts": "^2",
     "@naturalcycles/js-lib": "^15",