Skip to content

Commit

Permalink
fix: import nuxt composables from #imports (#2418)
Browse files Browse the repository at this point in the history
  • Loading branch information
danielroe committed Nov 8, 2023
1 parent 7e2f724 commit a33ca21
Show file tree
Hide file tree
Showing 12 changed files with 14 additions and 15 deletions.
3 changes: 1 addition & 2 deletions src/runtime/components/ContentDoc.vue
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<script lang="ts">
import { type PropType, type VNode, defineComponent, h, useSlots } from 'vue'
import { withTrailingSlash } from 'ufo'
import { useRuntimeConfig } from '#app'
import type { ParsedContent, QueryBuilderParams } from '../types'
import ContentRenderer from './ContentRenderer.vue'
import ContentQuery from './ContentQuery.vue'
import { useRoute, useContentHead } from '#imports'
import { useRuntimeConfig, useRoute, useContentHead } from '#imports'
const ContentDoc = defineComponent({
name: 'ContentDoc',
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/composables/client-db.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
import memoryDriver from 'unstorage/drivers/memory'
import { type Storage, createStorage, prefixStorage } from 'unstorage'
import { withBase } from 'ufo'
import { useRuntimeConfig, useNuxtApp } from '#app'
import { createQuery } from '../query/query'
import type { NavItem, ParsedContent, ParsedContentMeta } from '../types'
import { createNav } from '../server/navigation'
import { createPipelineFetcher } from '../query/match/pipeline'
import type { ContentQueryBuilderParams } from '../types/query'
import { useContentPreview } from './preview'
import { useRuntimeConfig, useNuxtApp } from '#imports'

const withContentBase = (url: string) => withBase(url, useRuntimeConfig().public.content.api.baseURL)

Expand Down
2 changes: 1 addition & 1 deletion src/runtime/composables/navigation.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { hash } from 'ohash'
import { useRuntimeConfig } from '#app'
import type { NavItem, QueryBuilder, QueryBuilderParams } from '../types'
import { encodeQueryParams } from '../utils/query'
import { jsonStringify } from '../utils/json'
import type { ContentQueryBuilder } from '../types/query'
import { addPrerenderPath, shouldUseClientDB, withContentBase } from './utils'
import { queryContent } from './query'
import { useContentPreview } from './preview'
import { useRuntimeConfig } from '#imports'

export const fetchContentNavigation = async (queryBuilder?: QueryBuilder | QueryBuilderParams | ContentQueryBuilder): Promise<Array<NavItem>> => {
const { content } = useRuntimeConfig().public
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/composables/query.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { joinURL, withLeadingSlash, withoutTrailingSlash } from 'ufo'
import { hash } from 'ohash'
import { useRuntimeConfig } from '#app'
import { createQuery } from '../query/query'
import type { ParsedContent } from '../types'
import { encodeQueryParams } from '../utils/query'
import { jsonStringify } from '../utils/json'
import type { ContentQueryBuilder, ContentQueryBuilderParams } from '../types/query'
import { addPrerenderPath, shouldUseClientDB, withContentBase } from './utils'
import { useContentPreview } from './preview'
import { useRuntimeConfig } from '#imports'

/**
* Query fetcher
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/composables/utils.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { withBase } from 'ufo'
import { useRuntimeConfig, useRequestEvent } from '#app'
import type { useContent } from './content'
import { useContentPreview } from './preview'
import { useRuntimeConfig, useRequestEvent } from '#imports'

export const withContentBase = (url: string) => withBase(url, useRuntimeConfig().public.content.api.baseURL)

Expand Down
3 changes: 1 addition & 2 deletions src/runtime/composables/web-socket.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { useRuntimeConfig } from '#app'
import { refreshNuxtData } from '#imports'
import { useRuntimeConfig, refreshNuxtData } from '#imports'

const logger = {
// eslint-disable-next-line no-console
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/legacy/composables/client-db.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
import memoryDriver from 'unstorage/drivers/memory'
import { type Storage, createStorage, prefixStorage } from 'unstorage'
import { withBase } from 'ufo'
import { useRuntimeConfig, useNuxtApp } from '#app'
import { createPipelineFetcherLegacy } from '../../query/match/pipeline-legacy'
import { createQuery } from '../../query/query'
import type { NavItem, ParsedContent, ParsedContentMeta, QueryBuilderParams } from '../../types'
import { createNav } from '../../server/navigation'
import { useContentPreview } from '../../composables/preview'
import type { ContentQueryBuilderParams, ContentQueryFetcher } from '../../types/query'
import { useRuntimeConfig, useNuxtApp } from '#imports'

const withContentBase = (url: string) => withBase(url, useRuntimeConfig().public.content.api.baseURL)

Expand Down
2 changes: 1 addition & 1 deletion src/runtime/legacy/composables/navigation.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { hash } from 'ohash'
import { useRuntimeConfig } from '#app'
import type { NavItem, QueryBuilder, QueryBuilderParams } from '../../types'
import { encodeQueryParams } from '../../utils/query'
import { jsonStringify } from '../../utils/json'
import type { ContentQueryBuilder } from '../../types/query'
import { addPrerenderPath, shouldUseClientDB, withContentBase } from '../../composables/utils'
import { useContentPreview } from '../../composables/preview'
import { queryContent } from './query'
import { useRuntimeConfig } from '#imports'

export const fetchContentNavigation = async (queryBuilder?: QueryBuilder | QueryBuilderParams | ContentQueryBuilder): Promise<Array<NavItem>> => {
const { content } = useRuntimeConfig().public
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/legacy/composables/query.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { joinURL, withLeadingSlash, withoutTrailingSlash } from 'ufo'
import { hash } from 'ohash'
import { useRuntimeConfig } from '#app'
import { createQuery } from '../../query/query'
import type { ParsedContent, QueryBuilder, QueryBuilderParams } from '../../types'
import { encodeQueryParams } from '../../utils/query'
import { jsonStringify } from '../../utils/json'
import { addPrerenderPath, shouldUseClientDB, withContentBase } from '../../composables/utils'
import { useContentPreview } from '../../composables/preview'
import { useRuntimeConfig } from '#imports'

/**
* Query fetcher
Expand Down
3 changes: 2 additions & 1 deletion src/runtime/legacy/plugins/documentDriven.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import type { RouteLocationNormalized, RouteLocationNormalizedLoaded } from 'vue-router'
import { withoutTrailingSlash, hasProtocol } from 'ufo'
import { pascalCase } from 'scule'
import { useRuntimeConfig, addRouteMiddleware, callWithNuxt, navigateTo, useRoute, defineNuxtPlugin, prefetchComponents, useRouter } from '#app'
import { callWithNuxt } from '#app/nuxt'
import type { MarkdownNode, NavItem, ParsedContent } from '../../types'
import type { ModuleOptions } from '../../../module'
import { useContentState } from '../../composables/content'
import { useContentHelpers } from '../../composables/helpers'
import { fetchContentNavigation } from '../composables/navigation'
import { queryContent } from '../composables/query'
import { useRuntimeConfig, addRouteMiddleware, navigateTo, useRoute, defineNuxtPlugin, prefetchComponents, useRouter } from '#imports'
import { componentNames } from '#components'
// @ts-ignore
import layouts from '#build/layouts'
Expand Down
3 changes: 1 addition & 2 deletions src/runtime/pages/document-driven.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<script setup lang="ts">
import { useRuntimeConfig } from '#app'
import { useRuntimeConfig, useContent, useContentHead, useRequestEvent } from '#imports'
import type { LayoutKey } from '#build/types/layouts'
import { useContent, useContentHead, useRequestEvent } from '#imports'
const { contentHead } = useRuntimeConfig().public.content
const { page, layout } = useContent()
Expand Down
3 changes: 2 additions & 1 deletion src/runtime/plugins/documentDriven.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import type { RouteLocationNormalized, RouteLocationNormalizedLoaded } from 'vue-router'
import { withoutTrailingSlash, hasProtocol } from 'ufo'
import { pascalCase } from 'scule'
import { useRuntimeConfig, addRouteMiddleware, callWithNuxt, navigateTo, useRoute, defineNuxtPlugin, prefetchComponents, useRouter } from '#app'
import { callWithNuxt } from '#app/nuxt'
import type { MarkdownNode, NavItem, ParsedContent } from '../types'
import type { ModuleOptions } from '../../module'
import { useContentState } from '../composables/content'
import { useContentHelpers } from '../composables/helpers'
import { fetchContentNavigation } from '../composables/navigation'
import { queryContent } from '../composables/query'
import { useRuntimeConfig, addRouteMiddleware, navigateTo, useRoute, defineNuxtPlugin, prefetchComponents, useRouter } from '#imports'
import { componentNames } from '#components'
// @ts-ignore
import layouts from '#build/layouts'
Expand Down

0 comments on commit a33ca21

Please sign in to comment.