Skip to content

Commit 9e864b8

Browse files
committed
Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts: # packages/bundler/package.json # packages/bundler/test/package.test.ts # pnpm-lock.yaml
2 parents fd67118 + d9b3d2a commit 9e864b8

3 files changed

Lines changed: 21 additions & 4 deletions

File tree

packages/bundler/package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
},
8181
"peerDependencies": {
8282
"@unhead/cli": "workspace:^",
83+
"@vitejs/devtools-kit": "^0.4.1",
8384
"esbuild": ">=0.17.0",
8485
"lightningcss": ">=1.20.0",
8586
"oxc-parser": ">=0.98.0",
@@ -92,6 +93,9 @@
9293
"@unhead/cli": {
9394
"optional": true
9495
},
96+
"@vitejs/devtools-kit": {
97+
"optional": true
98+
},
9599
"esbuild": {
96100
"optional": true
97101
},
@@ -112,13 +116,13 @@
112116
}
113117
},
114118
"dependencies": {
115-
"@vitejs/devtools-kit": "catalog:",
116119
"magic-string": "catalog:",
117120
"oxc-walker": "catalog:",
118121
"ufo": "catalog:",
119122
"unplugin": "catalog:"
120123
},
121124
"devDependencies": {
125+
"@vitejs/devtools-kit": "catalog:",
122126
"oxc-parser": "catalog:",
123127
"rollup": "catalog:",
124128
"unhead": "workspace:*",

packages/bundler/test/package.test.ts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { describe, expect, it } from 'vitest'
55
interface PackageJson {
66
dependencies?: Record<string, string>
77
devDependencies?: Record<string, string>
8+
optionalDependencies?: Record<string, string>
89
peerDependencies?: Record<string, string>
910
peerDependenciesMeta?: Record<string, { optional?: boolean }>
1011
}
@@ -20,4 +21,16 @@ describe('@unhead/bundler package', () => {
2021
expect(packageJson.peerDependenciesMeta?.['oxc-parser']).toEqual({ optional: true })
2122
expect(packageJson.devDependencies).toHaveProperty('oxc-parser')
2223
})
24+
25+
it('keeps Vite DevTools packages optional', () => {
26+
const runtimeDependencies = {
27+
...packageJson.dependencies,
28+
...packageJson.optionalDependencies,
29+
}
30+
31+
expect(Object.keys(runtimeDependencies).filter(name => name.startsWith('@vitejs/devtools'))).toEqual([])
32+
expect(packageJson.peerDependencies?.['@vitejs/devtools-kit']).toBeDefined()
33+
expect(packageJson.peerDependenciesMeta?.['@vitejs/devtools-kit']).toEqual({ optional: true })
34+
expect(packageJson.devDependencies?.['@vitejs/devtools-kit']).toBeDefined()
35+
})
2336
})

pnpm-lock.yaml

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)