chore: add app config to ssrContext

Author: userquin

src/runtime/plugins/critical.server.ts

@@ -4,6 +4,8 @@ import { writeHeaders } from './headers'
 import { useHttpClientHintsOptions, useHttpClientHintsState } from './utils'
 import { defineNuxtPlugin, useCookie, useRequestHeaders } from '#imports'
 import type { Plugin } from '#app'
+import type { HttpClientHintsOptions } from '~/src/types'
+import type { ResolvedHttpClientHintsOptions } from '~/src/runtime/shared-types/types'
 
 const plugin: Plugin = defineNuxtPlugin({
   name: 'http-client-hints:critical-server:plugin',
@@ -12,10 +14,11 @@ const plugin: Plugin = defineNuxtPlugin({
   // @ts-expect-error missing at build time
   dependsOn: ['http-client-hints:init-server:plugin'],
   async setup(nuxtApp) {
+    const ssrContext = nuxtApp.ssrContext!
+    const httpClientHints = ssrContext._httpClientHintsOptions as ResolvedHttpClientHintsOptions
+    const userAgent = ssrContext._httpClientHintsUserAgent as ReturnType<typeof parseUserAgent>
     const state = useHttpClientHintsState()
-    const httpClientHints = useHttpClientHintsOptions()
     const requestHeaders = useRequestHeaders<string>(CriticalHintsHeaders)
-    const userAgent = nuxtApp.ssrContext?._httpClientHintsUserAgent as ReturnType<typeof parseUserAgent>
     state.value.critical = extractCriticalHints(
       httpClientHints,
       requestHeaders,

src/runtime/plugins/detect.server.ts

@@ -6,9 +6,9 @@ import {
   parseUserAgent,
 } from 'detect-browser-es'
 import { appendHeader } from 'h3'
-import type { UserAgentHints } from '../shared-types/types'
+import type { ResolvedHttpClientHintsOptions, UserAgentHints } from '../shared-types/types'
 import { extractBrowser } from '../utils/detect'
-import { useHttpClientHintsOptions, useHttpClientHintsState } from './utils'
+import { useHttpClientHintsState } from './utils'
 import {
   defineNuxtPlugin,
   useNuxtApp,
@@ -23,9 +23,9 @@ const plugin: Plugin = defineNuxtPlugin({
   parallel: true,
   // @ts-expect-error missing at build time
   dependsOn: ['http-client-hints:init-server:plugin'],
-  async setup() {
+  async setup(nuxtApp) {
     const state = useHttpClientHintsState()
-    const httpClientHints = useHttpClientHintsOptions()
+    const httpClientHints = nuxtApp.ssrContext!._httpClientHintsOptions as ResolvedHttpClientHintsOptions
     const requestHeaders = useRequestHeaders()
 
     const userAgentHeader = requestHeaders['user-agent']

src/runtime/plugins/device.server.ts

@@ -1,6 +1,7 @@
 import type { parseUserAgent } from 'detect-browser-es'
 import { extractDeviceHints, HttpRequestHeaders } from '../utils/device'
-import { useHttpClientHintsOptions, useHttpClientHintsState } from './utils'
+import type { ResolvedHttpClientHintsOptions } from '../shared-types/types'
+import { useHttpClientHintsState } from './utils'
 import { writeHeaders } from './headers'
 import { defineNuxtPlugin, useRequestHeaders } from '#imports'
 import type { Plugin } from '#app'
@@ -12,9 +13,10 @@ const plugin: Plugin = defineNuxtPlugin({
   // @ts-expect-error missing at build time
   dependsOn: ['http-client-hints:init-server:plugin'],
   setup(nuxtApp) {
-    const userAgent = nuxtApp.ssrContext?._httpClientHintsUserAgent as ReturnType<typeof parseUserAgent>
+    const ssrContext = nuxtApp.ssrContext!
+    const httpClientHints = ssrContext._httpClientHintsOptions as ResolvedHttpClientHintsOptions
+    const userAgent = ssrContext._httpClientHintsUserAgent as ReturnType<typeof parseUserAgent>
     const state = useHttpClientHintsState()
-    const httpClientHints = useHttpClientHintsOptions()
     const requestHeaders = useRequestHeaders<string>(HttpRequestHeaders)
     state.value.device = extractDeviceHints(httpClientHints, requestHeaders, userAgent, writeHeaders)
   },

src/runtime/plugins/init.server.ts

@@ -1,5 +1,5 @@
 import { parseUserAgent } from 'detect-browser-es'
-import { useHttpClientHintsState } from './utils'
+import { useHttpClientHintsOptions, useHttpClientHintsState } from './utils'
 import { defineNuxtPlugin, useRequestHeaders } from '#imports'
 import type { Plugin } from '#app'
 
@@ -12,6 +12,7 @@ const plugin: Plugin = defineNuxtPlugin({
     const ssrContext = nuxtApp.ssrContext!
     const requestHeaders = useRequestHeaders<string>(['user-agent'])
     const userAgentHeader = requestHeaders['user-agent']
+    ssrContext._httpClientHintsOptions = useHttpClientHintsOptions()
     ssrContext._httpClientHintsUserAgent = userAgentHeader
       ? parseUserAgent(userAgentHeader)
       : null

src/runtime/plugins/network.server.ts

@@ -1,6 +1,7 @@
 import type { parseUserAgent } from 'detect-browser-es'
 import { extractNetworkHints, NetworkHintsHeaders } from '../utils/network'
-import { useHttpClientHintsOptions, useHttpClientHintsState } from './utils'
+import type { ResolvedHttpClientHintsOptions } from '../shared-types/types'
+import { useHttpClientHintsState } from './utils'
 import { writeHeaders } from './headers'
 import { defineNuxtPlugin, useRequestHeaders } from '#imports'
 import type { Plugin } from '#app'
@@ -12,9 +13,10 @@ const plugin: Plugin = defineNuxtPlugin({
   // @ts-expect-error missing at build time
   dependsOn: ['http-client-hints:init-server:plugin'],
   setup(nuxtApp) {
+    const ssrContext = nuxtApp.ssrContext!
+    const httpClientHints = ssrContext._httpClientHintsOptions as ResolvedHttpClientHintsOptions
+    const userAgent = ssrContext._httpClientHintsUserAgent as ReturnType<typeof parseUserAgent>
     const state = useHttpClientHintsState()
-    const userAgent = nuxtApp.ssrContext?._httpClientHintsUserAgent as ReturnType<typeof parseUserAgent>
-    const httpClientHints = useHttpClientHintsOptions()
     const requestHeaders = useRequestHeaders<string>(NetworkHintsHeaders)
     state.value.network = extractNetworkHints(httpClientHints, requestHeaders, userAgent, writeHeaders)
   },