perf: early return chained functions with falsy values (#25647)

packages/kit/src/compatibility.ts

@@ -89,9 +89,9 @@ export function isNuxt3 (nuxt: Nuxt = useNuxt()) {
  * Get nuxt version
  */
 export function getNuxtVersion (nuxt: Nuxt | any = useNuxt() /* TODO: LegacyNuxt */) {
-  const version = (nuxt?._version || nuxt?.version || nuxt?.constructor?.version || '').replace(/^v/g, '')
+  const rawVersion = nuxt?._version || nuxt?.version || nuxt?.constructor?.version
-  if (!version) {
+  if (!rawVersion) {
     throw new Error('Cannot determine nuxt version! Is current instance passed?')
   }
-  return version
+  return rawVersion.replace(/^v/g, '')
 }

packages/kit/src/loader/nuxt.ts

@@ -33,7 +33,7 @@ export async function loadNuxt (opts: LoadNuxtOptions): Promise<Nuxt> {
     throw new Error(`Cannot find any nuxt version from ${opts.cwd}`)
   }
   const pkg = await readPackageJSON(nearestNuxtPkg)
-  const majorVersion = parseInt((pkg.version || '').split('.')[0])
+  const majorVersion = pkg.version ? parseInt(pkg.version.split('.')[0]) : ''
 
   const rootDir = pathToFileURL(opts.cwd || process.cwd()).href
 

packages/nuxt/src/app/components/nuxt-error-page.vue

@@ -13,21 +13,23 @@ const props = defineProps({
 const _error = props.error
 
 // TODO: extract to a separate utility
-const stacktrace = (_error.stack || '')
+const stacktrace = _error.stack
-  .split('\n')
+  ? _error.stack
-  .splice(1)
+    .split('\n')
-  .map((line) => {
+    .splice(1)
-    const text = line
+    .map((line) => {
-      .replace('webpack:/', '')
+      const text = line
-      .replace('.vue', '.js') // TODO: Support sourcemap
+        .replace('webpack:/', '')
-      .trim()
+        .replace('.vue', '.js') // TODO: Support sourcemap
-    return {
+        .trim()
-      text,
+      return {
-      internal: (line.includes('node_modules') && !line.includes('.cache')) ||
+        text,
-        line.includes('internal') ||
+        internal: (line.includes('node_modules') && !line.includes('.cache')) ||
-        line.includes('new Promise')
+          line.includes('internal') ||
-    }
+          line.includes('new Promise')
-  }).map(i => `<span class="stack${i.internal ? ' internal' : ''}">${i.text}</span>`).join('\n')
+      }
+    }).map(i => `<span class="stack${i.internal ? ' internal' : ''}">${i.text}</span>`).join('\n')
+  : ''
 
 // Error page props
 const statusCode = Number(_error.statusCode || 500)

packages/nuxt/src/core/app.ts

@@ -233,7 +233,7 @@ export function checkForCircularDependencies (_plugins: Array<NuxtPlugin & Omit<
       return []
     }
     visited.push(name)
-    return (deps[name] || []).flatMap(dep => checkDeps(dep, [...visited]))
+    return deps[name]?.length ? deps[name].flatMap(dep => checkDeps(dep, [...visited])) : []
   }
   for (const name in deps) {
     checkDeps(name)

packages/nuxt/src/core/nitro.ts

@@ -287,13 +287,15 @@ export async function initNitro (nuxt: Nuxt & { _nitro?: Nitro }) {
         const routeRulesMatcher = toRouteMatcher(
           createRadixRouter({ routes: routeRules })
         )
-        const payloadSuffix = nuxt.options.experimental.renderJsonPayloads ? '/_payload.json' : '/_payload.js'
+        if (nitro._prerenderedRoutes?.length) {
-        for (const route of nitro._prerenderedRoutes || []) {
+          const payloadSuffix = nuxt.options.experimental.renderJsonPayloads ? '/_payload.json' : '/_payload.js'
-          if (!route.error && route.route.endsWith(payloadSuffix)) {
+          for (const route of nitro._prerenderedRoutes) {
-            const url = route.route.slice(0, -payloadSuffix.length) || '/'
+            if (!route.error && route.route.endsWith(payloadSuffix)) {
-            const rules = defu({}, ...routeRulesMatcher.matchAll(url).reverse()) as Record<string, any>
+              const url = route.route.slice(0, -payloadSuffix.length) || '/'
-            if (!rules.prerender) {
+              const rules = defu({}, ...routeRulesMatcher.matchAll(url).reverse()) as Record<string, any>
-              prerenderedRoutes.add(url)
+              if (!rules.prerender) {
+                prerenderedRoutes.add(url)
+              }
             }
           }
         }

packages/nuxt/src/core/plugins/dev-only.ts

@@ -21,11 +21,10 @@ export const DevOnlyPlugin = createUnplugin((options: DevOnlyPluginOptions) => {
       if (!DEVONLY_COMP_SINGLE_RE.test(code)) { return }
 
       const s = new MagicString(code)
-      for (const match of code.matchAll(DEVONLY_COMP_RE) || []) {
+      for (const match of code.matchAll(DEVONLY_COMP_RE)) {
         const ast: Node = parse(match[0]).children[0]
         const fallback: Node | undefined = ast.children?.find((n: Node) => n.name === 'template' && Object.values(n.attributes).includes('#fallback'))
         const replacement = fallback ? match[0].slice(fallback.loc[0].end, fallback.loc[fallback.loc.length - 1].start) : ''
-
         s.overwrite(match.index!, match.index! + match[0].length, replacement)
       }
 

packages/nuxt/src/core/plugins/tree-shake.ts

@@ -31,7 +31,7 @@ export const TreeShakeComposablesPlugin = createUnplugin((options: TreeShakeComp
 
       const s = new MagicString(code)
       const strippedCode = stripLiteral(code)
-      for (const match of strippedCode.matchAll(COMPOSABLE_RE_GLOBAL) || []) {
+      for (const match of strippedCode.matchAll(COMPOSABLE_RE_GLOBAL)) {
         s.overwrite(match.index!, match.index! + match[0].length, `${match[1]} false && /*@__PURE__*/ ${match[2]}`)
       }
 

packages/nuxt/src/core/utils/names.ts

@@ -28,7 +28,7 @@ export function resolveComponentNameSegments (fileName: string, prefixParts: str
   let index = prefixParts.length - 1
   const matchedSuffix: string[] = []
   while (index >= 0) {
-    matchedSuffix.unshift(...splitByCase(prefixParts[index] || '').map(p => p.toLowerCase()))
+    matchedSuffix.unshift(...splitByCase(prefixParts[index]).map(p => p.toLowerCase()))
     const matchedSuffixContent = matchedSuffix.join('/')
     if ((fileNamePartsContent === matchedSuffixContent || fileNamePartsContent.startsWith(matchedSuffixContent + '/')) ||
       // e.g Item/Item/Item.vue -> Item

packages/nuxt/src/head/runtime/components.ts

@@ -86,10 +86,10 @@ export const NoScript = defineComponent({
   },
   setup: setupForUseMeta((props, { slots }) => {
     const noscript = { ...props }
-    const textContent = (slots.default?.() || [])
+    const slotVnodes = slots.default?.()
-      .filter(({ children }) => children)
+    const textContent = slotVnodes
-      .map(({ children }) => children)
+      ? slotVnodes.filter(({ children }) => children).map(({ children }) => children).join('')
-      .join('')
+      : ''
     if (textContent) {
       noscript.children = textContent
     }

packages/nuxt/src/pages/module.ts

@@ -271,13 +271,15 @@ export default defineNuxtModule({
         processPages(pages)
       })
       nuxt.hook('nitro:build:before', (nitro) => {
-        for (const route of nitro.options.prerender.routes || []) {
+        if (nitro.options.prerender.routes.length) {
-          // Skip default route value as we only generate it if it is already
+          for (const route of nitro.options.prerender.routes) {
-          // in the detected routes from `~/pages`.
+            // Skip default route value as we only generate it if it is already
-          if (route === '/') { continue }
+            // in the detected routes from `~/pages`.
-          prerenderRoutes.add(route)
+            if (route === '/') { continue }
+            prerenderRoutes.add(route)
+          }
+          nitro.options.prerender.routes = Array.from(prerenderRoutes)
         }
-        nitro.options.prerender.routes = Array.from(prerenderRoutes)
       })
     })
 
@@ -389,13 +391,13 @@ export default defineNuxtModule({
     const getSources = (pages: NuxtPage[]): string[] => pages
       .filter(p => Boolean(p.file))
       .flatMap(p =>
-        [relative(nuxt.options.srcDir, p.file as string), ...getSources(p.children || [])]
+        [relative(nuxt.options.srcDir, p.file as string), ...(p.children?.length ? getSources(p.children) : [])]
       )
 
     // Do not prefetch page chunks
     nuxt.hook('build:manifest', (manifest) => {
       if (nuxt.options.dev) { return }
-      const sourceFiles = getSources(nuxt.apps.default.pages || [])
+      const sourceFiles = nuxt.apps.default?.pages?.length ? getSources(nuxt.apps.default.pages) : []
 
       for (const key in manifest) {
         if (manifest[key].isEntry) {

packages/vite/src/plugins/ssr-styles.ts

@@ -144,6 +144,8 @@ export function ssrStylesPlugin (options: SSRStylePluginOptions): Plugin {
         if (id === options.entry && (options.shouldInline === true || (typeof options.shouldInline === 'function' && options.shouldInline(id)))) {
           const s = new MagicString(code)
           options.clientCSSMap[id] ||= new Set()
+          if (!options.globalCSS.length) { return }
+
           for (const file of options.globalCSS) {
             const resolved = await this.resolve(file) ?? await this.resolve(file, id)
             const res = await this.resolve(file + '?inline&used') ?? await this.resolve(file + '?inline&used', id)

packages/vite/src/utils/warmup.ts

@@ -63,7 +63,7 @@ export async function warmupViteServer (
 
     try {
       const mod = await server.moduleGraph.getModuleByUrl(url, isServer)
-      const deps = mod?.ssrTransformResult?.deps /* server */ || Array.from(mod?.importedModules /* client */ || []).map(m => m.url)
+      const deps = mod?.ssrTransformResult?.deps /* server */ || mod?.importedModules.size ? Array.from(mod?.importedModules /* client */).map(m => m.url) : []
       await Promise.all(deps.map(m => warmup(m)))
     } catch (e) {
       logger.debug('[warmup] tracking dependencies for %s failed with: %s', url, e)

test/basic.test.ts

@@ -1986,6 +1986,7 @@ describe('component islands', () => {
         link.href = link.href.replace(fixtureDir, '/<rootDir>').replaceAll('//', '/')
         link.key = link.key.replace(/-[a-zA-Z0-9]+$/, '')
       }
+      result.head.link.sort((a, b) => b.href.localeCompare(a.href))
     }
 
     // TODO: fix rendering of styles in webpack