merge leftovers

packages/nuxt3/src/builder/index.ts

@@ -1,4 +1,4 @@
-import type { Nuxt } from 'nuxt/core'
+import type { Nuxt } from 'src/core'
 
 import Builder from './builder'
 export { default as Builder } from './builder'

packages/nuxt3/src/cli/commands/dev.ts

@@ -3,7 +3,7 @@ import chalk from 'chalk'
 import opener from 'opener'
 import type { ParsedArgs } from 'minimist'
 
-import { Nuxt } from 'nuxt/core'
+import { Nuxt } from 'src/core'
 
 import type NuxtCommand from '../command'
 import { common, server } from '../options'

packages/nuxt3/src/cli/utils/banner.ts

@@ -2,7 +2,7 @@ import consola from 'consola'
 import env from 'std-env'
 import chalk from 'chalk'
 
-import { Nuxt } from 'nuxt/core'
+import { Nuxt } from 'src/core'
 import { successBox } from './formatting'
 import { getFormattedMemoryUsage } from './memory'
 

packages/nuxt3/src/config/load.ts

@@ -9,7 +9,7 @@ import _createRequire from 'create-require'
 import destr from 'destr'
 import * as rc from 'rc9'
 
-import { LoadOptions } from 'nuxt/core/load'
+import { LoadOptions } from 'src/core/load'
 import { defaultNuxtConfigFile } from './config'
 
 // @ts-ignore

packages/nuxt3/src/core/load.ts

@@ -1,4 +1,4 @@
-import { EnvConfig } from 'nuxt/config/load'
+import { EnvConfig } from 'src/config/load'
 import { loadNuxtConfig } from '../config'
 import Nuxt from './nuxt'
 

packages/nuxt3/src/core/resolver.ts

@@ -1,7 +1,7 @@
 import { resolve, join } from 'path'
 import fs from 'fs-extra'
 
-import { Nuxt } from 'nuxt/core'
+import { Nuxt } from 'src/core'
 import {
   startsWithRootAlias,
   startsWithSrcAlias,

packages/nuxt3/src/generator/index.ts

@@ -1,4 +1,4 @@
-import type { Nuxt } from 'nuxt/core'
+import type { Nuxt } from 'src/core'
 
 import Generator from './generator'
 export { default as Generator } from './generator'

packages/nuxt3/src/server/context.ts

@@ -1,4 +1,4 @@
-import { Server } from 'nuxt/server'
+import { Server } from 'src/server'
 
 export default class ServerContext {
   nuxt: Server['nuxt']

packages/nuxt3/src/vue-renderer/renderer.ts

@@ -7,7 +7,7 @@ import { TARGETS, isModernRequest, waitFor } from 'src/utils'
 import SPARenderer from './renderers/spa'
 import SSRRenderer from './renderers/ssr'
 import ModernRenderer from './renderers/modern'
-import ServerContext from 'nuxt/server/context'
+import ServerContext from 'src/server/context'
 
 export default class VueRenderer {
   __closed?: boolean