From 12609737804af85cff3ecd6e84c3569b787d5e09 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.io>
Date: Wed, 16 Nov 2022 02:43:00 +0100
Subject: [PATCH 01/14] refactor!: remove deprecated and legscy options

---
 docs/content/3.api/4.advanced/2.kit.md        |  4 +-
 packages/kit/src/build.ts                     |  7 ---
 packages/kit/src/imports.ts                   | 18 ++-----
 packages/kit/src/module/define.ts             | 14 +----
 packages/kit/src/module/install.ts            |  8 ---
 .../nuxt/src/app/composables/asyncData.ts     |  6 +--
 packages/nuxt/src/app/composables/error.ts    |  3 --
 packages/nuxt/src/app/composables/router.ts   |  5 --
 packages/nuxt/src/core/nuxt.ts                | 25 ---------
 packages/nuxt/src/head/runtime/components.ts  | 51 -------------------
 packages/nuxt/src/imports/module.ts           |  8 ---
 packages/nuxt/src/pages/runtime/router.ts     |  4 --
 packages/schema/src/config/adhoc.ts           |  3 --
 packages/schema/src/config/common.ts          | 15 ------
 packages/schema/src/types/components.ts       | 14 -----
 packages/schema/src/types/config.ts           |  6 +--
 packages/schema/src/types/hooks.ts            |  8 ---
 packages/schema/src/types/nuxt.ts             |  4 --
 packages/schema/src/types/router.ts           |  4 --
 19 files changed, 9 insertions(+), 198 deletions(-)

