Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-22 21:55:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alexander 2024-10-10 23:06:43 +05:00 committed by Daniel Roe
parent 71e48ca1bb
commit 2513c80816
No known key found for this signature in database
GPG Key ID: CBC814C393D93268
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/schema/package.json
View File

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

13
packages/schema/src/types/config.ts
View File

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

6
pnpm-lock.yaml
View File

@ -666,6 +666,9 @@ importers:
packages/schema: packages/schema:
dependencies: dependencies:
c12:
specifier: ^2.0.1
version: 2.0.1(magicast@0.3.5)
compatx: compatx:
specifier: ^0.1.8 specifier: ^0.1.8
version: 0.1.8 version: 0.1.8
@ -736,9 +739,6 @@ importers:
'@vue/language-core': '@vue/language-core':
specifier: 2.1.6 specifier: 2.1.6
version: 2.1.6(typescript@5.6.3) version: 2.1.6(typescript@5.6.3)
c12:
specifier: 2.0.1
version: 2.0.1(magicast@0.3.5)
esbuild-loader: esbuild-loader:
specifier: 4.2.2 specifier: 4.2.2
version: 4.2.2(webpack@5.95.0) version: 4.2.2(webpack@5.95.0)