diff --git a/packages/schema/package.json b/packages/schema/package.json index d5dde12867..1df84597a3 100644 --- a/packages/schema/package.json +++ b/packages/schema/package.json @@ -45,7 +45,6 @@ "@vue/compiler-core": "3.5.12", "@vue/compiler-sfc": "3.5.12", "@vue/language-core": "2.1.6", - "c12": "2.0.1", "esbuild-loader": "4.2.2", "h3": "1.12.0", "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", diff --git a/packages/schema/src/types/config.ts b/packages/schema/src/types/config.ts index 80a55993c2..92117676a7 100644 --- a/packages/schema/src/types/config.ts +++ b/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 'nitropack' 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' @@ -61,16 +62,12 @@ export interface NuxtConfig extends DeepPartial from c12 -interface ConfigLayer { - config: T - cwd: string - configFile: string -} -export type NuxtConfigLayer = ConfigLayer +}> & { + cwd: string +} export interface NuxtBuilder { bundle: (nuxt: Nuxt) => Promise diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2937e2aacf..f7488c3fd9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -666,6 +666,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 @@ -736,9 +739,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)