diff --git a/docs/content/3.api/4.advanced/2.kit.md b/docs/content/3.api/4.advanced/2.kit.md
index 66fbcdeea7b..5e4d79d473b 100644
--- a/docs/content/3.api/4.advanced/2.kit.md
+++ b/docs/content/3.api/4.advanced/2.kit.md
@@ -40,8 +40,8 @@ description: Nuxt Kit provides composable utilities to help interacting with Nux
 [source code](https://github.com/nuxt/framework/blob/main/packages/kit/src/imports.ts)
 
 - `addImports(imports)`
-- `addImportsDir(autoImportDirs)`
-- `addImportsSources(autoImportSources)`
+- `addImportsDir(importDirs)`
+- `addImportsSources(importSources)`
 
 ### Components
 
diff --git a/packages/kit/src/build.ts b/packages/kit/src/build.ts
index b602b8a45d8..942210b285f 100644
--- a/packages/kit/src/build.ts
+++ b/packages/kit/src/build.ts
@@ -30,13 +30,6 @@ export interface ExtendConfigOptions {
 }
 
 export interface ExtendWebpackConfigOptions extends ExtendConfigOptions {
-  /**
-   * Install plugin on modern build
-   *
-   * @default true
-   * @deprecated Nuxt 2 only
-   */
-  modern?: boolean
 }
 
 export interface ExtendViteConfigOptions extends ExtendConfigOptions {}
diff --git a/packages/kit/src/imports.ts b/packages/kit/src/imports.ts
index d8ce03ef87f..f6ccbc9ca39 100644
--- a/packages/kit/src/imports.ts
+++ b/packages/kit/src/imports.ts
@@ -7,37 +7,25 @@ export function addImports (imports: Import | Import[]) {
   assertNuxtCompatibility({ bridge: true })
 
   // TODO: Use imports:* when widely adopted
-  useNuxt().hook('autoImports:extend', (_imports) => {
+  useNuxt().hook('imports:extend', (_imports) => {
     _imports.push(...(Array.isArray(imports) ? imports : [imports]))
   }, { allowDeprecated: true })
 }
 
-/**
- * @deprecated Please use `addImports` instead with nuxt>=3.0.0-rc.9
- */
-export const addAutoImport = addImports
-
 export function addImportsDir (dirs: string | string[]) {
   assertNuxtCompatibility({ bridge: true })
 
   // TODO: Use imports:* when widely adopted
-  useNuxt().hook('autoImports:dirs', (_dirs: string[]) => {
+  useNuxt().hook('imports:dirs', (_dirs: string[]) => {
     for (const dir of (Array.isArray(dirs) ? dirs : [dirs])) {
       _dirs.push(dir)
     }
   }, { allowDeprecated: true })
 }
-
-/**
- * @deprecated Please use `addImportsDir` instead with nuxt>=3.0.0-rc.9
- */
-export const addAutoImportDir = addImportsDir
-
 export function addImportsSources (presets: ImportPresetWithDeprecation | ImportPresetWithDeprecation[]) {
   assertNuxtCompatibility({ bridge: true })
 
-  // TODO: Use imports:* when widely adopted
-  useNuxt().hook('autoImports:sources', (_presets: ImportPresetWithDeprecation[]) => {
+  useNuxt().hook('imports:sources', (_presets: ImportPresetWithDeprecation[]) => {
     for (const preset of (Array.isArray(presets) ? presets : [presets])) {
       _presets.push(preset)
     }
diff --git a/packages/kit/src/module/define.ts b/packages/kit/src/module/define.ts
index 861f65d1aac..26d46f04e6b 100644
--- a/packages/kit/src/module/define.ts
+++ b/packages/kit/src/module/define.ts
@@ -13,20 +13,10 @@ import { templateUtils, compileTemplate } from '../internal/template'
  * any hooks that are provided, and calling an optional setup function for full control.
  */
 export function defineNuxtModule<OptionsT extends ModuleOptions> (definition: ModuleDefinition<OptionsT>): NuxtModule<OptionsT> {
-  // Legacy format. TODO: Remove in RC
-  if (typeof definition === 'function') {
-    // @ts-ignore
-    definition = definition(useNuxt())
-    logger.warn('Module definition as function is deprecated and will be removed in the future versions', definition)
-  }
-
   // Normalize definition and meta
   if (!definition.meta) { definition.meta = {} }
-  if (!definition.meta.configKey) {
-    // @ts-ignore TODO: Remove non-meta fallbacks in RC
-    definition.meta.name = definition.meta.name || definition.name
-    // @ts-ignore
-    definition.meta.configKey = definition.configKey || definition.meta.name
+  if (definition.meta.configKey === undefined) {
+    definition.meta.configKey = definition.meta.name
   }
 
   // Resolves module options from inline options, [configKey] in nuxt.config, defaults and schema
diff --git a/packages/kit/src/module/install.ts b/packages/kit/src/module/install.ts
index df8d9554269..733bfe8ca66 100644
--- a/packages/kit/src/module/install.ts
+++ b/packages/kit/src/module/install.ts
@@ -27,14 +27,6 @@ export async function installModule (moduleToInstall: string | NuxtModule, _inli
 async function normalizeModule (nuxtModule: string | NuxtModule, inlineOptions?: any) {
   const nuxt = useNuxt()
 
-  // Detect if `installModule` used with older signuture (nuxt, nuxtModule)
-  // TODO: Remove in RC
-  // @ts-ignore
-  if (nuxtModule?._version || nuxtModule?.version || nuxtModule?.constructor?.version || '') {
-    [nuxtModule, inlineOptions] = [inlineOptions, {}]
-    console.warn(new Error('`installModule` is being called with old signature!'))
-  }
-
   // Import if input is string
   if (typeof nuxtModule === 'string') {
     const _src = resolveModule(resolveAlias(nuxtModule), { paths: nuxt.options.modulesDir })
diff --git a/packages/nuxt/src/app/composables/asyncData.ts b/packages/nuxt/src/app/composables/asyncData.ts
index 96e33d0be58..75d21f30a47 100644
--- a/packages/nuxt/src/app/composables/asyncData.ts
+++ b/packages/nuxt/src/app/composables/asyncData.ts
@@ -96,11 +96,7 @@ export function useAsyncData<
   options.server = options.server ?? true
   options.default = options.default ?? getDefault
 
-  // TODO: remove support for `defer` in Nuxt 3 RC
-  if ((options as any).defer) {
-    console.warn('[useAsyncData] `defer` has been renamed to `lazy`. Support for `defer` will be removed in RC.')
-  }
-  options.lazy = options.lazy ?? (options as any).defer ?? false
+  options.lazy = options.lazy ?? false
   options.immediate = options.immediate ?? true
 
   // Setup nuxt instance payload
diff --git a/packages/nuxt/src/app/composables/error.ts b/packages/nuxt/src/app/composables/error.ts
index 8da32879244..ab638dd8660 100644
--- a/packages/nuxt/src/app/composables/error.ts
+++ b/packages/nuxt/src/app/composables/error.ts
@@ -21,9 +21,6 @@ export const showError = (_err: string | Error | Partial<NuxtError>) => {
   return err
 }
 
-/** @deprecated Use `throw createError()` or `showError` */
-export const throwError = showError
-
 export const clearError = async (options: { redirect?: string } = {}) => {
   const nuxtApp = useNuxtApp()
   const error = useError()
diff --git a/packages/nuxt/src/app/composables/router.ts b/packages/nuxt/src/app/composables/router.ts
index b4f3950f74c..e553bb8c792 100644
--- a/packages/nuxt/src/app/composables/router.ts
+++ b/packages/nuxt/src/app/composables/router.ts
@@ -30,11 +30,6 @@ export const onBeforeRouteUpdate = (guard: NavigationGuard) => {
   onUnmounted(unsubscribe)
 }
 
-/** @deprecated Use `useRoute` instead. */
-export const useActiveRoute = (): RouteLocationNormalizedLoaded => {
-  return useNuxtApp()._route
-}
-
 export interface RouteMiddleware {
   (to: RouteLocationNormalized, from: RouteLocationNormalized): ReturnType<NavigationGuard>
 }
diff --git a/packages/nuxt/src/core/nuxt.ts b/packages/nuxt/src/core/nuxt.ts
index a0145231736..5365ddb862c 100644
--- a/packages/nuxt/src/core/nuxt.ts
+++ b/packages/nuxt/src/core/nuxt.ts
@@ -168,22 +168,6 @@ async function initNuxt (nuxt: Nuxt) {
     filePath: resolve(nuxt.options.appDir, 'components/nuxt-loading-indicator')
   })
 
-  // Deprecate hooks
-  nuxt.hooks.deprecateHooks({
-    'autoImports:sources': {
-      to: 'imports:sources',
-      message: '`autoImports:sources` hook is deprecated. Use `addImportsSources()` from `@nuxt/kit` or `imports:dirs` with `nuxt>=3.0.0-rc.10`.'
-    },
-    'autoImports:dirs': {
-      to: 'imports:dirs',
-      message: '`autoImports:dirs` hook is deprecated. Use `addImportsDir()` from `@nuxt/kit` or `imports:dirs` with `nuxt>=3.0.0-rc.9`.'
-    },
-    'autoImports:extend': {
-      to: 'imports:extend',
-      message: '`autoImports:extend` hook is deprecated. Use `addImports()` from `@nuxt/kit` or `imports:extend` with `nuxt>=3.0.0-rc.9`.'
-    }
-  })
-
   // Add prerender payload support
   if (!nuxt.options.dev && nuxt.options.experimental.payloadExtraction) {
     addPlugin(resolve(nuxt.options.appDir, 'plugins/payload.client'))
@@ -260,12 +244,3 @@ export async function loadNuxt (opts: LoadNuxtOptions): Promise<Nuxt> {
 
   return nuxt
 }
-
-/** @deprecated `defineNuxtConfig` is auto imported. Remove import or alternatively use `import { defineNuxtConfig } from  'nuxt/config'`. */
-export function defineNuxtConfig (config: NuxtConfig): NuxtConfig {
-  return config
-}
-
-/** @deprecated Use `import type { NuxtConfig } from  'nuxt/config'`.  */
-type _NuxtConfig = NuxtConfig
-export type { _NuxtConfig as NuxtConfig }
diff --git a/packages/nuxt/src/head/runtime/components.ts b/packages/nuxt/src/head/runtime/components.ts
index 663da5a4326..b4029ed07a4 100644
--- a/packages/nuxt/src/head/runtime/components.ts
+++ b/packages/nuxt/src/head/runtime/components.ts
@@ -65,57 +65,6 @@ const globalProps = {
   translate: String
 }
 
-// <script>
-
-let scriptDeprecated = false
-
-/** @deprecated */
-export const Script = defineComponent({
-  // eslint-disable-next-line vue/no-reserved-component-names
-  name: 'Script',
-  inheritAttrs: false,
-  props: {
-    ...globalProps,
-    async: Boolean,
-    crossorigin: {
-      type: [Boolean, String as () => CrossOrigin],
-      default: undefined
-    },
-    defer: Boolean,
-    fetchpriority: String as PropType<FetchPriority>,
-    integrity: String,
-    nomodule: Boolean,
-    nonce: String,
-    referrerpolicy: String as PropType<ReferrerPolicy>,
-    src: String,
-    type: String,
-    /** @deprecated **/
-    charset: String,
-    /** @deprecated **/
-    language: String,
-    body: Boolean,
-    renderPriority: [String, Number]
-  },
-  setup: setupForUseMeta((props, { slots }) => {
-    if (process.dev && !scriptDeprecated) {
-      console.log('[nuxt] `<Script>` is deprecated and may be removed in a future release. We advise using `useHead()` directly.')
-      scriptDeprecated = true
-    }
-
-    const script = { ...props }
-    const textContent = (slots.default?.() || [])
-      .filter(({ children }) => children)
-      .map(({ children }) => children)
-      .join('')
-    if (textContent) {
-      script.children = textContent
-    }
-    return {
-      script: [script]
-    }
-  })
-})
-
 // <noscript>
 export const NoScript = defineComponent({
   name: 'NoScript',
diff --git a/packages/nuxt/src/imports/module.ts b/packages/nuxt/src/imports/module.ts
index 05d4e1d400e..237f8a3a947 100644
--- a/packages/nuxt/src/imports/module.ts
+++ b/packages/nuxt/src/imports/module.ts
@@ -23,14 +23,6 @@ export default defineNuxtModule<Partial<ImportsOptions>>({
     }
   },
   async setup (options, nuxt) {
-    // TODO: remove deprecation warning
-    // @ts-ignore
-    if (nuxt.options.autoImports) {
-      logger.warn('`autoImports` config is deprecated, use `imports` instead.')
-      // @ts-ignore
-      options = defu(nuxt.options.autoImports, options)
-    }
-
     // TODO: fix sharing of defaults between invocations of modules
     const presets = JSON.parse(JSON.stringify(options.presets)) as ImportPresetWithDeprecation[]
 
diff --git a/packages/nuxt/src/pages/runtime/router.ts b/packages/nuxt/src/pages/runtime/router.ts
index 662b8073bf4..da84dcb5f16 100644
--- a/packages/nuxt/src/pages/runtime/router.ts
+++ b/packages/nuxt/src/pages/runtime/router.ts
@@ -21,10 +21,6 @@ import { globalMiddleware, namedMiddleware } from '#build/middleware'
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
     NuxtPage: typeof NuxtPage
-    /** @deprecated */
-    NuxtNestedPage: typeof NuxtPage
-    /** @deprecated */
-    NuxtChild: typeof NuxtPage
   }
 }
 
diff --git a/packages/schema/src/config/adhoc.ts b/packages/schema/src/config/adhoc.ts
index 7d81e8151e1..37cddef86de 100644
--- a/packages/schema/src/config/adhoc.ts
+++ b/packages/schema/src/config/adhoc.ts
@@ -23,9 +23,6 @@ export default defineUntypedSchema({
     }
   },
 
-  /** @deprecated Please use `imports` config. */
-  autoImports: null,
-
   /**
    * Configure how Nuxt auto-imports composables into your application.
    *
diff --git a/packages/schema/src/config/common.ts b/packages/schema/src/config/common.ts
index c30c3f9ccbe..c9012c014d9 100644
--- a/packages/schema/src/config/common.ts
+++ b/packages/schema/src/config/common.ts
@@ -199,9 +199,6 @@ export default defineUntypedSchema({
    */
   modules: [],
 
-  /** @deprecated Use `modules` instead */
-  buildModules: [],
-
   /**
    * Customize default directory structure used by Nuxt.
    *
@@ -438,18 +435,6 @@ export default defineUntypedSchema({
     })
   },
 
-  /**
-   * @type {typeof import('../src/types/config').PrivateRuntimeConfig}
-   * @deprecated Use `runtimeConfig` option.
-   */
-  privateRuntimeConfig: {},
-
-  /**
-   * @type {typeof import('../src/types/config').PublicRuntimeConfig}
-   * @deprecated Use `runtimeConfig` option with `public` key (`runtimeConfig.public.*`).
-   */
-  publicRuntimeConfig: {},
-
   /**
    * Additional app configuration
    *
diff --git a/packages/schema/src/types/components.ts b/packages/schema/src/types/components.ts
index 5b1c189e662..bce1c330cba 100644
--- a/packages/schema/src/types/components.ts
+++ b/packages/schema/src/types/components.ts
@@ -9,15 +9,6 @@ export interface Component {
   preload: boolean
   global?: boolean
   mode?: 'client' | 'server' | 'all'
-
-  /** @deprecated */
-  level?: number
-  /** @deprecated */
-  import?: string
-  /** @deprecated */
-  asyncImport?: string
-  /** @deprecated */
-  async?: boolean
 }
 
 export interface ScanDir {
@@ -46,11 +37,6 @@ export interface ScanDir {
    * Ignore scanning this directory if set to `true`
    */
   enabled?: boolean
-  /**
-   * Level is used to define a hint when overwriting the components which have the same name in two different directories.
-   * @deprecated Not used by Nuxt 3 anymore
-   */
-  level?: number
   /**
    * These properties (prefetch/preload) are used in production to configure how components with Lazy prefix are handled by Webpack via its magic comments.
    * Learn more on Webpack documentation: https://webpack.js.org/api/module-methods/#magic-comments
diff --git a/packages/schema/src/types/config.ts b/packages/schema/src/types/config.ts
index ba2e7f8ec94..9d9f18e916a 100644
--- a/packages/schema/src/types/config.ts
+++ b/packages/schema/src/types/config.ts
@@ -62,11 +62,7 @@ type RuntimeConfigNamespace = Record<string, any>
 
 export interface PublicRuntimeConfig extends RuntimeConfigNamespace { }
 
-// TODO: remove before release of 3.0.0
-/** @deprecated use RuntimeConfig interface */
-export interface PrivateRuntimeConfig extends RuntimeConfigNamespace { }
-
-export interface RuntimeConfig extends PrivateRuntimeConfig, RuntimeConfigNamespace {
+export interface RuntimeConfig extends RuntimeConfigNamespace {
   public: PublicRuntimeConfig
 }
 
diff --git a/packages/schema/src/types/hooks.ts b/packages/schema/src/types/hooks.ts
index dba4939f8c5..441c537cb27 100644
--- a/packages/schema/src/types/hooks.ts
+++ b/packages/schema/src/types/hooks.ts
@@ -76,14 +76,6 @@ export interface NuxtHooks {
 
   'server:devHandler': (handler: EventHandler) => HookResult
 
-  // Auto imports
-  /** @deprecated Please use `imports:sources` hook */
-  'autoImports:sources': (presets: ImportPresetWithDeprecation[]) => HookResult
-  /** @deprecated Please use `imports:extend` hook */
-  'autoImports:extend': (imports: Import[]) => HookResult
-  /** @deprecated Please use `imports:dirs` hook */
-  'autoImports:dirs': (dirs: string[]) => HookResult
-
   'imports:sources': (presets: ImportPresetWithDeprecation[]) => HookResult
   'imports:extend': (imports: Import[]) => HookResult
   'imports:dirs': (dirs: string[]) => HookResult
diff --git a/packages/schema/src/types/nuxt.ts b/packages/schema/src/types/nuxt.ts
index 8de75ae52ec..85e40e36786 100644
--- a/packages/schema/src/types/nuxt.ts
+++ b/packages/schema/src/types/nuxt.ts
@@ -25,10 +25,6 @@ export interface Nuxt {
 }
 
 export interface NuxtTemplate<Options = Record<string, any>> {
-  /** @deprecated filename */
-  fileName?: string
-  /** @deprecated whether template is custom or a nuxt core template */
-  custom?: boolean
   /** resolved output file path (generated) */
   dst?: string
   /** The target filename once the template is copied into the Nuxt buildDir */
diff --git a/packages/schema/src/types/router.ts b/packages/schema/src/types/router.ts
index 27fd76f6207..f47d18bf141 100644
--- a/packages/schema/src/types/router.ts
+++ b/packages/schema/src/types/router.ts
@@ -13,7 +13,3 @@ export type RouterConfig = RouterOptions
  * Only JSON serializable router options are configurable from nuxt config
  */
 export type RouterConfigSerializable = Pick<RouterConfig, 'linkActiveClass' | 'linkExactActiveClass' | 'end' | 'sensitive' | 'strict' | 'hashMode'>
-
-
-/** @deprecated Use RouterConfigSerializable instead */
-export type RouterConfigOptions = RouterConfigSerializable

From afb41b1d83cf8c054b9b76b8437fe700da65b662 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.io>
Date: Wed, 16 Nov 2022 02:51:36 +0100
Subject: [PATCH 02/14] small updates

---
 packages/nuxi/src/commands/info.ts   |  2 +-
 packages/nuxi/src/utils/prepare.ts   |  1 -
 packages/nuxt/src/core/modules.ts    |  1 -
 packages/nuxt/src/core/nuxt.ts       |  1 -
 packages/schema/src/config/common.ts |  2 --
 test/fixtures/basic/nuxt.config.ts   | 10 +++++-----
 6 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/packages/nuxi/src/commands/info.ts b/packages/nuxi/src/commands/info.ts
index e613135355f..781f4f9cc19 100644
--- a/packages/nuxi/src/commands/info.ts
+++ b/packages/nuxi/src/commands/info.ts
@@ -68,7 +68,7 @@ export default defineNuxtCommand({
       Builder: builder,
       UserConfig: Object.keys(nuxtConfig).map(key => '`' + key + '`').join(', '),
       RuntimeModules: listModules(nuxtConfig.modules),
-      BuildModules: listModules(nuxtConfig.buildModules)
+      BuildModules: listModules(nuxtConfig.buildModules || [])
     }
 
     console.log('RootDir:', rootDir)
diff --git a/packages/nuxi/src/utils/prepare.ts b/packages/nuxi/src/utils/prepare.ts
index a7ce89fa957..e1ba9405d50 100644
--- a/packages/nuxi/src/utils/prepare.ts
+++ b/packages/nuxi/src/utils/prepare.ts
@@ -63,7 +63,6 @@ export const writeTypes = async (nuxt: Nuxt) => {
   }
 
   const references: TSReference[] = [
-    ...nuxt.options.buildModules,
     ...nuxt.options.modules,
     ...nuxt.options._modules
   ]
diff --git a/packages/nuxt/src/core/modules.ts b/packages/nuxt/src/core/modules.ts
index 5041095d4a2..6df928fc7d0 100644
--- a/packages/nuxt/src/core/modules.ts
+++ b/packages/nuxt/src/core/modules.ts
@@ -9,7 +9,6 @@ export const addModuleTranspiles = (opts: AddModuleTranspilesOptions = {}) => {
 
   const modules = [
     ...opts.additionalModules || [],
-    ...nuxt.options.buildModules,
     ...nuxt.options.modules,
     ...nuxt.options._modules
   ]
diff --git a/packages/nuxt/src/core/nuxt.ts b/packages/nuxt/src/core/nuxt.ts
index 5365ddb862c..a0e9aaed2cf 100644
--- a/packages/nuxt/src/core/nuxt.ts
+++ b/packages/nuxt/src/core/nuxt.ts
@@ -116,7 +116,6 @@ async function initNuxt (nuxt: Nuxt) {
   // Init user modules
   await nuxt.callHook('modules:before')
   const modulesToInstall = [
-    ...nuxt.options.buildModules,
     ...nuxt.options.modules,
     ...nuxt.options._modules
   ]
diff --git a/packages/schema/src/config/common.ts b/packages/schema/src/config/common.ts
index c9012c014d9..317a598a7e6 100644
--- a/packages/schema/src/config/common.ts
+++ b/packages/schema/src/config/common.ts
@@ -424,8 +424,6 @@ export default defineUntypedSchema({
    */
   runtimeConfig: {
     $resolve: async (val: RuntimeConfig, get) => defu(val, {
-      ...await get('publicRuntimeConfig'),
-      ...await get('privateRuntimeConfig'),
       public: await get('publicRuntimeConfig'),
       app: {
         baseURL: (await get('app')).baseURL,
diff --git a/test/fixtures/basic/nuxt.config.ts b/test/fixtures/basic/nuxt.config.ts
index b7d6bad0ed9..5553166e344 100644
--- a/test/fixtures/basic/nuxt.config.ts
+++ b/test/fixtures/basic/nuxt.config.ts
@@ -40,11 +40,11 @@ export default defineNuxtConfig({
       ]
     }
   },
-  publicRuntimeConfig: {
-    testConfig: 123
-  },
-  privateRuntimeConfig: {
-    privateConfig: 'secret_key'
+  runtimeConfig: {
+    privateConfig: 'secret_key',
+    public: {
+      testConfig: 123
+    }
   },
   modules: [
     '~/modules/example',

From 3f9b62b574bc271059144f5f38061c9e5ec57089 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.io>
Date: Wed, 16 Nov 2022 02:55:48 +0100
Subject: [PATCH 03/14] fix lint and type issues

---
 packages/kit/src/build.ts                  | 7 -------
 packages/kit/src/components.ts             | 8 --------
 packages/kit/src/template.ts               | 2 +-
 packages/nuxt/src/app/composables/index.ts | 4 ++--
 packages/nuxt/src/components/module.ts     | 2 --
 packages/nuxt/src/core/nuxt.ts             | 2 +-
 packages/nuxt/src/imports/module.ts        | 1 -
 7 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/packages/kit/src/build.ts b/packages/kit/src/build.ts
index 942210b285f..aefc7e629a0 100644
--- a/packages/kit/src/build.ts
+++ b/packages/kit/src/build.ts
@@ -66,13 +66,6 @@ export function extendWebpackConfig (
         fn(config)
       }
     }
-    // Nuxt 2 backwards compatibility
-    if (options.modern !== false) {
-      const config = configs.find(i => i.name === 'modern')
-      if (config) {
-        fn(config)
-      }
-    }
   })
 }
 
diff --git a/packages/kit/src/components.ts b/packages/kit/src/components.ts
index 81181fda4ed..8bd96e41014 100644
--- a/packages/kit/src/components.ts
+++ b/packages/kit/src/components.ts
@@ -1,6 +1,5 @@
 import { pascalCase, kebabCase } from 'scule'
 import type { ComponentsDir, Component } from '@nuxt/schema'
-import { genDynamicImport } from 'knitwork'
 import { useNuxt } from './context'
 import { assertNuxtCompatibility } from './compatibility'
 
@@ -40,14 +39,7 @@ export async function addComponent (opts: AddComponentOptions) {
     prefetch: false,
     preload: false,
     mode: 'all',
-
-    // Nuxt 2 support
     shortPath: opts.filePath,
-    async: false,
-    level: 0,
-    asyncImport: `${genDynamicImport(opts.filePath)}.then(r => r['${opts.export || 'default'}'])`,
-    import: `require(${JSON.stringify(opts.filePath)})['${opts.export || 'default'}']`,
-
     ...opts
   }
 
diff --git a/packages/kit/src/template.ts b/packages/kit/src/template.ts
index 01e2f481ac7..cbf0682eab5 100644
--- a/packages/kit/src/template.ts
+++ b/packages/kit/src/template.ts
@@ -45,7 +45,7 @@ export function normalizeTemplate (template: NuxtTemplate<any> | string): Resolv
     }
     if (!template.filename) {
       const srcPath = parse(template.src)
-      template.filename = template.fileName ||
+      template.filename = (template as any).fileName ||
         `${basename(srcPath.dir)}.${srcPath.name}.${hash(template.src)}${srcPath.ext}`
     }
   }
diff --git a/packages/nuxt/src/app/composables/index.ts b/packages/nuxt/src/app/composables/index.ts
index f7410691255..251a09fd596 100644
--- a/packages/nuxt/src/app/composables/index.ts
+++ b/packages/nuxt/src/app/composables/index.ts
@@ -3,14 +3,14 @@ export { useAsyncData, useLazyAsyncData, refreshNuxtData, clearNuxtData } from '
 export type { AsyncDataOptions, AsyncData } from './asyncData'
 export { useHydration } from './hydrate'
 export { useState } from './state'
-export { clearError, createError, isNuxtError, throwError, showError, useError } from './error'
+export { clearError, createError, isNuxtError, showError, useError } from './error'
 export type { NuxtError } from './error'
 export { useFetch, useLazyFetch } from './fetch'
 export type { FetchResult, UseFetchOptions } from './fetch'
 export { useCookie } from './cookie'
 export type { CookieOptions, CookieRef } from './cookie'
 export { useRequestHeaders, useRequestEvent, setResponseStatus } from './ssr'
-export { abortNavigation, addRouteMiddleware, defineNuxtRouteMiddleware, onBeforeRouteLeave, onBeforeRouteUpdate, setPageLayout, navigateTo, useRoute, useActiveRoute, useRouter } from './router'
+export { abortNavigation, addRouteMiddleware, defineNuxtRouteMiddleware, onBeforeRouteLeave, onBeforeRouteUpdate, setPageLayout, navigateTo, useRoute, useRouter } from './router'
 export type { AddRouteMiddlewareOptions, RouteMiddleware } from './router'
 export { preloadComponents, prefetchComponents, preloadRouteComponents } from './preload'
 export { isPrerendered, loadPayload, preloadPayload } from './payload'
diff --git a/packages/nuxt/src/components/module.ts b/packages/nuxt/src/components/module.ts
index 6f4b9419d73..5f078f502b1 100644
--- a/packages/nuxt/src/components/module.ts
+++ b/packages/nuxt/src/components/module.ts
@@ -78,8 +78,6 @@ export default defineNuxtModule<ComponentsOptions>({
         const transpile = typeof dirOptions.transpile === 'boolean' ? dirOptions.transpile : 'auto'
         const extensions = (dirOptions.extensions || nuxt.options.extensions).map(e => e.replace(/^\./g, ''))
 
-        dirOptions.level = Number(dirOptions.level || 0)
-
         const present = isDirectory(dirPath)
         if (!present && !DEFAULT_COMPONENTS_DIRS_RE.test(dirOptions.path)) {
           // eslint-disable-next-line no-console
diff --git a/packages/nuxt/src/core/nuxt.ts b/packages/nuxt/src/core/nuxt.ts
index a0e9aaed2cf..67462b743cf 100644
--- a/packages/nuxt/src/core/nuxt.ts
+++ b/packages/nuxt/src/core/nuxt.ts
@@ -1,6 +1,6 @@
 import { join, normalize, resolve } from 'pathe'
 import { createHooks, createDebugger } from 'hookable'
-import type { Nuxt, NuxtOptions, NuxtConfig, NuxtHooks } from '@nuxt/schema'
+import type { Nuxt, NuxtOptions, NuxtHooks } from '@nuxt/schema'
 import { loadNuxtConfig, LoadNuxtOptions, nuxtCtx, installModule, addComponent, addVitePlugin, addWebpackPlugin, tryResolveModule, addPlugin } from '@nuxt/kit'
 // Temporary until finding better placement
 /* eslint-disable import/no-restricted-paths */
diff --git a/packages/nuxt/src/imports/module.ts b/packages/nuxt/src/imports/module.ts
index 237f8a3a947..b82ae1fbf4f 100644
--- a/packages/nuxt/src/imports/module.ts
+++ b/packages/nuxt/src/imports/module.ts
@@ -2,7 +2,6 @@ import { addVitePlugin, addWebpackPlugin, defineNuxtModule, addTemplate, resolve
 import { isAbsolute, join, relative, resolve, normalize } from 'pathe'
 import { createUnimport, Import, scanDirExports, toImports, Unimport } from 'unimport'
 import { ImportsOptions, ImportPresetWithDeprecation } from '@nuxt/schema'
-import defu from 'defu'
 import { TransformPlugin } from './transform'
 import { defaultPresets } from './presets'
 

From 36052aef1663bf8381d072dbc3a1f24e7e03760c Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.io>
Date: Wed, 16 Nov 2022 02:58:38 +0100
Subject: [PATCH 04/14] remove presets.name

---
 packages/kit/src/imports.ts         | 6 ++----
 packages/nuxt/src/imports/module.ts | 8 --------
 packages/schema/src/types/hooks.ts  | 4 ----
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/packages/kit/src/imports.ts b/packages/kit/src/imports.ts
index f6ccbc9ca39..0c1db167dcc 100644
--- a/packages/kit/src/imports.ts
+++ b/packages/kit/src/imports.ts
@@ -6,21 +6,19 @@ import { assertNuxtCompatibility } from './compatibility'
 export function addImports (imports: Import | Import[]) {
   assertNuxtCompatibility({ bridge: true })
 
-  // TODO: Use imports:* when widely adopted
   useNuxt().hook('imports:extend', (_imports) => {
     _imports.push(...(Array.isArray(imports) ? imports : [imports]))
-  }, { allowDeprecated: true })
+  })
 }
 
 export function addImportsDir (dirs: string | string[]) {
   assertNuxtCompatibility({ bridge: true })
 
-  // TODO: Use imports:* when widely adopted
   useNuxt().hook('imports:dirs', (_dirs: string[]) => {
     for (const dir of (Array.isArray(dirs) ? dirs : [dirs])) {
       _dirs.push(dir)
     }
-  }, { allowDeprecated: true })
+  })
 }
 export function addImportsSources (presets: ImportPresetWithDeprecation | ImportPresetWithDeprecation[]) {
   assertNuxtCompatibility({ bridge: true })
diff --git a/packages/nuxt/src/imports/module.ts b/packages/nuxt/src/imports/module.ts
index b82ae1fbf4f..1756c540853 100644
--- a/packages/nuxt/src/imports/module.ts
+++ b/packages/nuxt/src/imports/module.ts
@@ -28,14 +28,6 @@ export default defineNuxtModule<Partial<ImportsOptions>>({
     // Allow modules extending sources
     await nuxt.callHook('imports:sources', presets)
 
-    for (const _i of presets) {
-      const i = _i as ImportPresetWithDeprecation | string
-      if (typeof i !== 'string' && i.names && !i.imports) {
-        i.imports = i.names
-        logger.warn('imports: presets.names is deprecated, use presets.imports instead')
-      }
-    }
-
     // Filter disabled sources
     // options.sources = options.sources.filter(source => source.disabled !== true)
 
diff --git a/packages/schema/src/types/hooks.ts b/packages/schema/src/types/hooks.ts
index 441c537cb27..99e8e41975d 100644
--- a/packages/schema/src/types/hooks.ts
+++ b/packages/schema/src/types/hooks.ts
@@ -40,10 +40,6 @@ export type NuxtLayout = {
 }
 
 export interface ImportPresetWithDeprecation extends InlinePreset {
-  /**
-   * @deprecated renamed to `imports`
-   */
-  names?: string[]
 }
 
 export interface GenerateAppOptions {

From fc63cb252e1c7650e22d75102503e9c303ba4daf Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.io>
Date: Wed, 16 Nov 2022 02:59:45 +0100
Subject: [PATCH 05/14] remove unnecessart flag

---
 packages/kit/src/imports.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/kit/src/imports.ts b/packages/kit/src/imports.ts
index 0c1db167dcc..cd532351cfa 100644
--- a/packages/kit/src/imports.ts
+++ b/packages/kit/src/imports.ts
@@ -27,5 +27,5 @@ export function addImportsSources (presets: ImportPresetWithDeprecation | Import
     for (const preset of (Array.isArray(presets) ? presets : [presets])) {
       _presets.push(preset)
     }
-  }, { allowDeprecated: true })
+  })
 }

From 1a7526ac68891fc778af95dd5111725fd6787a10 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.io>
Date: Wed, 16 Nov 2022 03:00:29 +0100
Subject: [PATCH 06/14] fix: major version is 3

---
 packages/schema/src/config/internal.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schema/src/config/internal.ts b/packages/schema/src/config/internal.ts
index 03794874de2..c515110fe42 100644
--- a/packages/schema/src/config/internal.ts
+++ b/packages/schema/src/config/internal.ts
@@ -2,7 +2,7 @@ import { defineUntypedSchema } from 'untyped'
 
 export default defineUntypedSchema({
   /** @private */
-  _majorVersion: 2,
+  _majorVersion: 3,
   /** @private */
   _legacyGenerate: false,
   /** @private */

From ff9ee7e24106c905a1acd950b8e1b53b250f4b7e Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.io>
Date: Wed, 16 Nov 2022 03:02:38 +0100
Subject: [PATCH 07/14] mark kit cjs utils as deprecated

---
 packages/kit/src/internal/cjs.ts      | 17 ++++++++++++-----
 packages/kit/src/internal/template.ts |  1 +
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/packages/kit/src/internal/cjs.ts b/packages/kit/src/internal/cjs.ts
index 8103c5ea37b..fbc724959b8 100644
--- a/packages/kit/src/internal/cjs.ts
+++ b/packages/kit/src/internal/cjs.ts
@@ -6,10 +6,12 @@ import jiti from 'jiti'
 // TODO: use create-require for jest environment
 const _require = jiti(process.cwd(), { interopDefault: true, esmResolve: true })
 
+/** @deprecated Do not use CJS utils */
 export interface ResolveModuleOptions {
   paths?: string | string[]
 }
 
+/** @deprecated Do not use CJS utils */
 export interface RequireModuleOptions extends ResolveModuleOptions {
   // TODO: use create-require for jest environment
   // native?: boolean
@@ -20,11 +22,13 @@ export interface RequireModuleOptions extends ResolveModuleOptions {
   interopDefault?: boolean
 }
 
+/** @deprecated Do not use CJS utils */
 export function isNodeModules (id: string) {
   // TODO: Follow symlinks
   return /[/\\]node_modules[/\\]/.test(id)
 }
 
+/** @deprecated Do not use CJS utils */
 export function clearRequireCache (id: string) {
   if (isNodeModules(id)) {
     return
@@ -48,6 +52,7 @@ export function clearRequireCache (id: string) {
   delete _require.cache[id]
 }
 
+/** @deprecated Do not use CJS utils */
 export function scanRequireTree (id: string, files = new Set<string>()) {
   if (isNodeModules(id) || files.has(id)) {
     return files
@@ -69,7 +74,7 @@ export function scanRequireTree (id: string, files = new Set<string>()) {
   return files
 }
 
-/** Access the require cache by module id. */
+/** @deprecated Do not use CJS utils */
 export function getRequireCacheItem (id: string) {
   try {
     return _require.cache[id]
@@ -82,7 +87,7 @@ export function requireModulePkg (id: string, opts: RequireModuleOptions = {}) {
   return requireModule(join(id, 'package.json'), opts)
 }
 
-/** Resolve the path of a module. */
+/** @deprecated Do not use CJS utils */
 export function resolveModule (id: string, opts: ResolveModuleOptions = {}) {
   return normalize(_require.resolve(id, {
     paths: ([] as string[]).concat(
@@ -96,7 +101,7 @@ export function resolveModule (id: string, opts: ResolveModuleOptions = {}) {
   }))
 }
 
-/** Try to resolve the path of a module, but don't emit an error if it can't be found. */
+/** @deprecated Do not use CJS utils */
 export function tryResolveModule (path: string, opts: ResolveModuleOptions = {}): string | null {
   try {
     return resolveModule(path, opts)
@@ -108,7 +113,7 @@ export function tryResolveModule (path: string, opts: ResolveModuleOptions = {})
   return null
 }
 
-/** Require a module and return it. */
+/** @deprecated Do not use CJS utils */
 export function requireModule (id: string, opts: RequireModuleOptions = {}) {
   // Resolve id
   const resolvedPath = resolveModule(id, opts)
@@ -124,6 +129,7 @@ export function requireModule (id: string, opts: RequireModuleOptions = {}) {
   return requiredModule
 }
 
+/** @deprecated Do not use CJS utils */
 export function importModule (id: string, opts: RequireModuleOptions = {}) {
   const resolvedPath = resolveModule(id, opts)
   if (opts.interopDefault !== false) {
@@ -132,13 +138,14 @@ export function importModule (id: string, opts: RequireModuleOptions = {}) {
   return import(pathToFileURL(resolvedPath).href)
 }
 
+/** @deprecated Do not use CJS utils */
 export function tryImportModule (id: string, opts: RequireModuleOptions = {}) {
   try {
     return importModule(id, opts).catch(() => undefined)
   } catch { }
 }
 
-/** Try to require a module, but don't emit an error if the module can't be required. */
+/** @deprecated Do not use CJS utils */
 export function tryRequireModule (id: string, opts: RequireModuleOptions = {}) {
   try {
     return requireModule(id, opts)
diff --git a/packages/kit/src/internal/template.ts b/packages/kit/src/internal/template.ts
index 19115415154..cb2414b7a55 100644
--- a/packages/kit/src/internal/template.ts
+++ b/packages/kit/src/internal/template.ts
@@ -4,6 +4,7 @@ import { genSafeVariableName, genDynamicImport, genImport } from 'knitwork'
 
 import type { NuxtTemplate } from '@nuxt/schema'
 
+/** @deprecated */
 export async function compileTemplate (template: NuxtTemplate, ctx: any) {
   const data = { ...ctx, options: template.options }
   if (template.src) {

From 770bfc4651336bc67be6842054cc8a7ad4a52434 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.io>
Date: Wed, 16 Nov 2022 03:04:18 +0100
Subject: [PATCH 08/14] update import for defineNuxtConfig

---
 test/fixtures/basic/extends/node_modules/foo/nuxt.config.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/fixtures/basic/extends/node_modules/foo/nuxt.config.ts b/test/fixtures/basic/extends/node_modules/foo/nuxt.config.ts
index 2221b92fc94..f716d9f9da9 100644
--- a/test/fixtures/basic/extends/node_modules/foo/nuxt.config.ts
+++ b/test/fixtures/basic/extends/node_modules/foo/nuxt.config.ts
@@ -1,3 +1,3 @@
-import { defineNuxtConfig } from 'nuxt'
+import { defineNuxtConfig } from 'nuxt/config'
 
 export default defineNuxtConfig({})

From 597514972286a39957ab95bcbc24d83704d0cbb0 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.io>
Date: Wed, 16 Nov 2022 03:05:33 +0100
Subject: [PATCH 09/14] lint

---
 packages/nuxt/src/imports/module.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nuxt/src/imports/module.ts b/packages/nuxt/src/imports/module.ts
index 1756c540853..f79fe291623 100644
--- a/packages/nuxt/src/imports/module.ts
+++ b/packages/nuxt/src/imports/module.ts
@@ -1,4 +1,4 @@
-import { addVitePlugin, addWebpackPlugin, defineNuxtModule, addTemplate, resolveAlias, useNuxt, addPluginTemplate, logger, updateTemplates } from '@nuxt/kit'
+import { addVitePlugin, addWebpackPlugin, defineNuxtModule, addTemplate, resolveAlias, useNuxt, addPluginTemplate, updateTemplates } from '@nuxt/kit'
 import { isAbsolute, join, relative, resolve, normalize } from 'pathe'
 import { createUnimport, Import, scanDirExports, toImports, Unimport } from 'unimport'
 import { ImportsOptions, ImportPresetWithDeprecation } from '@nuxt/schema'

From 8ba37221d3a1ae57e449907c244c1f155d609286 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.io>
Date: Wed, 16 Nov 2022 03:10:04 +0100
Subject: [PATCH 10/14] fix type test

---
 test/fixtures/basic/types.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/fixtures/basic/types.ts b/test/fixtures/basic/types.ts
index 76c35236290..a73c8738f2c 100644
--- a/test/fixtures/basic/types.ts
+++ b/test/fixtures/basic/types.ts
@@ -115,7 +115,7 @@ describe('modules', () => {
 describe('runtimeConfig', () => {
   it('generated runtimeConfig types', () => {
     const runtimeConfig = useRuntimeConfig()
-    expectTypeOf(runtimeConfig.testConfig).toEqualTypeOf<number>()
+    expectTypeOf(runtimeConfig.public.testConfig).toEqualTypeOf<number>()
     expectTypeOf(runtimeConfig.privateConfig).toEqualTypeOf<string>()
     expectTypeOf(runtimeConfig.unknown).toEqualTypeOf<any>()
   })

From 98ab4d5bd4e138fa24ff9f583df76b3f74b14df0 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.io>
Date: Wed, 16 Nov 2022 03:14:18 +0100
Subject: [PATCH 11/14] remove deprecated script from docs and example

---
 docs/content/1.getting-started/5.seo-meta.md | 58 ++++++++------------
 examples/composables/use-head/app.vue        |  1 -
 2 files changed, 23 insertions(+), 36 deletions(-)

diff --git a/docs/content/1.getting-started/5.seo-meta.md b/docs/content/1.getting-started/5.seo-meta.md
index e9babdb2e83..c997658c299 100644
--- a/docs/content/1.getting-started/5.seo-meta.md
+++ b/docs/content/1.getting-started/5.seo-meta.md
@@ -31,7 +31,7 @@ export default defineNuxtConfig({
   app: {
     head: {
       charset: 'utf-16',
-      viewport: 'width=500, initial-scale=1', 
+      viewport: 'width=500, initial-scale=1',
       title: 'My App',
       meta: [
         // <meta name="description" content="My amazing site">
@@ -72,7 +72,7 @@ useHead({
 
 ## Components
 
-Nuxt provides `<Title>`, `<Base>`, `<Script>`, `<NoScript>`, `<Style>`, `<Meta>`, `<Link>`, `<Body>`, `<Html>` and `<Head>` components so that you can interact directly with your metadata within your component's template.
+Nuxt provides `<Title>`, `<Base>`, `<NoScript>`, `<Style>`, `<Meta>`, `<Link>`, `<Body>`, `<Html>` and `<Head>` components so that you can interact directly with your metadata within your component's template.
 
 Because these component names match native HTML elements, it is very important that they are capitalized in the template.
 
@@ -134,7 +134,7 @@ It's recommended to use computed getters (`() => {}`) over computed (`computed((
   ```vue [useHead]
   <script setup lang="ts">
   const desc = ref('My amazing site.')
-  
+
   useHead({
     meta: [
       { name: 'description', content: desc }
@@ -186,30 +186,18 @@ You can use the `body: true` option on the `link` and `script` meta tags to appe
 
 For example:
 
-::code-group
-
-  ```vue [useHead]
-  <script setup lang="ts">
-  useHead({
-    script: [
-      {
-        src: 'https://third-party-script.com',
-        body: true
-      }
-    ]
-  })
-  </script>
-  ```
-
-  ```vue [Components]
-  <template>
-  <div>
-    <Script src="https://third-party-script.com" body="true" />
-  </div>
-  </template>
-  ```
-
-::
+```vue
+<script setup lang="ts">
+useHead({
+  script: [
+    {
+      src: 'https://third-party-script.com',
+      body: true
+    }
+  ]
+})
+</script>
+```
 
 ## Examples
 
@@ -254,7 +242,7 @@ In the example below, `titleTemplate` is set either as a string with the `%s` pl
     // as a string,
     // where `%s` is replaced with the title
     titleTemplate: '%s - Site Title',
-    // ... or as a function 
+    // ... or as a function
     titleTemplate: (productCategory) => {
       return productCategory
         ? `${productCategory} - Site Title`
@@ -273,17 +261,17 @@ The example below inserts Google Fonts using the `link` property of the `useHead
 ::code-group
 
   ```vue [useHead]
-  <script setup lang="ts">  
+  <script setup lang="ts">
   useHead({
     link: [
-      { 
-        rel: 'preconnect', 
+      {
+        rel: 'preconnect',
         href: 'https://fonts.googleapis.com'
       },
-      { 
-        rel: 'stylesheet', 
-        href: 'https://fonts.googleapis.com/css2?family=Roboto&display=swap', 
-        crossorigin: '' 
+      {
+        rel: 'stylesheet',
+        href: 'https://fonts.googleapis.com/css2?family=Roboto&display=swap',
+        crossorigin: ''
       }
     ]
   })
diff --git a/examples/composables/use-head/app.vue b/examples/composables/use-head/app.vue
index 3c19f0731ac..335ffbd8f90 100644
--- a/examples/composables/use-head/app.vue
+++ b/examples/composables/use-head/app.vue
@@ -12,7 +12,6 @@
         <Title>Luck number: {{ dynamic }}</Title>
         <Meta name="description" :content="`My page's ${dynamic} description`" />
         <Link rel="preload" href="/test.txt" as="script" />
-        <Script>console.log("hello script");</Script>
       </Head>
     </Html>
 

From f8db57fcc8c02ce1322aba47478509db5bbcb17d Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.io>
Date: Wed, 16 Nov 2022 03:16:44 +0100
Subject: [PATCH 12/14] remove Script from components

---
 packages/nuxt/src/head/module.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nuxt/src/head/module.ts b/packages/nuxt/src/head/module.ts
index b6993629be7..e83ab330c72 100644
--- a/packages/nuxt/src/head/module.ts
+++ b/packages/nuxt/src/head/module.ts
@@ -2,7 +2,7 @@ import { resolve } from 'pathe'
 import { addComponent, addPlugin, defineNuxtModule } from '@nuxt/kit'
 import { distDir } from '../dirs'
 
-const components = ['Script', 'NoScript', 'Link', 'Base', 'Title', 'Meta', 'Style', 'Head', 'Html', 'Body']
+const components = ['NoScript', 'Link', 'Base', 'Title', 'Meta', 'Style', 'Head', 'Html', 'Body']
 
 export default defineNuxtModule({
   meta: {

From 4497f447e02f475cd962043b985fd102ad49ac5c Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.io>
Date: Wed, 16 Nov 2022 03:18:00 +0100
Subject: [PATCH 13/14] trigger ci


From d32b9358052f9d62689521aa697cb40e8c409ba9 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.io>
Date: Wed, 16 Nov 2022 03:20:15 +0100
Subject: [PATCH 14/14] reserve `server` in app config

---
 packages/schema/src/types/config.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/schema/src/types/config.ts b/packages/schema/src/types/config.ts
index 9d9f18e916a..b245247332b 100644
--- a/packages/schema/src/types/config.ts
+++ b/packages/schema/src/types/config.ts
@@ -74,6 +74,8 @@ export interface AppConfigInput extends Record<string, any> {
   nuxt?: never
   /** @deprecated reserved */
   nitro?: never
+  /** @deprecated reserved */
+  server?: never
 }
 
 export interface NuxtAppConfig {