diff --git a/app/components/Code/DirectoryListing.vue b/app/components/Code/DirectoryListing.vue
index 31a6d1fe2..21ee58438 100644
--- a/app/components/Code/DirectoryListing.vue
+++ b/app/components/Code/DirectoryListing.vue
@@ -103,6 +103,7 @@ const bytesFormatter = useBytesFormatter()
         >
           <td colspan="2">
             <LinkBase
+              :trailing-slash="node.type === 'directory' ? 'append' : 'remove'"
               :to="getCodeRoute(node.path)"
               class="py-2 px-4 font-mono text-sm w-full"
               no-underline
diff --git a/app/components/Code/FileTree.vue b/app/components/Code/FileTree.vue
index 2e2d2352d..a02efb36d 100644
--- a/app/components/Code/FileTree.vue
+++ b/app/components/Code/FileTree.vue
@@ -87,6 +87,7 @@ watch(
       <!-- File -->
       <template v-else>
         <LinkBase
+          trailing-slash="remove"
           variant="button-secondary"
           :to="getFileRoute(node.path)"
           :aria-current="currentPath === node.path"
diff --git a/app/components/DependencyPathPopup.vue b/app/components/DependencyPathPopup.vue
index 9d0f40ba4..6b5c2a028 100644
--- a/app/components/DependencyPathPopup.vue
+++ b/app/components/DependencyPathPopup.vue
@@ -93,6 +93,7 @@ function parsePackageString(pkg: string): { name: string; version: string } {
           >
             <span v-if="idx > 0" class="text-fg-subtle me-1">└─</span>
             <NuxtLink
+              trailing-slash="append"
               :to="
                 packageRoute(
                   parsePackageString(pathItem).name,
diff --git a/app/components/Header/MobileMenu.client.vue b/app/components/Header/MobileMenu.client.vue
index 49c51497f..4d53c01d5 100644
--- a/app/components/Header/MobileMenu.client.vue
+++ b/app/components/Header/MobileMenu.client.vue
@@ -195,6 +195,7 @@ onUnmounted(deactivate)
                   </span>
                   <div>
                     <NuxtLink
+                      trailing-slash="append"
                       v-for="link in group.items"
                       :key="link.name"
                       :to="link.to"
diff --git a/app/components/Header/OrgsDropdown.vue b/app/components/Header/OrgsDropdown.vue
index b07b6352a..3bff8196b 100644
--- a/app/components/Header/OrgsDropdown.vue
+++ b/app/components/Header/OrgsDropdown.vue
@@ -58,6 +58,7 @@ function handleKeydown(event: KeyboardEvent) {
     @keydown="handleKeydown"
   >
     <NuxtLink
+      trailing-slash="append"
       :to="{ name: '~username-orgs', params: { username } }"
       class="link-subtle font-mono text-sm inline-flex items-center gap-1"
     >
@@ -94,6 +95,7 @@ function handleKeydown(event: KeyboardEvent) {
           <ul v-else-if="orgs.length > 0" class="py-1 max-h-80 overflow-y-auto">
             <li v-for="org in orgs" :key="org">
               <NuxtLink
+                trailing-slash="append"
                 :to="{ name: 'org', params: { org } }"
                 class="block px-3 py-2 font-mono text-sm text-fg hover:bg-bg-subtle transition-colors"
               >
@@ -108,6 +110,7 @@ function handleKeydown(event: KeyboardEvent) {
 
           <div class="px-3 py-2 border-t border-border">
             <NuxtLink
+              trailing-slash="append"
               :to="{ name: '~username-orgs', params: { username } }"
               class="link-subtle font-mono text-xs inline-flex items-center gap-1"
             >
diff --git a/app/components/Header/PackagesDropdown.vue b/app/components/Header/PackagesDropdown.vue
index 3f70c648f..364fa41ae 100644
--- a/app/components/Header/PackagesDropdown.vue
+++ b/app/components/Header/PackagesDropdown.vue
@@ -58,6 +58,7 @@ function handleKeydown(event: KeyboardEvent) {
     @keydown="handleKeydown"
   >
     <NuxtLink
+      trailing-slash="append"
       :to="{ name: '~username', params: { username } }"
       class="link-subtle font-mono text-sm inline-flex items-center gap-1"
     >
@@ -94,6 +95,7 @@ function handleKeydown(event: KeyboardEvent) {
           <ul v-else-if="packages.length > 0" class="py-1 max-h-80 overflow-y-auto">
             <li v-for="pkg in packages" :key="pkg">
               <NuxtLink
+                trailing-slash="append"
                 :to="packageRoute(pkg)"
                 class="block px-3 py-2 font-mono text-sm text-fg hover:bg-bg-subtle transition-colors truncate"
               >
@@ -108,6 +110,7 @@ function handleKeydown(event: KeyboardEvent) {
 
           <div class="px-3 py-2 border-t border-border">
             <NuxtLink
+              trailing-slash="append"
               :to="{ name: '~username', params: { username } }"
               class="link-subtle font-mono text-xs inline-flex items-center gap-1"
             >
diff --git a/app/components/Link/Base.vue b/app/components/Link/Base.vue
index 4eeecda2b..bcb5b025b 100644
--- a/app/components/Link/Base.vue
+++ b/app/components/Link/Base.vue
@@ -35,6 +35,8 @@ const props = withDefaults(
 
     /** should only be used for links where the context makes it very clear they are clickable. Don't just use this, because you don't like underlines. */
     noUnderline?: boolean
+
+    trailingSlash?: 'append' | 'remove' | undefined | null
   }>(),
   { variant: 'link', size: 'medium' },
 )
@@ -74,6 +76,7 @@ const isButtonMedium = computed(() => props.size === 'medium' && !isLink.value)
   <NuxtLink
     v-bind="props"
     v-else
+    :trailing-slash="isLinkExternal ? undefined : (trailingSlash ?? 'append')"
     class="group/link gap-x-1 items-center"
     :class="{
       'flex': block,
diff --git a/app/components/Org/MembersPanel.vue b/app/components/Org/MembersPanel.vue
index 580f35ec2..145bba571 100644
--- a/app/components/Org/MembersPanel.vue
+++ b/app/components/Org/MembersPanel.vue
@@ -446,6 +446,7 @@ watch(lastExecutionTime, () => {
         <div class="flex items-center justify-between">
           <div class="flex items-center gap-3">
             <NuxtLink
+              trailing-slash="append"
               :to="{ name: '~username', params: { username: member.name } }"
               class="font-mono text-sm text-fg hover:text-fg transition-colors duration-200"
             >
diff --git a/app/components/Org/TeamsPanel.vue b/app/components/Org/TeamsPanel.vue
index b0ddf5246..18fdab85b 100644
--- a/app/components/Org/TeamsPanel.vue
+++ b/app/components/Org/TeamsPanel.vue
@@ -418,6 +418,7 @@ watch(lastExecutionTime, () => {
               class="flex items-center justify-start py-1 ps-2 pe-1 rounded hover:bg-bg-subtle transition-colors duration-200"
             >
               <NuxtLink
+                trailing-slash="append"
                 :to="{ name: '~username', params: { username: user } }"
                 class="font-mono text-sm text-fg-muted hover:text-fg transition-colors duration-200"
               >
diff --git a/app/components/Package/Card.vue b/app/components/Package/Card.vue
index 12d25268b..da527cc48 100644
--- a/app/components/Package/Card.vue
+++ b/app/components/Package/Card.vue
@@ -46,6 +46,7 @@ const numberFormatter = useNumberFormatter()
         class="font-mono text-sm sm:text-base font-medium text-fg group-hover:text-fg transition-colors duration-200 min-w-0 break-all"
       >
         <NuxtLink
+          trailing-slash="append"
           :to="packageRoute(result.package.name)"
           :prefetch-on="prefetch ? 'visibility' : 'interaction'"
           class="decoration-none scroll-mt-48 scroll-mb-6 after:content-[''] after:absolute after:inset-0"
diff --git a/app/components/Package/ClaimPackageModal.vue b/app/components/Package/ClaimPackageModal.vue
index 7d061331b..4d3c1f843 100644
--- a/app/components/Package/ClaimPackageModal.vue
+++ b/app/components/Package/ClaimPackageModal.vue
@@ -175,6 +175,7 @@ const previewPackageJson = computed(() => {
 
       <div class="flex gap-3">
         <NuxtLink
+          trailing-slash="append"
           :to="packageRoute(packageName)"
           class="flex-1 px-4 py-2 font-mono text-sm text-center text-bg bg-fg rounded-md transition-colors duration-200 hover:bg-fg/90 focus-visible:outline-accent/70"
           @click="close"
@@ -289,6 +290,7 @@ const previewPackageJson = computed(() => {
               <span v-else class="w-4 h-4 shrink-0" />
               <div class="min-w-0">
                 <NuxtLink
+                  trailing-slash="append"
                   :to="packageRoute(pkg.name)"
                   class="font-mono text-sm text-fg hover:underline focus-visible:outline-accent/70 rounded"
                   target="_blank"
diff --git a/app/components/Package/DeprecatedTree.vue b/app/components/Package/DeprecatedTree.vue
index 079427c51..2dbb22b77 100644
--- a/app/components/Package/DeprecatedTree.vue
+++ b/app/components/Package/DeprecatedTree.vue
@@ -84,6 +84,7 @@ function getDepthStyle(depth: DependencyDepth) {
               <DependencyPathPopup v-if="pkg.path && pkg.path.length > 1" :path="pkg.path" />
 
               <NuxtLink
+                trailing-slash="append"
                 :to="packageRoute(pkg.name, pkg.version)"
                 class="font-mono text-sm font-medium hover:underline truncate py-4"
                 :class="getDepthStyle(pkg.depth).text"
diff --git a/app/components/Package/TableRow.vue b/app/components/Package/TableRow.vue
index 3e3768602..ad0fe3469 100644
--- a/app/components/Package/TableRow.vue
+++ b/app/components/Package/TableRow.vue
@@ -51,6 +51,7 @@ const allMaintainersText = computed(() => {
     <!-- Name (always visible) -->
     <td class="py-2 px-3">
       <NuxtLink
+        trailing-slash="append"
         :to="packageUrl"
         class="row-link font-mono text-sm text-fg hover:text-accent-fallback transition-colors duration-200"
         dir="ltr"
@@ -107,6 +108,7 @@ const allMaintainersText = computed(() => {
           :key="maintainer.username || maintainer.email"
         >
           <NuxtLink
+            trailing-slash="append"
             :to="{
               name: '~username',
               params: { username: maintainer.username || maintainer.name || '' },
diff --git a/app/components/Package/VulnerabilityTree.vue b/app/components/Package/VulnerabilityTree.vue
index 0eb15eba4..70d2e29da 100644
--- a/app/components/Package/VulnerabilityTree.vue
+++ b/app/components/Package/VulnerabilityTree.vue
@@ -124,6 +124,7 @@ function getDepthStyle(depth: string | undefined) {
                 <DependencyPathPopup v-if="pkg.path && pkg.path.length > 1" :path="pkg.path" />
 
                 <NuxtLink
+                  trailing-slash="append"
                   :to="packageRoute(pkg.name, pkg.version)"
                   class="font-mono text-sm font-medium hover:underline truncate shrink min-w-0"
                   :class="getDepthStyle(pkg.depth).text"
@@ -160,6 +161,7 @@ function getDepthStyle(depth: string | undefined) {
                 <span class="truncate w-0 flex-1">{{ vuln.summary }}</span>
                 <NuxtLink
                   v-if="vuln.fixedIn"
+                  trailing-slash="append"
                   :to="packageRoute(pkg.name, vuln.fixedIn)"
                   class="shrink-0 font-mono text-emerald-600 dark:text-emerald-400 hover:underline"
                   :title="$t('package.vulnerabilities.fixed_in_title', { version: vuln.fixedIn })"
diff --git a/app/components/SearchSuggestionCard.vue b/app/components/SearchSuggestionCard.vue
index 26e29f745..d2c63305c 100644
--- a/app/components/SearchSuggestionCard.vue
+++ b/app/components/SearchSuggestionCard.vue
@@ -14,6 +14,7 @@ defineProps<{
 <template>
   <BaseCard :isExactMatch="isExactMatch">
     <NuxtLink
+      trailing-slash="append"
       :to="
         type === 'user'
           ? { name: '~username', params: { username: name } }
diff --git a/app/components/Terminal/Install.vue b/app/components/Terminal/Install.vue
index 190c5dbb3..9688992ce 100644
--- a/app/components/Terminal/Install.vue
+++ b/app/components/Terminal/Install.vue
@@ -215,6 +215,7 @@ const copyDevInstallCommand = () =>
               ></code
             >
             <NuxtLink
+              trailing-slash="append"
               :to="packageRoute(typesPackageName!)"
               class="text-fg-subtle hover:text-fg-muted text-xs transition-colors focus-visible:outline-accent/70 rounded select-none"
               :title="$t('package.get_started.view_types', { package: typesPackageName })"
@@ -268,6 +269,7 @@ const copyDevInstallCommand = () =>
               :text="$t('package.create.view', { packageName: createPackageInfo.packageName })"
             >
               <NuxtLink
+                trailing-slash="append"
                 :to="packageRoute(createPackageInfo.packageName)"
                 class="inline-flex items-center justify-center min-w-6 min-h-6 -m-1 p-1 text-fg-muted hover:text-fg text-xs transition-colors focus-visible:outline-2 focus-visible:outline-accent/70 rounded"
               >
diff --git a/app/components/VersionSelector.vue b/app/components/VersionSelector.vue
index 5a0867ee8..81509a8fe 100644
--- a/app/components/VersionSelector.vue
+++ b/app/components/VersionSelector.vue
@@ -554,6 +554,7 @@ watch(
 
             <!-- Version link -->
             <NuxtLink
+              trailing-slash="append"
               :to="getVersionUrl(group.primaryVersion.version)"
               class="flex-1 truncate hover:text-fg transition-colors"
               @click="isOpen = false"
@@ -583,6 +584,7 @@ watch(
           >
             <template v-for="v in group.versions.slice(1)" :key="v.version">
               <NuxtLink
+                trailing-slash="append"
                 :id="`version-${v.version}`"
                 :to="getVersionUrl(v.version)"
                 role="option"
@@ -622,6 +624,7 @@ watch(
         <!-- Link to package page for full version list -->
         <div class="border-t border-border mt-1 pt-1 px-3 py-2">
           <NuxtLink
+            trailing-slash="append"
             :to="packageRoute(packageName)"
             class="text-xs text-fg-subtle hover:text-fg transition-[color] focus-visible:outline-none focus-visible:text-fg"
             @click="isOpen = false"
diff --git a/app/composables/npm/useResolvedVersion.ts b/app/composables/npm/useResolvedVersion.ts
index 992ce62b7..fda018525 100644
--- a/app/composables/npm/useResolvedVersion.ts
+++ b/app/composables/npm/useResolvedVersion.ts
@@ -4,15 +4,17 @@ export function useResolvedVersion(
   packageName: MaybeRefOrGetter<string>,
   requestedVersion: MaybeRefOrGetter<string | null>,
 ) {
-  return useFetch(
-    () => {
+  return useAsyncData(
+    () => `resolved-version:${toValue(packageName)}:${toValue(requestedVersion) ?? 'latest'}`,
+    async () => {
       const version = toValue(requestedVersion)
-      return version
-        ? `https://npm.antfu.dev/${toValue(packageName)}@${version}`
-        : `https://npm.antfu.dev/${toValue(packageName)}`
-    },
-    {
-      transform: (data: ResolvedPackageVersion) => data.version,
+      const name = toValue(packageName)
+      const url = version
+        ? `https://npm.antfu.dev/${name}@${version}`
+        : `https://npm.antfu.dev/${name}`
+      const data = await $fetch<ResolvedPackageVersion>(url)
+      return data.version
     },
+    { default: () => null },
   )
 }
diff --git a/app/middleware/trailing-slash.global.ts b/app/middleware/trailing-slash.global.ts
index f0386e923..ce2e389cf 100644
--- a/app/middleware/trailing-slash.global.ts
+++ b/app/middleware/trailing-slash.global.ts
@@ -1,19 +1,39 @@
 /**
- * Removes trailing slashes from URLs.
+ * Adds trailing slashes to URLs.
  *
- * This middleware only runs in development to maintain consistent behavior.
- * In production, Vercel handles this redirect via vercel.json.
+ * We use middleware to correctly handle all the cases, since Vercel doesn't handle it properly for nuxt app.
  *
- * - /package/vue/ → /package/vue
- * - /docs/getting-started/?query=value → /docs/getting-started?query=value
+ * - /package/vue → /package/vue/
+ * - /docs/getting-started?query=value → /docs/getting-started/?query=value
  */
 export default defineNuxtRouteMiddleware(to => {
-  if (!import.meta.dev) return
+  // request is marked as prerender for build and server ISR
+  // ignore rewrite for build prerender only
+  if (import.meta.prerender && process.env.NUXT_STAGE === 'build') return
 
-  if (to.path !== '/' && to.path.endsWith('/')) {
+  // ignore for package-code (file viewer shouldn't relate on trailing slash) and api routes
+  if (
+    to.path.startsWith('/package-code/') ||
+    to.path.startsWith('/api/') ||
+    to.path.endsWith('/_payload.json')
+  )
+    return
+
+  if (import.meta.server) {
+    const event = useRequestEvent()
+
+    // requests to /page-path/_payload.json are handled with to.path="/page-path", so we use the original url to check properly
+    const urlRaw = event?.node.req.originalUrl || event?.node.req.url || ''
+    const originalUrl = new URL(urlRaw, 'http://npmx.dev')
+
+    if (originalUrl.pathname.includes('/_payload.json') || originalUrl.pathname.endsWith('/'))
+      return
+  }
+
+  if (to.path !== '' && !to.path.endsWith('/')) {
     return navigateTo(
       {
-        path: to.path.slice(0, -1),
+        path: to.path + '/',
         query: to.query,
         hash: to.hash,
       },
diff --git a/app/pages/accessibility.vue b/app/pages/accessibility.vue
index 8f3750fb2..18f8089a0 100644
--- a/app/pages/accessibility.vue
+++ b/app/pages/accessibility.vue
@@ -58,6 +58,7 @@ const canGoBack = useCanGoBack()
             <i18n-t keypath="a11y.approach.p2" tag="span" scope="global">
               <template #about>
                 <NuxtLink
+                  trailing-slash="append"
                   :to="{ name: 'about' }"
                   class="text-fg-muted hover:text-fg underline decoration-fg-subtle/50 hover:decoration-fg"
                 >
diff --git a/app/pages/package-code/[[org]]/[packageName]/v/[version]/[...filePath].vue b/app/pages/package-code/[[org]]/[packageName]/v/[version]/[...filePath].vue
index 2202494d7..8b3d787ab 100644
--- a/app/pages/package-code/[[org]]/[packageName]/v/[version]/[...filePath].vue
+++ b/app/pages/package-code/[[org]]/[packageName]/v/[version]/[...filePath].vue
@@ -313,6 +313,7 @@ defineOgImageComponent('Default', {
         <!-- Package info and navigation -->
         <div class="flex items-center gap-2 mb-3 flex-wrap min-w-0">
           <NuxtLink
+            trailing-slash="append"
             :to="packageRoute(packageName, version)"
             class="font-mono text-lg font-medium hover:text-fg transition-colors min-w-0 truncate max-w-[60vw] sm:max-w-none"
             :title="packageName"
@@ -350,6 +351,7 @@ defineOgImageComponent('Default', {
         >
           <NuxtLink
             v-if="filePath"
+            trailing-slash="append"
             :to="getCurrentCodeUrlWithPath()"
             class="text-fg-muted hover:text-fg transition-colors shrink-0"
           >
@@ -360,6 +362,7 @@ defineOgImageComponent('Default', {
             <span class="text-fg-subtle">/</span>
             <NuxtLink
               v-if="i < breadcrumbs.length - 1"
+              trailing-slash="append"
               :to="getCurrentCodeUrlWithPath(crumb.path)"
               class="text-fg-muted hover:text-fg transition-colors"
             >
diff --git a/app/pages/package-docs/[...path].vue b/app/pages/package-docs/[...path].vue
index 07e6dbe92..1331f5c61 100644
--- a/app/pages/package-docs/[...path].vue
+++ b/app/pages/package-docs/[...path].vue
@@ -137,6 +137,7 @@ const showEmptyState = computed(() => docsData.value?.status !== 'ok')
           <div class="flex items-center gap-3 min-w-0">
             <NuxtLink
               v-if="packageName"
+              trailing-slash="append"
               :to="packageRoute(packageName)"
               class="font-mono text-lg sm:text-xl font-semibold text-fg hover:text-fg-muted transition-colors truncate"
             >
@@ -196,6 +197,7 @@ const showEmptyState = computed(() => docsData.value?.status !== 'ok')
             <div class="flex gap-4 mt-4">
               <NuxtLink
                 v-if="packageName"
+                trailing-slash="append"
                 :to="packageRoute(packageName)"
                 class="link-subtle font-mono text-sm"
               >
diff --git a/app/pages/package/[[org]]/[name].vue b/app/pages/package/[[org]]/[name].vue
index de6c114d9..8ba1ce144 100644
--- a/app/pages/package/[[org]]/[name].vue
+++ b/app/pages/package/[[org]]/[name].vue
@@ -195,18 +195,9 @@ const { data: skillsData } = useLazyFetch<SkillsListResponse>(
 const { data: packageAnalysis } = usePackageAnalysis(packageName, requestedVersion)
 const { data: moduleReplacement } = useModuleReplacement(packageName)
 
-const {
-  data: resolvedVersion,
-  status: versionStatus,
-  error: versionError,
-} = await useResolvedVersion(packageName, requestedVersion)
-
-if (
-  versionStatus.value === 'error' &&
-  versionError.value?.statusCode &&
-  versionError.value.statusCode >= 400 &&
-  versionError.value.statusCode < 500
-) {
+const { data: resolvedVersion } = await useResolvedVersion(packageName, requestedVersion)
+
+if (resolvedVersion.value === null) {
   throw createError({
     statusCode: 404,
     statusMessage: $t('package.not_found'),
diff --git a/app/pages/privacy.vue b/app/pages/privacy.vue
index c0e93030a..742d72e47 100644
--- a/app/pages/privacy.vue
+++ b/app/pages/privacy.vue
@@ -139,6 +139,7 @@ const { locale } = useI18n()
               </template>
               <template #settings>
                 <NuxtLink
+                  trailing-slash="append"
                   :to="{ name: 'settings' }"
                   class="text-fg-muted hover:text-fg underline decoration-fg-subtle/50 hover:decoration-fg"
                 >
@@ -267,6 +268,7 @@ const { locale } = useI18n()
             <i18n-t keypath="privacy_policy.authenticated.p2" tag="span" scope="global">
               <template #settings>
                 <NuxtLink
+                  trailing-slash="append"
                   :to="{ name: 'settings' }"
                   class="text-fg-muted hover:text-fg underline decoration-fg-subtle/50 hover:decoration-fg"
                 >
diff --git a/app/pages/~[username]/orgs.vue b/app/pages/~[username]/orgs.vue
index 138bd6913..236030cab 100644
--- a/app/pages/~[username]/orgs.vue
+++ b/app/pages/~[username]/orgs.vue
@@ -136,6 +136,7 @@ defineOgImageComponent('Default', {
       <!-- Back link -->
       <nav aria-labelledby="back-to-profile">
         <NuxtLink
+          trailing-slash="append"
           :to="{ name: '~username', params: { username } }"
           id="back-to-profile"
           class="link-subtle font-mono text-sm inline-flex items-center gap-1.5"
@@ -194,6 +195,7 @@ defineOgImageComponent('Default', {
         <ul class="grid gap-4 sm:grid-cols-2 lg:grid-cols-3">
           <li v-for="org in orgs" :key="org.name">
             <NuxtLink
+              trailing-slash="append"
               :to="{ name: 'org', params: { org: org.name } }"
               class="block p-5 bg-bg-subtle border border-border rounded-lg hover:border-fg-subtle transition-colors h-full"
             >
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 2a3629aa3..76e01eef6 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -86,11 +86,13 @@ export default defineNuxtConfig({
     url: 'https://npmx.dev',
     name: 'npmx',
     description: 'A fast, modern browser for the npm registry',
+    trailingSlash: true,
   },
 
   router: {
     options: {
       scrollBehaviorType: 'smooth',
+      strict: true,
     },
   },
 
@@ -133,14 +135,10 @@ export default defineNuxtConfig({
       },
     },
     // pages
-    '/package/:name': getISRConfig(60, { fallback: 'html' }),
-    '/package/:name/_payload.json': getISRConfig(60, { fallback: 'json' }),
-    '/package/:name/v/:version': getISRConfig(60, { fallback: 'html' }),
-    '/package/:name/v/:version/_payload.json': getISRConfig(60, { fallback: 'json' }),
-    '/package/:org/:name': getISRConfig(60, { fallback: 'html' }),
-    '/package/:org/:name/_payload.json': getISRConfig(60, { fallback: 'json' }),
-    '/package/:org/:name/v/:version': getISRConfig(60, { fallback: 'html' }),
-    '/package/:org/:name/v/:version/_payload.json': getISRConfig(60, { fallback: 'json' }),
+    '/package/:name/': getISRConfig(60),
+    '/package/:name/v/:version/': getISRConfig(3600),
+    '/package/:org/:name/': getISRConfig(60),
+    '/package/:org/:name/v/:version/': getISRConfig(3600),
     // infinite cache (versioned - doesn't change)
     '/package-code/**': { isr: true, cache: { maxAge: 365 * 24 * 60 * 60 } },
     '/package-docs/**': { isr: true, cache: { maxAge: 365 * 24 * 60 * 60 } },
@@ -374,8 +372,6 @@ function getISRConfig(expirationSeconds: number, options: ISRConfigOptions = {})
     }
   }
   return {
-    isr: {
-      expiration: expirationSeconds,
-    },
+    isr: expirationSeconds,
   }
 }
diff --git a/package.json b/package.json
index 2e6782357..7cc6232cd 100644
--- a/package.json
+++ b/package.json
@@ -10,9 +10,9 @@
     "url": "https://roe.dev"
   },
   "scripts": {
-    "build": "nuxt build",
+    "build": "NUXT_STAGE=build nuxt build",
     "build:lunaria": "node ./lunaria/lunaria.ts",
-    "build:test": "NODE_ENV=test pnpm build",
+    "build:test": "NUXT_STAGE=build NODE_ENV=test pnpm build",
     "dev": "nuxt dev",
     "dev:docs": "pnpm run --filter npmx-docs dev --port=3001",
     "i18n:check": "node scripts/compare-translations.ts",
diff --git a/test/e2e/connector.spec.ts b/test/e2e/connector.spec.ts
index 84cd6035e..8eefa1466 100644
--- a/test/e2e/connector.spec.ts
+++ b/test/e2e/connector.spec.ts
@@ -18,7 +18,7 @@ test.describe.configure({ mode: 'serial' })
  * This helper waits for the packages link to appear as proof of successful connection.
  */
 async function expectConnected(page: Page, username = 'testuser') {
-  await expect(page.locator(`a[href="/~${username}"]`, { hasText: 'packages' })).toBeVisible({
+  await expect(page.locator(`a[href="/~${username}/"]`, { hasText: 'packages' })).toBeVisible({
     timeout: 10_000,
   })
 }
@@ -79,7 +79,7 @@ test.describe('Connector Connection', () => {
     await modal.getByRole('button', { name: /close/i }).click()
 
     // The "packages" link should disappear since we're disconnected
-    await expect(page.locator('a[href="/~testuser"]', { hasText: 'packages' })).not.toBeVisible({
+    await expect(page.locator('a[href="/~testuser/"]', { hasText: 'packages' })).not.toBeVisible({
       timeout: 5000,
     })
 
@@ -257,7 +257,7 @@ test.describe('Package Access Controls', () => {
   async function goToPackageConnected(page: Page, gotoConnected: (path: string) => Promise<void>) {
     await gotoConnected('/')
     await expectConnected(page)
-    await page.goto('/package/@nuxt/kit')
+    await page.goto('/package/@nuxt/kit/')
     await expect(page.locator('h1')).toContainText('kit', { timeout: 30_000 })
   }
 
diff --git a/test/e2e/create-command.spec.ts b/test/e2e/create-command.spec.ts
index 15f00ee4c..9bb2cb1f7 100644
--- a/test/e2e/create-command.spec.ts
+++ b/test/e2e/create-command.spec.ts
@@ -3,7 +3,7 @@ import { expect, test } from './test-utils'
 test.describe('Create Command', () => {
   test.describe('Visibility', () => {
     test('/vite - should show create command (same maintainers)', async ({ page, goto }) => {
-      await goto('/package/vite', { waitUntil: 'domcontentloaded' })
+      await goto('/package/vite/', { waitUntil: 'domcontentloaded' })
 
       // Create command section should be visible (SSR)
       // Use specific container to avoid matching README code blocks
@@ -12,14 +12,14 @@ test.describe('Create Command', () => {
       await expect(createCommandSection.locator('code')).toContainText(/create vite/i)
 
       // Link to create-vite should be present (uses sr-only text, so check attachment not visibility)
-      await expect(page.locator('a[href="/package/create-vite"]').first()).toBeAttached()
+      await expect(page.locator('a[href="/package/create-vite/"]').first()).toBeAttached()
     })
 
     test('/next - should show create command (shared maintainer, same repo)', async ({
       page,
       goto,
     }) => {
-      await goto('/package/next', { waitUntil: 'domcontentloaded' })
+      await goto('/package/next/', { waitUntil: 'domcontentloaded' })
 
       // Create command section should be visible (SSR)
       // Use specific container to avoid matching README code blocks
@@ -28,14 +28,14 @@ test.describe('Create Command', () => {
       await expect(createCommandSection.locator('code')).toContainText(/create next-app/i)
 
       // Link to create-next-app should be present (uses sr-only text, so check attachment not visibility)
-      await expect(page.locator('a[href="/package/create-next-app"]').first()).toBeAttached()
+      await expect(page.locator('a[href="/package/create-next-app/"]').first()).toBeAttached()
     })
 
     test('/nuxt - should show create command (same maintainer, same org)', async ({
       page,
       goto,
     }) => {
-      await goto('/package/nuxt', { waitUntil: 'domcontentloaded' })
+      await goto('/package/nuxt/', { waitUntil: 'domcontentloaded' })
 
       // Create command section should be visible (SSR)
       // nuxt has create-nuxt package, so command is "npm create nuxt"
@@ -49,7 +49,7 @@ test.describe('Create Command', () => {
       page,
       goto,
     }) => {
-      await goto('/package/is-odd', { waitUntil: 'domcontentloaded' })
+      await goto('/package/is-odd/', { waitUntil: 'domcontentloaded' })
 
       // Wait for package to load
       await expect(page.locator('h1').filter({ hasText: 'is-odd' })).toBeVisible()
@@ -63,7 +63,7 @@ test.describe('Create Command', () => {
 
   test.describe('Copy Functionality', () => {
     test('hovering create command shows copy button', async ({ page, goto }) => {
-      await goto('/package/vite', { waitUntil: 'hydration' })
+      await goto('/package/vite/', { waitUntil: 'hydration' })
 
       await expect(page.locator('h1')).toContainText('vite', { timeout: 15000 })
 
@@ -94,7 +94,7 @@ test.describe('Create Command', () => {
       // Grant clipboard permissions
       await context.grantPermissions(['clipboard-read', 'clipboard-write'])
 
-      await goto('/package/vite', { waitUntil: 'hydration' })
+      await goto('/package/vite/', { waitUntil: 'hydration' })
       await expect(page.locator('h1')).toContainText('vite', { timeout: 15000 })
 
       await expect(page.locator('main header').locator('text=/v\\d+\\.\\d+/')).toBeVisible({
@@ -124,7 +124,7 @@ test.describe('Create Command', () => {
 
   test.describe('Install Command Copy', () => {
     test('hovering install command shows copy button', async ({ page, goto }) => {
-      await goto('/package/is-odd', { waitUntil: 'hydration' })
+      await goto('/package/is-odd/', { waitUntil: 'hydration' })
 
       // Find the install command container
       const installCommandContainer = page.locator('.group\\/installcmd').first()
@@ -149,7 +149,7 @@ test.describe('Create Command', () => {
       // Grant clipboard permissions
       await context.grantPermissions(['clipboard-read', 'clipboard-write'])
 
-      await goto('/package/is-odd', { waitUntil: 'hydration' })
+      await goto('/package/is-odd/', { waitUntil: 'hydration' })
 
       // Find and hover over the install command container
       const installCommandContainer = page.locator('.group\\/installcmd').first()
diff --git a/test/e2e/docs.spec.ts b/test/e2e/docs.spec.ts
index f95a23351..aa456799d 100644
--- a/test/e2e/docs.spec.ts
+++ b/test/e2e/docs.spec.ts
@@ -3,7 +3,7 @@ import { expect, test } from './test-utils'
 test.describe('API Documentation Pages', () => {
   test('docs page loads and shows content for a package', async ({ page, goto }) => {
     // Use a small, stable package with TypeScript types
-    await goto('/package-docs/ufo/v/1.6.3', { waitUntil: 'networkidle' })
+    await goto('/package-docs/ufo/v/1.6.3/', { waitUntil: 'networkidle' })
 
     // Page title should include package name
     await expect(page).toHaveTitle(/ufo.*docs/i)
@@ -24,7 +24,7 @@ test.describe('API Documentation Pages', () => {
   })
 
   test('docs page shows TOC sidebar on desktop', async ({ page, goto }) => {
-    await goto('/package-docs/ufo/v/1.6.3', { waitUntil: 'networkidle' })
+    await goto('/package-docs/ufo/v/1.6.3/', { waitUntil: 'networkidle' })
 
     // TOC sidebar should be visible (on desktop viewport)
     const tocSidebar = page.locator('aside')
@@ -38,7 +38,7 @@ test.describe('API Documentation Pages', () => {
   })
 
   test('TOC links navigate to sections', async ({ page, goto }) => {
-    await goto('/package-docs/ufo/v/1.6.3', { waitUntil: 'networkidle' })
+    await goto('/package-docs/ufo/v/1.6.3/', { waitUntil: 'networkidle' })
 
     // Click on Functions in TOC
     const functionsLink = page.locator('aside a[href="#section-function"]')
@@ -53,7 +53,7 @@ test.describe('API Documentation Pages', () => {
   })
 
   test('clicking symbol name scrolls to symbol', async ({ page, goto }) => {
-    await goto('/package-docs/ufo/v/1.6.3', { waitUntil: 'networkidle' })
+    await goto('/package-docs/ufo/v/1.6.3/', { waitUntil: 'networkidle' })
 
     // Find a symbol link in the TOC
     const symbolLink = page.locator('aside a[href^="#function-"]').first()
@@ -67,27 +67,27 @@ test.describe('API Documentation Pages', () => {
   })
 
   test('docs page without version redirects to latest', async ({ page, goto }) => {
-    await goto('/package-docs/ufo', { waitUntil: 'networkidle' })
+    await goto('/package-docs/ufo/', { waitUntil: 'networkidle' })
 
     // Should redirect to include version
     await expect(page).toHaveURL(/\/package-docs\/ufo\/v\//)
   })
 
   test('package link in header navigates to package page', async ({ page, goto }) => {
-    await goto('/package-docs/ufo/v/1.6.3', { waitUntil: 'networkidle' })
+    await goto('/package-docs/ufo/v/1.6.3/', { waitUntil: 'networkidle' })
 
     // Click on package name in header
     const packageLink = page.locator('header a').filter({ hasText: 'ufo' })
     await packageLink.click()
 
     // Should navigate to package page (URL ends with /ufo)
-    await expect(page).toHaveURL(/\/package\/ufo$/)
+    await expect(page).toHaveURL(/\/package\/ufo\/$/)
   })
 
   test('docs page handles package gracefully when types unavailable', async ({ page, goto }) => {
     // Use a simple JS package - the page should load without crashing
     // regardless of whether it has types or shows an error state
-    await goto('/package-docs/is-odd/v/3.0.1', { waitUntil: 'networkidle' })
+    await goto('/package-docs/is-odd/v/3.0.1/', { waitUntil: 'networkidle' })
 
     // Header should always show the package name
     await expect(page.locator('header').getByText('is-odd')).toBeVisible()
@@ -105,7 +105,7 @@ test.describe('API Documentation Pages', () => {
 
 test.describe('Version Selector', () => {
   test('version selector dropdown shows versions', async ({ page, goto }) => {
-    await goto('/package-docs/ufo/v/1.6.3', { waitUntil: 'hydration' })
+    await goto('/package-docs/ufo/v/1.6.3/', { waitUntil: 'hydration' })
 
     // Find and click the version selector button (wait for it to be visible)
     const versionButton = page.locator('header button').filter({ hasText: '1.6.3' })
@@ -123,7 +123,7 @@ test.describe('Version Selector', () => {
   })
 
   test('selecting a version navigates to that version', async ({ page, goto }) => {
-    await goto('/package-docs/ufo/v/1.6.3', { waitUntil: 'hydration' })
+    await goto('/package-docs/ufo/v/1.6.3/', { waitUntil: 'hydration' })
 
     // Find and click the version selector button (wait for it to be visible)
     const versionButton = page.locator('header button').filter({ hasText: '1.6.3' })
@@ -157,7 +157,7 @@ test.describe('Version Selector', () => {
   })
 
   test('escape key closes version dropdown', async ({ page, goto }) => {
-    await goto('/package-docs/ufo/v/1.6.3', { waitUntil: 'hydration' })
+    await goto('/package-docs/ufo/v/1.6.3/', { waitUntil: 'hydration' })
 
     // Wait for version button to be visible
     const versionButton = page.locator('header button').filter({ hasText: '1.6.3' })
diff --git a/test/e2e/hydration.spec.ts b/test/e2e/hydration.spec.ts
index 0f1c6ae9e..a79fd8674 100644
--- a/test/e2e/hydration.spec.ts
+++ b/test/e2e/hydration.spec.ts
@@ -3,13 +3,13 @@ import { expect, test } from './test-utils'
 
 const PAGES = [
   '/',
-  '/about',
-  '/settings',
-  '/privacy',
-  '/compare',
-  '/search',
-  '/package/nuxt',
-  '/search?q=vue',
+  '/about/',
+  '/settings/',
+  '/privacy/',
+  '/compare/',
+  '/search/',
+  '/package/nuxt/',
+  '/search/?q=vue',
 ] as const
 
 // ---------------------------------------------------------------------------
diff --git a/test/e2e/interactions.spec.ts b/test/e2e/interactions.spec.ts
index b900bbafa..16a93afc3 100644
--- a/test/e2e/interactions.spec.ts
+++ b/test/e2e/interactions.spec.ts
@@ -2,7 +2,7 @@ import { expect, test } from './test-utils'
 
 test.describe('Compare Page', () => {
   test('no-dep column renders separately from package columns', async ({ page, goto }) => {
-    await goto('/compare?packages=vue,__no_dependency__', { waitUntil: 'hydration' })
+    await goto('/compare/?packages=vue,__no_dependency__', { waitUntil: 'hydration' })
 
     const grid = page.locator('.comparison-grid')
     await expect(grid).toBeVisible({ timeout: 15000 })
@@ -20,7 +20,7 @@ test.describe('Compare Page', () => {
     goto,
   }) => {
     // Start with vue and no-dep
-    await goto('/compare?packages=vue,__no_dependency__', { waitUntil: 'hydration' })
+    await goto('/compare/?packages=vue,__no_dependency__', { waitUntil: 'hydration' })
 
     const grid = page.locator('.comparison-grid')
     await expect(grid).toBeVisible({ timeout: 15000 })
@@ -50,8 +50,8 @@ test.describe('Compare Page', () => {
 })
 
 test.describe('Search Pages', () => {
-  test('/search?q=vue → keyboard navigation (arrow keys + enter)', async ({ page, goto }) => {
-    await goto('/search?q=vue', { waitUntil: 'hydration' })
+  test('/search/?q=vue → keyboard navigation (arrow keys + enter)', async ({ page, goto }) => {
+    await goto('/search/?q=vue', { waitUntil: 'hydration' })
 
     await expect(page.locator('text=/found \\d+|showing \\d+/i').first()).toBeVisible({
       timeout: 15000,
@@ -73,8 +73,8 @@ test.describe('Search Pages', () => {
     await expect(page).toHaveURL(/\/(package|org|user)\/vue/)
   })
 
-  test('/search?q=vue → "/" focuses the search input from results', async ({ page, goto }) => {
-    await goto('/search?q=vue', { waitUntil: 'hydration' })
+  test('/search/?q=vue → "/" focuses the search input from results', async ({ page, goto }) => {
+    await goto('/search/?q=vue', { waitUntil: 'hydration' })
 
     await expect(page.locator('text=/found \\d+|showing \\d+/i').first()).toBeVisible({
       timeout: 15000,
@@ -108,8 +108,8 @@ test.describe('Search Pages', () => {
     await expect(headerSearchInput).toBeFocused()
   })
 
-  test('/settings → search, keeps focus on search input', async ({ page, goto }) => {
-    await goto('/settings', { waitUntil: 'hydration' })
+  test('/settings/ → search, keeps focus on search input', async ({ page, goto }) => {
+    await goto('/settings/', { waitUntil: 'hydration' })
 
     const searchInput = page.locator('input[type="search"]')
     await expect(searchInput).toBeVisible()
@@ -130,7 +130,7 @@ test.describe('Search Pages', () => {
 
 test.describe('Keyboard Shortcuts', () => {
   test('"c" navigates to /compare', async ({ page, goto }) => {
-    await goto('/settings', { waitUntil: 'hydration' })
+    await goto('/settings/', { waitUntil: 'hydration' })
 
     await page.keyboard.press('c')
 
@@ -138,7 +138,7 @@ test.describe('Keyboard Shortcuts', () => {
   })
 
   test('"c" does not navigate when any modifier key is pressed', async ({ page, goto }) => {
-    await goto('/settings', { waitUntil: 'hydration' })
+    await goto('/settings/', { waitUntil: 'hydration' })
 
     await page.keyboard.press('Shift+c')
     await expect(page).toHaveURL(/\/settings/)
@@ -156,16 +156,16 @@ test.describe('Keyboard Shortcuts', () => {
     page,
     goto,
   }) => {
-    await goto('/package/vue', { waitUntil: 'hydration' })
+    await goto('/package/vue/', { waitUntil: 'hydration' })
 
     await page.keyboard.press('c')
 
     // Should navigate to /compare with the package in the query
-    await expect(page).toHaveURL(/\/compare\?packages=vue/)
+    await expect(page).toHaveURL(/\/compare\/\?packages=vue/)
   })
 
   test('"c" does not navigate when search input is focused', async ({ page, goto }) => {
-    await goto('/settings', { waitUntil: 'hydration' })
+    await goto('/settings/', { waitUntil: 'hydration' })
 
     const searchInput = page.locator('#header-search')
     await searchInput.focus()
@@ -174,7 +174,7 @@ test.describe('Keyboard Shortcuts', () => {
     await page.keyboard.press('c')
 
     // Should still be on settings, not navigated to compare
-    await expect(page).toHaveURL(/\/settings/)
+    await expect(page).toHaveURL(/\/settings\//)
     // The 'c' should have been typed into the input
     await expect(searchInput).toHaveValue('c')
   })
@@ -183,7 +183,7 @@ test.describe('Keyboard Shortcuts', () => {
     page,
     goto,
   }) => {
-    await goto('/package/vue', { waitUntil: 'hydration' })
+    await goto('/package/vue/', { waitUntil: 'hydration' })
 
     await page.keyboard.press('Shift+c')
     await expect(page).toHaveURL(/\/vue/)
@@ -198,7 +198,7 @@ test.describe('Keyboard Shortcuts', () => {
   })
 
   test('"," navigates to /settings', async ({ page, goto }) => {
-    await goto('/compare', { waitUntil: 'hydration' })
+    await goto('/compare/', { waitUntil: 'hydration' })
 
     await page.keyboard.press(',')
 
@@ -206,7 +206,7 @@ test.describe('Keyboard Shortcuts', () => {
   })
 
   test('"," does not navigate when any modifier key is pressed', async ({ page, goto }) => {
-    await goto('/settings', { waitUntil: 'hydration' })
+    await goto('/settings/', { waitUntil: 'hydration' })
 
     const searchInput = page.locator('#header-search')
     await searchInput.focus()
@@ -225,7 +225,7 @@ test.describe('Keyboard Shortcuts', () => {
   })
 
   test('"," does not navigate when search input is focused', async ({ page, goto }) => {
-    await goto('/compare', { waitUntil: 'hydration' })
+    await goto('/compare/', { waitUntil: 'hydration' })
 
     const searchInput = page.locator('#header-search')
     await searchInput.focus()
diff --git a/test/e2e/package-manager-select.spec.ts b/test/e2e/package-manager-select.spec.ts
index e5a185f74..8c5111c5c 100644
--- a/test/e2e/package-manager-select.spec.ts
+++ b/test/e2e/package-manager-select.spec.ts
@@ -2,7 +2,7 @@ import { expect, test } from './test-utils'
 
 test.describe('Package Page', () => {
   test('/vue → package manager select dropdown works', async ({ page, goto }) => {
-    await goto('/package/vue', { waitUntil: 'hydration' })
+    await goto('/package/vue/', { waitUntil: 'hydration' })
 
     await expect(page.locator('h1')).toContainText('vue', { timeout: 15000 })
 
diff --git a/test/e2e/url-compatibility.spec.ts b/test/e2e/url-compatibility.spec.ts
index b555d7605..993d0e2cd 100644
--- a/test/e2e/url-compatibility.spec.ts
+++ b/test/e2e/url-compatibility.spec.ts
@@ -3,7 +3,7 @@ import { expect, test } from './test-utils'
 test.describe('npmjs.com URL Compatibility', () => {
   test.describe('Package Pages', () => {
     test('/package/vue → package page', async ({ page, goto }) => {
-      await goto('/package/vue', { waitUntil: 'domcontentloaded' })
+      await goto('/package/vue/', { waitUntil: 'domcontentloaded' })
 
       // Should show package name
       await expect(page.locator('h1')).toContainText('vue')
@@ -12,14 +12,14 @@ test.describe('npmjs.com URL Compatibility', () => {
     })
 
     test('/package/@nuxt/kit → scoped package page', async ({ page, goto }) => {
-      await goto('/package/@nuxt/kit', { waitUntil: 'domcontentloaded' })
+      await goto('/package/@nuxt/kit/', { waitUntil: 'domcontentloaded' })
 
       // Should show scoped package name
       await expect(page.locator('h1')).toContainText('@nuxt/kit')
     })
 
     test('/package/vue/v/3.5.27 → specific version', async ({ page, goto }) => {
-      await goto('/package/vue/v/3.5.27', { waitUntil: 'domcontentloaded' })
+      await goto('/package/vue/v/3.5.27/', { waitUntil: 'domcontentloaded' })
 
       // Should show package name
       await expect(page.locator('h1')).toContainText('vue')
@@ -31,7 +31,7 @@ test.describe('npmjs.com URL Compatibility', () => {
       page,
       goto,
     }) => {
-      await goto('/package/@nuxt/kit/v/3.20.0', { waitUntil: 'domcontentloaded' })
+      await goto('/package/@nuxt/kit/v/3.20.0/', { waitUntil: 'domcontentloaded' })
 
       // Should show scoped package name
       await expect(page.locator('h1')).toContainText('@nuxt/kit')
@@ -40,7 +40,7 @@ test.describe('npmjs.com URL Compatibility', () => {
     })
 
     test('/package/nonexistent-pkg-12345 → 404 handling', async ({ page, goto }) => {
-      await goto('/package/nonexistent-pkg-12345', { waitUntil: 'domcontentloaded' })
+      await goto('/package/nonexistent-pkg-12345/', { waitUntil: 'domcontentloaded' })
 
       // Should show error state - look for the heading specifically
       await expect(page.getByRole('heading', { name: /not found/i })).toBeVisible()
@@ -49,7 +49,7 @@ test.describe('npmjs.com URL Compatibility', () => {
 
   test.describe('Search Pages', () => {
     test('/search?q=vue → search results', async ({ page, goto }) => {
-      await goto('/search?q=vue', { waitUntil: 'domcontentloaded' })
+      await goto('/search/?q=vue', { waitUntil: 'domcontentloaded' })
 
       // Should show search input with query
       await expect(page.locator('input[type="search"]')).toHaveValue('vue')
@@ -58,7 +58,7 @@ test.describe('npmjs.com URL Compatibility', () => {
     })
 
     test('/search?q=keywords:framework → keyword search', async ({ page, goto }) => {
-      await goto('/search?q=keywords:framework', { waitUntil: 'domcontentloaded' })
+      await goto('/search/?q=keywords:framework', { waitUntil: 'domcontentloaded' })
 
       // Should show search input with query
       await expect(page.locator('input[type="search"]')).toHaveValue('keywords:framework')
@@ -67,7 +67,7 @@ test.describe('npmjs.com URL Compatibility', () => {
     })
 
     test('/search → empty search page', async ({ page, goto }) => {
-      await goto('/search', { waitUntil: 'domcontentloaded' })
+      await goto('/search/', { waitUntil: 'domcontentloaded' })
 
       // Should show empty state prompt
       await expect(page.locator('text=/start typing/i')).toBeVisible()
@@ -76,7 +76,7 @@ test.describe('npmjs.com URL Compatibility', () => {
 
   test.describe('User Profile Pages', () => {
     test('/~qwerzl → user profile', async ({ page, goto }) => {
-      await goto('/~qwerzl', { waitUntil: 'hydration' })
+      await goto('/~qwerzl/', { waitUntil: 'hydration' })
 
       // Should show username
       await expect(page.locator('h1')).toContainText('~qwerzl')
@@ -87,7 +87,7 @@ test.describe('npmjs.com URL Compatibility', () => {
     })
 
     test('/~nonexistent-user-12345 → empty user handling', async ({ page, goto }) => {
-      await goto('/~nonexistent-user-12345', { waitUntil: 'domcontentloaded' })
+      await goto('/~nonexistent-user-12345/', { waitUntil: 'domcontentloaded' })
 
       // Should show username in header
       await expect(page.locator('h1')).toContainText('~nonexistent-user-12345')
@@ -98,7 +98,7 @@ test.describe('npmjs.com URL Compatibility', () => {
 
   test.describe('Organization Pages', () => {
     test('/org/nuxt → organization page', async ({ page, goto }) => {
-      await goto('/org/nuxt', { waitUntil: 'domcontentloaded' })
+      await goto('/org/nuxt/', { waitUntil: 'domcontentloaded' })
 
       // Should show org name
       await expect(page.locator('h1')).toContainText('@nuxt')
@@ -107,7 +107,7 @@ test.describe('npmjs.com URL Compatibility', () => {
     })
 
     test('/org/nonexistent-org-12345 → 404 handling', async ({ page, goto }) => {
-      await goto('/org/nonexistent-org-12345', { waitUntil: 'domcontentloaded' })
+      await goto('/org/nonexistent-org-12345/', { waitUntil: 'domcontentloaded' })
 
       // Should show 404 error page
       await expect(page.locator('h1')).toContainText('Organization not found')
@@ -116,19 +116,19 @@ test.describe('npmjs.com URL Compatibility', () => {
 
   test.describe('Edge Cases', () => {
     test('package name with dots: /package/lodash.merge', async ({ page, goto }) => {
-      await goto('/package/lodash.merge', { waitUntil: 'domcontentloaded' })
+      await goto('/package/lodash.merge/', { waitUntil: 'domcontentloaded' })
 
       await expect(page.locator('h1')).toContainText('lodash.merge')
     })
 
     test('package name with hyphens: /package/is-odd', async ({ page, goto }) => {
-      await goto('/package/is-odd', { waitUntil: 'domcontentloaded' })
+      await goto('/package/is-odd/', { waitUntil: 'domcontentloaded' })
 
       await expect(page.locator('h1')).toContainText('is-odd')
     })
 
     test('scoped package with hyphens: /package/@types/node', async ({ page, goto }) => {
-      await goto('/package/@types/node', { waitUntil: 'domcontentloaded' })
+      await goto('/package/@types/node/', { waitUntil: 'domcontentloaded' })
 
       await expect(page.locator('h1')).toContainText('@types/node')
     })
diff --git a/test/nuxt/components/VersionSelector.spec.ts b/test/nuxt/components/VersionSelector.spec.ts
index dc3e2b59b..90efa13e2 100644
--- a/test/nuxt/components/VersionSelector.spec.ts
+++ b/test/nuxt/components/VersionSelector.spec.ts
@@ -322,7 +322,7 @@ describe('VersionSelector', () => {
 
       const versionLink = component.findAll('a').find(a => a.text().includes('1.0.0'))
       expect(versionLink?.attributes('href')).toBe(
-        '/package-code/test-package/v/1.0.0/src/index.ts',
+        '/package-code/test-package/v/1.0.0/src/index.ts/',
       )
     })
   })
diff --git a/test/nuxt/components/compare/PackageSelector.spec.ts b/test/nuxt/components/compare/PackageSelector.spec.ts
index 54eece316..01d3b8e9f 100644
--- a/test/nuxt/components/compare/PackageSelector.spec.ts
+++ b/test/nuxt/components/compare/PackageSelector.spec.ts
@@ -40,7 +40,7 @@ describe('PackageSelector', () => {
         },
       })
 
-      const link = component.find('a[href="/package/lodash"]')
+      const link = component.find('a[href="/package/lodash/"]')
       expect(link.exists()).toBe(true)
     })
 
diff --git a/vercel.json b/vercel.json
index a72838625..b84865c1e 100644
--- a/vercel.json
+++ b/vercel.json
@@ -1,6 +1,5 @@
 {
   "$schema": "https://openapi.vercel.sh/vercel.json",
-  "trailingSlash": false,
   "redirects": [
     {
       "source": "/(.*)",