fimo 0.3.4-staging.27 → 0.3.5-experimental.1

package/dist/cli/bundle.json

@@ -1,8 +1,8 @@
 {
   "bundled": true,
   "bundler": "esbuild",
-  "bundledAt": "2026-07-07T11:04:00.742Z",
-  "cliVersion": "0.3.3",
+  "bundledAt": "2026-07-07T12:46:54.057Z",
+  "cliVersion": "0.3.4",
   "external": [
     "oxc-parser",
     "fsevents"

package/dist/cli/index.js

@@ -103822,7 +103822,8 @@ async function loadPublicTenantLabels(cwd, locale) {
   try {
     const url2 = new URL("/labels", apiUrl);
     url2.searchParams.set("locale", locale);
-    const response = await fetchWithTimeout(url2, 4e3);
+    const headers = env2.VITE_FIMO_BRANCH ? { "X-Fimo-Branch": env2.VITE_FIMO_BRANCH } : {};
+    const response = await fetchWithTimeout(url2, 4e3, headers);
     if (!response.ok) {
       return null;
     }
@@ -103830,17 +103831,17 @@ async function loadPublicTenantLabels(cwd, locale) {
     if (Array.isArray(body.data)) {
       return labelsToRecord(body.data);
     }
-    return body.data?.labels ?? {};
+    return body.data?.labels ?? null;
   } catch {
     return null;
   }
 }
 __name(loadPublicTenantLabels, "loadPublicTenantLabels");
-async function fetchWithTimeout(url2, timeoutMs) {
+async function fetchWithTimeout(url2, timeoutMs, headers) {
   const controller = new AbortController();
   const timeout = setTimeout(() => controller.abort(), timeoutMs);
   try {
-    return await fetch(url2, { signal: controller.signal });
+    return await fetch(url2, { signal: controller.signal, headers });
   } finally {
     clearTimeout(timeout);
   }
@@ -103854,6 +103855,9 @@ async function readProjectEnv(cwd) {
   if (process.env.VITE_API_URL) {
     values.VITE_API_URL = process.env.VITE_API_URL;
   }
+  if (process.env.VITE_FIMO_BRANCH) {
+    values.VITE_FIMO_BRANCH = process.env.VITE_FIMO_BRANCH;
+  }
   return values;
 }
 __name(readProjectEnv, "readProjectEnv");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fimo",
-  "version": "0.3.4-staging.27",
+  "version": "0.3.5-experimental.1",
   "description": "Fimo CLI - create, deploy, and manage Fimo projects",
   "bin": {
     "fimo": "dist/cli/index.js"

package/scripts/lib/release-core.mjs

@@ -100,15 +100,44 @@ export function stripTemplateLockfile(cliRoot) {
   return () => writeFileSync(file, original);
 }
 
+/**
+ * Next per-version prerelease counter: one past the highest already-published
+ * `<base>-<distTag>.<n>` on npm. Counting from what's actually published
+ * (instead of resetting blindly to 1) keeps the counter collision-proof even
+ * when the projected base flaps back to a value that already has prereleases —
+ * npm versions are immutable, so a blind reset would make the publish fail.
+ *
+ * @param {readonly string[]} existingVersions - all published versions of the package
+ * @param {string} base - X.Y.Z base (no prerelease suffix)
+ * @param {string} distTag
+ * @returns {number}
+ */
+export function nextPrereleaseCounter(existingVersions, base, distTag) {
+  const prefix = `${base}-${distTag}.`;
+  let max = 0;
+  for (const version of existingVersions) {
+    if (!version.startsWith(prefix)) {
+      continue;
+    }
+    const n = Number(version.slice(prefix.length));
+    if (Number.isInteger(n) && n > max) {
+      max = n;
+    }
+  }
+  return max + 1;
+}
+
 /**
  * Compute the version to publish for a channel.
  * - Stable (`latest`) publishes the exact package.json version.
- * - Prerelease channels synthesize a disposable `X.Y.Z-<distTag>.<n>`,
- *   where `n` is the CI run number when available, else a timestamp.
+ * - Prerelease channels synthesize a disposable `X.Y.Z-<distTag>.<n>`.
+ *   `n` counts per base version (`0.3.5-staging.1`, `.2`, …) when the
+ *   published versions could be fetched from npm; otherwise it falls back
+ *   to the CI run number, then a timestamp.
  *
  * @param {string} baseVersion - package.json version
  * @param {import('./channels.mjs').Channel} channel
- * @param {{ runId?: string }} [opts]
+ * @param {{ runId?: string, existingVersions?: readonly string[] }} [opts]
  * @returns {string}
  */
 export function computePublishVersion(baseVersion, channel, opts = {}) {
@@ -117,7 +146,9 @@ export function computePublishVersion(baseVersion, channel, opts = {}) {
   }
   // Strip any existing prerelease suffix from the base so we don't stack them.
   const base = baseVersion.split('-')[0];
-  const n = opts.runId ?? String(Date.now());
+  const n = opts.existingVersions
+    ? String(nextPrereleaseCounter(opts.existingVersions, base, channel.distTag))
+    : (opts.runId ?? String(Date.now()));
   return `${base}-${channel.distTag}.${n}`;
 }
 

package/scripts/lib/release-core.test.ts

@@ -5,7 +5,7 @@ import { join } from 'node:path';
 import { afterEach, describe, expect, it } from 'vitest';
 
 // @ts-expect-error plain mjs module without types
-import { computePublishVersion, nextVersionFromChangesets } from './release-core.mjs';
+import { computePublishVersion, nextPrereleaseCounter, nextVersionFromChangesets } from './release-core.mjs';
 
 const stagingChannel = { prerelease: true, distTag: 'staging' };
 const latestChannel = { prerelease: false, distTag: 'latest' };
@@ -22,6 +22,37 @@ describe('computePublishVersion', () => {
   it('strips an existing prerelease suffix before synthesizing', () => {
     expect(computePublishVersion('0.3.3-staging.9', stagingChannel, { runId: '26' })).toBe('0.3.3-staging.26');
   });
+
+  it('counts per base version when published versions are provided', () => {
+    const existingVersions = ['0.3.4', '0.3.5-staging.1', '0.3.5-staging.2'];
+    expect(computePublishVersion('0.3.5', stagingChannel, { runId: '30', existingVersions })).toBe('0.3.5-staging.3');
+  });
+
+  it('starts at 1 for a base with no published prereleases', () => {
+    const existingVersions = ['0.3.4', '0.3.4-staging.26', '0.3.4-staging.27'];
+    expect(computePublishVersion('0.3.5', stagingChannel, { runId: '30', existingVersions })).toBe('0.3.5-staging.1');
+  });
+});
+
+describe('nextPrereleaseCounter', () => {
+  it('returns 1 when nothing matches the base + tag', () => {
+    expect(nextPrereleaseCounter([], '0.3.5', 'staging')).toBe(1);
+    expect(nextPrereleaseCounter(['0.3.5', '0.3.5-experimental.4'], '0.3.5', 'staging')).toBe(1);
+  });
+
+  it('continues past the highest published counter for the base', () => {
+    const versions = ['0.3.4-staging.26', '0.3.4-staging.27', '0.3.3-staging.25'];
+    expect(nextPrereleaseCounter(versions, '0.3.4', 'staging')).toBe(28);
+  });
+
+  it('does not confuse prefix-sharing bases (0.3.4 vs 0.3.40)', () => {
+    expect(nextPrereleaseCounter(['0.3.40-staging.9'], '0.3.4', 'staging')).toBe(1);
+  });
+
+  it('ignores non-integer counters (timestamps still count, garbage does not)', () => {
+    expect(nextPrereleaseCounter(['0.3.4-staging.abc', '0.3.4-staging.2.5'], '0.3.4', 'staging')).toBe(1);
+    expect(nextPrereleaseCounter(['0.3.3-experimental.1783410168478'], '0.3.3', 'experimental')).toBe(1783410168479);
+  });
 });
 
 describe('nextVersionFromChangesets', () => {

package/scripts/publish-npm.mjs

@@ -71,6 +71,23 @@ function run(cmd, args, cwd) {
   }
 }
 
+// All published versions of the package, or null when the registry can't be
+// reached (offline, first-ever publish) — callers fall back to the
+// run-number/timestamp counter.
+function fetchPublishedVersions(name) {
+  const result = spawnSync('npm', ['view', name, 'versions', '--json'], { encoding: 'utf8' });
+  if (result.status !== 0) {
+    return null;
+  }
+  try {
+    const parsed = JSON.parse(result.stdout);
+    // npm view returns a bare string when exactly one version is published.
+    return Array.isArray(parsed) ? parsed : [parsed];
+  } catch {
+    return null;
+  }
+}
+
 const { channel: channelName, dryRun, bootstrap, plan } = parseArgs(process.argv.slice(2));
 
 if (!channelName) {
@@ -98,7 +115,14 @@ const baseVersion = channel.prerelease
   ? nextVersionFromChangesets(pkg.version, resolve(CLI_ROOT, '../../.changeset'))
   : pkg.version;
 const runId = process.env.GITHUB_RUN_NUMBER;
-const publishVersion = computePublishVersion(baseVersion, channel, { runId });
+let existingVersions;
+if (channel.prerelease) {
+  existingVersions = fetchPublishedVersions(pkg.name) ?? undefined;
+  if (!existingVersions) {
+    console.warn('[publish-npm] could not fetch published versions from npm — using run/timestamp counter.');
+  }
+}
+const publishVersion = computePublishVersion(baseVersion, channel, { runId, existingVersions });
 
 console.log(`[publish-npm] channel:   ${channelName}  (dist-tag: ${channel.distTag})`);
 console.log(

package/templates/react-router/package.json

@@ -21,7 +21,7 @@
     "cmdk": "^1.1.1",
     "date-fns": "^4.1.0",
     "embla-carousel-react": "^8.6.0",
-    "fimo": "0.3.4-staging.27",
+    "fimo": "0.3.5-experimental.1",
     "input-otp": "^1.4.2",
     "isbot": "^5",
     "lucide-react": "^0.577.0",