Merge remote-tracking branch 'origin/main' into fix/nitro-errors

.stackblitz/config.json

@@ -0,0 +1,3 @@
+{
+  "startCommand": "pnpm build:stub && pnpm play"
+}

docs/content/1.getting-started/10.deployment.md

@@ -139,6 +139,7 @@ Nuxt 3 can be deployed to several cloud providers with a minimal amount of confi
 
 - :IconCloud{class="h-5 w-4 inline mb-2"} [AWS](https://nitro.unjs.io/deploy/providers/aws)
 - :LogoAzure{class="h-5 w-4 inline mb-2"} [Azure](https://nitro.unjs.io/deploy/providers/azure)
+- :IconCloud{class="h-5 w-4 inline mb-2"} [Cleavr](https://nitro.unjs.io/deploy/providers/cleavr)
 - :LogoCloudFlare{class="h-5 w-4 inline mb-2"} [CloudFlare](https://nitro.unjs.io/deploy/providers/cloudflare)
 - :IconCloud{class="h-5 w-4 inline mb-2"} [Digital Ocean](https://nitro.unjs.io/deploy/providers/digitalocean)
 - :LogoFirebase{class="h-5 w-4 inline mb-2"} [Firebase](https://nitro.unjs.io/deploy/providers/firebase)

docs/public/_redirects

@@ -74,4 +74,5 @@
 /guide/deploy/providers/render      https://nitro.unjs.io/deploy/providers/render 302!
 /guide/deploy/providers/stormkit    https://nitro.unjs.io/deploy/providers/stormkit 302!
 /guide/deploy/providers/vercel      https://nitro.unjs.io/deploy/providers/vercel 302!
+/guide/deploy/providers/cleavr      https://nitro.unjs.io/deploy/providers/cleavr 302!
 

package.json

@@ -51,7 +51,7 @@
     "@types/node": "^16.11.66",
     "@types/rimraf": "^3",
     "@types/semver": "^7",
-    "@unocss/reset": "^0.45.29",
+    "@unocss/reset": "^0.45.30",
     "case-police": "^0.5.10",
     "changelogen": "^0.3.5",
     "crawler": "^1.3.0",

packages/nuxi/package.json

@@ -35,7 +35,7 @@
     "execa": "^6.1.0",
     "flat": "^5.0.2",
     "giget": "^0.1.7",
-    "h3": "^0.8.3",
+    "h3": "^0.8.4",
     "jiti": "^1.16.0",
     "listhen": "^0.3.4",
     "mlly": "^0.5.16",

packages/nuxt/package.json

@@ -52,7 +52,7 @@
     "escape-string-regexp": "^5.0.0",
     "fs-extra": "^10.1.0",
     "globby": "^13.1.2",
-    "h3": "^0.8.3",
+    "h3": "^0.8.4",
     "hash-sum": "^2.0.0",
     "hookable": "^5.4.1",
     "knitwork": "^0.1.2",

packages/nuxt/src/core/runtime/nitro/renderer.ts

@@ -10,7 +10,12 @@ import { useRuntimeConfig, useNitroApp, defineRenderHandler, getRouteRules } fro
 import type { NuxtApp, NuxtSSRContext } from '#app'
 
 // @ts-ignore
-import { buildAssetsURL } from '#paths'
+import { buildAssetsURL, publicAssetsURL } from '#paths'
+
+// @ts-ignore
+globalThis.__buildAssetsURL = buildAssetsURL
+// @ts-ignore
+globalThis.__publicAssetsURL = publicAssetsURL
 
 export interface NuxtRenderHTMLContext {
   htmlAttrs: string[]
@@ -198,7 +203,7 @@ export default defineRenderHandler(async (event) => {
   const renderedMeta = await ssrContext.renderMeta?.() ?? {}
 
   // Render inline styles
-  const inlinedStyles = process.env.NUXT_INLINE_STYLES && !(process.env.NUXT_NO_SSR || ssrContext.noSSR)
+  const inlinedStyles = process.env.NUXT_INLINE_STYLES
     ? await renderInlineStyles(ssrContext.modules ?? ssrContext._registeredComponents ?? [])
     : ''
 
@@ -284,6 +289,7 @@ function renderHTMLDocument (html: NuxtRenderHTMLContext) {
 }
 
 async function renderInlineStyles (usedModules: Set<string> | string[]) {
+  const { entryCSS } = await getClientManifest()
   const styleMap = await getSSRStyles()
   const inlinedStyles = new Set<string>()
   for (const mod of ['entry', ...usedModules]) {
@@ -293,6 +299,9 @@ async function renderInlineStyles (usedModules: Set<string> | string[]) {
       }
     }
   }
+  for (const css of entryCSS?.css || []) {
+    inlinedStyles.add(`<link rel="stylesheet" href=${JSON.stringify(buildAssetsURL(css))} media="print" onload="this.media='all'; this.onload=null;">`)
+  }
   return Array.from(inlinedStyles).join('')
 }
 

packages/nuxt/src/core/templates.ts

@@ -240,8 +240,11 @@ export const publicPathTemplate: NuxtTemplate = {
       '  return path.length ? joinURL(publicBase, ...path) : publicBase',
       '}',
 
-      'globalThis.__buildAssetsURL = buildAssetsURL',
-      'globalThis.__publicAssetsURL = publicAssetsURL'
+      // On server these are registered directly in packages/nuxt/src/core/runtime/nitro/renderer.ts
+      'if (process.client) {',
+      '  globalThis.__buildAssetsURL = buildAssetsURL',
+      '  globalThis.__publicAssetsURL = publicAssetsURL',
+      '}'
     ].filter(Boolean).join('\n')
   }
 }

packages/vite/package.json

@@ -33,7 +33,7 @@
     "externality": "^0.2.2",
     "fs-extra": "^10.1.0",
     "get-port-please": "^2.6.1",
-    "h3": "^0.8.3",
+    "h3": "^0.8.4",
     "knitwork": "^0.1.2",
     "magic-string": "^0.26.7",
     "mlly": "^0.5.16",

packages/vite/src/server.ts

@@ -129,13 +129,13 @@ export async function buildServer (ctx: ViteBuildContext) {
         }
         // Add entry CSS as prefetch (non-blocking)
         if (entry.isEntry) {
-          manifest[key + '-css'] = {
+          manifest.entryCSS = {
             file: '',
             css: entry.css
           }
           entry.css = []
           entry.dynamicImports = entry.dynamicImports || []
-          entry.dynamicImports.push(key + '-css')
+          entry.dynamicImports.push('entryCSS')
         }
       }
     })

test/basic.test.ts

@@ -616,8 +616,7 @@ describe.skipIf(process.env.NUXT_TEST_DEV || process.env.TEST_WITH_WEBPACK)('inl
       `)
   })
 
-  // TODO: fix this in style inlining implementation: https://github.com/nuxt/framework/pull/8265#issuecomment-1282148407
-  it.skip('still downloads client-only styles', async () => {
+  it('still downloads client-only styles', async () => {
     const page = await createPage('/styles')
     await page.waitForLoadState('networkidle')
     expect(await page.$eval('.client-only-css', e => getComputedStyle(e).color)).toBe('rgb(50, 50, 50)')