Skip to content

Commit 4072d10

Browse files
committed
chore: prefer explicit imports
1 parent aa56938 commit 4072d10

File tree

10 files changed

+14
-10
lines changed

10 files changed

+14
-10
lines changed

src/runtime/server/kit.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { createRouter as createRadixRouter, toRouteMatcher } from 'radix3'
22
import { defu } from 'defu'
33
import { parseURL, withoutBase, withoutTrailingSlash } from 'ufo'
44
import type { NitroRouteRules } from 'nitropack'
5-
import { useRuntimeConfig } from '#imports'
5+
import { useRuntimeConfig } from 'nitropack/runtime'
66

77
export function withoutQuery(path: string) {
88
return path.split('?')[0]

src/runtime/server/plugins/compression.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { useCompressionStream } from 'h3-compression'
2-
import { defineNitroPlugin } from '#imports'
2+
import { defineNitroPlugin } from 'nitropack/runtime'
33

44
export default defineNitroPlugin((nitro) => {
55
nitro.hooks.hook('beforeResponse', async (event, response) => {

src/runtime/server/plugins/nuxt-content-v2.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { defu } from 'defu'
22
import type { ParsedContent } from '@nuxt/content'
33
import type { NitroApp } from 'nitropack/types'
4+
import { defineNitroPlugin } from 'nitropack/runtime'
45
import type { SitemapUrl } from '../../types'
56
import { useSitemapRuntimeConfig } from '../utils'
6-
import { defineNitroPlugin } from '#imports'
77

88
export default defineNitroPlugin((nitroApp: NitroApp) => {
99
const { discoverImages, isNuxtContentDocumentDriven } = useSitemapRuntimeConfig()

src/runtime/server/plugins/warm-up.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { withLeadingSlash } from 'ufo'
2+
import { defineNitroPlugin } from 'nitropack/runtime'
23
import { useSitemapRuntimeConfig } from '../utils'
3-
import { defineNitroPlugin } from '#imports'
44

55
export default defineNitroPlugin((nitroApp) => {
66
const { sitemaps } = useSitemapRuntimeConfig()

src/runtime/server/routes/__sitemap__/debug.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
globalSitemapSources,
77
resolveSitemapSources,
88
} from '../../sitemap/urlset/sources'
9-
import { useNitroOrigin } from '#imports'
9+
import { useNitroOrigin } from '#site-config/server/composables/useNitroOrigin'
1010

1111
export default defineEventHandler(async (e) => {
1212
const _runtimeConfig = useSitemapRuntimeConfig()

src/runtime/server/routes/sitemap.xml.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { defineEventHandler, sendRedirect } from 'h3'
22
import { withBase } from 'ufo'
3+
import { useRuntimeConfig } from 'nitropack/runtime'
34
import { useSitemapRuntimeConfig } from '../utils'
45
import { createSitemap } from '../sitemap/nitro'
5-
import { useRuntimeConfig } from '#imports'
66

77
export default defineEventHandler(async (e) => {
88
const runtimeConfig = useSitemapRuntimeConfig()

src/runtime/server/routes/sitemap.xsl.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import { defineEventHandler, getHeader, setHeader } from 'h3'
22
import { getQuery, parseURL, withQuery } from 'ufo'
33
import { useSitemapRuntimeConfig } from '../utils'
4-
import { createSitePathResolver, useSiteConfig } from '#imports'
4+
import { useSiteConfig } from '#site-config/server/composables/useSiteConfig'
5+
import { createSitePathResolver } from '#site-config/server/composables/utils'
56

67
export default defineEventHandler(async (e) => {
78
const fixPath = createSitePathResolver(e, { absolute: false, withBase: true })

src/runtime/server/routes/sitemap_index.xml.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { appendHeader, defineEventHandler, setHeader } from 'h3'
22
import { joinURL } from 'ufo'
3+
import { useNitroApp } from 'nitropack/runtime'
34
import { useSitemapRuntimeConfig } from '../utils'
45
import { buildSitemapIndex, urlsToIndexXml } from '../sitemap/builder/sitemap-index'
56
import type { SitemapOutputHookCtx } from '../../types'
67
import { useNitroUrlResolvers } from '../sitemap/nitro'
7-
import { useNitroApp } from '#imports'
88

99
export default defineEventHandler(async (e) => {
1010
const runtimeConfig = useSitemapRuntimeConfig()

src/runtime/server/sitemap/nitro.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { getQuery, setHeader, createError } from 'h3'
22
import type { H3Event } from 'h3'
33
import { fixSlashes } from 'nuxt-site-config/urls'
44
import { defu } from 'defu'
5+
import { useNitroApp } from 'nitropack/runtime'
56
import type {
67
ModuleRuntimeConfig,
78
NitroUrlResolvers,
@@ -14,7 +15,9 @@ import { createNitroRouteRuleMatcher } from '../kit'
1415
import { buildSitemapUrls, urlsToXml } from './builder/sitemap'
1516
import { normaliseEntry, preNormalizeEntry } from './urlset/normalise'
1617
import { sortSitemapUrls } from './urlset/sort'
17-
import { useNitroApp, createSitePathResolver, getPathRobotConfig, useSiteConfig } from '#imports'
18+
import { getPathRobotConfig } from '#imports' // can't solve this
19+
import { useSiteConfig } from '#site-config/server/composables/useSiteConfig'
20+
import { createSitePathResolver } from '#site-config/server/composables/utils'
1821

1922
export function useNitroUrlResolvers(e: H3Event): NitroUrlResolvers {
2023
const canonicalQuery = getQuery(e).canonical

src/runtime/server/utils.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { H3Event } from 'h3'
2+
import { useRuntimeConfig } from 'nitropack/runtime'
23
import type { ModuleRuntimeConfig } from '../types'
34
import { normalizeRuntimeFilters } from '../utils-pure'
4-
import { useRuntimeConfig } from '#imports'
55

66
export * from '../utils-pure'
77

0 commit comments

Comments
 (0)