fix(schema): use ConfigLayer type from c12 (#29370)

packages/schema/package.json

@@ -45,7 +45,6 @@
     "@vue/compiler-core": "3.5.11",
     "@vue/compiler-sfc": "3.5.11",
     "@vue/language-core": "2.1.6",
-    "c12": "2.0.1",
     "esbuild-loader": "4.2.2",
     "h3": "npm:h3-nightly@2.0.0-1718872656.6765a6e",
     "ignore": "6.0.2",
@@ -63,6 +62,7 @@
     "webpack-dev-middleware": "7.4.2"
   },
   "dependencies": {
+    "c12": "^2.0.1",
     "compatx": "^0.1.8",
     "consola": "^3.2.3",
     "defu": "^6.1.4",

packages/schema/src/types/config.ts

@@ -5,6 +5,7 @@ import type { Options as VueJsxPluginOptions } from '@vitejs/plugin-vue-jsx'
 import type { SchemaDefinition } from 'untyped'
 import type { NitroRuntimeConfig, NitroRuntimeConfigApp } from 'nitro/types'
 import type { SnakeCase } from 'scule'
+import type { ResolvedConfig } from 'c12'
 import type { ConfigSchema } from '../../schema/config'
 import type { Nuxt } from './nuxt'
 import type { AppHeadMetaObject } from './head'
@@ -62,16 +63,12 @@ export interface NuxtConfig extends DeepPartial<Omit<ConfigSchema, 'vue' | 'vite
   $schema?: SchemaDefinition
 }
 
