fix: add server imports for composables (#5)

Author: onmax

pnpm-lock.yaml

@@ -248,6 +248,8 @@ export default defineNitroPlugin(() => {
       registerNitroPlugin(nuxt, pluginPath.dst)
     }
 
+    // Ensure server/Nitro bundles can resolve auto-imported composables.
+    addServerImportsDir(resolver.resolve('./runtime/composables'))
     addImportsDir(resolver.resolve('./runtime/composables'))
 
     nuxt.hook('eslint:config:addons', (addons) => {

src/module.ts

@@ -0,0 +1,46 @@
+import { execSync } from 'node:child_process'
+import { existsSync, readdirSync, readFileSync, statSync } from 'node:fs'
+import { join } from 'node:path'
+import { fileURLToPath } from 'node:url'
+import { describe, expect, it } from 'vitest'
+
+function listFiles(dir: string): string[] {
+  const out: string[] = []
+  for (const entry of readdirSync(dir)) {
+    const p = join(dir, entry)
+    const st = statSync(p)
+    if (st.isDirectory())
+      out.push(...listFiles(p))
+    else
+      out.push(p)
+  }
+  return out
+}
+
+describe('cloudflare preset auto-imports', () => {
+  it('does not leave useSafeRuntimeConfig as an unresolved global', () => {
+    const fixtureDir = fileURLToPath(new URL('./fixtures/cloudflare-auto-import', import.meta.url))
+    execSync('pnpm nuxi build', { cwd: fixtureDir, stdio: 'pipe' })
+
+    const serverDir = join(fixtureDir, '.output/server')
+    expect(existsSync(serverDir)).toBe(true)
+
+    const failing: string[] = []
+    for (const file of listFiles(serverDir).filter(f => f.endsWith('.mjs'))) {
+      const src = readFileSync(file, 'utf-8')
+      if (!src.includes('useSafeRuntimeConfig('))
+        continue
+
+      const hasBinding = (
+        /\bfunction\s+useSafeRuntimeConfig\b/.test(src)
+        || /\b(?:const|let|var)\s+useSafeRuntimeConfig\b/.test(src)
+        || (src.includes('import') && src.includes('useSafeRuntimeConfig'))
+      )
+
+      if (!hasBinding)
+        failing.push(file)
+    }
+
+    expect(failing).toEqual([])
+  }, 120000)
+})

test/cloudflare-auto-import.test.ts

@@ -0,0 +1,28 @@
+import { object, string } from 'valibot'
+import SafeRuntimeConfig from '../../../src/module'
+
+const runtimeConfigSchema = object({
+  public: object({
+    apiBase: string(),
+  }),
+  secretKey: string(),
+})
+
+export default defineNuxtConfig({
+  modules: [SafeRuntimeConfig],
+
+  nitro: {
+    preset: 'cloudflare_module',
+  },
+
+  runtimeConfig: {
+    secretKey: 'test-secret-key',
+    public: {
+      apiBase: 'https://api.test.com',
+    },
+  },
+
+  safeRuntimeConfig: {
+    $schema: runtimeConfigSchema,
+  },
+})

test/fixtures/cloudflare-auto-import/nuxt.config.ts

@@ -0,0 +1,14 @@
+{
+  "name": "nuxt-safe-runtime-config-test-cloudflare-auto-import",
+  "type": "module",
+  "private": true,
+  "scripts": {
+    "prepare": "nuxt prepare"
+  },
+  "dependencies": {
+    "valibot": "catalog:"
+  },
+  "devDependencies": {
+    "nuxt": "catalog:"
+  }
+}

test/fixtures/cloudflare-auto-import/package.json

@@ -0,0 +1,4 @@
+export default defineEventHandler(() => {
+  const config = useSafeRuntimeConfig() as any
+  return { ok: true, apiBase: config.public.apiBase }
+})