Skip to content

Commit 4e10bd2

Browse files
danielroedanielroe
committedDec 5, 2024
chore: add knip and reduce peer dependencies
#1019
·
v3.17.2v3.15.0
1 parent 4f3f503 commit 4e10bd2

File tree

22 files changed

+229
-191
lines changed

22 files changed

+229
-191
lines changed
 

‎build.config.ts

+2
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,7 @@ export default defineBuildConfig({
1919
'#app/entry',
2020
'#build/root-component.mjs',
2121
'#imports',
22+
'vue-router',
23+
'nitropack',
2224
],
2325
})

‎examples/app-cucumber/package.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
"test": "NODE_OPTIONS='--loader ts-node/esm' NODE_ENV=test cucumber-js"
1212
},
1313
"dependencies": {
14-
"nuxt": "^3.14.1592",
15-
"vue": "^3.5.13",
16-
"vue-router": "^4.4.5"
14+
"nuxt": "^3.14.1592"
1715
},
1816
"devDependencies": {
1917
"@cucumber/cucumber": "11.1.0",

‎examples/app-jest/package.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
"test": "node --no-warnings --experimental-vm-modules node_modules/jest/bin/jest.js"
1212
},
1313
"dependencies": {
14-
"nuxt": "^3.14.1592",
15-
"vue": "^3.5.13",
16-
"vue-router": "^4.4.5"
14+
"nuxt": "^3.14.1592"
1715
},
1816
"devDependencies": {
1917
"@nuxt/test-utils": "latest",

‎examples/app-playwright/package.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
"test": "playwright test"
1212
},
1313
"dependencies": {
14-
"nuxt": "^3.14.1592",
15-
"vue": "^3.5.13",
16-
"vue-router": "^4.4.5"
14+
"nuxt": "^3.14.1592"
1715
},
1816
"devDependencies": {
1917
"@nuxt/test-utils": "latest",

‎examples/app-vitest-full/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
"test": "pnpm test:happy-dom && pnpm test:jsdom && pnpm test:dev && pnpm test:types"
1717
},
1818
"devDependencies": {
19-
"@nuxt/devtools": "1.3.9",
2019
"@nuxt/test-utils": "latest",
2120
"@testing-library/vue": "8.1.0",
2221
"happy-dom": "15.11.6",

‎examples/app-vitest-full/vitest.config.ts

-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ import { defineVitestConfig } from '@nuxt/test-utils/config'
44
export default defineVitestConfig({
55
test: {
66
dir: 'tests',
7-
coverage: {
8-
reportsDirectory: 'coverage',
9-
},
107
includeSource: ['../pages/index.vue'],
118
environmentOptions: {
129
nuxt: {

‎examples/app-vitest/package.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
"test": "vitest run"
1212
},
1313
"dependencies": {
14-
"nuxt": "^3.14.1592",
15-
"vue": "^3.5.13",
16-
"vue-router": "^4.4.5"
14+
"nuxt": "^3.14.1592"
1715
},
1816
"devDependencies": {
1917
"@nuxt/test-utils": "latest",

‎examples/i18n/package.json

+1-4
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,9 @@
1111
"postinstall": "nuxt prepare"
1212
},
1313
"devDependencies": {
14-
"@nuxt/devtools": "1.0.8",
1514
"@nuxt/test-utils": "latest",
1615
"@nuxtjs/i18n": "9.1.0",
1716
"nuxt": "3.14.1592",
18-
"vitest": "2.1.8",
19-
"vue": "3.5.13",
20-
"vue-router": "4.4.5"
17+
"vitest": "2.1.8"
2118
}
2219
}

‎examples/module/package.json

+1-5
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,11 @@
2626
"test:watch": "vitest watch"
2727
},
2828
"dependencies": {
29-
"@nuxt/kit": "^3.14.1592",
30-
"vue": "^3.5.13",
31-
"vue-router": "^4.4.5"
29+
"@nuxt/kit": "^3.14.1592"
3230
},
3331
"devDependencies": {
3432
"@nuxt/module-builder": "0.8.4",
35-
"@nuxt/schema": "3.14.1592",
3633
"@nuxt/test-utils": "latest",
37-
"changelogen": "0.5.7",
3834
"nuxt": "3.14.1592",
3935
"vitest": "2.1.8"
4036
}

‎knip.json

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"$schema": "https://unpkg.com/knip@5/schema.json",
3+
"workspaces": {
4+
".": {
5+
"ignore": [
6+
"config.d.ts",
7+
"e2e.d.ts",
8+
"experimental.d.ts",
9+
"module.d.ts",
10+
"playwright.d.ts",
11+
"runtime.d.ts",
12+
"vitest-environment.d.ts"
13+
],
14+
"entry": [
15+
"src/config.ts",
16+
"src/e2e.ts",
17+
"src/playwright.ts",
18+
"src/experimental.ts",
19+
"src/module.ts",
20+
"src/runtime-utils/index.mjs",
21+
"src/vitest-environment.ts",
22+
"src/runtime/**/*.{js,ts,mjs,vue}",
23+
"scripts/update-changelog.ts"
24+
]
25+
}
26+
}
27+
}

‎package.json

+12-17
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
"estree-walker": "^3.0.3",
5454
"fake-indexeddb": "^6.0.0",
5555
"get-port-please": "^3.1.2",
56+
"h3": "^1.13.0",
5657
"local-pkg": "^0.5.1",
5758
"magic-string": "^0.30.13",
5859
"node-fetch-native": "^1.6.4",
@@ -66,14 +67,14 @@
6667
"ufo": "^1.5.4",
6768
"unenv": "^1.10.0",
6869
"unplugin": "^2.0.0",
69-
"vitest-environment-nuxt": "^1.0.1"
70+
"vite": "^5.4.11",
71+
"vitest-environment-nuxt": "^1.0.1",
72+
"vue": "^3.5.13"
7073
},
7174
"devDependencies": {
7275
"@cucumber/cucumber": "11.1.0",
7376
"@jest/globals": "29.7.0",
74-
"@nuxt/devtools": "1.0.8",
7577
"@nuxt/eslint-config": "0.7.2",
76-
"@nuxt/module-builder": "0.8.4",
7778
"@playwright/test": "1.49.0",
7879
"@testing-library/vue": "8.1.0",
7980
"@types/estree": "1.0.6",
@@ -84,8 +85,8 @@
8485
"changelogen": "0.5.7",
8586
"compatx": "0.1.8",
8687
"eslint": "9.16.0",
87-
"h3": "1.13.0",
8888
"jiti": "2.4.0",
89+
"knip": "^5.39.2",
8990
"nitropack": "2.10.4",
9091
"nuxt": "3.14.1592",
9192
"playwright-core": "1.49.0",
@@ -94,7 +95,6 @@
9495
"typescript": "5.6.3",
9596
"unbuild": "latest",
9697
"unimport": "3.13.2",
97-
"vite": "5.4.11",
9898
"vitest": "2.1.8",
9999
"vue-router": "4.4.5",
100100
"vue-tsc": "2.1.10"
@@ -106,44 +106,39 @@
106106
"@testing-library/vue": "^7.0.0 || ^8.0.1",
107107
"@vitest/ui": "^0.34.6 || ^1.0.0 || ^2.0.0",
108108
"@vue/test-utils": "^2.4.2",
109-
"h3": "*",
110109
"happy-dom": "^9.10.9 || ^10.0.0 || ^11.0.0 || ^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0",
111110
"jsdom": "^22.0.0 || ^23.0.0 || ^24.0.0 || ^25.0.0",
112-
"nitropack": "*",
113111
"playwright-core": "^1.43.1",
114-
"vite": "*",
115-
"vitest": "^0.34.6 || ^1.0.0 || ^2.0.0",
116-
"vue": "^3.3.4",
117-
"vue-router": "^4.0.0"
112+
"vitest": "^0.34.6 || ^1.0.0 || ^2.0.0"
118113
},
119114
"peerDependenciesMeta": {
120115
"@cucumber/cucumber": {
121116
"optional": true
122117
},
118+
"@jest/globals": {
119+
"optional": true
120+
},
123121
"@playwright/test": {
124122
"optional": true
125123
},
126124
"@testing-library/vue": {
127125
"optional": true
128126
},
129-
"happy-dom": {
127+
"@vitest/ui": {
130128
"optional": true
131129
},
132130
"@vue/test-utils": {
133131
"optional": true
134132
},
135-
"jsdom": {
133+
"happy-dom": {
136134
"optional": true
137135
},
138-
"@jest/globals": {
136+
"jsdom": {
139137
"optional": true
140138
},
141139
"playwright-core": {
142140
"optional": true
143141
},
144-
"@vitest/ui": {
145-
"optional": true
146-
},
147142
"vitest": {
148143
"optional": true
149144
}

‎pnpm-lock.yaml

+163-127
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎scripts/_utils.ts

+2-5
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,13 @@ import { resolve } from 'pathe'
33
import { exec } from 'tinyexec'
44
import { determineSemverChange, getGitDiff, loadChangelogConfig, parseCommits } from 'changelogen'
55

6-
export interface Dep {
6+
interface Dep {
77
name: string
88
range: string
99
type: string
1010
}
1111

12-
type ThenArg<T> = T extends PromiseLike<infer U> ? U : T
13-
export type Package = ThenArg<ReturnType<typeof loadPackage>>
14-
15-
export async function loadPackage(dir: string) {
12+
async function loadPackage(dir: string) {
1613
const pkgPath = resolve(dir, 'package.json')
1714
const data = JSON.parse(await fsp.readFile(pkgPath, 'utf-8').catch(() => '{}'))
1815
const save = () => fsp.writeFile(pkgPath, JSON.stringify(data, null, 2) + '\n')

‎src/environments/vitest/env/happy-dom.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export default <EnvironmentNuxt> async function (_, { happyDom = {} }) {
88
return {
99
window,
1010
teardown() {
11-
window.happyDOM.cancelAsync()
11+
window.happyDOM.abort()
1212
},
1313
}
1414
}

‎src/environments/vitest/env/jsdom.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { importModule } from 'local-pkg'
22
import type { DOMWindow, SupportedContentTypes } from 'jsdom'
33
import defu from 'defu'
4-
import type { JSDOMOptions } from 'vitest'
4+
import type { JSDOMOptions } from 'vitest/node'
55
import type { EnvironmentNuxt, NuxtWindow } from '../types'
66

77
export default <EnvironmentNuxt> async function (global, { jsdom = {} }) {

‎src/environments/vitest/types.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { App } from 'h3'
22
import type { $Fetch } from 'nitropack'
3-
import type { JSDOMOptions, HappyDOMOptions } from 'vitest'
3+
import type { JSDOMOptions, HappyDOMOptions } from 'vitest/node'
44

55
export type NuxtBuiltinEnvironment = 'happy-dom' | 'jsdom'
66
export interface NuxtWindow extends Window {

‎src/module.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import { pathToFileURL } from 'node:url'
22
import { addVitePlugin, createResolver, defineNuxtModule, logger, resolvePath } from '@nuxt/kit'
3-
import type { File, Reporter, Vitest, UserConfig as VitestConfig } from 'vitest'
3+
import type { Vitest, UserConfig as VitestConfig } from 'vitest/node'
4+
import type { Reporter } from 'vitest/reporters'
5+
import type { RunnerTestFile } from 'vitest'
46
import { mergeConfig } from 'vite'
57
import type { InlineConfig as ViteConfig } from 'vite'
68
import { getPort } from 'get-port-please'
@@ -72,7 +74,7 @@ export default defineNuxtModule<NuxtVitestOptions>({
7274
let loaded = false
7375
let promise: Promise<void> | undefined
7476
let ctx: Vitest = undefined!
75-
let testFiles: File[] | null = null
77+
let testFiles: RunnerTestFile[] | null = null
7678

7779
const updateTabs = debounce(() => {
7880
nuxt.callHook('devtools:customTabs:refresh')

‎src/module/plugins/mock.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ const HELPER_MOCK_HOIST = '__NUXT_VITEST_MOCKS'
2020

2121
const HELPERS_NAME = [HELPER_MOCK_IMPORT, HELPER_MOCK_COMPONENT]
2222

23-
export interface MockImportInfo {
23+
interface MockImportInfo {
2424
name: string
2525
import: Import
2626
factory: string
2727
}
2828

29-
export interface MockComponentInfo {
29+
interface MockComponentInfo {
3030
path: string
3131
factory: string
3232
}

‎src/runtime-utils/mock.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import type {
1515
SetupContext,
1616
} from 'vue'
1717

18-
export type Awaitable<T> = T | Promise<T>
19-
export type OptionalFunction<T> = T | (() => Awaitable<T>)
18+
type Awaitable<T> = T | Promise<T>
19+
type OptionalFunction<T> = T | (() => Awaitable<T>)
2020

2121
/**
2222
* `registerEndpoint` allows you create Nitro endpoint that returns mocked data. It can come in handy if you want to test a component that makes requests to API to display some data.

‎src/runtime-utils/mount.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { RouterLink } from './components/RouterLink'
1010
import NuxtRoot from '#build/root-component.mjs'
1111
import { tryUseNuxtApp, useRouter } from '#imports'
1212

13-
export type MountSuspendedOptions<T> = ComponentMountingOptions<T> & {
13+
type MountSuspendedOptions<T> = ComponentMountingOptions<T> & {
1414
route?: RouteLocationRaw
1515
}
1616

‎src/runtime-utils/render.ts

+3-5
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ import { RouterLink } from './components/RouterLink'
99
import NuxtRoot from '#build/root-component.mjs'
1010
import { tryUseNuxtApp, useRouter } from '#imports'
1111

12-
export type RenderOptions<C = unknown> = TestingLibraryRenderOptions<C> & {
12+
type RenderOptions<C = unknown> = TestingLibraryRenderOptions<C> & {
1313
route?: RouteLocationRaw
1414
}
1515

16-
export const WRAPPER_EL_ID = 'test-wrapper'
16+
const WRAPPER_EL_ID = 'test-wrapper'
1717

1818
// eslint-disable-next-line @typescript-eslint/no-explicit-any
1919
type SetupState = Record<string, any>
@@ -56,9 +56,7 @@ export async function renderSuspended<T>(component: T, options?: RenderOptions<T
5656
..._options
5757
} = options || {}
5858

59-
const { render: renderFromTestingLibrary } = await import(
60-
'@testing-library/vue'
61-
)
59+
const { render: renderFromTestingLibrary } = await import('@testing-library/vue')
6260

6361
const vueApp = tryUseNuxtApp()?.vueApp
6462
// @ts-expect-error untyped global __unctx__

‎src/utils.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
import destr from 'destr'
88
import { snakeCase } from 'scule'
99

10-
export type EnvOptions = {
10+
type EnvOptions = {
1111
env?: Record<string, any>
1212
prefix?: string
1313
altPrefix?: string
1414
}
1515

16-
export function getEnv(key: string, opts: EnvOptions) {
16+
function getEnv(key: string, opts: EnvOptions) {
1717
const env = opts.env ?? process.env
1818
const envKey = snakeCase(key).toUpperCase()
1919
return destr(

0 commit comments

Comments
 (0)
Please sign in to comment.