From e2146007d7d5e131533d1e80acafb439b8f81a38 Mon Sep 17 00:00:00 2001
From: Anthony Fu <anthonyfu117@hotmail.com>
Date: Thu, 25 Aug 2022 16:49:45 +0800
Subject: [PATCH 1/8] chore: improve type strictness

---
 packages/nuxi/package.json                 |  1 +
 packages/nuxi/src/commands/dev.ts          | 11 ++++++-----
 packages/nuxi/src/commands/index.ts        |  2 +-
 packages/nuxi/src/commands/info.ts         | 23 ++++++++++++----------
 packages/nuxi/src/commands/init.ts         | 13 ++++++------
 packages/nuxi/src/utils/cjs.ts             |  6 +++---
 packages/nuxi/src/utils/diff.ts            | 18 ++++++++---------
 packages/nuxi/src/utils/help.ts            | 16 +++++++++------
 packages/nuxi/src/utils/kit.ts             |  2 +-
 packages/nuxi/src/utils/nuxt.ts            |  2 +-
 packages/nuxi/src/utils/packageManagers.ts |  7 +++++--
 packages/nuxi/src/utils/prepare.ts         |  3 ++-
 packages/nuxi/tsconfig.json                | 11 +++++++++++
 packages/test-utils/src/browser.ts         |  2 +-
 packages/test-utils/src/context.ts         |  8 +++++---
 packages/test-utils/src/nuxt.ts            |  2 +-
 packages/test-utils/src/run.ts             |  1 +
 packages/test-utils/src/server.ts          |  4 ++--
 packages/test-utils/tsconfig.json          | 11 +++++++++++
 yarn.lock                                  |  8 ++++++++
 20 files changed, 99 insertions(+), 52 deletions(-)
 create mode 100644 packages/nuxi/tsconfig.json
 create mode 100644 packages/test-utils/tsconfig.json

diff --git a/packages/nuxi/package.json b/packages/nuxi/package.json
index 17e7902b393..532fa8de0bf 100644
--- a/packages/nuxi/package.json
+++ b/packages/nuxi/package.json
@@ -21,6 +21,7 @@
     "@nuxt/kit": "3.0.0-rc.8",
     "@nuxt/schema": "3.0.0-rc.8",
     "@types/clear": "^0",
+    "@types/flat": "^5.0.2",
     "@types/mri": "^1.1.1",
     "@types/semver": "^7",
     "c12": "^0.2.9",
diff --git a/packages/nuxi/src/commands/dev.ts b/packages/nuxi/src/commands/dev.ts
index d63de0dbe06..aa8edeb4509 100644
--- a/packages/nuxi/src/commands/dev.ts
+++ b/packages/nuxi/src/commands/dev.ts
@@ -1,4 +1,5 @@
 import type { AddressInfo } from 'node:net'
+import { RequestListener } from 'node:http'
 import { resolve, relative, normalize } from 'pathe'
 import chokidar from 'chokidar'
 import { debounce } from 'perfect-debounce'