-// TODO: Expose ConfigLayer<T> from c12
+export type NuxtConfigLayer = ResolvedConfig<NuxtConfig & {
-interface ConfigLayer<T> {
-  config: T
-  cwd: string
-  configFile: string
-}
-export type NuxtConfigLayer = ConfigLayer<NuxtConfig & {
   srcDir: ConfigSchema['srcDir']
   rootDir: ConfigSchema['rootDir']
-}>
+}> & {
+  cwd: string
+}
 
 export interface NuxtBuilder {
   bundle: (nuxt: Nuxt) => Promise<void>

pnpm-lock.yaml

@@ -665,6 +665,9 @@ importers:
 
   packages/schema:
     dependencies:
+      c12:
+        specifier: 2.0.1
+        version: 2.0.1(magicast@0.3.5)
       compatx:
         specifier: ^0.1.8
         version: 0.1.8
@@ -735,9 +738,6 @@ importers:
       '@vue/language-core':
         specifier: 2.1.6
         version: 2.1.6(typescript@5.6.3)
-      c12:
-        specifier: 2.0.1
-        version: 2.0.1(magicast@0.3.5)
       esbuild-loader:
         specifier: 4.2.2
         version: 4.2.2(webpack@5.95.0)
@@ -2526,51 +2526,16 @@ packages:
     cpu: [x64]
     os: [win32]
 
-  '@rspack/binding-darwin-arm64@1.0.9':
-    resolution: {integrity: sha512-9CROBttbjfFcw78KGQHKGO6Im5uBLo0he2M8I+N4IOcTOCIqgtHSy0rjbpKxdpGlugokFafW/T5GBke+LW+J6A==}
-    cpu: [arm64]
-    os: [darwin]
-
-  '@rspack/binding-darwin-x64@1.0.9':
-    resolution: {integrity: sha512-o0WmrkVYxEO8LKeZvflERRv8z/VKBM/JyvhHOGSQF1kV5989Eob9Dqd3JbXiHpgXZb8syh0xq9J/C/KL2djClw==}
-    cpu: [x64]
-    os: [darwin]
-
-  '@rspack/binding-linux-arm64-gnu@1.0.9':
-    resolution: {integrity: sha512-8lXgxL19HZSSzvlG7EsomACRYjdJKiSVsh5fMGO7nIF/elRsG0edMqtM/Vbm1srMN5o15/houvftb/kpK6giZg==}
-    cpu: [arm64]
-    os: [linux]
-
   '@rspack/binding-linux-arm64-musl@1.0.9':
     resolution: {integrity: sha512-nZus0toIKvHJcJCPGKPRnQYM1FXpagyVs53tr+AA/uxFA5mnHIrQ+RAP/PrdRT9+B6VOI+2Cs6nqwkrXtKg7qQ==}
     cpu: [arm64]
     os: [linux]
 
-  '@rspack/binding-linux-x64-gnu@1.0.9':
-    resolution: {integrity: sha512-3B54wWAhH4k3gJHYR4CUU8e82NWwZFIiBiCQzOOk0uh+rDkFtBt2xiOOZERQGLVvZmoz1K5JvNNPBBETVFKORg==}
-    cpu: [x64]
-    os: [linux]
-
-  '@rspack/binding-linux-x64-musl@1.0.9':
-    resolution: {integrity: sha512-EF8T9VGQmCu+snhd6meexUWB7qQSdyqmGEMZNGTt2Qa+NC0x2W2owg6QzyyyTP1tTlTkIC5fWKKtN/4xP7dttA==}
-    cpu: [x64]
-    os: [linux]
-
-  '@rspack/binding-win32-arm64-msvc@1.0.9':
-    resolution: {integrity: sha512-TTXsOrpBgxcArTlOywFrThYZ4lNFQaowKaNf59QJhWm02fYb7ZezEbVzbJXhsqr4flLOaZcCuLPVaxhGaqZHYA==}
-    cpu: [arm64]
-    os: [win32]
-
   '@rspack/binding-win32-ia32-msvc@1.0.9':
     resolution: {integrity: sha512-/CJsa3D0+0/BkCTXpK8y7aYQRnrOlu8rboIx24LfCOK5wJB5WxvrvmXHT9XFUiUQt9zLYRQj6l5PdAj66Aoozg==}
     cpu: [ia32]
     os: [win32]
 
-  '@rspack/binding-win32-x64-msvc@1.0.9':
-    resolution: {integrity: sha512-euDrnVN2iFClu/7TpBErx99/4flhZCsvNcLBganbaCrM+NxWuCEa889Tmm6SosLoqvundk6pdsvPb9ubMqOEjg==}
-    cpu: [x64]
-    os: [win32]
-
   '@rspack/binding@1.0.9':
     resolution: {integrity: sha512-QbhCVrnSMB1HyvRXhzGJK1J4AKZbckAUFlN1fTijH3oRbSYzUOK8bbL9DPt6BtIjkEWnfPv8rKqfl3Yo9OJbTA==}
 
@@ -9158,44 +9123,16 @@ snapshots:
   '@rollup/rollup-win32-x64-msvc@4.24.0':
     optional: true
 
-  '@rspack/binding-darwin-arm64@1.0.9':
-    optional: true
-
-  '@rspack/binding-darwin-x64@1.0.9':
-    optional: true
-
-  '@rspack/binding-linux-arm64-gnu@1.0.9':
-    optional: true
-
   '@rspack/binding-linux-arm64-musl@1.0.9':
     optional: true
 
-  '@rspack/binding-linux-x64-gnu@1.0.9':
-    optional: true
-
-  '@rspack/binding-linux-x64-musl@1.0.9':
-    optional: true
-
-  '@rspack/binding-win32-arm64-msvc@1.0.9':
-    optional: true
-
   '@rspack/binding-win32-ia32-msvc@1.0.9':
     optional: true
 
-  '@rspack/binding-win32-x64-msvc@1.0.9':
-    optional: true
-
   '@rspack/binding@1.0.9':
     optionalDependencies:
-      '@rspack/binding-darwin-arm64': 1.0.9
-      '@rspack/binding-darwin-x64': 1.0.9
-      '@rspack/binding-linux-arm64-gnu': 1.0.9
       '@rspack/binding-linux-arm64-musl': 1.0.9
-      '@rspack/binding-linux-x64-gnu': 1.0.9
-      '@rspack/binding-linux-x64-musl': 1.0.9
-      '@rspack/binding-win32-arm64-msvc': 1.0.9
       '@rspack/binding-win32-ia32-msvc': 1.0.9
-      '@rspack/binding-win32-x64-msvc': 1.0.9
 
   '@rspack/core@1.0.9':
     dependencies: