perf(dev,module): handle registry trailing slashes internally

Author: danielroe

packages/nuxt-cli/package.json

@@ -80,7 +80,6 @@
     "std-env": "^4.2.0",
     "tinyclip": "^1.0.1",
     "tinyexec": "^1.3.0",
-    "ufo": "^1.6.4",
     "uqr": "^0.1.3",
     "verkit": "^0.3.1"
   },

packages/nuxt-cli/src/commands/module/add.ts

@@ -12,7 +12,6 @@ import { defineCommand } from 'citty'
 import { detectPackageManager, packageManagers } from 'nypm'
 import { resolve } from 'pathe'
 import { readPackageJSON } from 'pkg-types'
-import { joinURL } from 'ufo'
 import { findMaxSatisfying, satisfies } from 'verkit'
 
 import { runCommandDef as runCommand } from '../../run-command'
@@ -435,7 +434,7 @@ async function resolveModule(moduleName: string, cwd: string, modulesDB: NuxtMod
   }
 
   // TODO: spinner
-  const pkgUrl = joinURL(meta.registry, `${pkgName}`)
+  const pkgUrl = `${meta.registry}/${pkgName}`
   const pkgDetails = await fetchJson<any>(pkgUrl, { headers }).catch((err: unknown) => {
     logNetworkError(err, { url: pkgUrl, prefix: `Failed to fetch package details for ${styleText('cyan', pkgName)}.` })
     return null

packages/nuxt-cli/src/dev/utils.ts

@@ -21,7 +21,6 @@ import { debounce } from 'perfect-debounce'
 import { toNodeHandler } from 'srvx/node'
 import { provider } from 'std-env'
 
-import { joinURL } from 'ufo'
 import { showBanner } from '../utils/banner'
 import { clearBuildDir } from '../utils/fs'
 import { loadKit } from '../utils/kit'
@@ -589,10 +588,9 @@ export class NuxtDevServer extends EventEmitter<DevServerEventMap> {
         const nuxt = this.#currentNuxt
         if (!nuxt || !nuxt.server)
           return
-        const viteHmrPath = joinURL(
-          nuxt.options.app.baseURL.startsWith('./') ? nuxt.options.app.baseURL.slice(1) : nuxt.options.app.baseURL,
-          nuxt.options.app.buildAssetsDir,
-        )
+        const baseURL = nuxt.options.app.baseURL.startsWith('./') ? nuxt.options.app.baseURL.slice(1) : nuxt.options.app.baseURL
+        const assetsDir = nuxt.options.app.buildAssetsDir
+        const viteHmrPath = `${baseURL.replace(/\/$/, '')}/${assetsDir.replace(/^\//, '')}`
         if (req.url?.startsWith(viteHmrPath)) {
           return // Skip for Vite HMR
         }

packages/nuxt-cli/src/utils/registry.ts

@@ -11,6 +11,7 @@ const PROTOCOL_RE = /^https?:\/\//
 const TRAILING_SLASH_RE = /\/$/
 
 export interface RegistryMeta {
+  /** Registry URL without a trailing slash, so paths can be appended directly. */
   registry: string
   authToken: string | null
 }
@@ -66,15 +67,16 @@ async function getRegistryFromFile(paths: string[], scope: string | null) {
 }
 
 async function getRegistry(scope: string | null, cwd: string): Promise<string> {
-  if (process.env.COREPACK_NPM_REGISTRY) {
-    return process.env.COREPACK_NPM_REGISTRY
-  }
-  return await getRegistryFromFile(getNpmrcPaths(cwd), scope) || 'https://registry.npmjs.org'
+  const registry = process.env.COREPACK_NPM_REGISTRY
+    || await getRegistryFromFile(getNpmrcPaths(cwd), scope)
+    || 'https://registry.npmjs.org'
+
+  return registry.replace(TRAILING_SLASH_RE, '')
 }
 
 async function getAuthToken(registry: RegistryMeta['registry'], cwd: string): Promise<RegistryMeta['authToken']> {
   const paths = getNpmrcPaths(cwd)
-  const registryHost = registry.replace(PROTOCOL_RE, '').replace(TRAILING_SLASH_RE, '')
+  const registryHost = registry.replace(PROTOCOL_RE, '')
   const authTokenKey = `//${registryHost}/:_authToken`
 
   for (const npmrcPath of paths) {

packages/nuxt-cli/src/utils/update-check.ts

@@ -4,7 +4,6 @@ import { styleText } from 'node:util'
 
 import { readUser, updateUser } from 'rc9'
 import { isCI, isTest, provider } from 'std-env'
-import { joinURL } from 'ufo'
 import { isGreater, tryParse } from 'verkit'
 
 import { fetchJson } from './fetch'
@@ -85,7 +84,7 @@ async function resolveLatestVersion(name: string): Promise<string | undefined> {
   let latest: string | undefined
   try {
     const { registry, authToken } = await detectNpmRegistry(null)
-    latest = (await fetchJson<{ latest?: string }>(joinURL(registry, `-/package/${name}/dist-tags`), {
+    latest = (await fetchJson<{ latest?: string }>(`${registry}/-/package/${name}/dist-tags`, {
       headers: authToken ? { Authorization: `Bearer ${authToken}` } : undefined,
       timeout: FETCH_TIMEOUT,
       retry: 0,

packages/nuxt-cli/src/utils/versions.ts

@@ -1,5 +1,4 @@
 import { readPackageJSON } from 'pkg-types'
-import { joinURL } from 'ufo'
 import { coerce, findMaxSatisfying } from 'verkit'
 
 import { resolveCatalogEntry } from './catalog'
@@ -44,7 +43,7 @@ export async function resolveRegistryVersion(pkg: string, range: string): Promis
     const scope = pkg.startsWith('@') ? pkg.split('/')[0]! : null
     const { registry, authToken } = await detectNpmRegistry(scope)
 
-    packument = await fetchJson(joinURL(registry, pkg), {
+    packument = await fetchJson(`${registry}/${pkg}`, {
       headers: {
         // The abbreviated packument is a fraction of the size of the full one and
         // still carries every version and dist-tag.

packages/nuxt-cli/test/unit/utils/registry.spec.ts

@@ -77,7 +77,7 @@ describe('detectNpmRegistry', () => {
     ].join('\n'))
 
     await expect(detectNpmRegistry(null, directory)).resolves.toEqual({
-      registry: 'https://registry.example.com/',
+      registry: 'https://registry.example.com',
       authToken: 'secret',
     })
     expect(process.env.COREPACK_NPM_REGISTRY).toBeUndefined()

packages/nuxt-cli/test/unit/utils/update.spec.ts

@@ -156,7 +156,7 @@ describe('update check', () => {
     })
 
     it('queries the configured registry with its auth token', async () => {
-      registry.current = { registry: 'https://npm.example.com/', authToken: 'secret' }
+      registry.current = { registry: 'https://npm.example.com', authToken: 'secret' }
       fetchMock.mockResolvedValue({ latest: '4.1.0' })
       await checkForNuxtUpdate('/project')
       expect(fetchMock).toHaveBeenCalledWith(