Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add vite 3 support #1561

Merged
merged 9 commits into from Jun 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions docs/package.json
Expand Up @@ -24,8 +24,14 @@
"https-localhost": "^4.7.1",
"unocss": "^0.39.3",
"unplugin-vue-components": "^0.19.6",
"vite": "^2.9.10",
"vite-plugin-pwa": "^0.12.0",
"vitepress": "^1.0.0-alpha.4",
"workbox-window": "^6.5.3"
},
"pnpm": {
"overrides": {
"vite": "^2.9.10"
}
}
}
5 changes: 3 additions & 2 deletions docs/vite.config.ts
Expand Up @@ -19,11 +19,12 @@ import SponsorLinkFix from './plugins/FixSponsorLink'

export default defineConfig({
plugins: [
// TODO remove cast when moved to Vite 3
Components({
include: [/\.vue/, /\.md/],
dirs: '.vitepress/components',
dts: '.vitepress/components.d.ts',
}),
}) as Plugin,
Unocss({
shortcuts: [
['btn', 'px-4 py-1 rounded inline-flex justify-center gap-2 text-white leading-30px children:mya !no-underline cursor-pointer disabled:cursor-default disabled:bg-gray-600 disabled:opacity-50'],
Expand All @@ -37,7 +38,7 @@ export default defineConfig({
scale: 1.2,
}),
],
}),
}) as unknown as Plugin,
SponsorLinkFix(),
IncludesPlugin(),
VitePWA({
Expand Down
2 changes: 1 addition & 1 deletion examples/nextjs/tsconfig.json
@@ -1,6 +1,6 @@
{
"compilerOptions": {
"target": "es5",
"target": "es6",
"lib": ["dom", "dom.iterable", "esnext"],
"allowJs": true,
"skipLibCheck": true,
Expand Down
3 changes: 2 additions & 1 deletion examples/puppeteer/test/basic.test.ts
Expand Up @@ -22,7 +22,8 @@ describe('basic', async () => {
})
})

test('should have the correct title', async () => {
// TODO make more stable
test.skip('should have the correct title', async () => {
try {
await page.goto('http://localhost:3000')
const button = (await page.$('#btn'))!
Expand Down
2 changes: 1 addition & 1 deletion examples/solid/package.json
Expand Up @@ -10,8 +10,8 @@
},
"devDependencies": {
"jsdom": "*",
"solid-start": "next",
"solid-testing-library": "0.3.0",
"vite-plugin-solid": "^2.2.6",
"vitest": "latest"
}
}
2 changes: 1 addition & 1 deletion examples/solid/vite.config.mjs
Expand Up @@ -2,7 +2,7 @@
/// <reference types="vite/client" />

import { defineConfig } from 'vite'
import solid from 'solid-start' // or use 'vite-plugin-solid' instead
import solid from 'vite-plugin-solid'

export default defineConfig({
test: {
Expand Down
3 changes: 1 addition & 2 deletions package.json
Expand Up @@ -62,13 +62,12 @@
"rollup-plugin-license": "^2.8.1",
"simple-git-hooks": "^2.8.0",
"typescript": "^4.7.4",
"vite": "^2.9.12",
"vite": "^2.9.12 || ^3.0.0-0",
"vitest": "workspace:*",
"vue": "^3.2.37"
},
"pnpm": {
"overrides": {
"vite": "^2.9.12",
"esbuild": "^0.14.47",
"vitest": "workspace:*"
}
Expand Down
1 change: 1 addition & 0 deletions packages/ui/package.json
Expand Up @@ -65,6 +65,7 @@
"unocss": "^0.39.3",
"unplugin-auto-import": "^0.8.8",
"unplugin-vue-components": "^0.19.6",
"vite": "^2.9.10 || ^3.0.0-0",
"vite-plugin-pages": "^0.24.2",
"vue": "^3.2.37",
"vue-router": "^4.0.16"
Expand Down
2 changes: 1 addition & 1 deletion packages/vite-node/package.json
Expand Up @@ -69,7 +69,7 @@
"kolorist": "^1.5.1",
"mlly": "^0.5.3",
"pathe": "^0.2.0",
"vite": "^2.9.12"
"vite": "^2.9.12 || ^3.0.0-0"
},
"devDependencies": {
"@types/debug": "^4.1.7",
Expand Down
2 changes: 1 addition & 1 deletion packages/vitest/package.json
Expand Up @@ -90,7 +90,7 @@
"local-pkg": "^0.4.1",
"tinypool": "^0.2.1",
"tinyspy": "^0.3.3",
"vite": "^2.9.12"
"vite": "^2.9.12 || ^3.0.0-0"
},
"devDependencies": {
"@antfu/install-pkg": "^0.1.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/vitest/src/node/config.ts
Expand Up @@ -115,9 +115,9 @@ export function resolveConfig(
if (resolved.deps.inline !== true) {
// eslint-disable-next-line @typescript-eslint/prefer-ts-expect-error
// @ts-ignore ssr is not typed in Vite 2, but defined in Vite 3, so we can't use expect-error
const ssrOptions = viteConfig.ssr || {}
const ssrOptions = viteConfig.ssr

if (ssrOptions.noExternal === true && resolved.deps.inline == null) {
if (ssrOptions?.noExternal === true && resolved.deps.inline == null) {
resolved.deps.inline = true
}
else {
Expand Down