Skip to content

Commit

Permalink
refactor: tsconfig.json
Browse files Browse the repository at this point in the history
  • Loading branch information
lihbr committed Jun 12, 2024
1 parent 5ad29f7 commit 494b54a
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 15 deletions.
3 changes: 1 addition & 2 deletions examples/minimal/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{
// https://nuxt.com/docs/guide/concepts/typescript
"extends": "./.nuxt/tsconfig.json"
"extends": "./.nuxt/tsconfig.json"
}
3 changes: 3 additions & 0 deletions playground/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"extends": "./.nuxt/tsconfig.json"
}
7 changes: 4 additions & 3 deletions test/__testutils__/mockedNuxtKit.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ export const mockedNuxtKit = async () => {

return {
...kit,
defineNuxtModule: definition => (options = {}) => {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
defineNuxtModule: (definition: any) => (options = {}) => {
const mockedNuxt = {
options: {
rootDir: '/tmp/nuxt',
Expand Down Expand Up @@ -35,8 +36,8 @@ export const mockedNuxtKit = async () => {
addPlugin: vi.fn(),
addImports: vi.fn(),
addComponent: vi.fn(),
extendPages: vi.fn((extendPagesHook) => {
const pages = []
extendPages: vi.fn((extendPagesHook: (pages: string[]) => void) => {
const pages: string[] = []

extendPagesHook(pages)

Expand Down
2 changes: 1 addition & 1 deletion test/module-preview.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ it('injects default preview page', () => {
mockedPrismicModule({ endpoint: 'qwerty' })

expect(extendPages).toHaveBeenCalledOnce()
expect(vi.mocked(extendPages).mock.results[0].value.find(route => route.name === 'prismic-preview')).toBeDefined()
expect(vi.mocked(extendPages).mock.results[0].value.find((route: { name: string }) => route.name === 'prismic-preview')).toBeDefined()
})

it('uses user preview when avaiable', () => {
Expand Down
13 changes: 6 additions & 7 deletions test/runtime-usePrismicPreview.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { it, expect, vi, afterEach } from 'vitest'

import { onMounted } from 'vue'
import { usePrismicPreview } from '../src/runtime/usePrismicPreview'
// @ts-expect-error VFS is not typed here
import { useRouter, usePrismic } from '#imports'

vi.mock('vue', () => {
Expand Down Expand Up @@ -30,9 +29,9 @@ it('resolves preview', async () => {

await vi.mocked(onMounted).mock.results[0].value

expect(usePrismic.mock.results[0].value.client.resolvePreviewURL).toHaveBeenCalledOnce()
expect(useRouter.mock.results[0].value.push).toHaveBeenCalledOnce()
expect(useRouter.mock.results[0].value.push).toHaveBeenCalledWith('/')
expect(vi.mocked(usePrismic).mock.results[0].value.client.resolvePreviewURL).toHaveBeenCalledOnce()
expect(vi.mocked(useRouter).mock.results[0].value.push).toHaveBeenCalledOnce()
expect(vi.mocked(useRouter).mock.results[0].value.push).toHaveBeenCalledWith('/')
})

it('resolves preview with provided `defaultURL`', async (ctx) => {
Expand All @@ -44,7 +43,7 @@ it('resolves preview with provided `defaultURL`', async (ctx) => {

await vi.mocked(onMounted).mock.results[0].value

expect(usePrismic.mock.results[0].value.client.resolvePreviewURL).toHaveBeenCalledOnce()
expect(useRouter.mock.results[0].value.push).toHaveBeenCalledOnce()
expect(useRouter.mock.results[0].value.push).toHaveBeenCalledWith(ctx.task.name)
expect(vi.mocked(usePrismic).mock.results[0].value.client.resolvePreviewURL).toHaveBeenCalledOnce()
expect(vi.mocked(useRouter).mock.results[0].value.push).toHaveBeenCalledOnce()
expect(vi.mocked(useRouter).mock.results[0].value.push).toHaveBeenCalledWith(ctx.task.name)
})
11 changes: 9 additions & 2 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
{
"extends": "./playground/.nuxt/tsconfig.json",
"include": ["src", "playground", "./playground/.nuxt/nuxt.d.ts", "./dist/types.d.ts"]
"extends": "./playground/.nuxt/tsconfig.json",
"exclude": [
"dist",
"node_modules",
"playground",
"examples",
"client",
"docs",
]
}

0 comments on commit 494b54a

Please sign in to comment.