diff --git a/packages/devtools/client/app.config.ts b/packages/devtools/client/app.config.ts index 8498ea7330..05d0191e20 100644 --- a/packages/devtools/client/app.config.ts +++ b/packages/devtools/client/app.config.ts @@ -1,4 +1,4 @@ -import { defineAppConfig } from '#imports' +import { defineAppConfig } from 'nuxt/app' export default defineAppConfig({ fixture1: 'from app.config.ts', diff --git a/packages/devtools/client/composables/client.ts b/packages/devtools/client/composables/client.ts index 63c4d0fba8..c55b90d315 100644 --- a/packages/devtools/client/composables/client.ts +++ b/packages/devtools/client/composables/client.ts @@ -1,9 +1,9 @@ -import type { useRoute, useRouter } from '#imports' import type { NuxtDevtoolsClient, NuxtDevtoolsHostClient, NuxtDevtoolsIframeClient, VueInspectorData } from '@nuxt/devtools-kit/types' import type { Unhead } from '@unhead/schema' +import type { useRoute, useRouter } from 'nuxt/app' import type { ComputedRef } from 'vue' -import { useState } from '#imports' import { useColorMode } from '@vueuse/core' +import { useState } from 'nuxt/app' import { computed, ref } from 'vue' import { renderMarkdown } from './client-services/markdown' import { renderCodeHighlight } from './client-services/shiki' diff --git a/packages/devtools/client/composables/dialog.ts b/packages/devtools/client/composables/dialog.ts index 3d8d96e3fc..f64f65c42f 100644 --- a/packages/devtools/client/composables/dialog.ts +++ b/packages/devtools/client/composables/dialog.ts @@ -1,6 +1,6 @@ import type { InstallModuleReturn, ModuleActionType, ModuleStaticInfo } from '../../src/types' -import { useState } from '#imports' import { createTemplatePromise } from '@vueuse/core' +import { useState } from 'nuxt/app' export const ModuleDialog = createTemplatePromise() diff --git a/packages/devtools/client/composables/state-modules.ts b/packages/devtools/client/composables/state-modules.ts index aff556e54b..ef40e4e99c 100644 --- a/packages/devtools/client/composables/state-modules.ts +++ b/packages/devtools/client/composables/state-modules.ts @@ -1,5 +1,5 @@ import type { InstalledModuleInfo, ModuleStaticInfo } from '../../src/types' -import { useState } from '#imports' +import { useState } from 'nuxt/app' import { computed } from 'vue' import { useServerConfig } from './state' import { getModuleNameFromPath, isNodeModulePath, parseReadablePath, useAsyncState } from './utils' diff --git a/packages/devtools/client/composables/utils.ts b/packages/devtools/client/composables/utils.ts index ea3db5e870..abf8255b38 100644 --- a/packages/devtools/client/composables/utils.ts +++ b/packages/devtools/client/composables/utils.ts @@ -4,8 +4,8 @@ import type { Ref } from 'vue' import type { ComponentRelationship, ComponentWithRelationships, NormalizedHeadTag, SocialPreviewCard, SocialPreviewResolved } from '~/../src/types' import { useAsyncData } from '#app/composables/asyncData' import { useNuxtApp } from '#app/nuxt' -import { useState } from '#imports' import { useSessionStorage } from '@vueuse/core' +import { useState } from 'nuxt/app' import { relative } from 'pathe' import { isRef, triggerRef } from 'vue' import { useClient } from './client' diff --git a/packages/devtools/client/middleware/route.global.ts b/packages/devtools/client/middleware/route.global.ts index 1789871914..a8295fecc2 100644 --- a/packages/devtools/client/middleware/route.global.ts +++ b/packages/devtools/client/middleware/route.global.ts @@ -1,4 +1,4 @@ -import { defineNuxtRouteMiddleware, navigateTo } from '#imports' +import { defineNuxtRouteMiddleware, navigateTo } from 'nuxt/app' import { isFirstVisit } from '~/composables/storage' export default defineNuxtRouteMiddleware((to) => { diff --git a/packages/devtools/client/plugins/floating-vue.ts b/packages/devtools/client/plugins/floating-vue.ts index c46d9fe4d7..fd15bf5ce2 100644 --- a/packages/devtools/client/plugins/floating-vue.ts +++ b/packages/devtools/client/plugins/floating-vue.ts @@ -1,5 +1,5 @@ -import { defineNuxtPlugin } from '#imports' import FloatingVue from 'floating-vue' +import { defineNuxtPlugin } from 'nuxt/app' export default defineNuxtPlugin((nuxtApp) => { nuxtApp.vueApp.use(FloatingVue) diff --git a/packages/devtools/client/plugins/global.ts b/packages/devtools/client/plugins/global.ts index 3b8a677f8b..56eea625c5 100644 --- a/packages/devtools/client/plugins/global.ts +++ b/packages/devtools/client/plugins/global.ts @@ -1,4 +1,4 @@ -import { defineNuxtPlugin, useRouter } from '#imports' +import { defineNuxtPlugin, useRouter } from 'nuxt/app' import { triggerRef } from 'vue' import { useClient, useComponentInspectorData } from '../composables/client' import { rpc } from '../composables/rpc' diff --git a/packages/devtools/client/plugins/vue-devtools.ts b/packages/devtools/client/plugins/vue-devtools.ts index 6cbcae160a..c6a8d04789 100644 --- a/packages/devtools/client/plugins/vue-devtools.ts +++ b/packages/devtools/client/plugins/vue-devtools.ts @@ -1,5 +1,5 @@ -import { defineNuxtPlugin } from '#imports' import { VueDevToolsVuePlugin } from '@vue/devtools-core' +import { defineNuxtPlugin } from 'nuxt/app' export default defineNuxtPlugin((nuxtApp) => { nuxtApp.vueApp.use(VueDevToolsVuePlugin()) diff --git a/packages/devtools/client/setup/client-rpc.ts b/packages/devtools/client/setup/client-rpc.ts index 7483f8cbf4..6af2a0156f 100644 --- a/packages/devtools/client/setup/client-rpc.ts +++ b/packages/devtools/client/setup/client-rpc.ts @@ -1,5 +1,5 @@ import type { ClientFunctions } from '../../src/types' -import { useNuxtApp, useRouter } from '#imports' +import { useNuxtApp, useRouter } from 'nuxt/app' import { useClient } from '../composables/client' import { devAuthToken, isDevAuthed } from '../composables/dev-auth' import { clientFunctions, rpc } from '../composables/rpc' diff --git a/packages/devtools/src/runtime/plugins/devtools.client.ts b/packages/devtools/src/runtime/plugins/devtools.client.ts index 974647c848..f23a298df4 100644 --- a/packages/devtools/src/runtime/plugins/devtools.client.ts +++ b/packages/devtools/src/runtime/plugins/devtools.client.ts @@ -3,7 +3,7 @@ import type { TimelineServerState } from '@nuxt/devtools/types' import type { Router } from 'vue-router' // eslint-disable-next-line ts/ban-ts-comment // @ts-ignore tsconfig -import { defineNuxtPlugin, useRouter, useState } from '#imports' +import { defineNuxtPlugin, useRouter, useState } from 'nuxt/app' import { shallowReactive, watchEffect } from 'vue' import { setupHooksDebug } from '../shared/hooks' diff --git a/packages/devtools/src/runtime/plugins/devtools.server.ts b/packages/devtools/src/runtime/plugins/devtools.server.ts index 82e19216ce..66666e9362 100644 --- a/packages/devtools/src/runtime/plugins/devtools.server.ts +++ b/packages/devtools/src/runtime/plugins/devtools.server.ts @@ -1,5 +1,5 @@ import type { TimelineServerState } from '@nuxt/devtools/types' -import { defineNuxtPlugin, useState } from '#imports' +import { defineNuxtPlugin, useState } from 'nuxt/app' export default defineNuxtPlugin(() => { // record ssr start time diff --git a/packages/devtools/src/runtime/plugins/view/client.ts b/packages/devtools/src/runtime/plugins/view/client.ts index a170888950..1f13bafc68 100644 --- a/packages/devtools/src/runtime/plugins/view/client.ts +++ b/packages/devtools/src/runtime/plugins/view/client.ts @@ -3,11 +3,11 @@ import type { $Fetch } from 'ofetch' import type { Ref } from 'vue' import type { Router } from 'vue-router' -// eslint-disable-next-line ts/ban-ts-comment -// @ts-ignore tsconfig -import { useAppConfig, useRuntimeConfig } from '#imports' import { setIframeServerContext } from '@vue/devtools-kit' import { createHooks } from 'hookable' +// eslint-disable-next-line ts/ban-ts-comment +// @ts-ignore tsconfig +import { useAppConfig, useRuntimeConfig } from 'nuxt/app' import { debounce } from 'perfect-debounce' import { computed, createApp, h, markRaw, ref, shallowReactive, shallowRef, watch } from 'vue' diff --git a/playgrounds/module-starter/src/runtime/plugin.ts b/playgrounds/module-starter/src/runtime/plugin.ts index 3e3f112df9..0c256ff556 100644 --- a/playgrounds/module-starter/src/runtime/plugin.ts +++ b/playgrounds/module-starter/src/runtime/plugin.ts @@ -1,4 +1,4 @@ -import { defineNuxtPlugin } from '#imports' +import { defineNuxtPlugin } from 'nuxt/app' export default defineNuxtPlugin((_nuxtApp) => { // eslint-disable-next-line no-console