@@ -24,15 +25,15 @@ export default defineNuxtCommand({
     overrideEnv('development')
 
     const { listen } = await import('listhen')
-    let currentHandler
+    let currentHandler: RequestListener | undefined
     let loadingMessage = 'Nuxt is starting...'
-    const loadingHandler = async (_req, res) => {
+    const loadingHandler: RequestListener = async (_req, res) => {
       const { loading: loadingTemplate } = await importModule('@nuxt/ui-templates')
       res.setHeader('Content-Type', 'text/html; charset=UTF-8')
       res.statusCode = 503 // Service Unavailable
       res.end(loadingTemplate({ loading: loadingMessage }))
     }
-    const serverHandler = (req, res) => {
+    const serverHandler: RequestListener = (req, res) => {
       return currentHandler ? currentHandler(req, res) : loadingHandler(req, res)
     }
 
@@ -64,7 +65,7 @@ export default defineNuxtCommand({
     const load = async (isRestart: boolean, reason?: string) => {
       try {
         loadingMessage = `${reason ? reason + '. ' : ''}${isRestart ? 'Restarting' : 'Starting'} nuxt...`
-        currentHandler = null
+        currentHandler = undefined
         if (isRestart) {
           consola.info(loadingMessage)
         }
@@ -103,7 +104,7 @@ export default defineNuxtCommand({
         }
       } catch (err) {
         consola.error(`Cannot ${isRestart ? 'restart' : 'start'} nuxt: `, err)
-        currentHandler = null
+        currentHandler = undefined
         loadingMessage = 'Error while loading nuxt. Please check console and fix errors.'
       }
     }
diff --git a/packages/nuxi/src/commands/index.ts b/packages/nuxi/src/commands/index.ts
index b2469131f0a..4771e7c4da0 100644
--- a/packages/nuxi/src/commands/index.ts
+++ b/packages/nuxi/src/commands/index.ts
@@ -1,6 +1,6 @@
 import type { Argv } from 'mri'
 
-const _rDefault = r => r.default || r
+const _rDefault = (r: any) => r.default || r
 
 export const commands = {
   dev: () => import('./dev').then(_rDefault),
diff --git a/packages/nuxi/src/commands/info.ts b/packages/nuxi/src/commands/info.ts
index 66753eda94c..06ce952edd4 100644
--- a/packages/nuxi/src/commands/info.ts
+++ b/packages/nuxi/src/commands/info.ts
@@ -6,6 +6,7 @@ import jiti from 'jiti'
 import destr from 'destr'
 import { splitByCase } from 'scule'
 import clipboardy from 'clipboardy'
+import { NuxtModule } from '@nuxt/schema'
 import { getPackageManager, getPackageManagerVersion } from '../utils/packageManagers'
 import { findup } from '../utils/fs'
 import { defineNuxtCommand } from './index'
@@ -27,13 +28,13 @@ export default defineNuxtCommand({
     const { dependencies = {}, devDependencies = {} } = findPackage(rootDir)
 
     // Utils to query a dependency version
-    const getDepVersion = name => getPkg(name, rootDir)?.version || dependencies[name] || devDependencies[name]
+    const getDepVersion = (name: string) => getPkg(name, rootDir)?.version || dependencies[name] || devDependencies[name]
 
     const listModules = (arr = []) => arr
-      .map(normalizeConfigModule)
+      .map(m => normalizeConfigModule(m, rootDir))
       .filter(Boolean)
       .map((name) => {
-        const npmName = name.split('/').splice(0, 2).join('/') // @foo/bar/baz => @foo/bar
+        const npmName = name!.split('/').splice(0, 2).join('/') // @foo/bar/baz => @foo/bar
         const v = getDepVersion(npmName)
         return '`' + (v ? `${name}@${v}` : name) + '`'
       })
@@ -54,6 +55,7 @@ export default defineNuxtCommand({
     if (packageManager) {
       packageManager += '@' + getPackageManagerVersion(packageManager)
     } else {
+      // @ts-expect-error
       packageManager = 'unknown'
     }
 
@@ -95,14 +97,14 @@ export default defineNuxtCommand({
   }
 })
 
-function normalizeConfigModule (module, rootDir) {
+function normalizeConfigModule (module: NuxtModule | string | null | undefined, rootDir: string): string | null {
   if (!module) {
     return null
   }
   if (typeof module === 'string') {
     return module
-      .split(rootDir).pop() // Strip rootDir
-      .split('node_modules').pop() // Strip node_modules
+      .split(rootDir).pop()! // Strip rootDir
+      .split('node_modules').pop()! // Strip node_modules
       .replace(/^\//, '')
   }
   if (typeof module === 'function') {
@@ -111,9 +113,10 @@ function normalizeConfigModule (module, rootDir) {
   if (Array.isArray(module)) {
     return normalizeConfigModule(module[0], rootDir)
   }
+  return null
 }
 
-function getNuxtConfig (rootDir) {
+function getNuxtConfig (rootDir: string) {
   try {
     return jiti(rootDir, { interopDefault: true, esmResolve: true })('./nuxt.config')
   } catch (err) {
@@ -122,7 +125,7 @@ function getNuxtConfig (rootDir) {
   }
 }
 
-function getPkg (name, rootDir) {
+function getPkg (name: string, rootDir: string) {
   // Assume it is in {rootDir}/node_modules/${name}/package.json
   let pkgPath = resolve(rootDir, 'node_modules', name, 'package.json')
 
@@ -135,7 +138,7 @@ function getPkg (name, rootDir) {
   return readJSONSync(pkgPath)
 }
 
-function findPackage (rootDir) {
+function findPackage (rootDir: string) {
   return findup(rootDir, (dir) => {
     const p = resolve(dir, 'package.json')
     if (existsSync(p)) {
@@ -144,7 +147,7 @@ function findPackage (rootDir) {
   }) || {}
 }
 
-function readJSONSync (filePath) {
+function readJSONSync (filePath: string) {
   try {
     return destr(readFileSync(filePath, 'utf-8'))
   } catch (err) {
diff --git a/packages/nuxi/src/commands/init.ts b/packages/nuxi/src/commands/init.ts
index bf858633f23..6022aeaa348 100644
--- a/packages/nuxi/src/commands/init.ts
+++ b/packages/nuxi/src/commands/init.ts
@@ -1,13 +1,14 @@
 import { existsSync, readdirSync } from 'node:fs'
+// @ts-expect-error missing types
 import createTiged from 'tiged'
 import { relative, resolve } from 'pathe'
 import superb from 'superb'
 import consola from 'consola'
 import { defineNuxtCommand } from './index'
 
-const rpath = p => relative(process.cwd(), p)
+const rpath = (p: string) => relative(process.cwd(), p)
 
-const resolveTemplate = (template) => {
+const resolveTemplate = (template: string | boolean) => {
   if (typeof template === 'boolean') {
     consola.error('Please specify a template!')
     process.exit(1)
@@ -39,12 +40,12 @@ export default defineNuxtCommand({
       consola.error(`Directory ${dstDir} is not empty. Please pick another name or remove it first. Aborting.`)
       process.exit(1)
     }
-    const formatArgs = msg => msg.replace('options.', '--')
-    tiged.on('warn', event => consola.warn(formatArgs(event.message)))
-    tiged.on('info', event => consola.info(formatArgs(event.message)))
+    const formatArgs = (msg: string) => msg.replace('options.', '--')
+    tiged.on('warn', (event: any) => consola.warn(formatArgs(event.message)))
+    tiged.on('info', (event: any) => consola.info(formatArgs(event.message)))
     try {
       await tiged.clone(dstDir)
-    } catch (e) {
+    } catch (e: any) {
       if (e.toString().includes('could not find commit hash')) {
         consola.error(`Failed to clone template from \`${src}\`. Please check the repo is valid and that you have installed \`git\` correctly.`)
         process.exit(1)
diff --git a/packages/nuxi/src/utils/cjs.ts b/packages/nuxi/src/utils/cjs.ts
index 27cfa1dabd9..0acdb9b06fd 100644
--- a/packages/nuxi/src/utils/cjs.ts
+++ b/packages/nuxi/src/utils/cjs.ts
@@ -3,14 +3,14 @@ import { pathToFileURL } from 'node:url'
 import { normalize, dirname } from 'pathe'
 
 export function getModulePaths (paths?: string | string[]): string[] {
-  return [].concat(
+  return [
     // @ts-ignore
     global.__NUXT_PREPATHS__,
-    ...(Array.isArray(paths) ? paths : [paths]),
+    ...(paths ? [] : Array.isArray(paths) ? paths : [paths]),
     process.cwd(),
     // @ts-ignore
     global.__NUXT_PATHS__
-  ).filter(Boolean)
+  ].filter(Boolean)
 }
 
 const _require = createRequire(process.cwd())
diff --git a/packages/nuxi/src/utils/diff.ts b/packages/nuxi/src/utils/diff.ts
index 9b6ba04e76b..217afe8426a 100644
--- a/packages/nuxi/src/utils/diff.ts
+++ b/packages/nuxi/src/utils/diff.ts
@@ -2,19 +2,19 @@ import flatten from 'flat'
 import { detailedDiff } from 'deep-object-diff'
 import { green, red, blue, cyan } from 'colorette'
 
-function normalizeDiff (diffObj, type, ignore) {
+function normalizeDiff (diffObj: any, type: 'added' | 'deleted' | 'updated', ignore: string[]) {
   return Object.entries(flatten(diffObj))
     .map(([key, value]) => ({ key, value, type }))
     .filter(item => !ignore.includes(item.key) && typeof item.value !== 'function')
 }
 
-export function diff (a, b, ignore) {
+export function diff (a: any, b: any, ignore: string[]) {
   const _diff: any = detailedDiff(a, b)
-  return [].concat(
-    normalizeDiff(_diff.added, 'added', ignore),
-    normalizeDiff(_diff.deleted, 'deleted', ignore),
-    normalizeDiff(_diff.updated, 'updated', ignore)
-  )
+  return [
+    ...normalizeDiff(_diff.added, 'added', ignore),
+    ...normalizeDiff(_diff.deleted, 'deleted', ignore),
+    ...normalizeDiff(_diff.updated, 'updated', ignore)
+  ]
 }
 
 const typeMap = {
@@ -23,9 +23,9 @@ const typeMap = {
   updated: blue('updated')
 }
 
-export function printDiff (diff) {
+export function printDiff (diff: any) {
   for (const item of diff) {
-    console.log('  ', typeMap[item.type] || item.type, cyan(item.key), item.value ? `~> ${cyan(item.value)}` : '')
+    console.log('  ', typeMap[item.type as keyof typeof typeMap] || item.type, cyan(item.key), item.value ? `~> ${cyan(item.value)}` : '')
   }
   console.log()
 }
diff --git a/packages/nuxi/src/utils/help.ts b/packages/nuxi/src/utils/help.ts
index 1bcf609e538..1274da3a8e3 100644
--- a/packages/nuxi/src/utils/help.ts
+++ b/packages/nuxi/src/utils/help.ts
@@ -1,13 +1,17 @@
 import { cyan, magenta } from 'colorette'
-export function showHelp (meta?) {
+import { NuxtCommandMeta } from '../commands'
+
+export function showHelp (meta?: Partial<NuxtCommandMeta>) {
   const sections: string[] = []
 
-  if (meta.usage) {
-    sections.push(magenta('> ') + 'Usage: ' + cyan(meta.usage))
-  }
+  if (meta) {
+    if (meta.usage) {
+      sections.push(magenta('> ') + 'Usage: ' + cyan(meta.usage))
+    }
 
-  if (meta.description) {
-    sections.push(magenta('⋮ ') + meta.description)
+    if (meta.description) {
+      sections.push(magenta('⋮ ') + meta.description)
+    }
   }
 
   sections.push(`Use ${cyan('npx nuxi [command] --help')} to see help for each command`)
diff --git a/packages/nuxi/src/utils/kit.ts b/packages/nuxi/src/utils/kit.ts
index d6812cd17c5..f2568cf5278 100644
--- a/packages/nuxi/src/utils/kit.ts
+++ b/packages/nuxi/src/utils/kit.ts
@@ -3,7 +3,7 @@ import { importModule } from './cjs'
 export const loadKit = async (rootDir: string): Promise<typeof import('@nuxt/kit')> => {
   try {
     return await importModule('@nuxt/kit', rootDir) as typeof import('@nuxt/kit')
-  } catch (e) {
+  } catch (e: any) {
     if (e.toString().includes("Cannot find module '@nuxt/kit'")) {
       throw new Error('nuxi requires `@nuxt/kit` to be installed in your project. Try installing `nuxt3` or `@nuxt/bridge` first.')
     }
diff --git a/packages/nuxi/src/utils/nuxt.ts b/packages/nuxi/src/utils/nuxt.ts
index d24a7c89518..d8d26698fcd 100644
--- a/packages/nuxi/src/utils/nuxt.ts
+++ b/packages/nuxi/src/utils/nuxt.ts
@@ -6,7 +6,7 @@ import type { Nuxt } from '@nuxt/schema'
 import { rmRecursive } from './fs'
 
 export interface NuxtProjectManifest {
-  _hash: string
+  _hash: string | null
   project: {
     rootDir: string
   },
diff --git a/packages/nuxi/src/utils/packageManagers.ts b/packages/nuxi/src/utils/packageManagers.ts
index 8b301f249a5..ba43eaeb921 100644
--- a/packages/nuxi/src/utils/packageManagers.ts
+++ b/packages/nuxi/src/utils/packageManagers.ts
@@ -9,14 +9,17 @@ export const packageManagerLocks = {
   pnpm: 'pnpm-lock.yaml'
 }
 
+type PackageManager = keyof typeof packageManagerLocks
+
 export function getPackageManager (rootDir: string) {
   return findup(rootDir, (dir) => {
     for (const name in packageManagerLocks) {
-      if (existsSync(resolve(dir, packageManagerLocks[name]))) {
+      const path = packageManagerLocks[name as PackageManager]
+      if (path && existsSync(resolve(dir, path))) {
         return name
       }
     }
-  })
+  }) as PackageManager | null
 }
 
 export function getPackageManagerVersion (name: string) {
diff --git a/packages/nuxi/src/utils/prepare.ts b/packages/nuxi/src/utils/prepare.ts
index 0710d9961f4..533e33eefe0 100644
--- a/packages/nuxi/src/utils/prepare.ts
+++ b/packages/nuxi/src/utils/prepare.ts
@@ -31,7 +31,7 @@ export const writeTypes = async (nuxt: Nuxt) => {
     ]
   })
 
-  const aliases = {
+  const aliases: Record<string, string> = {
     ...nuxt.options.alias,
     '#build': nuxt.options.buildDir
   }
@@ -48,6 +48,7 @@ export const writeTypes = async (nuxt: Nuxt) => {
       : aliases[alias]
 
     const stats = await fsp.stat(resolve(nuxt.options.rootDir, relativePath)).catch(() => null /* file does not exist */)
+    tsConfig.compilerOptions = tsConfig.compilerOptions || {}
     if (stats?.isDirectory()) {
       tsConfig.compilerOptions.paths[alias] = [relativePath]
       tsConfig.compilerOptions.paths[`${alias}/*`] = [`${relativePath}/*`]
diff --git a/packages/nuxi/tsconfig.json b/packages/nuxi/tsconfig.json
new file mode 100644
index 00000000000..35a35f01926
--- /dev/null
+++ b/packages/nuxi/tsconfig.json
@@ -0,0 +1,11 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "strict": true,
+    "noImplicitAny": true
+  },
+  "include": [
+    "./src/**/*.ts",
+    "./test/**/*.ts"
+  ]
+}
diff --git a/packages/test-utils/src/browser.ts b/packages/test-utils/src/browser.ts
index 03a005fc8e0..1fe15c77cf2 100644
--- a/packages/test-utils/src/browser.ts
+++ b/packages/test-utils/src/browser.ts
@@ -31,7 +31,7 @@ export async function getBrowser (): Promise<Browser> {
   if (!ctx.browser) {
     await createBrowser()
   }
-  return ctx.browser
+  return ctx.browser!
 }
 
 export async function createPage (path?: string, options?: BrowserContextOptions) {
diff --git a/packages/test-utils/src/context.ts b/packages/test-utils/src/context.ts
index 85bff696d2f..3a09ecab5f1 100644
--- a/packages/test-utils/src/context.ts
+++ b/packages/test-utils/src/context.ts
@@ -2,7 +2,7 @@ import { resolve } from 'node:path'
 import defu from 'defu'
 import type { TestContext, TestOptions, TestRunner } from './types'
 
-let currentContext: TestContext
+let currentContext: TestContext | undefined
 
 export function createTestContext (options: Partial<TestOptions>): TestContext {
   const _options: Partial<TestOptions> = defu(options, {
@@ -18,7 +18,7 @@ export function createTestContext (options: Partial<TestOptions>): TestContext {
     // TODO: auto detect based on process.env
     runner: <TestRunner>'vitest',
     browserOptions: {
-      type: 'chromium'
+      type: 'chromium' as const
     }
   })
 
@@ -32,7 +32,9 @@ export function useTestContext (): TestContext {
   return currentContext
 }
 
-export function setTestContext (context: TestContext): TestContext {
+export function setTestContext (context: TestContext): TestContext
+export function setTestContext (context?: TestContext): TestContext | undefined
+export function setTestContext (context?: TestContext): TestContext | undefined {
   currentContext = context
   return currentContext
 }
diff --git a/packages/test-utils/src/nuxt.ts b/packages/test-utils/src/nuxt.ts
index b50ac34a94c..fe022b34cd7 100644
--- a/packages/test-utils/src/nuxt.ts
+++ b/packages/test-utils/src/nuxt.ts
@@ -64,5 +64,5 @@ export async function loadFixture () {
 
 export async function buildFixture () {
   const ctx = useTestContext()
-  await kit.buildNuxt(ctx.nuxt)
+  await kit.buildNuxt(ctx.nuxt!)
 }
diff --git a/packages/test-utils/src/run.ts b/packages/test-utils/src/run.ts
index c594e0c6df3..094b14845dd 100644
--- a/packages/test-utils/src/run.ts
+++ b/packages/test-utils/src/run.ts
@@ -21,6 +21,7 @@ export async function runTests (opts: RunTestOptions) {
     process.env.NUXT_TEST_DEV = 'true'
   }
 
+  // @ts-ignore missing types
   const { startVitest } = await import('vitest/dist/node.mjs')
   const succeeded = await startVitest(
     [] /* argv */,
diff --git a/packages/test-utils/src/server.ts b/packages/test-utils/src/server.ts
index 20e16641a08..a67ec4eec5d 100644
--- a/packages/test-utils/src/server.ts
+++ b/packages/test-utils/src/server.ts
@@ -16,7 +16,7 @@ export async function startServer () {
   if (ctx.options.dev) {
     const nuxiCLI = await kit.resolvePath('nuxi/cli')
     ctx.serverProcess = execa(nuxiCLI, ['dev'], {
-      cwd: ctx.nuxt.options.rootDir,
+      cwd: ctx.nuxt!.options.rootDir,
       stdio: 'inherit',
       env: {
         ...process.env,
@@ -37,7 +37,7 @@ export async function startServer () {
     throw new Error('Timeout waiting for dev server!')
   } else {
     ctx.serverProcess = execa('node', [
-      resolve(ctx.nuxt.options.nitro.output.dir, 'server/index.mjs')
+      resolve(ctx.nuxt!.options.nitro.output!.dir!, 'server/index.mjs')
     ], {
       stdio: 'inherit',
       env: {
diff --git a/packages/test-utils/tsconfig.json b/packages/test-utils/tsconfig.json
new file mode 100644
index 00000000000..35a35f01926
--- /dev/null
+++ b/packages/test-utils/tsconfig.json
@@ -0,0 +1,11 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "strict": true,
+    "noImplicitAny": true
+  },
+  "include": [
+    "./src/**/*.ts",
+    "./test/**/*.ts"
+  ]
+}
diff --git a/yarn.lock b/yarn.lock
index ebda30f432f..01c889e008f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2375,6 +2375,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/flat@npm:^5.0.2":
+  version: 5.0.2
+  resolution: "@types/flat@npm:5.0.2"
+  checksum: e21d51d872e788bdb381887c2880f717ba4377beb4055078136127134858efd15044655610f1fce4832d9a103ded468a25335203fc53f36db08edd5ab5a8b3db
+  languageName: node
+  linkType: hard
+
 "@types/fs-extra@npm:^9.0.13":
   version: 9.0.13
   resolution: "@types/fs-extra@npm:9.0.13"
@@ -10196,6 +10203,7 @@ __metadata:
     "@nuxt/kit": 3.0.0-rc.8
     "@nuxt/schema": 3.0.0-rc.8
     "@types/clear": ^0
+    "@types/flat": ^5.0.2
     "@types/mri": ^1.1.1
     "@types/semver": ^7
     c12: ^0.2.9

From 180092975037b718efac7af6d8c4e554a25b269b Mon Sep 17 00:00:00 2001
From: Anthony Fu <anthonyfu117@hotmail.com>
Date: Thu, 25 Aug 2022 21:26:56 +0800
Subject: [PATCH 2/8] feat: update

---
 packages/kit/tsconfig.json                   | 11 -----
 packages/nuxi/tsconfig.json                  | 11 -----
 packages/nuxt/tsconfig.json                  | 11 -----
 packages/schema/package.json                 |  1 +
 packages/schema/src/config/_adhoc.ts         |  4 +-
 packages/schema/src/config/_app.ts           | 32 +++++++------
 packages/schema/src/config/_common.ts        | 31 +++++++------
 packages/schema/src/config/build.ts          | 23 +++++----
 packages/schema/src/config/experimental.ts   |  8 ++--
 packages/schema/src/config/generate.ts       | 17 +++++--
 packages/schema/src/config/postcss.ts        |  5 +-
 packages/schema/src/config/render.ts         | 12 +++--
 packages/schema/src/config/router.ts         |  9 ++--
 packages/schema/src/config/vite.ts           | 19 ++++----
 packages/test-utils/tsconfig.json            | 11 -----
 packages/vite/tsconfig.json                  | 11 -----
 packages/webpack/package.json                |  1 +
 packages/webpack/src/configs/client.ts       |  1 +
 packages/webpack/src/configs/server.ts       | 15 ++++--
 packages/webpack/src/plugins/dynamic-base.ts |  4 +-
 packages/webpack/src/plugins/vue/client.ts   | 49 ++++++++++----------
 packages/webpack/src/plugins/vue/server.ts   | 33 ++++++-------
 packages/webpack/src/plugins/vue/util.ts     | 11 +++--
 packages/webpack/src/presets/assets.ts       |  2 +-
 packages/webpack/src/presets/base.ts         | 16 +++++--
 packages/webpack/src/presets/esbuild.ts      |  4 +-
 packages/webpack/src/presets/node.ts         |  2 +-
 packages/webpack/src/presets/pug.ts          |  2 +-
 packages/webpack/src/presets/style.ts        | 22 ++++-----
 packages/webpack/src/presets/vue.ts          |  8 ++--
 packages/webpack/src/utils/config.ts         |  4 +-
 packages/webpack/src/utils/mfs.ts            |  2 +-
 packages/webpack/src/utils/postcss.ts        |  8 ++--
 packages/webpack/src/virtual-modules.ts      |  3 +-
 packages/webpack/src/webpack.ts              | 12 ++---
 scripts/bump-edge.ts                         | 10 +++-
 test/basic.test.ts                           |  8 ++--
 test/utils.ts                                |  8 ++--
 tsconfig.json                                |  5 +-
 yarn.lock                                    | 11 +++++
 40 files changed, 235 insertions(+), 222 deletions(-)
 delete mode 100644 packages/kit/tsconfig.json
 delete mode 100644 packages/nuxi/tsconfig.json
 delete mode 100644 packages/nuxt/tsconfig.json
 delete mode 100644 packages/test-utils/tsconfig.json
 delete mode 100644 packages/vite/tsconfig.json

diff --git a/packages/kit/tsconfig.json b/packages/kit/tsconfig.json
deleted file mode 100644
index 35a35f01926..00000000000
--- a/packages/kit/tsconfig.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "strict": true,
-    "noImplicitAny": true
-  },
-  "include": [
-    "./src/**/*.ts",
-    "./test/**/*.ts"
-  ]
-}
diff --git a/packages/nuxi/tsconfig.json b/packages/nuxi/tsconfig.json
deleted file mode 100644
index 35a35f01926..00000000000
--- a/packages/nuxi/tsconfig.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "strict": true,
-    "noImplicitAny": true
-  },
-  "include": [
-    "./src/**/*.ts",
-    "./test/**/*.ts"
-  ]
-}
diff --git a/packages/nuxt/tsconfig.json b/packages/nuxt/tsconfig.json
deleted file mode 100644
index 35a35f01926..00000000000
--- a/packages/nuxt/tsconfig.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "strict": true,
-    "noImplicitAny": true
-  },
-  "include": [
-    "./src/**/*.ts",
-    "./test/**/*.ts"
-  ]
-}
diff --git a/packages/schema/package.json b/packages/schema/package.json
index 0fddc1f6f71..f8371ead99f 100644
--- a/packages/schema/package.json
+++ b/packages/schema/package.json
@@ -17,6 +17,7 @@
     "@types/lodash.template": "^4",
     "@types/semver": "^7",
     "unbuild": "latest",
+    "untyped": "^0.4.5",
     "vite": "~3.0.9"
   },
   "dependencies": {
diff --git a/packages/schema/src/config/_adhoc.ts b/packages/schema/src/config/_adhoc.ts
index af4e4707eab..effbc6fd928 100644
--- a/packages/schema/src/config/_adhoc.ts
+++ b/packages/schema/src/config/_adhoc.ts
@@ -1,3 +1,5 @@
+import type { InputObject } from 'untyped'
+
 export default {
   /**
    * Configure Nuxt component auto-registration.
@@ -12,7 +14,7 @@ export default {
    * @version 2
    * @version 3
    */
-  components: {
+  components: <InputObject>{
     $resolve: (val, get) => {
       if (Array.isArray(val)) {
         return { dirs: val }
diff --git a/packages/schema/src/config/_app.ts b/packages/schema/src/config/_app.ts
index 045bd6ee37a..fe08301e5ca 100644
--- a/packages/schema/src/config/_app.ts
+++ b/packages/schema/src/config/_app.ts
@@ -1,6 +1,8 @@
 import { resolve, join } from 'pathe'
 import { existsSync, readdirSync } from 'node:fs'
 import defu from 'defu'
+import type { InputObject } from 'untyped'
+import { MetaObject } from '../types/meta'
 
 export default {
   /**
@@ -17,8 +19,12 @@ export default {
      * @version 2
      */
     config: {
-      silent: { $resolve: (val, get) => val ?? !get('dev') },
-      performance: { $resolve: (val, get) => val ?? get('dev') },
+      silent: <InputObject>{
+        $resolve: (val, get) => val ?? !get('dev') 
+      },
+      performance: <InputObject>{
+        $resolve: (val, get) => val ?? get('dev') 
+      },
     },
     /**
      * Options for the Vue compiler that will be passed at build time.
@@ -54,7 +60,7 @@ export default {
      * @deprecated - use `buildAssetsDir` instead
      * @version 2
      */
-    assetsPath: {
+    assetsPath: <InputObject>{
       $resolve: (val, get) => val ?? get('buildAssetsDir')
     },
     /**
@@ -66,7 +72,7 @@ export default {
      * NUXT_APP_CDN_URL=https://mycdn.org/ node .output/server/index.mjs
      * ```
      */
-    cdnURL: {
+    cdnURL: <InputObject>{
       $resolve: (val, get) => get('dev') ? '' : (process.env.NUXT_APP_CDN_URL ?? val) || ''
     },
     /**
@@ -103,9 +109,9 @@ export default {
      * @type {typeof import('../src/types/config').NuxtAppConfig['head']}
      * @version 3
      */
-    head: {
+    head: <InputObject>{
       $resolve: (val, get) => {
-        const resolved = defu(val, get('meta'), {
+        const resolved: Required<MetaObject> = defu(val, get('meta'), {
           meta: [],
           link: [],
           style: [],
@@ -173,7 +179,7 @@ export default {
    * ```
    * @version 2
    */
-  appTemplatePath: {
+  appTemplatePath: <InputObject>{
     $resolve: (val, get) => {
       if (val) {
         return resolve(get('srcDir'), val)
@@ -191,7 +197,7 @@ export default {
    * By default, it is enabled if there is a `store/` directory.
    * @version 2
    */
-  store: {
+  store: <InputObject>{
     $resolve: (val, get) => val !== false &&
       existsSync(join(get('srcDir'), get('dir.store'))) &&
       readdirSync(join(get('srcDir'), get('dir.store')))
@@ -305,8 +311,8 @@ export default {
    * @version 2
    * @version 3
    */
-  css: {
-    $resolve: val => (val ?? []).map(c => c.src || c)
+  css: <InputObject>{
+    $resolve: val => (val ?? []).map((c: any) => c.src || c)
   },
 
   /**
@@ -370,7 +376,7 @@ export default {
    * other options will be passed to the template).
    * @version 2
    */
-  loadingIndicator: {
+  loadingIndicator: <InputObject>{
     $resolve: (val, get) => {
       val = typeof val === 'string' ? { name: val } : val
       return defu(val, {
@@ -394,7 +400,7 @@ export default {
    * @see [vue@3 documentation](https://vuejs.org/guide/built-ins/transition-group.html#enter-leave-transitions)
    * @version 2
    */
-  pageTransition: {
+  pageTransition: <InputObject>{
     $resolve: (val, get) => {
       val = typeof val === 'string' ? { name: val } : val
       return defu(val, {
@@ -418,7 +424,7 @@ export default {
    * @see [vue@3 documentation](https://vuejs.org/guide/built-ins/transition-group.html#enter-leave-transitions)
    * @version 2
    */
-  layoutTransition: {
+  layoutTransition: <InputObject>{
     $resolve: val => {
       val = typeof val === 'string' ? { name: val } : val
       return defu(val, {
diff --git a/packages/schema/src/config/_common.ts b/packages/schema/src/config/_common.ts
index e69f134e119..ba5200536ec 100644
--- a/packages/schema/src/config/_common.ts
+++ b/packages/schema/src/config/_common.ts
@@ -4,6 +4,7 @@ import createRequire from 'create-require'
 import { pascalCase } from 'scule'
 import jiti from 'jiti'
 import defu from 'defu'
+import type { InputObject } from 'untyped'
 import { RuntimeConfig } from '../types/config'
 
 export default {
@@ -31,7 +32,7 @@ export default {
    * @version 2
    * @version 3
    */
-  rootDir: {
+  rootDir: <InputObject>{
     $resolve: val => typeof val === 'string' ? resolve(val) : process.cwd()
   },
 
@@ -65,7 +66,7 @@ export default {
    * @version 2
    * @version 3
    */
-  srcDir: {
+  srcDir: <InputObject>{
     $resolve: (val, get) => resolve(get('rootDir'), val || '.')
   },
 
@@ -84,7 +85,7 @@ export default {
    * @version 2
    * @version 3
    */
-  buildDir: {
+  buildDir: <InputObject>{
     $resolve: (val, get) => resolve(get('rootDir'), val || '.nuxt')
   },
 
@@ -109,7 +110,7 @@ export default {
    * By default, it's only enabled in development mode.
    * @version 2
    */
-  debug: {
+  debug: <InputObject>{
     $resolve: (val, get) => val ?? get('dev')
   },
 
@@ -128,7 +129,7 @@ export default {
    *
    * @version 2
    */
-  env: {
+  env: <InputObject>{
     $default: {},
     $resolve: (val) => {
       val = { ...val }
@@ -149,7 +150,7 @@ export default {
    * @type {'jiti' | 'native' | ((p: string | { filename: string }) => NodeRequire)}
    * @version 2
    */
-  createRequire: {
+  createRequire: <InputObject>{
     $resolve: (val: any) => {
       val = process.env.NUXT_CREATE_REQUIRE || val ||
         (typeof globalThis.jest !== 'undefined' ? 'native' : 'jiti')
@@ -171,7 +172,7 @@ export default {
    * @type {'server' | 'static'}
    * @version 2
    */
-  target: {
+  target: <InputObject>{
     $resolve: val => ['server', 'static'].includes(val) ? val : 'server'
   },
 
@@ -187,7 +188,7 @@ export default {
   /**
    * @deprecated use `ssr` option
    */
-  mode: {
+  mode: <InputObject>{
     $resolve: (val, get) => val || (get('ssr') ? 'spa' : 'universal'),
     $schema: { deprecated: '`mode` option is deprecated' }
   },
@@ -302,7 +303,7 @@ export default {
    * Vue instance name and other options.
    * @version 2
    */
-  globalName: {
+  globalName: <InputObject>{
     $resolve: val => (typeof val === 'string' && /^[a-zA-Z]+$/.test(val)) ? val.toLocaleLowerCase() : 'nuxt'
   },
 
@@ -397,7 +398,7 @@ export default {
    * @version 2
    * @deprecated Use `serverHandlers` instead
    */
-  serverMiddleware: {
+  serverMiddleware: <InputObject>{
     $resolve: (val: any) => {
       if (!val) {
         return []
@@ -425,7 +426,7 @@ export default {
    * ```
    * @version 2
    */
-  modulesDir: {
+  modulesDir: <InputObject>{
     $default: ['node_modules'],
     $resolve: (val, get) => [].concat(
       val.map(dir => resolve(get('rootDir'), dir)),
@@ -494,7 +495,7 @@ export default {
    * @version 2
    * @version 3
    */
-  extensions: {
+  extensions: <InputObject>{
     $resolve: val => ['.js', '.jsx', '.mjs', '.ts', '.tsx', '.vue'].concat(val).filter(Boolean)
   },
 
@@ -592,7 +593,7 @@ export default {
    * @version 2
    * @version 3
    */
-  ignore: {
+  ignore: <InputObject>{
     $resolve: (val, get) => [
       '**/*.stories.{js,ts,jsx,tsx}', // ignore storybook files
       '**/*.{spec,test}.{js,ts,jsx,tsx}', // ignore tests
@@ -616,7 +617,7 @@ export default {
    * @type {string[]}
    * @version 2
    */
-  watch: {
+  watch: <InputObject>{
     $resolve: (val, get) => {
       const rootDir = get('rootDir')
       return Array.from(new Set([].concat(val, get('_nuxtConfigFiles'))
@@ -720,7 +721,7 @@ export default {
    * @type {typeof import('../src/types/config').RuntimeConfig}
    * @version 3
    */
-  runtimeConfig: {
+  runtimeConfig: <InputObject>{
     $resolve: (val: RuntimeConfig, get) => defu(val, {
       ...get('publicRuntimeConfig'),
       ...get('privateRuntimeConfig'),
diff --git a/packages/schema/src/config/build.ts b/packages/schema/src/config/build.ts
index ab78aff5220..bacc7b84149 100644
--- a/packages/schema/src/config/build.ts
+++ b/packages/schema/src/config/build.ts
@@ -2,6 +2,7 @@ import defu from 'defu'
 import { join } from 'pathe'
 import { isCI, isTest } from 'std-env'
 import { normalizeURL, withTrailingSlash } from 'ufo'
+import type { InputObject } from 'untyped'
 
 export default {
   /**
@@ -10,7 +11,7 @@ export default {
    * @type {'vite' | 'webpack' | { bundle: (nuxt: typeof import('../src/types/nuxt').Nuxt) => Promise<void> }}
    * @version 3
    */
-  builder: {
+  builder: <InputObject>{
     $resolve: (val, get) => {
       if (typeof val === 'object') {
         return val
@@ -58,7 +59,7 @@ export default {
      * ```
      * @type {boolean | typeof import('webpack-bundle-analyzer').BundleAnalyzerPlugin.Options | typeof import('rollup-plugin-visualizer').PluginVisualizerOptions}
      */
-    analyze: {
+    analyze: <InputObject>{
       $resolve: (val, get) => {
         if(val !== true) {
           return val ?? false
@@ -137,7 +138,7 @@ export default {
      * Enables CSS source map support (defaults to true in development)
      * @version 2
      */
-    cssSourceMap: {
+    cssSourceMap: <InputObject>{
       $resolve: (val, get) => val ?? get('sourcemap') ?? get('dev')
     },
 
@@ -153,7 +154,7 @@ export default {
      * @warning This is an unstable feature.
      * @version 2
      */
-    parallel: {
+    parallel: <InputObject>{
       $resolve: (val, get) => get('build.extractCSS') ? false : Boolean(val)
     },
 
@@ -197,7 +198,7 @@ export default {
      * ```
      * @version 2
      */
-    publicPath: {
+    publicPath: <InputObject>{
       $resolve: (val, get) => val ? withTrailingSlash(normalizeURL(val)) : get('app').buildAssetsDir
     },
 
@@ -240,7 +241,7 @@ export default {
      * Customize the options of Nuxt's integrated webpack loaders.
      * @version 2
      */
-    loaders: {
+    loaders: <InputObject>{
       $resolve: (val, get) => {
         const styleLoaders = [
           'css', 'cssModules', 'less',
@@ -349,7 +350,7 @@ export default {
      * @see [optimize-css-assets-webpack-plugin documentation](https://github.com/NMFR/optimize-css-assets-webpack-plugin).
      * @version 2
      */
-    optimizeCSS: {
+    optimizeCSS: <InputObject>{
       $resolve: (val, get) => val ?? (get('build.extractCSS') ? {} : false)
     },
 
@@ -360,7 +361,9 @@ export default {
     optimization: {
       runtimeChunk: 'single',
       /** Set minimize to false to disable all minimizers. (It is disabled in development by default) */
-      minimize: { $resolve: (val, get) => val ?? !get('dev') },
+      minimize: <InputObject>{ 
+        $resolve: (val, get) => val ?? !get('dev')
+      },
       /** You can set minimizer to a customized array of plugins. */
       minimizer: undefined,
       splitChunks: {
@@ -490,7 +493,7 @@ export default {
      */
     postcss: {
       execute: undefined,
-      postcssOptions: {
+      postcssOptions: <InputObject>{
         $resolve: (val, get) => {
           // Ensure we return the same object in `build.postcss.postcssOptions as `postcss`
           // so modules which modify the configuration continue to work.
@@ -609,7 +612,7 @@ export default {
      * Set to `'none'` or `false` to disable stats printing out after a build.
      * @version 2
      */
-    stats: {
+    stats: <InputObject>{
       $resolve: (val, get) => (val === 'none' || get('build.quiet')) ? false : val,
       excludeAssets: [
         /.map$/,
diff --git a/packages/schema/src/config/experimental.ts b/packages/schema/src/config/experimental.ts
index 8dbf76b4821..527ca01bed2 100644
--- a/packages/schema/src/config/experimental.ts
+++ b/packages/schema/src/config/experimental.ts
@@ -1,11 +1,13 @@
+import type { InputObject } from 'untyped'
+
 export default {
   /** @version 3 */
   experimental: {
     /**
      * Set to true to generate an async entry point for the Vue bundle (for module federation support).
      */
-    asyncEntry: {
-      $resolve: (val, get) => val ?? false
+    asyncEntry: <InputObject>{
+      $resolve: (val) => val ?? false
     },
 
     /**
@@ -31,7 +33,7 @@ export default {
      *
      * @deprecated use `vite.devBundler: 'vite-node'`
      */
-    viteNode: {
+    viteNode: <InputObject>{
       $resolve: (val) => {
         val = process.env.EXPERIMENTAL_VITE_NODE ? true : val
         if (val === true) {
diff --git a/packages/schema/src/config/generate.ts b/packages/schema/src/config/generate.ts
index b881d6b330e..1d3d40206e3 100644
--- a/packages/schema/src/config/generate.ts
+++ b/packages/schema/src/config/generate.ts
@@ -1,5 +1,6 @@
 import { resolve } from 'pathe'
 import { joinURL } from 'ufo'
+import type { InputObject } from 'untyped'
 
 /**
  * @version 2
@@ -8,7 +9,7 @@ export default {
   /**
    * Directory name that holds all the assets and generated pages for a `static` build.
    */
-  dir: {
+  dir: <InputObject>{
     $resolve: (val = 'dist', get) => resolve(get('rootDir'), val)
   },
 
@@ -160,10 +161,16 @@ export default {
      * The full path to the directory underneath `/_nuxt/` where static assets
      * (payload, state and manifest files) will live.
      */
-    base: { $resolve: (val, get) => val || joinURL(get('app').buildAssetsDir, get('generate.dir')) },
-    /** The full path to the versioned directory where static assets for the current buidl are located. */
-    versionBase: { $resolve: (val, get) => val || joinURL(get('generate.base'), get('generate.version')) },
+    base: <InputObject>{
+      $resolve: (val, get) => val || joinURL(get('app').buildAssetsDir, get('generate.dir')) 
+    },
+    /** The full path to the versioned directory where static assets for the current build are located. */
+    versionBase: <InputObject>{ 
+      $resolve: (val, get) => val || joinURL(get('generate.base'), get('generate.version')) 
+    },
     /** A unique string to uniquely identify payload versions (defaults to the current timestamp).  */
-    version: { $resolve: val => val || (String(Math.round(Date.now() / 1000))) }
+    version: <InputObject>{ 
+      $resolve: val => val || (String(Math.round(Date.now() / 1000))) 
+    }
   }
 }
diff --git a/packages/schema/src/config/postcss.ts b/packages/schema/src/config/postcss.ts
index 60edb87784e..ec93c218a40 100644
--- a/packages/schema/src/config/postcss.ts
+++ b/packages/schema/src/config/postcss.ts
@@ -1,5 +1,6 @@
 import defu from 'defu'
 import createResolver from 'postcss-import-resolver'
+import type { InputObject } from 'untyped'
 
 export default {
   /** @version 3 */
@@ -17,7 +18,7 @@ export default {
       /**
        * https://github.com/postcss/postcss-import
        */
-      'postcss-import': {
+      'postcss-import': <InputObject>{
         $resolve: (val, get) => val !== false ? defu(val || {}, {
           resolve: createResolver({
             alias: { ...get('alias') },
@@ -40,7 +41,7 @@ export default {
        */
       autoprefixer: {},
 
-      cssnano: {
+      cssnano: <InputObject>{
         $resolve: (val, get) => val ?? (!get('dev') && {
           preset: ['default', {
             // Keep quotes in font values to prevent from HEX conversion
diff --git a/packages/schema/src/config/render.ts b/packages/schema/src/config/render.ts
index 7f71aca9c57..53ce31fc469 100644
--- a/packages/schema/src/config/render.ts
+++ b/packages/schema/src/config/render.ts
@@ -1,3 +1,5 @@
+import type { InputObject } from 'untyped'
+
 /**
  * @version 2
  */
@@ -12,7 +14,9 @@ export default {
     shouldPrefetch: () => false,
     shouldPreload: (_fileWithoutQuery, asType) => ['script', 'style'].includes(asType),
     /** enabled by default for development */
-    runInNewContext: { $resolve: (val, get) => val ?? get('dev') }
+    runInNewContext: <InputObject>{
+      $resolve: (val, get) => val ?? get('dev')
+    }
   },
 
   /**
@@ -41,7 +45,9 @@ export default {
    *
    * Set to `collapsed` to collapse the logs, or `false` to disable.
    */
-  ssrLog: { $resolve: (val, get) => get('dev') ? Boolean(val) : false },
+  ssrLog: <InputObject>{
+    $resolve: (val, get) => get('dev') ? Boolean(val) : false
+  },
 
   /**
    * Configuration for HTTP2 push headers.
@@ -206,7 +212,7 @@ export default {
    * }
    * ```
    */
-  csp: {
+  csp: <InputObject>{
     $resolve: (val, get) => {
       if (!val) { return false }
       return {
diff --git a/packages/schema/src/config/router.ts b/packages/schema/src/config/router.ts
index 2ac691d3f86..f998f6b6848 100644
--- a/packages/schema/src/config/router.ts
+++ b/packages/schema/src/config/router.ts
@@ -1,4 +1,5 @@
 import { normalizeURL, withTrailingSlash } from 'ufo'
+import type { InputObject } from 'untyped'
 
 export default {
   /**
@@ -31,12 +32,12 @@ export default {
    * within a bigger web site.
    * @version 2
    */
-  base: {
+  base: <InputObject>{
     $resolve: (val, get) => val ? withTrailingSlash(normalizeURL(val)) : get('app').baseURL
   },
 
   /** @private */
-  _routerBaseSpecified: {
+  _routerBaseSpecified: <InputObject>{
     $resolve: (_val, get) => typeof get('router.base') === 'string'
   },
 
@@ -57,7 +58,7 @@ export default {
    * Set the default(s) middleware for every page of the application.
    * @version 2
    */
-  middleware: {
+  middleware: <InputObject>{
     $resolve: val => Array.isArray(val) ? val : [val].filter(Boolean)
   },
 
@@ -109,7 +110,7 @@ export default {
    * @see [vue-router `scrollBehavior` documentation](https://router.vuejs.org/guide/advanced/scroll-behavior.html).
    * @version 2
    */
-  scrollBehavior: {
+  scrollBehavior: <InputObject>{
     $schema: {
       deprecated: 'router.scrollBehavior` property is deprecated in favor of using `~/app/router.scrollBehavior.js` file, learn more: https://nuxtjs.org/api/configuration-router#scrollbehavior'
     }
diff --git a/packages/schema/src/config/vite.ts b/packages/schema/src/config/vite.ts
index 0a194fa57a1..b44f9268c93 100644
--- a/packages/schema/src/config/vite.ts
+++ b/packages/schema/src/config/vite.ts
@@ -1,5 +1,6 @@
 import { resolve } from 'pathe'
 import { withoutLeadingSlash } from 'ufo'
+import type { InputObject } from 'untyped'
 
 export default {
   /**
@@ -12,14 +13,14 @@ export default {
    * @version 3
    */
   vite: {
-    root: {
+    root: <InputObject>{
       $resolve: (val, get) => val ?? get('srcDir')
     },
-    mode: {
+    mode: <InputObject>{
       $resolve: (val, get) => val ?? (get('dev') ? 'development' : 'production')
     },
     logLevel: 'warn',
-    define: {
+    define: <InputObject>{
       $resolve: (val, get) => ({
         'process.dev': get('dev'),
         ...val || {}
@@ -28,21 +29,21 @@ export default {
     resolve: {
       extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json', '.vue']
     },
-    publicDir: {
+    publicDir: <InputObject>{
       $resolve: (val, get) => val ?? resolve(get('srcDir'), get('dir').public)
     },
     vue: {
-      isProduction: {
+      isProduction: <InputObject>{
         $resolve: (val, get) => val ?? !get('dev')
       },
       template: {
-        compilerOptions: {
+        compilerOptions: <InputObject>{
           $resolve: (val, get) => val ?? get('vue').compilerOptions
         }
       }
     },
     optimizeDeps: {
-      exclude: {
+      exclude: <InputObject>{
         $resolve: (val, get) => [
           ...val || [],
           ...get('build.transpile').filter((i) => typeof i === 'string'),
@@ -57,7 +58,7 @@ export default {
     },
     clearScreen: false,
     build: {
-      assetsDir: {
+      assetsDir: <InputObject>{
         $resolve: (val, get) => val ?? withoutLeadingSlash(get('app').buildAssetsDir)
       },
       emptyOutDir: false
@@ -65,7 +66,7 @@ export default {
     server: {
       fs: {
         strict: false,
-        allow: {
+        allow: <InputObject>{
           $resolve: (val, get) => [
             get('buildDir'),
             get('srcDir'),
diff --git a/packages/test-utils/tsconfig.json b/packages/test-utils/tsconfig.json
deleted file mode 100644
index 35a35f01926..00000000000
--- a/packages/test-utils/tsconfig.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "strict": true,
-    "noImplicitAny": true
-  },
-  "include": [
-    "./src/**/*.ts",
-    "./test/**/*.ts"
-  ]
-}
diff --git a/packages/vite/tsconfig.json b/packages/vite/tsconfig.json
deleted file mode 100644
index 35a35f01926..00000000000
--- a/packages/vite/tsconfig.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "strict": true,
-    "noImplicitAny": true
-  },
-  "include": [
-    "./src/**/*.ts",
-    "./test/**/*.ts"
-  ]
-}
diff --git a/packages/webpack/package.json b/packages/webpack/package.json
index f63b32d2ede..58bf31e4ddc 100644
--- a/packages/webpack/package.json
+++ b/packages/webpack/package.json
@@ -58,6 +58,7 @@
   },
   "devDependencies": {
     "@nuxt/schema": "3.0.0-rc.8",
+    "@types/lodash-es": "^4.17.6",
     "@types/pify": "^5.0.1",
     "@types/webpack-bundle-analyzer": "^4.4.2",
     "@types/webpack-dev-middleware": "^5.0.2",
diff --git a/packages/webpack/src/configs/client.ts b/packages/webpack/src/configs/client.ts
index fc7d268d9f2..a2834740f32 100644
--- a/packages/webpack/src/configs/client.ts
+++ b/packages/webpack/src/configs/client.ts
@@ -68,6 +68,7 @@ function clientHMR (ctx: WebpackConfigContext) {
       `webpack-hot-middleware/client?${hotMiddlewareClientOptionsStr}`
   )
 
+  config.plugins = config.plugins || []
   config.plugins.push(new webpack.HotModuleReplacementPlugin())
 }
 
diff --git a/packages/webpack/src/configs/server.ts b/packages/webpack/src/configs/server.ts
index f84e031be8f..a5fae9ceb1e 100644
--- a/packages/webpack/src/configs/server.ts
+++ b/packages/webpack/src/configs/server.ts
@@ -26,7 +26,7 @@ export function server (ctx: WebpackConfigContext) {
 function serverPreset (ctx: WebpackConfigContext) {
   const { config } = ctx
 
-  config.output.filename = 'server.mjs'
+  config.output!.filename = 'server.mjs'
   config.devtool = 'cheap-module-source-map'
 
   config.optimization = {
@@ -53,8 +53,11 @@ function serverStandalone (ctx: WebpackConfigContext) {
 
   if (!Array.isArray(ctx.config.externals)) { return }
   ctx.config.externals.push(({ request }, cb) => {
+    if (!request) {
+      return cb(undefined, false)
+    }
     if (external.includes(request)) {
-      return cb(null, true)
+      return cb(undefined, true)
     }
     if (
       request[0] === '.' ||
@@ -63,16 +66,18 @@ function serverStandalone (ctx: WebpackConfigContext) {
       assetPattern.test(request)
     ) {
       // console.log('Inline', request)
-      return cb(null, false)
+      return cb(undefined, false)
     }
     // console.log('Ext', request)
-    return cb(null, true)
+    return cb(undefined, true)
   })
 }
 
 function serverPlugins (ctx: WebpackConfigContext) {
   const { config, options } = ctx
 
+  config.plugins = config.plugins || []
+
   // Server polyfills
   if (options.webpack.serverURLPolyfill) {
     config.plugins.push(new webpack.ProvidePlugin({
@@ -83,6 +88,6 @@ function serverPlugins (ctx: WebpackConfigContext) {
 
   // Add type-checking
   if (ctx.nuxt.options.typescript.typeCheck === true || (ctx.nuxt.options.typescript.typeCheck === 'build' && !ctx.nuxt.options.dev)) {
-    ctx.config.plugins.push(new ForkTSCheckerWebpackPlugin({ logger }))
+    config.plugins.push(new ForkTSCheckerWebpackPlugin({ logger }))
   }
 }
diff --git a/packages/webpack/src/plugins/dynamic-base.ts b/packages/webpack/src/plugins/dynamic-base.ts
index 8fd6ccf9c1b..b51506de060 100644
--- a/packages/webpack/src/plugins/dynamic-base.ts
+++ b/packages/webpack/src/plugins/dynamic-base.ts
@@ -24,7 +24,9 @@ export const DynamicBasePlugin = createUnplugin((options: DynamicBasePluginOptio
       s.append(`${options.globalPublicPath} = buildAssetsURL();\n`)
       return {
         code: s.toString(),
-        map: options.sourcemap && s.generateMap({ source: id, includeContent: true })
+        map: options.sourcemap
+          ? s.generateMap({ source: id, includeContent: true })
+          : undefined
       }
     }
   }
diff --git a/packages/webpack/src/plugins/vue/client.ts b/packages/webpack/src/plugins/vue/client.ts
index de8259996b4..0cb12426dda 100644
--- a/packages/webpack/src/plugins/vue/client.ts
+++ b/packages/webpack/src/plugins/vue/client.ts
@@ -10,6 +10,7 @@ import { uniq } from 'lodash-es'
 import fse from 'fs-extra'
 
 import type { Nuxt } from '@nuxt/schema'
+import type { Compilation, Compiler } from 'webpack'
 import { isJS, isCSS, isHotUpdate } from './util'
 
 interface PluginOptions {
@@ -26,17 +27,17 @@ export default class VueSSRClientPlugin {
     }, options)
   }
 
-  apply (compiler) {
-    compiler.hooks.afterEmit.tap('VueSSRClientPlugin', async (compilation: any) => {
+  apply (compiler: Compiler) {
+    compiler.hooks.afterEmit.tap('VueSSRClientPlugin', async (compilation: Compilation) => {
       const stats = compilation.getStats().toJson()
 
-      const allFiles = uniq(stats.assets
+      const allFiles = uniq(stats.assets!
         .map(a => a.name))
         .filter(file => !isHotUpdate(file))
 
-      const initialFiles = uniq(Object.keys(stats.entrypoints)
-        .map(name => stats.entrypoints[name].assets)
-        .reduce((files, entryAssets) => files.concat(entryAssets.map(entryAsset => entryAsset.name)), [])
+      const initialFiles = uniq(Object.keys(stats.entrypoints!)
+        .map(name => stats.entrypoints![name].assets!)
+        .reduce((files, entryAssets) => files.concat(entryAssets.map(entryAsset => entryAsset.name)), [] as string[])
         .filter(file => isJS(file) || isCSS(file)))
         .filter(file => !isHotUpdate(file))
 
@@ -45,11 +46,11 @@ export default class VueSSRClientPlugin {
         .filter(file => !initialFiles.includes(file))
         .filter(file => !isHotUpdate(file))
 
-      const assetsMapping = {}
-      stats.assets
+      const assetsMapping: Record<string, string[]> = {}
+      stats.assets!
         .filter(({ name }) => isJS(name))
         .filter(({ name }) => !isHotUpdate(name))
-        .forEach(({ name, chunkNames }) => {
+        .forEach(({ name, chunkNames = [] }) => {
           const componentHash = hash(chunkNames.join('|'))
           if (!assetsMapping[componentHash]) {
             assetsMapping[componentHash] = []
@@ -62,29 +63,29 @@ export default class VueSSRClientPlugin {
         all: allFiles,
         initial: initialFiles,
         async: asyncFiles,
-        modules: { /* [identifier: string]: Array<index: number> */ },
+        modules: { /* [identifier: string]: Array<index: number> */ } as Record<string, number[]>,
         assetsMapping
       }
 
-      const { entrypoints, namedChunkGroups } = stats
-      const assetModules = stats.modules.filter(m => m.assets.length)
-      const fileToIndex = file => webpackManifest.all.indexOf(file)
-      stats.modules.forEach((m) => {
+      const { entrypoints = {}, namedChunkGroups = {} } = stats
+      const assetModules = stats.modules!.filter(m => m.assets!.length)
+      const fileToIndex = (file: string) => webpackManifest.all.indexOf(file)
+      stats.modules!.forEach((m) => {
         // Ignore modules duplicated in multiple chunks
-        if (m.chunks.length === 1) {
-          const [cid] = m.chunks
-          const chunk = stats.chunks.find(c => c.id === cid)
+        if (m.chunks!.length === 1) {
+          const [cid] = m.chunks!
+          const chunk = stats.chunks!.find(c => c.id === cid)
           if (!chunk || !chunk.files) {
             return
           }
-          const id = m.identifier.replace(/\s\w+$/, '') // remove appended hash
+          const id = m.identifier!.replace(/\s\w+$/, '') // remove appended hash
           const filesSet = new Set(chunk.files.map(fileToIndex).filter(i => i !== -1))
 
-          for (const chunkName of chunk.names) {
+          for (const chunkName of chunk.names!) {
             if (!entrypoints[chunkName]) {
               const chunkGroup = namedChunkGroups[chunkName]
               if (chunkGroup) {
-                for (const asset of chunkGroup.assets) {
+                for (const asset of chunkGroup.assets!) {
                   filesSet.add(fileToIndex(asset.name))
                 }
               }
@@ -98,7 +99,7 @@ export default class VueSSRClientPlugin {
           // Include ConcatenatedModule for not losing module-component mapping
           if (Array.isArray(m.modules)) {
             for (const concatenatedModule of m.modules) {
-              const id = hash(concatenatedModule.identifier.replace(/\s\w+$/, ''))
+              const id = hash(concatenatedModule.identifier!.replace(/\s\w+$/, ''))
               if (!webpackManifest.modules[id]) {
                 webpackManifest.modules[id] = files
               }
@@ -107,14 +108,14 @@ export default class VueSSRClientPlugin {
 
           // Find all asset modules associated with the same chunk
           assetModules.forEach((m) => {
-            if (m.chunks.includes(cid)) {
-              files.push.apply(files, m.assets.map(fileToIndex))
+            if (m.chunks!.includes(cid)) {
+              files.push.apply(files, (m.assets as string[]).map(fileToIndex))
             }
           })
         }
       })
 
-      const manifest = normalizeWebpackManifest(webpackManifest)
+      const manifest = normalizeWebpackManifest(webpackManifest as any)
       await this.options.nuxt.callHook('build:manifest', manifest)
 
       const src = JSON.stringify(manifest, null, 2)
diff --git a/packages/webpack/src/plugins/vue/server.ts b/packages/webpack/src/plugins/vue/server.ts
index e9bd1ee3115..bc5769b5e84 100644
--- a/packages/webpack/src/plugins/vue/server.ts
+++ b/packages/webpack/src/plugins/vue/server.ts
@@ -1,35 +1,36 @@
-
-import webpack from 'webpack'
+import webpack, { Compilation, Compiler } from 'webpack'
 import { validate, isJS, extractQueryPartJS } from './util'
 
+export interface VueSSRServerPluginOptions {
+  filename: string
+}
+
 export default class VueSSRServerPlugin {
-  options: {
-    filename?: string
-  }
+  options: VueSSRServerPluginOptions
 
-  constructor (options = {}) {
+  constructor (options: Partial<VueSSRServerPluginOptions> = {}) {
     this.options = Object.assign({
       filename: null
-    }, options)
+    }, options) as VueSSRServerPluginOptions
   }
 
-  apply (compiler) {
+  apply (compiler: Compiler) {
     validate(compiler)
-    compiler.hooks.make.tap('VueSSRServerPlugin', (compilation: any) => {
+    compiler.hooks.make.tap('VueSSRServerPlugin', (compilation: Compilation) => {
       compilation.hooks.processAssets.tapAsync({
         name: 'VueSSRServerPlugin',
         stage: webpack.Compilation.PROCESS_ASSETS_STAGE_ADDITIONAL
-      }, (assets, cb) => {
+      }, (assets: any, cb: any) => {
         const stats = compilation.getStats().toJson()
-        const [entryName] = Object.keys(stats.entrypoints)
-        const entryInfo = stats.entrypoints[entryName]
+        const [entryName] = Object.keys(stats.entrypoints!)
+        const entryInfo = stats.entrypoints![entryName]
 
         if (!entryInfo) {
           // #5553
           return cb()
         }
 
-        const entryAssets = entryInfo.assets.filter(asset => isJS(asset.name))
+        const entryAssets = entryInfo.assets!.filter((asset: { name:string }) => isJS(asset.name))
 
         if (entryAssets.length > 1) {
           throw new Error(
@@ -47,11 +48,11 @@ export default class VueSSRServerPlugin {
 
         const bundle = {
           entry: entry.name,
-          files: {},
-          maps: {}
+          files: {} as Record<string, string>,
+          maps: {} as Record<string, string>
         }
 
-        stats.assets.forEach((asset) => {
+        stats.assets!.forEach((asset: any) => {
           if (isJS(asset.name)) {
             const queryPart = extractQueryPartJS(asset.name)
             if (queryPart !== undefined) {
diff --git a/packages/webpack/src/plugins/vue/util.ts b/packages/webpack/src/plugins/vue/util.ts
index 7a092f2a9c4..590d6ceec27 100644
--- a/packages/webpack/src/plugins/vue/util.ts
+++ b/packages/webpack/src/plugins/vue/util.ts
@@ -4,8 +4,9 @@
  */
 
 import { logger } from '@nuxt/kit'
+import type { Compiler } from 'webpack'
 
-export const validate = (compiler) => {
+export const validate = (compiler: Compiler) => {
   if (compiler.options.target !== 'node') {
     logger.warn('webpack config `target` should be "node".')
   }
@@ -20,10 +21,10 @@ export const validate = (compiler) => {
 
 const isJSRegExp = /\.[cm]?js(\?[^.]+)?$/
 
-export const isJS = file => isJSRegExp.test(file)
+export const isJS = (file: string) => isJSRegExp.test(file)
 
-export const extractQueryPartJS = file => isJSRegExp.exec(file)[1]
+export const extractQueryPartJS = (file: string) => isJSRegExp.exec(file)?.[1]
 
-export const isCSS = file => /\.css(\?[^.]+)?$/.test(file)
+export const isCSS = (file: string) => /\.css(\?[^.]+)?$/.test(file)
 
-export const isHotUpdate = file => file.includes('hot-update')
+export const isHotUpdate = (file: string) => file.includes('hot-update')
diff --git a/packages/webpack/src/presets/assets.ts b/packages/webpack/src/presets/assets.ts
index 15a52ad7b23..9f588fd3316 100644
--- a/packages/webpack/src/presets/assets.ts
+++ b/packages/webpack/src/presets/assets.ts
@@ -1,7 +1,7 @@
 import { fileName, WebpackConfigContext } from '../utils/config'
 
 export function assets (ctx: WebpackConfigContext) {
-  ctx.config.module.rules.push(
+  ctx.config.module!.rules!.push(
     {
       test: /\.(png|jpe?g|gif|svg|webp)$/i,
       use: [{
diff --git a/packages/webpack/src/presets/base.ts b/packages/webpack/src/presets/base.ts
index 171eeeb3bcf..e57d7bf0047 100644
--- a/packages/webpack/src/presets/base.ts
+++ b/packages/webpack/src/presets/base.ts
@@ -1,8 +1,10 @@
 import { resolve, normalize } from 'pathe'
+// @ts-expect-error missing types
 import TimeFixPlugin from 'time-fix-plugin'
 import WebpackBar from 'webpackbar'
 import webpack from 'webpack'
 import { logger } from '@nuxt/kit'
+// @ts-expect-error missing types
 import FriendlyErrorsWebpackPlugin from '@nuxt/friendly-errors-webpack-plugin'
 import escapeRegExp from 'escape-string-regexp'
 import { joinURL } from 'ufo'
@@ -44,6 +46,8 @@ function baseConfig (ctx: WebpackConfigContext) {
 function basePlugins (ctx: WebpackConfigContext) {
   const { config, options, nuxt } = ctx
 
+  config.plugins = config.plugins || []
+
   // Add timefix-plugin before other plugins
   if (options.dev) {
     config.plugins.push(new TimeFixPlugin())
@@ -63,7 +67,7 @@ function basePlugins (ctx: WebpackConfigContext) {
     ctx.isServer ||
     (ctx.isDev && !options.build.quiet && options.webpack.friendlyErrors)
   ) {
-    ctx.config.plugins.push(
+    config.plugins.push(
       new FriendlyErrorsWebpackPlugin({
         clearConsole: false,
         reporter: 'consola',
@@ -81,16 +85,17 @@ function basePlugins (ctx: WebpackConfigContext) {
     }
     config.plugins.push(new WebpackBar({
       name: ctx.name,
-      color: colors[ctx.name],
+      color: colors[ctx.name as keyof typeof colors],
       reporters: ['stats'],
       stats: !ctx.isDev,
       reporter: {
-      // @ts-ignore
+        // @ts-ignore
         change: (_, { shortPath }) => {
           if (!ctx.isServer) {
             nuxt.callHook('bundler:change', shortPath)
           }
         },
+        // @ts-ignore
         done: ({ state }) => {
           if (state.hasErrors) {
             nuxt.callHook('bundler:error')
@@ -101,6 +106,7 @@ function basePlugins (ctx: WebpackConfigContext) {
         allDone: () => {
           nuxt.callHook('bundler:done')
         },
+        // @ts-ignore
         progress ({ statesArray }) {
           nuxt.callHook('bundler:progress', statesArray)
         }
@@ -220,7 +226,7 @@ function getWarningIgnoreFilter (ctx: WebpackConfigContext): WarningFilter {
 function getEnv (ctx: WebpackConfigContext) {
   const { options } = ctx
 
-  const _env = {
+  const _env: Record<string, string | boolean> = {
     'process.env.NODE_ENV': JSON.stringify(ctx.config.mode),
     'process.mode': JSON.stringify(ctx.config.mode),
     'process.dev': options.dev,
@@ -239,7 +245,7 @@ function getEnv (ctx: WebpackConfigContext) {
 
   Object.entries(options.env).forEach(([key, value]) => {
     const isNative = ['boolean', 'number'].includes(typeof value)
-    _env['process.env.' + key] = isNative ? value : JSON.stringify(value)
+    _env['process.env.' + key] = isNative ? value as string : JSON.stringify(value)
   })
 
   return _env
diff --git a/packages/webpack/src/presets/esbuild.ts b/packages/webpack/src/presets/esbuild.ts
index 494282144cd..e78c5147220 100644
--- a/packages/webpack/src/presets/esbuild.ts
+++ b/packages/webpack/src/presets/esbuild.ts
@@ -10,9 +10,9 @@ export function esbuild (ctx: WebpackConfigContext) {
   const target = ctx.isServer ? 'es2019' : 'chrome85'
 
   // https://github.com/nuxt/framework/issues/2372
-  config.optimization.minimizer.push(new (esbuildLoader as unknown as typeof import('esbuild-loader')).ESBuildMinifyPlugin())
+  config.optimization!.minimizer!.push(new (esbuildLoader as unknown as typeof import('esbuild-loader')).ESBuildMinifyPlugin())
 
-  config.module.rules.push(
+  config.module!.rules!.push(
     {
       test: /\.m?[jt]s$/i,
       loader: 'esbuild-loader',
diff --git a/packages/webpack/src/presets/node.ts b/packages/webpack/src/presets/node.ts
index 4f1fd4a9ce8..b5d584c6e4b 100644
--- a/packages/webpack/src/presets/node.ts
+++ b/packages/webpack/src/presets/node.ts
@@ -6,7 +6,7 @@ export function node (ctx: WebpackConfigContext) {
   config.target = 'node'
   config.node = false
 
-  config.experiments.outputModule = true
+  config.experiments!.outputModule = true
 
   config.output = {
     ...config.output,
diff --git a/packages/webpack/src/presets/pug.ts b/packages/webpack/src/presets/pug.ts
index 2cccf5867b8..2a414a28c9c 100644
--- a/packages/webpack/src/presets/pug.ts
+++ b/packages/webpack/src/presets/pug.ts
@@ -1,7 +1,7 @@
 import { WebpackConfigContext } from '../utils/config'
 
 export function pug (ctx: WebpackConfigContext) {
-  ctx.config.module.rules.push({
+  ctx.config.module!.rules!.push({
     test: /\.pug$/i,
     oneOf: [
       {
diff --git a/packages/webpack/src/presets/style.ts b/packages/webpack/src/presets/style.ts
index d51609a509f..5a5d39efe5b 100644
--- a/packages/webpack/src/presets/style.ts
+++ b/packages/webpack/src/presets/style.ts
@@ -14,8 +14,8 @@ export function style (ctx: WebpackConfigContext) {
 function minimizer (ctx: WebpackConfigContext) {
   const { options, config } = ctx
 
-  if (options.webpack.optimizeCSS && Array.isArray(config.optimization.minimizer)) {
-    config.optimization.minimizer.push(new CssMinimizerPlugin({
+  if (options.webpack.optimizeCSS && Array.isArray(config.optimization!.minimizer)) {
+    config.optimization!.minimizer.push(new CssMinimizerPlugin({
       ...options.webpack.optimizeCSS
     }))
   }
@@ -26,7 +26,7 @@ function extractCSS (ctx: WebpackConfigContext) {
 
   // CSS extraction
   if (options.webpack.extractCSS) {
-    config.plugins.push(new MiniCssExtractPlugin({
+    config.plugins!.push(new MiniCssExtractPlugin({
       filename: fileName(ctx, 'css'),
       chunkFilename: fileName(ctx, 'css'),
       ...options.webpack.extractCSS === true ? {} : options.webpack.extractCSS
@@ -38,28 +38,28 @@ function loaders (ctx: WebpackConfigContext) {
   const { config, options } = ctx
 
   // CSS
-  config.module.rules.push(createdStyleRule('css', /\.css$/i, null, ctx))
+  config.module!.rules!.push(createdStyleRule('css', /\.css$/i, null, ctx))
 
   // Postcss
-  config.module.rules.push(createdStyleRule('postcss', /\.p(ost)?css$/i, null, ctx))
+  config.module!.rules!.push(createdStyleRule('postcss', /\.p(ost)?css$/i, null, ctx))
 
   // Less
   const lessLoader = { loader: 'less-loader', options: options.webpack.loaders.less }
-  config.module.rules.push(createdStyleRule('less', /\.less$/i, lessLoader, ctx))
+  config.module!.rules!.push(createdStyleRule('less', /\.less$/i, lessLoader, ctx))
 
   // Sass (TODO: optional dependency)
   const sassLoader = { loader: 'sass-loader', options: options.webpack.loaders.sass }
-  config.module.rules.push(createdStyleRule('sass', /\.sass$/i, sassLoader, ctx))
+  config.module!.rules!.push(createdStyleRule('sass', /\.sass$/i, sassLoader, ctx))
 
   const scssLoader = { loader: 'sass-loader', options: options.webpack.loaders.scss }
-  config.module.rules.push(createdStyleRule('scss', /\.scss$/i, scssLoader, ctx))
+  config.module!.rules!.push(createdStyleRule('scss', /\.scss$/i, scssLoader, ctx))
 
   // Stylus
   const stylusLoader = { loader: 'stylus-loader', options: options.webpack.loaders.stylus }
-  config.module.rules.push(createdStyleRule('stylus', /\.styl(us)?$/i, stylusLoader, ctx))
+  config.module!.rules!.push(createdStyleRule('stylus', /\.styl(us)?$/i, stylusLoader, ctx))
 }
 
-function createdStyleRule (lang: string, test: RegExp, processorLoader, ctx: WebpackConfigContext) {
+function createdStyleRule (lang: string, test: RegExp, processorLoader: any, ctx: WebpackConfigContext) {
   const { options } = ctx
 
   const styleLoaders = [
@@ -90,7 +90,7 @@ function createdStyleRule (lang: string, test: RegExp, processorLoader, ctx: Web
   }
 }
 
-function createCssLoadersRule (ctx: WebpackConfigContext, cssLoaderOptions) {
+function createCssLoadersRule (ctx: WebpackConfigContext, cssLoaderOptions: any) {
   const { options } = ctx
 
   const cssLoader = { loader: 'css-loader', options: cssLoaderOptions }
diff --git a/packages/webpack/src/presets/vue.ts b/packages/webpack/src/presets/vue.ts
index 8032e696b84..b81e277f797 100644
--- a/packages/webpack/src/presets/vue.ts
+++ b/packages/webpack/src/presets/vue.ts
@@ -11,7 +11,7 @@ export function vue (ctx: WebpackConfigContext) {
   // @ts-ignore
   config.plugins.push(new (VueLoaderPlugin.default || VueLoaderPlugin)())
 
-  config.module.rules.push({
+  config.module!.rules!.push({
     test: /\.vue$/i,
     loader: 'vue-loader',
     options: {
@@ -21,12 +21,12 @@ export function vue (ctx: WebpackConfigContext) {
   })
 
   if (ctx.isClient) {
-    config.plugins.push(new VueSSRClientPlugin({
+    config.plugins!.push(new VueSSRClientPlugin({
       filename: resolve(options.buildDir, 'dist/server', `${ctx.name}.manifest.json`),
       nuxt: ctx.nuxt
     }))
   } else {
-    config.plugins.push(new VueSSRServerPlugin({
+    config.plugins!.push(new VueSSRServerPlugin({
       filename: `${ctx.name}.manifest.json`
     }))
   }
@@ -34,7 +34,7 @@ export function vue (ctx: WebpackConfigContext) {
   // Feature flags
   // https://github.com/vuejs/vue-next/tree/master/packages/vue#bundler-build-feature-flags
   // TODO: Provide options to toggle
-  config.plugins.push(new webpack.DefinePlugin({
+  config.plugins!.push(new webpack.DefinePlugin({
     __VUE_OPTIONS_API__: 'true',
     __VUE_PROD_DEVTOOLS__: 'false'
   }))
diff --git a/packages/webpack/src/utils/config.ts b/packages/webpack/src/utils/config.ts
index ac0415c8898..905bde5b166 100644
--- a/packages/webpack/src/utils/config.ts
+++ b/packages/webpack/src/utils/config.ts
@@ -19,7 +19,7 @@ export function createWebpackConfigContext (nuxt: Nuxt) {
     isServer: false,
     isClient: false,
 
-    alias: {} as Configuration['resolve']['alias'],
+    alias: {} as NonNullable<Configuration['resolve']>['alias'],
     transpile: [] as RegExp[]
   }
 }
@@ -61,7 +61,7 @@ export function getWebpackConfig (ctx: WebpackConfigContext): Configuration {
 
   // TODO
   const builder = {}
-  const loaders = []
+  const loaders: any[] = []
 
   // @ts-ignore
   const { extend } = options.build
diff --git a/packages/webpack/src/utils/mfs.ts b/packages/webpack/src/utils/mfs.ts
index 4df4d4ecc9d..06239d69815 100644
--- a/packages/webpack/src/utils/mfs.ts
+++ b/packages/webpack/src/utils/mfs.ts
@@ -9,7 +9,7 @@ export function createMFS () {
   const fs = createFsFromVolume(new Volume())
 
   // Clone to extend
-  const _fs: Partial<IFs> & { join?(...paths: string[]): string } = { ...fs }
+  const _fs: IFs & { join?(...paths: string[]): string } = { ...fs } as any
 
   // fs.join method is (still) expected by webpack-dev-middleware
   // There might be differences with https://github.com/webpack/memory-fs/blob/master/lib/join.js
diff --git a/packages/webpack/src/utils/postcss.ts b/packages/webpack/src/utils/postcss.ts
index b04566777c7..964184f5640 100644
--- a/packages/webpack/src/utils/postcss.ts
+++ b/packages/webpack/src/utils/postcss.ts
@@ -35,20 +35,20 @@ export const getPostcssConfig = (nuxt: Nuxt) => {
     }
   }
 
-  function sortPlugins ({ plugins, order }) {
+  function sortPlugins ({ plugins, order }: any) {
     const names = Object.keys(plugins)
     if (typeof order === 'string') {
-      order = orderPresets[order]
+      order = orderPresets[order as keyof typeof orderPresets]
     }
     return typeof order === 'function' ? order(names, orderPresets) : (order || names)
   }
 
-  function loadPlugins (config) {
+  function loadPlugins (config: any) {
     if (!isPureObject(config.plugins)) { return }
 
     // Map postcss plugins into instances on object mode once
     const cjs = createCommonJS(import.meta.url)
-    config.plugins = sortPlugins(config).map((pluginName) => {
+    config.plugins = sortPlugins(config).map((pluginName: string) => {
       const pluginFn = requireModule(pluginName, { paths: [cjs.__dirname] })
       const pluginOptions = config.plugins[pluginName]
       if (!pluginOptions || typeof pluginFn !== 'function') { return null }
diff --git a/packages/webpack/src/virtual-modules.ts b/packages/webpack/src/virtual-modules.ts
index 688690b2a3d..d161bdbf58c 100644
--- a/packages/webpack/src/virtual-modules.ts
+++ b/packages/webpack/src/virtual-modules.ts
@@ -1,4 +1,5 @@
 import { useNuxt } from '@nuxt/kit'
+import { Compilation } from 'webpack'
 import VirtualModulesPlugin from 'webpack-virtual-modules'
 
 export function registerVirtualModules () {
@@ -13,7 +14,7 @@ export function registerVirtualModules () {
   }
 
   // Workaround to initialize virtual modules
-  nuxt.hook('build:compile', ({ compiler }) => {
+  nuxt.hook('build:compile', ({ compiler }: Compilation) => {
     if (compiler.name === 'server') { writeFiles() }
   })
   // Update virtual modules when templates are updated
diff --git a/packages/webpack/src/webpack.ts b/packages/webpack/src/webpack.ts
index 0952f56d447..4391862ac38 100644
--- a/packages/webpack/src/webpack.ts
+++ b/packages/webpack/src/webpack.ts
@@ -1,7 +1,7 @@
 import type { IncomingMessage, ServerResponse } from 'node:http'
 import pify from 'pify'
 import webpack from 'webpack'
-import webpackDevMiddleware, { API } from 'webpack-dev-middleware'
+import webpackDevMiddleware, { API, OutputFileSystem } from 'webpack-dev-middleware'
 import webpackHotMiddleware from 'webpack-hot-middleware'
 import type { Compiler, Watching } from 'webpack'
 
@@ -34,10 +34,10 @@ export async function bundle (nuxt: Nuxt) {
 
   // Configure compilers
   const compilers = webpackConfigs.map((config) => {
-    config.plugins.push(DynamicBasePlugin.webpack({
+    config.plugins!.push(DynamicBasePlugin.webpack({
       sourcemap: nuxt.options.sourcemap
     }))
-    config.plugins.push(composableKeysPlugin.webpack({
+    config.plugins!.push(composableKeysPlugin.webpack({
       sourcemap: nuxt.options.sourcemap,
       rootDir: nuxt.options.rootDir
     }))
@@ -47,7 +47,7 @@ export async function bundle (nuxt: Nuxt) {
 
     // In dev, write files in memory FS
     if (nuxt.options.dev) {
-      compiler.outputFileSystem = mfs
+      compiler.outputFileSystem = mfs as unknown as OutputFileSystem
     }
 
     return compiler
@@ -88,7 +88,7 @@ async function createDevMiddleware (compiler: Compiler) {
   const hotMiddleware = pify(webpackHotMiddleware(compiler, {
     log: false,
     heartbeat: 10000,
-    path: joinURL(nuxt.options.app.baseURL, '__webpack_hmr', compiler.options.name),
+    path: joinURL(nuxt.options.app.baseURL, '__webpack_hmr', compiler.options.name!),
     ...hotMiddlewareOptions
   }))
 
@@ -152,7 +152,7 @@ async function compile (compiler: Compiler) {
   }
 
   // --- Production Build ---
-  const stats = await new Promise<webpack.Stats>((resolve, reject) => compiler.run((err, stats) => err ? reject(err) : resolve(stats)))
+  const stats = await new Promise<webpack.Stats>((resolve, reject) => compiler.run((err, stats) => err ? reject(err) : resolve(stats!)))
 
   if (stats.hasErrors()) {
     // non-quiet mode: errors will be printed by webpack itself
diff --git a/scripts/bump-edge.ts b/scripts/bump-edge.ts
index 9096979d7dd..09c916ae3f6 100644
--- a/scripts/bump-edge.ts
+++ b/scripts/bump-edge.ts
@@ -3,16 +3,22 @@ import { execSync } from 'node:child_process'
 import { resolve } from 'pathe'
 import { globby } from 'globby'
 
+interface Dep {
+  name: string,
+  range: string,
+  type: string
+}
+
 async function loadPackage (dir: string) {
   const pkgPath = resolve(dir, 'package.json')
   const data = JSON.parse(await fsp.readFile(pkgPath, 'utf-8').catch(() => '{}'))
   const save = () => fsp.writeFile(pkgPath, JSON.stringify(data, null, 2) + '\n')
 
-  const updateDeps = (reviver: Function) => {
+  const updateDeps = (reviver: (dep: Dep) => Dep | void) => {
     for (const type of ['dependencies', 'devDependencies', 'optionalDependencies', 'peerDependencies']) {
       if (!data[type]) { continue }
       for (const e of Object.entries(data[type])) {
-        const dep = { name: e[0], range: e[1], type }
+        const dep: Dep = { name: e[0], range: e[1] as string, type }
         delete data[type][dep.name]
         const updated = reviver(dep) || dep
         data[updated.type] = data[updated.type] || {}
diff --git a/test/basic.test.ts b/test/basic.test.ts
index 07450c8067f..b3709b9359d 100644
--- a/test/basic.test.ts
+++ b/test/basic.test.ts
@@ -350,7 +350,7 @@ describe('extends support', () => {
   describe('app', () => {
     it('extends foo/app/router.options & bar/app/router.options', async () => {
       const html: string = await $fetch('/')
-      const routerLinkClasses = html.match(/href="\/" class="([^"]*)"/)[1].split(' ')
+      const routerLinkClasses = html.match(/href="\/" class="([^"]*)"/)?.[1].split(' ')
       expect(routerLinkClasses).toContain('foo-active-class')
       expect(routerLinkClasses).toContain('bar-exact-active-class')
     })
@@ -404,7 +404,7 @@ describe('dynamic paths', () => {
   }
 
   it('should work with no overrides', async () => {
-    const html = await $fetch('/assets')
+    const html: string = await $fetch('/assets')
     for (const match of html.matchAll(/(href|src)="(.*?)"/g)) {
       const url = match[2]
       expect(url.startsWith('/_nuxt/') || url === '/public.svg').toBeTruthy()
@@ -417,11 +417,11 @@ describe('dynamic paths', () => {
       return
     }
 
-    const html = await $fetch('/assets')
+    const html: string = await $fetch('/assets')
     const urls = Array.from(html.matchAll(/(href|src)="(.*?)"/g)).map(m => m[2])
     const cssURL = urls.find(u => /_nuxt\/assets.*\.css$/.test(u))
     expect(cssURL).toBeDefined()
-    const css = await $fetch(cssURL)
+    const css: string = await $fetch(cssURL!)
     const imageUrls = Array.from(css.matchAll(/url\(([^)]*)\)/g)).map(m => m[1].replace(/[-.][\w]{8}\./g, '.'))
     expect(imageUrls).toMatchInlineSnapshot(`
         [
diff --git a/test/utils.ts b/test/utils.ts
index bdd96611d78..517274a5d62 100644
--- a/test/utils.ts
+++ b/test/utils.ts
@@ -4,13 +4,13 @@ import { expect } from 'vitest'
 export async function renderPage (path = '/') {
   const ctx = useTestContext()
   if (!ctx.options.browser) {
-    return
+    throw new Error('`renderPage` require `options.browser` to be set')
   }
 
   const browser = await getBrowser()
   const page = await browser.newPage({})
-  const pageErrors = []
-  const consoleLogs = []
+  const pageErrors: Error[] = []
+  const consoleLogs: { type:string, text:string }[] = []
 
   page.on('console', (message) => {
     consoleLogs.push({
@@ -39,7 +39,7 @@ export async function expectNoClientErrors (path: string) {
     return
   }
 
-  const { pageErrors, consoleLogs } = await renderPage(path)
+  const { pageErrors, consoleLogs } = (await renderPage(path))!
 
   const consoleLogErrors = consoleLogs.filter(i => i.type === 'error')
   const consoleLogWarnings = consoleLogs.filter(i => i.type === 'warning')
diff --git a/tsconfig.json b/tsconfig.json
index ffabca27f6c..ad18daf7ab3 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -6,7 +6,8 @@
     "target": "ESNext",
     "module": "ESNext",
     "moduleResolution": "Node",
-    "strict": false,
+    "strict": true,
+    "noImplicitAny": true,
     "allowJs": true,
     "noEmit": true,
     "noUnusedLocals": true,
@@ -33,7 +34,7 @@
     }
   },
   "exclude": [
-    "**/*/dist/*",
+    "**/dist/**",
     "**/.nuxt/**",
     "**/nuxt.d.ts",
     "**/examples/**",
diff --git a/yarn.lock b/yarn.lock
index 01c889e008f..06c5e96ec45 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1767,6 +1767,7 @@ __metadata:
     ufo: ^0.8.5
     unbuild: latest
     unimport: ^0.6.7
+    untyped: ^0.4.5
     vite: ~3.0.9
   languageName: unknown
   linkType: soft
@@ -1904,6 +1905,7 @@ __metadata:
     "@nuxt/friendly-errors-webpack-plugin": ^2.5.2
     "@nuxt/kit": 3.0.0-rc.8
     "@nuxt/schema": 3.0.0-rc.8
+    "@types/lodash-es": ^4.17.6
     "@types/pify": ^5.0.1
     "@types/webpack-bundle-analyzer": ^4.4.2
     "@types/webpack-dev-middleware": ^5.0.2
@@ -2433,6 +2435,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/lodash-es@npm:^4.17.6":
+  version: 4.17.6
+  resolution: "@types/lodash-es@npm:4.17.6"
+  dependencies:
+    "@types/lodash": "*"
+  checksum: 9bd239dd525086e278821949ce12fbdd4f100a060fed9323fc7ad5661113e1641f28a7ebab617230ed3474680d8f4de705c1928b48252bb684be6ec9eed715db
+  languageName: node
+  linkType: hard
+
 "@types/lodash.template@npm:^4":
   version: 4.5.1
   resolution: "@types/lodash.template@npm:4.5.1"

From 51c72a2b506e5b45051f75abecb53945c724d817 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.io>
Date: Fri, 26 Aug 2022 14:23:50 +0200
Subject: [PATCH 3/8] update untyped

---
 docs/package.json            |  2 +-
 packages/kit/package.json    |  2 +-
 packages/nuxt/package.json   |  2 +-
 packages/schema/package.json |  2 +-
 yarn.lock                    | 20 ++++++++++++++++----
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/docs/package.json b/docs/package.json
index 8dd8a352a06..530c5171f88 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -20,7 +20,7 @@
     "pathe": "^0.3.5",
     "rimraf": "^3.0.2",
     "scule": "^0.3.2",
-    "untyped": "^0.4.5",
+    "untyped": "^0.4.6",
     "vue-mq": "^1.0.1",
     "vue-plausible": "^1.3.2"
   },
diff --git a/packages/kit/package.json b/packages/kit/package.json
index d357efc9130..e52c85dd551 100644
--- a/packages/kit/package.json
+++ b/packages/kit/package.json
@@ -30,7 +30,7 @@
     "semver": "^7.3.7",
     "unctx": "^2.0.1",
     "unimport": "^0.6.7",
-    "untyped": "^0.4.5"
+    "untyped": "^0.4.6"
   },
   "devDependencies": {
     "@types/lodash.template": "^4",
diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json
index f70f44a7888..19d0fffcdcc 100644
--- a/packages/nuxt/package.json
+++ b/packages/nuxt/package.json
@@ -65,7 +65,7 @@
     "unenv": "^0.6.1",
     "unimport": "^0.6.7",
     "unplugin": "^0.9.2",
-    "untyped": "^0.4.5",
+    "untyped": "^0.4.6",
     "vue": "^3.2.37",
     "vue-bundle-renderer": "^0.4.2",
     "vue-devtools-stub": "^0.1.0",
diff --git a/packages/schema/package.json b/packages/schema/package.json
index f8371ead99f..768241ab059 100644
--- a/packages/schema/package.json
+++ b/packages/schema/package.json
@@ -17,7 +17,7 @@
     "@types/lodash.template": "^4",
     "@types/semver": "^7",
     "unbuild": "latest",
-    "untyped": "^0.4.5",
+    "untyped": "^0.4.6",
     "vite": "~3.0.9"
   },
   "dependencies": {
diff --git a/yarn.lock b/yarn.lock
index 709a222be84..62c23ff1f2c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -327,7 +327,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/standalone@npm:^7.18.11":
+"@babel/standalone@npm:^7.18.11, @babel/standalone@npm:^7.18.13":
   version: 7.18.13
   resolution: "@babel/standalone@npm:7.18.13"
   checksum: da010b1ef0d53f7888d01b3ef93aac9a17af5711979e7bc048b80bf08ae6dfa6b637bf92fee0c5753b4ff1bc3639a5b82925f9234d4e2150fc6d4d5c2ccc1f89
@@ -1661,7 +1661,7 @@ __metadata:
     unbuild: latest
     unctx: ^2.0.1
     unimport: ^0.6.7
-    untyped: ^0.4.5
+    untyped: ^0.4.6
   languageName: unknown
   linkType: soft
 
@@ -1688,7 +1688,7 @@ __metadata:
     ufo: ^0.8.5
     unbuild: latest
     unimport: ^0.6.7
-    untyped: ^0.4.5
+    untyped: ^0.4.6
     vite: ~3.0.9
   languageName: unknown
   linkType: soft
@@ -9995,7 +9995,7 @@ __metadata:
     unenv: ^0.6.1
     unimport: ^0.6.7
     unplugin: ^0.9.2
-    untyped: ^0.4.5
+    untyped: ^0.4.6
     vue: ^3.2.37
     vue-bundle-renderer: ^0.4.2
     vue-devtools-stub: ^0.1.0
@@ -13209,6 +13209,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"untyped@npm:^0.4.6":
+  version: 0.4.6
+  resolution: "untyped@npm:0.4.6"
+  dependencies:
+    "@babel/core": ^7.18.13
+    "@babel/standalone": ^7.18.13
+    "@babel/types": ^7.18.13
+    scule: ^0.3.2
+  checksum: 3caf8c6c523dfc7f31282ebaaa70a42c24d8b1682f85953a891a89ef3e3dd75ba470a6a0904b8ec454c374e99f2f9c088e3e9aecc9964539ceb4dfc0366656db
+  languageName: node
+  linkType: hard
+
 "upath@npm:^2.0.1":
   version: 2.0.1
   resolution: "upath@npm:2.0.1"

From c148013ba473f58a0253f0cc21c46773fc5b4b64 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.io>
Date: Fri, 26 Aug 2022 15:52:17 +0200
Subject: [PATCH 4/8] refactor: use SchemaObject type [wip]

---
 packages/schema/build.config.ts            |  3 +-
 packages/schema/src/config/_adhoc.ts       |  8 ++--
 packages/schema/src/config/_app.ts         | 34 +++++++-------
 packages/schema/src/config/_common.ts      | 38 ++++++++--------
 packages/schema/src/config/_internal.ts    |  6 ++-
 packages/schema/src/config/build.ts        | 26 +++++------
 packages/schema/src/config/cli.ts          |  6 ++-
 packages/schema/src/config/experimental.ts | 10 ++--
 packages/schema/src/config/generate.ts     | 18 ++++----
 packages/schema/src/config/messages.ts     |  6 ++-
 packages/schema/src/config/nitro.ts        |  6 ++-
 packages/schema/src/config/postcss.ts      | 10 ++--
 packages/schema/src/config/render.ts       | 12 ++---
 packages/schema/src/config/router.ts       | 14 +++---
 packages/schema/src/config/server.ts       |  4 +-
 packages/schema/src/config/typescript.ts   |  6 ++-
 packages/schema/src/config/vite.ts         | 24 +++++-----
 packages/schema/src/config/webpack.ts      | 17 +++----
 packages/schema/src/types/module.ts        |  4 +-
 packages/schema/src/utils.ts               | 53 ++++++++++++++++++++++
 20 files changed, 188 insertions(+), 117 deletions(-)
 create mode 100644 packages/schema/src/utils.ts

diff --git a/packages/schema/build.config.ts b/packages/schema/build.config.ts
index 285a00ae19a..7b84dbfccec 100644
--- a/packages/schema/build.config.ts
+++ b/packages/schema/build.config.ts
@@ -41,6 +41,7 @@ export default defineBuildConfig({
     'ignore',
     // Implicit
     '@vue/compiler-core',
-    '@vue/shared'
+    '@vue/shared',
+    'untyped'
   ]
 })
diff --git a/packages/schema/src/config/_adhoc.ts b/packages/schema/src/config/_adhoc.ts
index effbc6fd928..c153a9c5fc0 100644
--- a/packages/schema/src/config/_adhoc.ts
+++ b/packages/schema/src/config/_adhoc.ts
@@ -1,6 +1,6 @@
-import type { InputObject } from 'untyped'
+import { defineSchemaObject } from '../utils'
 
-export default {
+export default defineSchemaObject({
   /**
    * Configure Nuxt component auto-registration.
    *
@@ -14,7 +14,7 @@ export default {
    * @version 2
    * @version 3
    */
-  components: <InputObject>{
+  components: {
     $resolve: (val, get) => {
       if (Array.isArray(val)) {
         return { dirs: val }
@@ -59,4 +59,4 @@ export default {
    * @version 3
   */
   telemetry: undefined
-}
+})
diff --git a/packages/schema/src/config/_app.ts b/packages/schema/src/config/_app.ts
index fe08301e5ca..5afdb230599 100644
--- a/packages/schema/src/config/_app.ts
+++ b/packages/schema/src/config/_app.ts
@@ -1,10 +1,12 @@
 import { resolve, join } from 'pathe'
 import { existsSync, readdirSync } from 'node:fs'
 import defu from 'defu'
-import type { InputObject } from 'untyped'
+
 import { MetaObject } from '../types/meta'
 
-export default {
+import { defineSchemaObject } from '../utils'
+
+export default defineSchemaObject({
   /**
    * Vue.js config
    * @version 2
@@ -19,11 +21,11 @@ export default {
      * @version 2
      */
     config: {
-      silent: <InputObject>{
-        $resolve: (val, get) => val ?? !get('dev') 
+      silent: {
+        $resolve: (val, get) => val ?? !get('dev')
       },
-      performance: <InputObject>{
-        $resolve: (val, get) => val ?? get('dev') 
+      performance: {
+        $resolve: (val, get) => val ?? get('dev')
       },
     },
     /**
@@ -60,7 +62,7 @@ export default {
      * @deprecated - use `buildAssetsDir` instead
      * @version 2
      */
-    assetsPath: <InputObject>{
+    assetsPath: {
       $resolve: (val, get) => val ?? get('buildAssetsDir')
     },
     /**
@@ -72,7 +74,7 @@ export default {
      * NUXT_APP_CDN_URL=https://mycdn.org/ node .output/server/index.mjs
      * ```
      */
-    cdnURL: <InputObject>{
+    cdnURL: {
       $resolve: (val, get) => get('dev') ? '' : (process.env.NUXT_APP_CDN_URL ?? val) || ''
     },
     /**
@@ -109,7 +111,7 @@ export default {
      * @type {typeof import('../src/types/config').NuxtAppConfig['head']}
      * @version 3
      */
-    head: <InputObject>{
+    head: {
       $resolve: (val, get) => {
         const resolved: Required<MetaObject> = defu(val, get('meta'), {
           meta: [],
@@ -179,7 +181,7 @@ export default {
    * ```
    * @version 2
    */
-  appTemplatePath: <InputObject>{
+  appTemplatePath: {
     $resolve: (val, get) => {
       if (val) {
         return resolve(get('srcDir'), val)
@@ -197,7 +199,7 @@ export default {
    * By default, it is enabled if there is a `store/` directory.
    * @version 2
    */
-  store: <InputObject>{
+  store: {
     $resolve: (val, get) => val !== false &&
       existsSync(join(get('srcDir'), get('dir.store'))) &&
       readdirSync(join(get('srcDir'), get('dir.store')))
@@ -311,7 +313,7 @@ export default {
    * @version 2
    * @version 3
    */
-  css: <InputObject>{
+  css: {
     $resolve: val => (val ?? []).map((c: any) => c.src || c)
   },
 
@@ -376,7 +378,7 @@ export default {
    * other options will be passed to the template).
    * @version 2
    */
-  loadingIndicator: <InputObject>{
+  loadingIndicator: {
     $resolve: (val, get) => {
       val = typeof val === 'string' ? { name: val } : val
       return defu(val, {
@@ -400,7 +402,7 @@ export default {
    * @see [vue@3 documentation](https://vuejs.org/guide/built-ins/transition-group.html#enter-leave-transitions)
    * @version 2
    */
-  pageTransition: <InputObject>{
+  pageTransition: {
     $resolve: (val, get) => {
       val = typeof val === 'string' ? { name: val } : val
       return defu(val, {
@@ -424,7 +426,7 @@ export default {
    * @see [vue@3 documentation](https://vuejs.org/guide/built-ins/transition-group.html#enter-leave-transitions)
    * @version 2
    */
-  layoutTransition: <InputObject>{
+  layoutTransition: {
     $resolve: val => {
       val = typeof val === 'string' ? { name: val } : val
       return defu(val, {
@@ -466,4 +468,4 @@ export default {
     /** Set to false to disable the `<ClientOnly>` component (see [docs](https://github.com/egoist/vue-client-only)) */
     componentClientOnly: true
   }
-}
+})
diff --git a/packages/schema/src/config/_common.ts b/packages/schema/src/config/_common.ts
index ba5200536ec..f7662380294 100644
--- a/packages/schema/src/config/_common.ts
+++ b/packages/schema/src/config/_common.ts
@@ -4,10 +4,12 @@ import createRequire from 'create-require'
 import { pascalCase } from 'scule'
 import jiti from 'jiti'
 import defu from 'defu'
-import type { InputObject } from 'untyped'
+
 import { RuntimeConfig } from '../types/config'
 
-export default {
+import { defineSchemaObject } from '../utils'
+
+export default defineSchemaObject({
   /**
    * Extend nested configurations from multiple local or remote sources.
    *
@@ -32,7 +34,7 @@ export default {
    * @version 2
    * @version 3
    */
-  rootDir: <InputObject>{
+  rootDir: {
     $resolve: val => typeof val === 'string' ? resolve(val) : process.cwd()
   },
 
@@ -66,7 +68,7 @@ export default {
    * @version 2
    * @version 3
    */
-  srcDir: <InputObject>{
+  srcDir: {
     $resolve: (val, get) => resolve(get('rootDir'), val || '.')
   },
 
@@ -85,7 +87,7 @@ export default {
    * @version 2
    * @version 3
    */
-  buildDir: <InputObject>{
+  buildDir: {
     $resolve: (val, get) => resolve(get('rootDir'), val || '.nuxt')
   },
 
@@ -110,7 +112,7 @@ export default {
    * By default, it's only enabled in development mode.
    * @version 2
    */
-  debug: <InputObject>{
+  debug: {
     $resolve: (val, get) => val ?? get('dev')
   },
 
@@ -129,7 +131,7 @@ export default {
    *
    * @version 2
    */
-  env: <InputObject>{
+  env: {
     $default: {},
     $resolve: (val) => {
       val = { ...val }
@@ -150,7 +152,7 @@ export default {
    * @type {'jiti' | 'native' | ((p: string | { filename: string }) => NodeRequire)}
    * @version 2
    */
-  createRequire: <InputObject>{
+  createRequire: {
     $resolve: (val: any) => {
       val = process.env.NUXT_CREATE_REQUIRE || val ||
         (typeof globalThis.jest !== 'undefined' ? 'native' : 'jiti')
@@ -172,7 +174,7 @@ export default {
    * @type {'server' | 'static'}
    * @version 2
    */
-  target: <InputObject>{
+  target: {
     $resolve: val => ['server', 'static'].includes(val) ? val : 'server'
   },
 
@@ -188,7 +190,7 @@ export default {
   /**
    * @deprecated use `ssr` option
    */
-  mode: <InputObject>{
+  mode: {
     $resolve: (val, get) => val || (get('ssr') ? 'spa' : 'universal'),
     $schema: { deprecated: '`mode` option is deprecated' }
   },
@@ -303,7 +305,7 @@ export default {
    * Vue instance name and other options.
    * @version 2
    */
-  globalName: <InputObject>{
+  globalName: {
     $resolve: val => (typeof val === 'string' && /^[a-zA-Z]+$/.test(val)) ? val.toLocaleLowerCase() : 'nuxt'
   },
 
@@ -398,7 +400,7 @@ export default {
    * @version 2
    * @deprecated Use `serverHandlers` instead
    */
-  serverMiddleware: <InputObject>{
+  serverMiddleware: {
     $resolve: (val: any) => {
       if (!val) {
         return []
@@ -426,7 +428,7 @@ export default {
    * ```
    * @version 2
    */
-  modulesDir: <InputObject>{
+  modulesDir: {
     $default: ['node_modules'],
     $resolve: (val, get) => [].concat(
       val.map(dir => resolve(get('rootDir'), dir)),
@@ -495,7 +497,7 @@ export default {
    * @version 2
    * @version 3
    */
-  extensions: <InputObject>{
+  extensions: {
     $resolve: val => ['.js', '.jsx', '.mjs', '.ts', '.tsx', '.vue'].concat(val).filter(Boolean)
   },
 
@@ -593,7 +595,7 @@ export default {
    * @version 2
    * @version 3
    */
-  ignore: <InputObject>{
+  ignore: {
     $resolve: (val, get) => [
       '**/*.stories.{js,ts,jsx,tsx}', // ignore storybook files
       '**/*.{spec,test}.{js,ts,jsx,tsx}', // ignore tests
@@ -617,7 +619,7 @@ export default {
    * @type {string[]}
    * @version 2
    */
-  watch: <InputObject>{
+  watch: {
     $resolve: (val, get) => {
       const rootDir = get('rootDir')
       return Array.from(new Set([].concat(val, get('_nuxtConfigFiles'))
@@ -721,7 +723,7 @@ export default {
    * @type {typeof import('../src/types/config').RuntimeConfig}
    * @version 3
    */
-  runtimeConfig: <InputObject>{
+  runtimeConfig: {
     $resolve: (val: RuntimeConfig, get) => defu(val, {
       ...get('publicRuntimeConfig'),
       ...get('privateRuntimeConfig'),
@@ -760,4 +762,4 @@ export default {
    * @version 3
    */
    appConfig: {},
-}
+})
diff --git a/packages/schema/src/config/_internal.ts b/packages/schema/src/config/_internal.ts
index ba3144962b8..2c16dabea21 100644
--- a/packages/schema/src/config/_internal.ts
+++ b/packages/schema/src/config/_internal.ts
@@ -1,4 +1,6 @@
-export default {
+import { defineSchemaObject } from '../utils'
+
+export default defineSchemaObject({
   /** @private */
   _majorVersion: 2,
   /** @private */
@@ -21,4 +23,4 @@ export default {
   _nuxtConfigFiles: [],
   /** @private */
   appDir: ''
-}
+})
diff --git a/packages/schema/src/config/build.ts b/packages/schema/src/config/build.ts
index bacc7b84149..732d3d15034 100644
--- a/packages/schema/src/config/build.ts
+++ b/packages/schema/src/config/build.ts
@@ -2,16 +2,16 @@ import defu from 'defu'
 import { join } from 'pathe'
 import { isCI, isTest } from 'std-env'
 import { normalizeURL, withTrailingSlash } from 'ufo'
-import type { InputObject } from 'untyped'
+import { defineSchemaObject } from '../utils'
 
-export default {
+export default defineSchemaObject({
   /**
    * The builder to use for bundling the Vue part of your application.
    *
    * @type {'vite' | 'webpack' | { bundle: (nuxt: typeof import('../src/types/nuxt').Nuxt) => Promise<void> }}
    * @version 3
    */
-  builder: <InputObject>{
+  builder: {
     $resolve: (val, get) => {
       if (typeof val === 'object') {
         return val
@@ -59,7 +59,7 @@ export default {
      * ```
      * @type {boolean | typeof import('webpack-bundle-analyzer').BundleAnalyzerPlugin.Options | typeof import('rollup-plugin-visualizer').PluginVisualizerOptions}
      */
-    analyze: <InputObject>{
+    analyze: {
       $resolve: (val, get) => {
         if(val !== true) {
           return val ?? false
@@ -138,7 +138,7 @@ export default {
      * Enables CSS source map support (defaults to true in development)
      * @version 2
      */
-    cssSourceMap: <InputObject>{
+    cssSourceMap: {
       $resolve: (val, get) => val ?? get('sourcemap') ?? get('dev')
     },
 
@@ -154,7 +154,7 @@ export default {
      * @warning This is an unstable feature.
      * @version 2
      */
-    parallel: <InputObject>{
+    parallel: {
       $resolve: (val, get) => get('build.extractCSS') ? false : Boolean(val)
     },
 
@@ -198,7 +198,7 @@ export default {
      * ```
      * @version 2
      */
-    publicPath: <InputObject>{
+    publicPath: {
       $resolve: (val, get) => val ? withTrailingSlash(normalizeURL(val)) : get('app').buildAssetsDir
     },
 
@@ -241,7 +241,7 @@ export default {
      * Customize the options of Nuxt's integrated webpack loaders.
      * @version 2
      */
-    loaders: <InputObject>{
+    loaders: {
       $resolve: (val, get) => {
         const styleLoaders = [
           'css', 'cssModules', 'less',
@@ -350,7 +350,7 @@ export default {
      * @see [optimize-css-assets-webpack-plugin documentation](https://github.com/NMFR/optimize-css-assets-webpack-plugin).
      * @version 2
      */
-    optimizeCSS: <InputObject>{
+    optimizeCSS: {
       $resolve: (val, get) => val ?? (get('build.extractCSS') ? {} : false)
     },
 
@@ -361,7 +361,7 @@ export default {
     optimization: {
       runtimeChunk: 'single',
       /** Set minimize to false to disable all minimizers. (It is disabled in development by default) */
-      minimize: <InputObject>{ 
+      minimize: {
         $resolve: (val, get) => val ?? !get('dev')
       },
       /** You can set minimizer to a customized array of plugins. */
@@ -493,7 +493,7 @@ export default {
      */
     postcss: {
       execute: undefined,
-      postcssOptions: <InputObject>{
+      postcssOptions: {
         $resolve: (val, get) => {
           // Ensure we return the same object in `build.postcss.postcssOptions as `postcss`
           // so modules which modify the configuration continue to work.
@@ -612,7 +612,7 @@ export default {
      * Set to `'none'` or `false` to disable stats printing out after a build.
      * @version 2
      */
-    stats: <InputObject>{
+    stats: {
       $resolve: (val, get) => (val === 'none' || get('build.quiet')) ? false : val,
       excludeAssets: [
         /.map$/,
@@ -642,4 +642,4 @@ export default {
      */
     followSymlinks: false
   }
-}
+})
diff --git a/packages/schema/src/config/cli.ts b/packages/schema/src/config/cli.ts
index 287873d9989..adec750761a 100644
--- a/packages/schema/src/config/cli.ts
+++ b/packages/schema/src/config/cli.ts
@@ -1,4 +1,6 @@
-export default {
+import { defineSchemaObject } from '../utils'
+
+export default defineSchemaObject({
   /**
    * Add a message to the CLI banner by adding a string to this array.
    * @type {string[]}
@@ -11,4 +13,4 @@ export default {
    * @version 2
    */
   bannerColor: 'green'
-}
+})
diff --git a/packages/schema/src/config/experimental.ts b/packages/schema/src/config/experimental.ts
index 527ca01bed2..5ebdcfe1e1c 100644
--- a/packages/schema/src/config/experimental.ts
+++ b/packages/schema/src/config/experimental.ts
@@ -1,12 +1,12 @@
-import type { InputObject } from 'untyped'
+import { defineSchemaObject } from '../utils'
 
-export default {
+export default defineSchemaObject({
   /** @version 3 */
   experimental: {
     /**
      * Set to true to generate an async entry point for the Vue bundle (for module federation support).
      */
-    asyncEntry: <InputObject>{
+    asyncEntry: {
       $resolve: (val) => val ?? false
     },
 
@@ -33,7 +33,7 @@ export default {
      *
      * @deprecated use `vite.devBundler: 'vite-node'`
      */
-    viteNode: <InputObject>{
+    viteNode: {
       $resolve: (val) => {
         val = process.env.EXPERIMENTAL_VITE_NODE ? true : val
         if (val === true) {
@@ -53,4 +53,4 @@ export default {
      */
     viteServerDynamicImports: true
   }
-}
+})
diff --git a/packages/schema/src/config/generate.ts b/packages/schema/src/config/generate.ts
index 1d3d40206e3..fd23b2b4842 100644
--- a/packages/schema/src/config/generate.ts
+++ b/packages/schema/src/config/generate.ts
@@ -1,15 +1,15 @@
 import { resolve } from 'pathe'
 import { joinURL } from 'ufo'
-import type { InputObject } from 'untyped'
+import { SchemaObject } from '../utils'
 
 /**
  * @version 2
  */
-export default {
+ export default <SchemaObject> {
   /**
    * Directory name that holds all the assets and generated pages for a `static` build.
    */
-  dir: <InputObject>{
+  dir: {
     $resolve: (val = 'dist', get) => resolve(get('rootDir'), val)
   },
 
@@ -161,16 +161,16 @@ export default {
      * The full path to the directory underneath `/_nuxt/` where static assets
      * (payload, state and manifest files) will live.
      */
-    base: <InputObject>{
-      $resolve: (val, get) => val || joinURL(get('app').buildAssetsDir, get('generate.dir')) 
+    base: {
+      $resolve: (val, get) => val || joinURL(get('app').buildAssetsDir, get('generate.dir'))
     },
     /** The full path to the versioned directory where static assets for the current build are located. */
-    versionBase: <InputObject>{ 
-      $resolve: (val, get) => val || joinURL(get('generate.base'), get('generate.version')) 
+    versionBase: {
+      $resolve: (val, get) => val || joinURL(get('generate.base'), get('generate.version'))
     },
     /** A unique string to uniquely identify payload versions (defaults to the current timestamp).  */
-    version: <InputObject>{ 
-      $resolve: val => val || (String(Math.round(Date.now() / 1000))) 
+    version: {
+      $resolve: val => val || (String(Math.round(Date.now() / 1000)))
     }
   }
 }
diff --git a/packages/schema/src/config/messages.ts b/packages/schema/src/config/messages.ts
index 8bc2beb4200..49eac3dccfc 100644
--- a/packages/schema/src/config/messages.ts
+++ b/packages/schema/src/config/messages.ts
@@ -1,7 +1,9 @@
+import { defineSchemaObject } from '../utils'
+
 /**
  * @version 2
  */
-export default {
+export default defineSchemaObject({
   /** The text that displays on the Nuxt loading indicator when `ssr: false`. */
   loading: 'Loading...',
   /** The 404 text on the default Nuxt error page. */
@@ -18,4 +20,4 @@ export default {
   client_error: 'Error',
   /** The error message (in debug mode) on the built-in Nuxt error page. */
   client_error_details: 'An error occurred while rendering the page. Check developer tools console for details.'
-}
+})
diff --git a/packages/schema/src/config/nitro.ts b/packages/schema/src/config/nitro.ts
index d6828e11d1a..34881b29b60 100644
--- a/packages/schema/src/config/nitro.ts
+++ b/packages/schema/src/config/nitro.ts
@@ -1,4 +1,6 @@
-export default {
+import { defineSchemaObject } from '../utils'
+
+export default defineSchemaObject({
   /**
    * Configuration for Nitro.
    *
@@ -31,4 +33,4 @@ export default {
    * @version 3
    */
   devServerHandlers: []
-}
+})
diff --git a/packages/schema/src/config/postcss.ts b/packages/schema/src/config/postcss.ts
index ec93c218a40..e046eff7c8d 100644
--- a/packages/schema/src/config/postcss.ts
+++ b/packages/schema/src/config/postcss.ts
@@ -1,8 +1,8 @@
 import defu from 'defu'
 import createResolver from 'postcss-import-resolver'
-import type { InputObject } from 'untyped'
+import { defineSchemaObject } from '../utils'
 
-export default {
+export default defineSchemaObject({
   /** @version 3 */
   postcss: {
     /** Path to postcss config file. */
@@ -18,7 +18,7 @@ export default {
       /**
        * https://github.com/postcss/postcss-import
        */
-      'postcss-import': <InputObject>{
+      'postcss-import': {
         $resolve: (val, get) => val !== false ? defu(val || {}, {
           resolve: createResolver({
             alias: { ...get('alias') },
@@ -41,7 +41,7 @@ export default {
        */
       autoprefixer: {},
 
-      cssnano: <InputObject>{
+      cssnano: {
         $resolve: (val, get) => val ?? (!get('dev') && {
           preset: ['default', {
             // Keep quotes in font values to prevent from HEX conversion
@@ -52,4 +52,4 @@ export default {
       }
     }
   }
-}
+})
diff --git a/packages/schema/src/config/render.ts b/packages/schema/src/config/render.ts
index 53ce31fc469..89d1175cb76 100644
--- a/packages/schema/src/config/render.ts
+++ b/packages/schema/src/config/render.ts
@@ -1,9 +1,9 @@
-import type { InputObject } from 'untyped'
+import { defineSchemaObject } from '../utils'
 
 /**
  * @version 2
  */
-export default {
+export default defineSchemaObject({
   /**
    * Use this option to customize the Vue SSR bundle renderer.
    * This option is skipped if `ssr: false`.
@@ -14,7 +14,7 @@ export default {
     shouldPrefetch: () => false,
     shouldPreload: (_fileWithoutQuery, asType) => ['script', 'style'].includes(asType),
     /** enabled by default for development */
-    runInNewContext: <InputObject>{
+    runInNewContext: {
       $resolve: (val, get) => val ?? get('dev')
     }
   },
@@ -45,7 +45,7 @@ export default {
    *
    * Set to `collapsed` to collapse the logs, or `false` to disable.
    */
-  ssrLog: <InputObject>{
+  ssrLog: {
     $resolve: (val, get) => get('dev') ? Boolean(val) : false
   },
 
@@ -212,7 +212,7 @@ export default {
    * }
    * ```
    */
-  csp: <InputObject>{
+  csp: {
     $resolve: (val, get) => {
       if (!val) { return false }
       return {
@@ -295,4 +295,4 @@ export default {
       }
     }
   }
-}
+})
diff --git a/packages/schema/src/config/router.ts b/packages/schema/src/config/router.ts
index f998f6b6848..3ce84688d8c 100644
--- a/packages/schema/src/config/router.ts
+++ b/packages/schema/src/config/router.ts
@@ -1,7 +1,7 @@
 import { normalizeURL, withTrailingSlash } from 'ufo'
-import type { InputObject } from 'untyped'
+import { defineSchemaObject } from '../utils'
 
-export default {
+export default defineSchemaObject({
   /**
    * Additional options passed to `vue-router`.
    *
@@ -32,12 +32,12 @@ export default {
    * within a bigger web site.
    * @version 2
    */
-  base: <InputObject>{
+  base: {
     $resolve: (val, get) => val ? withTrailingSlash(normalizeURL(val)) : get('app').baseURL
   },
 
   /** @private */
-  _routerBaseSpecified: <InputObject>{
+  _routerBaseSpecified: {
     $resolve: (_val, get) => typeof get('router.base') === 'string'
   },
 
@@ -58,7 +58,7 @@ export default {
    * Set the default(s) middleware for every page of the application.
    * @version 2
    */
-  middleware: <InputObject>{
+  middleware: {
     $resolve: val => Array.isArray(val) ? val : [val].filter(Boolean)
   },
 
@@ -110,7 +110,7 @@ export default {
    * @see [vue-router `scrollBehavior` documentation](https://router.vuejs.org/guide/advanced/scroll-behavior.html).
    * @version 2
    */
-  scrollBehavior: <InputObject>{
+  scrollBehavior: {
     $schema: {
       deprecated: 'router.scrollBehavior` property is deprecated in favor of using `~/app/router.scrollBehavior.js` file, learn more: https://nuxtjs.org/api/configuration-router#scrollbehavior'
     }
@@ -169,4 +169,4 @@ export default {
    * @version 2
    */
   trailingSlash: undefined
-}
+})
diff --git a/packages/schema/src/config/server.ts b/packages/schema/src/config/server.ts
index 973d63a40e9..49d36ef11ea 100644
--- a/packages/schema/src/config/server.ts
+++ b/packages/schema/src/config/server.ts
@@ -1,5 +1,7 @@
+import { SchemaObject } from '../utils'
+
 /** @version 2 */
-export default {
+export default <SchemaObject> {
   /**
    * Whether to enable HTTPS.
    *
diff --git a/packages/schema/src/config/typescript.ts b/packages/schema/src/config/typescript.ts
index ad4c77e11f4..35d8f612b3e 100644
--- a/packages/schema/src/config/typescript.ts
+++ b/packages/schema/src/config/typescript.ts
@@ -1,4 +1,6 @@
-export default {
+import { defineSchemaObject } from '../utils'
+
+export default defineSchemaObject({
   /**
    * Configuration for Nuxt's TypeScript integration.
    *
@@ -35,4 +37,4 @@ export default {
      */
     shim: true
   }
-}
+})
diff --git a/packages/schema/src/config/vite.ts b/packages/schema/src/config/vite.ts
index b44f9268c93..1b11db1967d 100644
--- a/packages/schema/src/config/vite.ts
+++ b/packages/schema/src/config/vite.ts
@@ -1,8 +1,8 @@
 import { resolve } from 'pathe'
 import { withoutLeadingSlash } from 'ufo'
-import type { InputObject } from 'untyped'
+import { defineSchemaObject } from '../utils'
 
-export default {
+export default defineSchemaObject({
   /**
    * Configuration that will be passed directly to Vite.
    *
@@ -13,14 +13,14 @@ export default {
    * @version 3
    */
   vite: {
-    root: <InputObject>{
+    root: {
       $resolve: (val, get) => val ?? get('srcDir')
     },
-    mode: <InputObject>{
+    mode: {
       $resolve: (val, get) => val ?? (get('dev') ? 'development' : 'production')
     },
     logLevel: 'warn',
-    define: <InputObject>{
+    define: {
       $resolve: (val, get) => ({
         'process.dev': get('dev'),
         ...val || {}
@@ -29,21 +29,21 @@ export default {
     resolve: {
       extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json', '.vue']
     },
-    publicDir: <InputObject>{
+    publicDir: {
       $resolve: (val, get) => val ?? resolve(get('srcDir'), get('dir').public)
     },
     vue: {
-      isProduction: <InputObject>{
+      isProduction: {
         $resolve: (val, get) => val ?? !get('dev')
       },
       template: {
-        compilerOptions: <InputObject>{
+        compilerOptions: {
           $resolve: (val, get) => val ?? get('vue').compilerOptions
         }
       }
     },
     optimizeDeps: {
-      exclude: <InputObject>{
+      exclude: {
         $resolve: (val, get) => [
           ...val || [],
           ...get('build.transpile').filter((i) => typeof i === 'string'),
@@ -58,7 +58,7 @@ export default {
     },
     clearScreen: false,
     build: {
-      assetsDir: <InputObject>{
+      assetsDir: {
         $resolve: (val, get) => val ?? withoutLeadingSlash(get('app').buildAssetsDir)
       },
       emptyOutDir: false
@@ -66,7 +66,7 @@ export default {
     server: {
       fs: {
         strict: false,
-        allow: <InputObject>{
+        allow: {
           $resolve: (val, get) => [
             get('buildDir'),
             get('srcDir'),
@@ -78,4 +78,4 @@ export default {
       }
     }
   }
-}
+})
diff --git a/packages/schema/src/config/webpack.ts b/packages/schema/src/config/webpack.ts
index 15d40baf3e4..e8f5fa9bb29 100644
--- a/packages/schema/src/config/webpack.ts
+++ b/packages/schema/src/config/webpack.ts
@@ -1,6 +1,7 @@
 import { join } from 'pathe'
+import { defineSchemaObject } from '../utils'
 
-export default {
+export default defineSchemaObject({
   /** @version 3 */
   webpack: {
     /**
@@ -122,12 +123,12 @@ export default {
      * ```
      */
     filenames: {
-      app: ({ isDev }) => isDev ? `[name].js` : `[contenthash:7].js`,
-      chunk: ({ isDev }) => isDev ? `[name].js` : `[contenthash:7].js`,
-      css: ({ isDev }) => isDev ? '[name].css' : 'css/[contenthash:7].css',
-      img: ({ isDev }) => isDev ? '[path][name].[ext]' : 'img/[name].[contenthash:7].[ext]',
-      font: ({ isDev }) => isDev ? '[path][name].[ext]' : 'fonts/[name].[contenthash:7].[ext]',
-      video: ({ isDev }) => isDev ? '[path][name].[ext]' : 'videos/[name].[contenthash:7].[ext]'
+      app: ({ isDev }: { isDev: boolean }) => isDev ? `[name].js` : `[contenthash:7].js`,
+      chunk: ({ isDev }: { isDev: boolean }) => isDev ? `[name].js` : `[contenthash:7].js`,
+      css: ({ isDev }: { isDev: boolean }) => isDev ? '[name].css' : 'css/[contenthash:7].css',
+      img: ({ isDev }: { isDev: boolean }) => isDev ? '[path][name].[ext]' : 'img/[name].[contenthash:7].[ext]',
+      font: ({ isDev }: { isDev: boolean }) => isDev ? '[path][name].[ext]' : 'fonts/[name].[contenthash:7].[ext]',
+      video: ({ isDev }: { isDev: boolean }) => isDev ? '[path][name].[ext]' : 'videos/[name].[contenthash:7].[ext]'
     },
 
     /**
@@ -297,4 +298,4 @@ export default {
      */
     warningIgnoreFilters: [],
   }
-}
+})
diff --git a/packages/schema/src/types/module.ts b/packages/schema/src/types/module.ts
index f963478b20b..1a410fbe418 100644
--- a/packages/schema/src/types/module.ts
+++ b/packages/schema/src/types/module.ts
@@ -71,10 +71,10 @@ export interface ModuleContainer {
   addServerMiddleware(arg1: any): void
 
   /** Allows extending webpack build config by chaining `options.build.extend` function. */
-  extendBuild(fn): void
+  extendBuild(fn: Function): void
 
   /** Allows extending routes by chaining `options.router.extendRoutes` function. */
-  extendRoutes(fn): void
+  extendRoutes(fn: Function): void
 
   /** Registers a module. */
   requireModule(installOptions: any, opts: any): Promise<void>
diff --git a/packages/schema/src/utils.ts b/packages/schema/src/utils.ts
new file mode 100644
index 00000000000..6e5a3a36dcb
--- /dev/null
+++ b/packages/schema/src/utils.ts
@@ -0,0 +1,53 @@
+//-- From Untyped
+export type JSValue = string | number | bigint | boolean | symbol | Function | Array<any> | undefined | object | null;
+export type JSType = 'string' | 'number' | 'bigint' | 'boolean' | 'symbol' | 'function' | 'object' | 'any' | 'array';
+export type ResolveFn = ((value: any, get: (key: string) => any) => JSValue);
+export interface TypeDescriptor {
+    /** Used internally to handle schema types */
+    type?: JSType | JSType[];
+    /** Fully resolved correct TypeScript type for generated TS declarations */
+    tsType?: string;
+    /** Human-readable type description for use in generated documentation */
+    markdownType?: string;
+    items?: TypeDescriptor | TypeDescriptor[];
+}
+export interface FunctionArg extends TypeDescriptor {
+    name?: string;
+    default?: JSValue;
+    optional?: boolean;
+}
+export interface Schema extends TypeDescriptor {
+    id?: string;
+    default?: JSValue;
+    resolve?: ResolveFn;
+    properties?: {
+        [key: string]: Schema;
+    };
+    title?: string;
+    description?: string;
+    $schema?: string;
+    tags?: string[];
+    args?: FunctionArg[];
+    returns?: TypeDescriptor;
+}
+// --
+
+export interface SchemaObject {
+  [key: string]: SchemaObject | JSValue;
+  $schema?: Schema;
+  $resolve?: ResolveFn;
+}
+
+defineSchemaObject({
+  test: '123',
+  foo: {
+    bar: '123',
+    baz: {
+      $resolve: (val, get) => val ?? get('test')
+    }
+  }
+})
+
+export function defineSchemaObject(input: SchemaObject): SchemaObject {
+  return input
+}

From 5e6c39753d0232deda218a98065891b847dbce6c Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.io>
Date: Fri, 26 Aug 2022 15:56:22 +0200
Subject: [PATCH 5/8] fix webpack type

---
 packages/webpack/src/webpack.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/webpack/src/webpack.ts b/packages/webpack/src/webpack.ts
index 4391862ac38..7f114a67c5f 100644
--- a/packages/webpack/src/webpack.ts
+++ b/packages/webpack/src/webpack.ts
@@ -96,9 +96,9 @@ async function createDevMiddleware (compiler: Compiler) {
   await nuxt.callHook('webpack:hotMiddleware', hotMiddleware)
 
   // Register devMiddleware on server
-  await nuxt.callHook('server:devMiddleware', async (req, res, next) => {
+  await nuxt.callHook('server:devMiddleware', async (req: IncomingMessage, res: ServerResponse, next: (error?: any) => void) => {
     for (const mw of [devMiddleware, hotMiddleware]) {
-      await mw?.(req, res)
+      await mw?.(req, res, next)
     }
     next()
   })
@@ -111,11 +111,11 @@ async function compile (compiler: Compiler) {
 
   const { name } = compiler.options
 
-  await nuxt.callHook('build:compile', { name, compiler })
+  await nuxt.callHook('build:compile', { name: name!, compiler })
 
   // Load renderer resources after build
   compiler.hooks.done.tap('load-resources', async (stats) => {
-    await nuxt.callHook('build:compiled', { name, compiler, stats })
+    await nuxt.callHook('build:compiled', { name: name!, compiler, stats })
     // Reload renderer
     await nuxt.callHook('build:resources', compiler.outputFileSystem)
   })

From 9409fcfaafd0253ebbb70419c290025839bee964 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.io>
Date: Fri, 26 Aug 2022 16:03:19 +0200
Subject: [PATCH 6/8] use direct annotation for @version to to avoid including
 them in docs

---
 packages/schema/src/config/messages.ts | 6 +++---
 packages/schema/src/config/render.ts   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/schema/src/config/messages.ts b/packages/schema/src/config/messages.ts
index 49eac3dccfc..8917f83b925 100644
--- a/packages/schema/src/config/messages.ts
+++ b/packages/schema/src/config/messages.ts
@@ -1,9 +1,9 @@
-import { defineSchemaObject } from '../utils'
+import { SchemaObject } from '../utils'
 
 /**
  * @version 2
  */
-export default defineSchemaObject({
+export default <SchemaObject> {
   /** The text that displays on the Nuxt loading indicator when `ssr: false`. */
   loading: 'Loading...',
   /** The 404 text on the default Nuxt error page. */
@@ -20,4 +20,4 @@ export default defineSchemaObject({
   client_error: 'Error',
   /** The error message (in debug mode) on the built-in Nuxt error page. */
   client_error_details: 'An error occurred while rendering the page. Check developer tools console for details.'
-})
+}
diff --git a/packages/schema/src/config/render.ts b/packages/schema/src/config/render.ts
index 89d1175cb76..4c94d1d5559 100644
--- a/packages/schema/src/config/render.ts
+++ b/packages/schema/src/config/render.ts
@@ -1,9 +1,9 @@
-import { defineSchemaObject } from '../utils'
+import { SchemaObject } from '../utils'
 
 /**
  * @version 2
  */
-export default defineSchemaObject({
+export default <SchemaObject> {
   /**
    * Use this option to customize the Vue SSR bundle renderer.
    * This option is skipped if `ssr: false`.
@@ -295,4 +295,4 @@ export default defineSchemaObject({
       }
     }
   }
-})
+}

From 2aa43d894a526707bcfcf29d7cfe9447b33d18c7 Mon Sep 17 00:00:00 2001
From: Anthony Fu <anthonyfu117@hotmail.com>
Date: Fri, 26 Aug 2022 22:58:23 +0800
Subject: [PATCH 7/8] chore: update

---
 packages/nuxi/src/utils/diff.ts               |  2 +-
 .../nuxt/src/app/composables/asyncData.ts     |  2 +-
 packages/nuxt/src/app/nuxt.ts                 |  2 +-
 packages/schema/src/config/_common.ts         | 23 ++++++++++---------
 packages/schema/src/config/build.ts           | 15 ++++++------
 packages/schema/src/config/render.ts          |  2 +-
 packages/schema/src/config/vite.ts            |  2 +-
 packages/webpack/src/utils/config.ts          |  4 ++--
 packages/webpack/src/utils/postcss.ts         |  2 ++
 packages/webpack/src/virtual-modules.ts       |  5 ++--
 10 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/packages/nuxi/src/utils/diff.ts b/packages/nuxi/src/utils/diff.ts
index 217afe8426a..515f0a9c989 100644
--- a/packages/nuxi/src/utils/diff.ts
+++ b/packages/nuxi/src/utils/diff.ts
@@ -3,7 +3,7 @@ import { detailedDiff } from 'deep-object-diff'
 import { green, red, blue, cyan } from 'colorette'
 
 function normalizeDiff (diffObj: any, type: 'added' | 'deleted' | 'updated', ignore: string[]) {
-  return Object.entries(flatten(diffObj))
+  return Object.entries(flatten(diffObj) as Record<string, any>)
     .map(([key, value]) => ({ key, value, type }))
     .filter(item => !ignore.includes(item.key) && typeof item.value !== 'function')
 }
diff --git a/packages/nuxt/src/app/composables/asyncData.ts b/packages/nuxt/src/app/composables/asyncData.ts
index 5b191ef2f17..7318718becf 100644
--- a/packages/nuxt/src/app/composables/asyncData.ts
+++ b/packages/nuxt/src/app/composables/asyncData.ts
@@ -144,7 +144,7 @@ export function useAsyncData<
           result = options.transform(result)
         }
         if (options.pick) {
-          result = pick(result, options.pick) as DataT
+          result = pick(result as any, options.pick) as DataT
         }
         asyncData.data.value = result
         asyncData.error.value = null
diff --git a/packages/nuxt/src/app/nuxt.ts b/packages/nuxt/src/app/nuxt.ts
index 0795cfee85e..812022729dc 100644
--- a/packages/nuxt/src/app/nuxt.ts
+++ b/packages/nuxt/src/app/nuxt.ts
@@ -231,7 +231,7 @@ export function normalizePlugins (_plugins: Plugin[]) {
   return plugins as Plugin[]
 }
 
-export function defineNuxtPlugin<T> (plugin: Plugin<T>) {
+export function defineNuxtPlugin<T extends Record<string, any>> (plugin: Plugin<T>) {
   plugin[NuxtPluginIndicator] = true
   return plugin
 }
diff --git a/packages/schema/src/config/_common.ts b/packages/schema/src/config/_common.ts
index f7662380294..619fe0b5827 100644
--- a/packages/schema/src/config/_common.ts
+++ b/packages/schema/src/config/_common.ts
@@ -155,12 +155,13 @@ export default defineSchemaObject({
   createRequire: {
     $resolve: (val: any) => {
       val = process.env.NUXT_CREATE_REQUIRE || val ||
+        // @ts-expect-error global type
         (typeof globalThis.jest !== 'undefined' ? 'native' : 'jiti')
       if (val === 'jiti') {
-        return p => jiti(typeof p === 'string' ? p : p.filename, { esmResolve: true })
+        return (p: string | { filename: string }) => jiti(typeof p === 'string' ? p : p.filename, { esmResolve: true })
       }
       if (val === 'native') {
-        return p => createRequire(typeof p === 'string' ? p : p.filename)
+        return (p: string | { filename: string }) => createRequire(typeof p === 'string' ? p : p.filename)
       }
       return val
     }
@@ -315,17 +316,17 @@ export default defineSchemaObject({
    */
   globals: {
     /** @type {(globalName: string) => string} */
-    id: globalName => `__${globalName}`,
+    id: (globalName: string) => `__${globalName}`,
     /** @type {(globalName: string) => string} */
-    nuxt: globalName => `$${globalName}`,
+    nuxt: (globalName: string) => `$${globalName}`,
     /** @type {(globalName: string) => string} */
-    context: globalName => `__${globalName.toUpperCase()}__`,
+    context: (globalName: string) => `__${globalName.toUpperCase()}__`,
     /** @type {(globalName: string) => string} */
-    pluginPrefix: globalName => globalName,
+    pluginPrefix: (globalName: string) => globalName,
     /** @type {(globalName: string) => string} */
-    readyCallback: globalName => `on${pascalCase(globalName)}Ready`,
+    readyCallback: (globalName: string) => `on${pascalCase(globalName)}Ready`,
     /** @type {(globalName: string) => string} */
-    loadedCallback: globalName => `_on${pascalCase(globalName)}Loaded`
+    loadedCallback: (globalName: string) => `_on${pascalCase(globalName)}Loaded`
   },
 
   /**
@@ -430,10 +431,10 @@ export default defineSchemaObject({
    */
   modulesDir: {
     $default: ['node_modules'],
-    $resolve: (val, get) => [].concat(
-      val.map(dir => resolve(get('rootDir'), dir)),
+    $resolve: (val, get) => [
+      ...val.map((dir: string) => resolve(get('rootDir'), dir)),
       resolve(process.cwd(), 'node_modules')
-    )
+    ]
   },
 
   /**
diff --git a/packages/schema/src/config/build.ts b/packages/schema/src/config/build.ts
index 732d3d15034..12fd0a76e05 100644
--- a/packages/schema/src/config/build.ts
+++ b/packages/schema/src/config/build.ts
@@ -16,7 +16,7 @@ export default defineSchemaObject({
       if (typeof val === 'object') {
         return val
       }
-      const map = {
+      const map: Record<string, string> = {
         vite: '@nuxt/vite-builder',
         webpack: '@nuxt/webpack-builder',
       }
@@ -226,15 +226,16 @@ export default defineSchemaObject({
      *   chunk: ({ isDev }) => (isDev ? '[name].js' : '[id].[contenthash].js')
      * }
      * ```
+     * @type {Record<string, ((arg: any) => string)>}
      * @version 2
      */
     filenames: {
-      app: ({ isDev, isModern }) => isDev ? `[name]${isModern ? '.modern' : ''}.js` : `[contenthash:7]${isModern ? '.modern' : ''}.js`,
-      chunk: ({ isDev, isModern }) => isDev ? `[name]${isModern ? '.modern' : ''}.js` : `[contenthash:7]${isModern ? '.modern' : ''}.js`,
-      css: ({ isDev }) => isDev ? '[name].css' : 'css/[contenthash:7].css',
-      img: ({ isDev }) => isDev ? '[path][name].[ext]' : 'img/[name].[contenthash:7].[ext]',
-      font: ({ isDev }) => isDev ? '[path][name].[ext]' : 'fonts/[name].[contenthash:7].[ext]',
-      video: ({ isDev }) => isDev ? '[path][name].[ext]' : 'videos/[name].[contenthash:7].[ext]'
+      app: ({ isDev, isModern }: any) => isDev ? `[name]${isModern ? '.modern' : ''}.js` : `[contenthash:7]${isModern ? '.modern' : ''}.js`,
+      chunk: ({ isDev, isModern }: any) => isDev ? `[name]${isModern ? '.modern' : ''}.js` : `[contenthash:7]${isModern ? '.modern' : ''}.js`,
+      css: ({ isDev }: any) => isDev ? '[name].css' : 'css/[contenthash:7].css',
+      img: ({ isDev }: any) => isDev ? '[path][name].[ext]' : 'img/[name].[contenthash:7].[ext]',
+      font: ({ isDev }: any) => isDev ? '[path][name].[ext]' : 'fonts/[name].[contenthash:7].[ext]',
+      video: ({ isDev }: any) => isDev ? '[path][name].[ext]' : 'videos/[name].[contenthash:7].[ext]'
     },
 
     /**
diff --git a/packages/schema/src/config/render.ts b/packages/schema/src/config/render.ts
index 4c94d1d5559..d126f56c873 100644
--- a/packages/schema/src/config/render.ts
+++ b/packages/schema/src/config/render.ts
@@ -12,7 +12,7 @@ export default <SchemaObject> {
    */
   bundleRenderer: {
     shouldPrefetch: () => false,
-    shouldPreload: (_fileWithoutQuery, asType) => ['script', 'style'].includes(asType),
+    shouldPreload: (_fileWithoutQuery: string, asType: string) => ['script', 'style'].includes(asType),
     /** enabled by default for development */
     runInNewContext: {
       $resolve: (val, get) => val ?? get('dev')
diff --git a/packages/schema/src/config/vite.ts b/packages/schema/src/config/vite.ts
index 1b11db1967d..dc0b0b364b3 100644
--- a/packages/schema/src/config/vite.ts
+++ b/packages/schema/src/config/vite.ts
@@ -46,7 +46,7 @@ export default defineSchemaObject({
       exclude: {
         $resolve: (val, get) => [
           ...val || [],
-          ...get('build.transpile').filter((i) => typeof i === 'string'),
+          ...get('build.transpile').filter((i: string) => typeof i === 'string'),
           'vue-demi'
         ]
       }
diff --git a/packages/webpack/src/utils/config.ts b/packages/webpack/src/utils/config.ts
index 905bde5b166..1e70520a678 100644
--- a/packages/webpack/src/utils/config.ts
+++ b/packages/webpack/src/utils/config.ts
@@ -19,7 +19,7 @@ export function createWebpackConfigContext (nuxt: Nuxt) {
     isServer: false,
     isClient: false,
 
-    alias: {} as NonNullable<Configuration['resolve']>['alias'],
+    alias: {} as { [index: string]: string | false | string[] },
     transpile: [] as RegExp[]
   }
 }
@@ -40,7 +40,7 @@ export function applyPresets (ctx: WebpackConfigContext, presets: WebpackConfigP
 export function fileName (ctx: WebpackConfigContext, key: string) {
   const { options } = ctx
 
-  let fileName = options.webpack.filenames[key]
+  let fileName = options.webpack.filenames[key as keyof typeof options.webpack.filenames] as ((ctx: WebpackConfigContext) => string) | string
 
   if (typeof fileName === 'function') {
     fileName = fileName(ctx)
diff --git a/packages/webpack/src/utils/postcss.ts b/packages/webpack/src/utils/postcss.ts
index 964184f5640..badf932a8e4 100644
--- a/packages/webpack/src/utils/postcss.ts
+++ b/packages/webpack/src/utils/postcss.ts
@@ -81,9 +81,11 @@ export const getPostcssConfig = (nuxt: Nuxt) => {
       loadPlugins(postcssOptions)
     }
 
+    // @ts-expect-error
     delete nuxt.options.webpack.postcss.order
 
     return {
+      // @ts-expect-error
       sourceMap: nuxt.options.webpack.cssSourceMap,
       ...nuxt.options.webpack.postcss,
       postcssOptions
diff --git a/packages/webpack/src/virtual-modules.ts b/packages/webpack/src/virtual-modules.ts
index d161bdbf58c..068f9e0fbca 100644
--- a/packages/webpack/src/virtual-modules.ts
+++ b/packages/webpack/src/virtual-modules.ts
@@ -1,5 +1,4 @@
 import { useNuxt } from '@nuxt/kit'
-import { Compilation } from 'webpack'
 import VirtualModulesPlugin from 'webpack-virtual-modules'
 
 export function registerVirtualModules () {
@@ -14,7 +13,7 @@ export function registerVirtualModules () {
   }
 
   // Workaround to initialize virtual modules
-  nuxt.hook('build:compile', ({ compiler }: Compilation) => {
+  nuxt.hook('build:compile', ({ compiler }) => {
     if (compiler.name === 'server') { writeFiles() }
   })
   // Update virtual modules when templates are updated
@@ -22,6 +21,6 @@ export function registerVirtualModules () {
 
   nuxt.hook('webpack:config', configs => configs.forEach((config) => {
     // Support virtual modules (input)
-    config.plugins.push(virtualModules)
+    config.plugins!.push(virtualModules)
   }))
 }

From 088e529734b61461aeb25a91bc3ab07f0264b1b7 Mon Sep 17 00:00:00 2001
From: Anthony Fu <anthonyfu117@hotmail.com>
Date: Fri, 26 Aug 2022 23:03:19 +0800
Subject: [PATCH 8/8] chore: upgrade untyped

---
 docs/package.json                          |  2 +-
 packages/kit/package.json                  |  2 +-
 packages/nuxt/package.json                 |  2 +-
 packages/schema/package.json               |  2 +-
 packages/schema/src/config/_adhoc.ts       |  4 +-
 packages/schema/src/config/_app.ts         |  5 +-
 packages/schema/src/config/_common.ts      |  4 +-
 packages/schema/src/config/_internal.ts    |  4 +-
 packages/schema/src/config/build.ts        |  4 +-
 packages/schema/src/config/cli.ts          |  4 +-
 packages/schema/src/config/experimental.ts |  4 +-
 packages/schema/src/config/generate.ts     |  4 +-
 packages/schema/src/config/messages.ts     |  4 +-
 packages/schema/src/config/nitro.ts        |  4 +-
 packages/schema/src/config/postcss.ts      |  4 +-
 packages/schema/src/config/render.ts       |  4 +-
 packages/schema/src/config/router.ts       |  4 +-
 packages/schema/src/config/server.ts       |  4 +-
 packages/schema/src/config/typescript.ts   |  4 +-
 packages/schema/src/config/vite.ts         |  4 +-
 packages/schema/src/config/webpack.ts      |  4 +-
 packages/schema/src/utils.ts               | 53 ----------------------
 yarn.lock                                  | 14 +++---
 23 files changed, 45 insertions(+), 99 deletions(-)
 delete mode 100644 packages/schema/src/utils.ts

diff --git a/docs/package.json b/docs/package.json
index 530c5171f88..d17d7368221 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -20,7 +20,7 @@
     "pathe": "^0.3.5",
     "rimraf": "^3.0.2",
     "scule": "^0.3.2",
-    "untyped": "^0.4.6",
+    "untyped": "^0.4.7",
     "vue-mq": "^1.0.1",
     "vue-plausible": "^1.3.2"
   },
diff --git a/packages/kit/package.json b/packages/kit/package.json
index e52c85dd551..7ae2022be9b 100644
--- a/packages/kit/package.json
+++ b/packages/kit/package.json
@@ -30,7 +30,7 @@
     "semver": "^7.3.7",
     "unctx": "^2.0.1",
     "unimport": "^0.6.7",
-    "untyped": "^0.4.6"
+    "untyped": "^0.4.7"
   },
   "devDependencies": {
     "@types/lodash.template": "^4",
diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json
index 19d0fffcdcc..d7fa95b46a9 100644
--- a/packages/nuxt/package.json
+++ b/packages/nuxt/package.json
@@ -65,7 +65,7 @@
     "unenv": "^0.6.1",
     "unimport": "^0.6.7",
     "unplugin": "^0.9.2",
-    "untyped": "^0.4.6",
+    "untyped": "^0.4.7",
     "vue": "^3.2.37",
     "vue-bundle-renderer": "^0.4.2",
     "vue-devtools-stub": "^0.1.0",
diff --git a/packages/schema/package.json b/packages/schema/package.json
index 768241ab059..15fbf21c4c5 100644
--- a/packages/schema/package.json
+++ b/packages/schema/package.json
@@ -17,7 +17,7 @@
     "@types/lodash.template": "^4",
     "@types/semver": "^7",
     "unbuild": "latest",
-    "untyped": "^0.4.6",
+    "untyped": "^0.4.7",
     "vite": "~3.0.9"
   },
   "dependencies": {
diff --git a/packages/schema/src/config/_adhoc.ts b/packages/schema/src/config/_adhoc.ts
index c153a9c5fc0..d6926ab68df 100644
--- a/packages/schema/src/config/_adhoc.ts
+++ b/packages/schema/src/config/_adhoc.ts
@@ -1,6 +1,6 @@
-import { defineSchemaObject } from '../utils'
+import { defineUntypedSchema } from 'untyped'
 
-export default defineSchemaObject({
+export default defineUntypedSchema({
   /**
    * Configure Nuxt component auto-registration.
    *
diff --git a/packages/schema/src/config/_app.ts b/packages/schema/src/config/_app.ts
index 5afdb230599..a6dec3d01ba 100644
--- a/packages/schema/src/config/_app.ts
+++ b/packages/schema/src/config/_app.ts
@@ -1,12 +1,11 @@
 import { resolve, join } from 'pathe'
 import { existsSync, readdirSync } from 'node:fs'
 import defu from 'defu'
+import { defineUntypedSchema } from 'untyped'
 
 import { MetaObject } from '../types/meta'
 
-import { defineSchemaObject } from '../utils'
-
-export default defineSchemaObject({
+export default defineUntypedSchema({
   /**
    * Vue.js config
    * @version 2
diff --git a/packages/schema/src/config/_common.ts b/packages/schema/src/config/_common.ts
index 619fe0b5827..d6067f441be 100644
--- a/packages/schema/src/config/_common.ts
+++ b/packages/schema/src/config/_common.ts
@@ -7,9 +7,9 @@ import defu from 'defu'
 
 import { RuntimeConfig } from '../types/config'
 
-import { defineSchemaObject } from '../utils'
+import { defineUntypedSchema } from 'untyped'
 
-export default defineSchemaObject({
+export default defineUntypedSchema({
   /**
    * Extend nested configurations from multiple local or remote sources.
    *
diff --git a/packages/schema/src/config/_internal.ts b/packages/schema/src/config/_internal.ts
index 2c16dabea21..400aad87e86 100644
--- a/packages/schema/src/config/_internal.ts
+++ b/packages/schema/src/config/_internal.ts
@@ -1,6 +1,6 @@
-import { defineSchemaObject } from '../utils'
+import { defineUntypedSchema } from 'untyped'
 
-export default defineSchemaObject({
+export default defineUntypedSchema({
   /** @private */
   _majorVersion: 2,
   /** @private */
diff --git a/packages/schema/src/config/build.ts b/packages/schema/src/config/build.ts
index 12fd0a76e05..e1122c7ec56 100644
--- a/packages/schema/src/config/build.ts
+++ b/packages/schema/src/config/build.ts
@@ -2,9 +2,9 @@ import defu from 'defu'
 import { join } from 'pathe'
 import { isCI, isTest } from 'std-env'
 import { normalizeURL, withTrailingSlash } from 'ufo'
-import { defineSchemaObject } from '../utils'
+import { defineUntypedSchema } from 'untyped'
 
-export default defineSchemaObject({
+export default defineUntypedSchema({
   /**
    * The builder to use for bundling the Vue part of your application.
    *
diff --git a/packages/schema/src/config/cli.ts b/packages/schema/src/config/cli.ts
index adec750761a..93bb4219802 100644
--- a/packages/schema/src/config/cli.ts
+++ b/packages/schema/src/config/cli.ts
@@ -1,6 +1,6 @@
-import { defineSchemaObject } from '../utils'
+import { defineUntypedSchema } from 'untyped'
 
-export default defineSchemaObject({
+export default defineUntypedSchema({
   /**
    * Add a message to the CLI banner by adding a string to this array.
    * @type {string[]}
diff --git a/packages/schema/src/config/experimental.ts b/packages/schema/src/config/experimental.ts
index 5ebdcfe1e1c..491cb3f82f1 100644
--- a/packages/schema/src/config/experimental.ts
+++ b/packages/schema/src/config/experimental.ts
@@ -1,6 +1,6 @@
-import { defineSchemaObject } from '../utils'
+import { defineUntypedSchema } from 'untyped'
 
-export default defineSchemaObject({
+export default defineUntypedSchema({
   /** @version 3 */
   experimental: {
     /**
diff --git a/packages/schema/src/config/generate.ts b/packages/schema/src/config/generate.ts
index fd23b2b4842..ea41f9c0721 100644
--- a/packages/schema/src/config/generate.ts
+++ b/packages/schema/src/config/generate.ts
@@ -1,11 +1,11 @@
 import { resolve } from 'pathe'
 import { joinURL } from 'ufo'
-import { SchemaObject } from '../utils'
+import { SchemaDefinition } from 'untyped'
 
 /**
  * @version 2
  */
- export default <SchemaObject> {
+ export default <SchemaDefinition> {
   /**
    * Directory name that holds all the assets and generated pages for a `static` build.
    */
diff --git a/packages/schema/src/config/messages.ts b/packages/schema/src/config/messages.ts
index 8917f83b925..f6eff563b53 100644
--- a/packages/schema/src/config/messages.ts
+++ b/packages/schema/src/config/messages.ts
@@ -1,9 +1,9 @@
-import { SchemaObject } from '../utils'
+import { SchemaDefinition } from 'untyped'
 
 /**
  * @version 2
  */
-export default <SchemaObject> {
+export default <SchemaDefinition> {
   /** The text that displays on the Nuxt loading indicator when `ssr: false`. */
   loading: 'Loading...',
   /** The 404 text on the default Nuxt error page. */
diff --git a/packages/schema/src/config/nitro.ts b/packages/schema/src/config/nitro.ts
index 34881b29b60..091bee65ae7 100644
--- a/packages/schema/src/config/nitro.ts
+++ b/packages/schema/src/config/nitro.ts
@@ -1,6 +1,6 @@
-import { defineSchemaObject } from '../utils'
+import { defineUntypedSchema } from 'untyped'
 
-export default defineSchemaObject({
+export default defineUntypedSchema({
   /**
    * Configuration for Nitro.
    *
diff --git a/packages/schema/src/config/postcss.ts b/packages/schema/src/config/postcss.ts
index e046eff7c8d..d2f03632d23 100644
--- a/packages/schema/src/config/postcss.ts
+++ b/packages/schema/src/config/postcss.ts
@@ -1,8 +1,8 @@
 import defu from 'defu'
 import createResolver from 'postcss-import-resolver'
-import { defineSchemaObject } from '../utils'
+import { defineUntypedSchema } from 'untyped'
 
-export default defineSchemaObject({
+export default defineUntypedSchema({
   /** @version 3 */
   postcss: {
     /** Path to postcss config file. */
diff --git a/packages/schema/src/config/render.ts b/packages/schema/src/config/render.ts
index d126f56c873..203ebc4e0f9 100644
--- a/packages/schema/src/config/render.ts
+++ b/packages/schema/src/config/render.ts
@@ -1,9 +1,9 @@
-import { SchemaObject } from '../utils'
+import { SchemaDefinition } from 'untyped'
 
 /**
  * @version 2
  */
-export default <SchemaObject> {
+export default <SchemaDefinition>{
   /**
    * Use this option to customize the Vue SSR bundle renderer.
    * This option is skipped if `ssr: false`.
diff --git a/packages/schema/src/config/router.ts b/packages/schema/src/config/router.ts
index 3ce84688d8c..6a895654dd0 100644
--- a/packages/schema/src/config/router.ts
+++ b/packages/schema/src/config/router.ts
@@ -1,7 +1,7 @@
 import { normalizeURL, withTrailingSlash } from 'ufo'
-import { defineSchemaObject } from '../utils'
+import { defineUntypedSchema } from 'untyped'
 
-export default defineSchemaObject({
+export default defineUntypedSchema({
   /**
    * Additional options passed to `vue-router`.
    *
diff --git a/packages/schema/src/config/server.ts b/packages/schema/src/config/server.ts
index 49d36ef11ea..51ebed8c4bc 100644
--- a/packages/schema/src/config/server.ts
+++ b/packages/schema/src/config/server.ts
@@ -1,7 +1,7 @@
-import { SchemaObject } from '../utils'
+import { SchemaDefinition } from 'untyped'
 
 /** @version 2 */
-export default <SchemaObject> {
+export default <SchemaDefinition>{
   /**
    * Whether to enable HTTPS.
    *
diff --git a/packages/schema/src/config/typescript.ts b/packages/schema/src/config/typescript.ts
index 35d8f612b3e..7b3c7d185e9 100644
--- a/packages/schema/src/config/typescript.ts
+++ b/packages/schema/src/config/typescript.ts
@@ -1,6 +1,6 @@
-import { defineSchemaObject } from '../utils'
+import { defineUntypedSchema } from 'untyped'
 
-export default defineSchemaObject({
+export default defineUntypedSchema({
   /**
    * Configuration for Nuxt's TypeScript integration.
    *
diff --git a/packages/schema/src/config/vite.ts b/packages/schema/src/config/vite.ts
index dc0b0b364b3..e5feca1a013 100644
--- a/packages/schema/src/config/vite.ts
+++ b/packages/schema/src/config/vite.ts
@@ -1,8 +1,8 @@
 import { resolve } from 'pathe'
 import { withoutLeadingSlash } from 'ufo'
-import { defineSchemaObject } from '../utils'
+import { defineUntypedSchema } from 'untyped'
 
-export default defineSchemaObject({
+export default defineUntypedSchema({
   /**
    * Configuration that will be passed directly to Vite.
    *
diff --git a/packages/schema/src/config/webpack.ts b/packages/schema/src/config/webpack.ts
index e8f5fa9bb29..42c6830aaba 100644
--- a/packages/schema/src/config/webpack.ts
+++ b/packages/schema/src/config/webpack.ts
@@ -1,7 +1,7 @@
 import { join } from 'pathe'
-import { defineSchemaObject } from '../utils'
+import { defineUntypedSchema } from 'untyped'
 
-export default defineSchemaObject({
+export default defineUntypedSchema({
   /** @version 3 */
   webpack: {
     /**
diff --git a/packages/schema/src/utils.ts b/packages/schema/src/utils.ts
deleted file mode 100644
index 6e5a3a36dcb..00000000000
--- a/packages/schema/src/utils.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-//-- From Untyped
-export type JSValue = string | number | bigint | boolean | symbol | Function | Array<any> | undefined | object | null;
-export type JSType = 'string' | 'number' | 'bigint' | 'boolean' | 'symbol' | 'function' | 'object' | 'any' | 'array';
-export type ResolveFn = ((value: any, get: (key: string) => any) => JSValue);
-export interface TypeDescriptor {
-    /** Used internally to handle schema types */
-    type?: JSType | JSType[];
-    /** Fully resolved correct TypeScript type for generated TS declarations */
-    tsType?: string;
-    /** Human-readable type description for use in generated documentation */
-    markdownType?: string;
-    items?: TypeDescriptor | TypeDescriptor[];
-}
-export interface FunctionArg extends TypeDescriptor {
-    name?: string;
-    default?: JSValue;
-    optional?: boolean;
-}
-export interface Schema extends TypeDescriptor {
-    id?: string;
-    default?: JSValue;
-    resolve?: ResolveFn;
-    properties?: {
-        [key: string]: Schema;
-    };
-    title?: string;
-    description?: string;
-    $schema?: string;
-    tags?: string[];
-    args?: FunctionArg[];
-    returns?: TypeDescriptor;
-}
-// --
-
-export interface SchemaObject {
-  [key: string]: SchemaObject | JSValue;
-  $schema?: Schema;
-  $resolve?: ResolveFn;
-}
-
-defineSchemaObject({
-  test: '123',
-  foo: {
-    bar: '123',
-    baz: {
-      $resolve: (val, get) => val ?? get('test')
-    }
-  }
-})
-
-export function defineSchemaObject(input: SchemaObject): SchemaObject {
-  return input
-}
diff --git a/yarn.lock b/yarn.lock
index 62c23ff1f2c..64ae347cd81 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1661,7 +1661,7 @@ __metadata:
     unbuild: latest
     unctx: ^2.0.1
     unimport: ^0.6.7
-    untyped: ^0.4.6
+    untyped: ^0.4.7
   languageName: unknown
   linkType: soft
 
@@ -1688,7 +1688,7 @@ __metadata:
     ufo: ^0.8.5
     unbuild: latest
     unimport: ^0.6.7
-    untyped: ^0.4.6
+    untyped: ^0.4.7
     vite: ~3.0.9
   languageName: unknown
   linkType: soft
@@ -9995,7 +9995,7 @@ __metadata:
     unenv: ^0.6.1
     unimport: ^0.6.7
     unplugin: ^0.9.2
-    untyped: ^0.4.6
+    untyped: ^0.4.7
     vue: ^3.2.37
     vue-bundle-renderer: ^0.4.2
     vue-devtools-stub: ^0.1.0
@@ -13209,15 +13209,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"untyped@npm:^0.4.6":
-  version: 0.4.6
-  resolution: "untyped@npm:0.4.6"
+"untyped@npm:^0.4.7":
+  version: 0.4.7
+  resolution: "untyped@npm:0.4.7"
   dependencies:
     "@babel/core": ^7.18.13
     "@babel/standalone": ^7.18.13
     "@babel/types": ^7.18.13
     scule: ^0.3.2
-  checksum: 3caf8c6c523dfc7f31282ebaaa70a42c24d8b1682f85953a891a89ef3e3dd75ba470a6a0904b8ec454c374e99f2f9c088e3e9aecc9964539ceb4dfc0366656db
+  checksum: d5b189b19e114c4d60e122da9234c68a93d71b312a64bd8303e3aaa96f7a677befa8519ce003dec8cb587ed3e5503046131532196257ed10e647bc741532b1bc
   languageName: node
   linkType: hard