diff --git a/scripts/prepublish.ts b/scripts/prepublish.ts index efc5dfdde2..37a398986b 100644 --- a/scripts/prepublish.ts +++ b/scripts/prepublish.ts @@ -255,7 +255,7 @@ if (sanitisedCount > 0) { // to ensure all require() calls use the real package names. { const serverOutput = join(APP_DIR, ".next", "server"); - const HASH_RE = /(['"\\])([a-z@][a-z0-9@./_-]+-[0-9a-f]{16})\1/g; + const HASH_RE = /(['"\\])([a-z@][a-z0-9@./_-]+?-[0-9a-f]{16}(?:\/[^'"\\]+)?)\1/g; let patchedFiles = 0; let patchedMatches = 0; const walkDir = (dir: string) => { @@ -277,7 +277,7 @@ if (sanitisedCount > 0) { const src = readFileSync(full, "utf8"); let count = 0; const patched = src.replace(HASH_RE, (_, q, name) => { - const base = name.replace(/-[0-9a-f]{16}$/, ""); + const base = name.replace(/-[0-9a-f]{16}(?=\/|$)/, ""); count++; return `${q}${base}${q}`; }); diff --git a/src/app/(dashboard)/dashboard/combos/page.tsx b/src/app/(dashboard)/dashboard/combos/page.tsx index f4774d4796..73a275e506 100644 --- a/src/app/(dashboard)/dashboard/combos/page.tsx +++ b/src/app/(dashboard)/dashboard/combos/page.tsx @@ -2801,7 +2801,7 @@ function ComboFormModal({ isOpen, combo, onClose, onSave, activeProviders, combo } className={`py-1.5 px-2 rounded-md text-xs font-medium transition-all ${ strategy === s.value - ? "bg-white dark:bg-bg-main shadow-sm text-primary" + ? "bg-white dark:bg-white/5 shadow-sm text-primary" : "text-text-muted hover:text-text-main" }`} > @@ -2913,7 +2913,7 @@ function ComboFormModal({ isOpen, combo, onClose, onSave, activeProviders, combo }} placeholder="provider/model" data-testid="combo-manual-model-input" - className="flex-1 text-xs py-2 px-2 rounded border border-black/10 dark:border-white/10 bg-white dark:bg-bg-main text-text-main focus:border-primary focus:outline-none font-mono" + className="flex-1 text-xs py-2 px-2 rounded border border-black/10 dark:border-white/10 bg-white dark:bg-white/5 text-text-main focus:border-primary focus:outline-none font-mono" />