Skip to content
This repository has been archived by the owner on Apr 6, 2023. It is now read-only.

feat(vite): upgrade to vite 2.9.0 #3974

Merged
merged 6 commits into from Mar 31, 2022
Merged
Show file tree
Hide file tree
Changes from 4 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
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -30,7 +30,7 @@
"jiti": "^1.13.0",
"nitropack-dev": "link:../nitropack",
"nuxt3": "workspace:./packages/nuxt3",
"vite": "~2.8.6",
"vite": "^2.9.0",
"unbuild": "^0.7.2"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/bridge/package.json
Expand Up @@ -61,7 +61,7 @@
"unplugin": "^0.6.0",
"unplugin-vue2-script-setup": "^0.10.1",
"untyped": "^0.4.3",
"vite": "~2.8.6",
"vite": "^2.9.0",
"vite-plugin-vue2": "^1.9.3",
"vue-template-compiler": "^2.6.14"
},
Expand Down
11 changes: 0 additions & 11 deletions packages/bridge/src/vite/vite.ts
@@ -1,9 +1,7 @@
import { resolve } from 'pathe'
import * as vite from 'vite'
import { logger } from '@nuxt/kit'
import { withoutLeadingSlash } from 'ufo'
import { distDir } from '../dirs'
import { warmupViteServer } from '../../../vite/src/utils/warmup'
import { buildClient } from './client'
import { buildServer } from './server'
import { defaultExportPlugin } from './plugins/default-export'
Expand Down Expand Up @@ -89,15 +87,6 @@ async function bundle (nuxt: Nuxt, builder: any) {

await ctx.nuxt.callHook('vite:extend', ctx)

if (nuxt.options.dev) {
ctx.nuxt.hook('vite:serverCreated', (server: vite.ViteDevServer) => {
const start = Date.now()
warmupViteServer(server, ['/.nuxt/entry.mjs']).then(() => {
logger.info(`Vite warmed up in ${Date.now() - start}ms`)
}).catch(logger.error)
})
}

await buildClient(ctx)
await prepareManifests(ctx)
await buildServer(ctx)
Expand Down
2 changes: 1 addition & 1 deletion packages/vite/package.json
Expand Up @@ -43,7 +43,7 @@
"rollup-plugin-visualizer": "^5.6.0",
"ufo": "^0.8.1",
"unplugin": "^0.6.0",
"vite": "~2.8.6",
"vite": "^2.9.0",
"vite-node": "^0.8.1"
},
"peerDependencies": {
Expand Down
20 changes: 0 additions & 20 deletions packages/vite/src/utils/warmup.ts

This file was deleted.

10 changes: 2 additions & 8 deletions packages/vite/src/vite.ts
Expand Up @@ -2,14 +2,13 @@ import * as vite from 'vite'
import { resolve } from 'pathe'
import type { Nuxt } from '@nuxt/schema'
import type { InlineConfig, SSROptions } from 'vite'
import { logger, isIgnored } from '@nuxt/kit'
import { isIgnored } from '@nuxt/kit'
import type { Options } from '@vitejs/plugin-vue'
import { sanitizeFilePath } from 'mlly'
import { getPort } from 'get-port-please'
import { buildClient } from './client'
import { buildServer } from './server'
import virtual from './plugins/virtual'
import { warmupViteServer } from './utils/warmup'
import { resolveCSSOptions } from './css'

export interface ViteOptions extends InlineConfig {
Expand Down Expand Up @@ -89,7 +88,7 @@ export async function bundle (nuxt: Nuxt) {

await nuxt.callHook('vite:extend', ctx)

nuxt.hook('vite:serverCreated', (server: vite.ViteDevServer, env) => {
nuxt.hook('vite:serverCreated', (server: vite.ViteDevServer) => {
// Invalidate virtual modules when templates are re-generated
ctx.nuxt.hook('app:templatesGenerated', () => {
for (const [id, mod] of server.moduleGraph.idToModuleMap) {
Expand All @@ -98,11 +97,6 @@ export async function bundle (nuxt: Nuxt) {
}
}
})

const start = Date.now()
warmupViteServer(server, ['/entry.mjs'])
.then(() => logger.info(`Vite ${env.isClient ? 'client' : 'server'} warmed up in ${Date.now() - start}ms`))
.catch(logger.error)
})

await buildClient(ctx)
Expand Down
1 change: 0 additions & 1 deletion renovate.json
Expand Up @@ -16,7 +16,6 @@
"@docus/social-image",
"@docus/theme",
"@docus/twitter",
"vite",
"h3"
]
}
20 changes: 10 additions & 10 deletions yarn.lock
Expand Up @@ -2637,7 +2637,7 @@ __metadata:
unplugin: ^0.6.0
unplugin-vue2-script-setup: ^0.10.1
untyped: ^0.4.3
vite: ~2.8.6
vite: ^2.9.0
vite-plugin-vue2: ^1.9.3
vue: ^2
vue-router: ^3
Expand Down Expand Up @@ -3341,7 +3341,7 @@ __metadata:
ufo: ^0.8.1
unbuild: latest
unplugin: ^0.6.0
vite: ~2.8.6
vite: ^2.9.0
vite-node: ^0.8.1
vue: 3.2.31
peerDependencies:
Expand Down Expand Up @@ -9880,7 +9880,7 @@ __metadata:
languageName: node
linkType: hard

"esbuild@npm:^0.14.14, esbuild@npm:^0.14.25, esbuild@npm:^0.14.27, esbuild@npm:^0.14.29, esbuild@npm:^0.14.6":
"esbuild@npm:^0.14.25, esbuild@npm:^0.14.27, esbuild@npm:^0.14.29, esbuild@npm:^0.14.6":
version: 0.14.29
resolution: "esbuild@npm:0.14.29"
dependencies:
Expand Down Expand Up @@ -17968,7 +17968,7 @@ __metadata:
languageName: node
linkType: hard

"postcss@npm:^8, postcss@npm:^8.1.10, postcss@npm:^8.2.15, postcss@npm:^8.3.5, postcss@npm:^8.4.12, postcss@npm:^8.4.6, postcss@npm:^8.4.7":
"postcss@npm:^8, postcss@npm:^8.1.10, postcss@npm:^8.2.15, postcss@npm:^8.3.5, postcss@npm:^8.4.12, postcss@npm:^8.4.7":
version: 8.4.12
resolution: "postcss@npm:8.4.12"
dependencies:
Expand Down Expand Up @@ -21652,13 +21652,13 @@ __metadata:
languageName: node
linkType: hard

"vite@npm:~2.8.6":
version: 2.8.6
resolution: "vite@npm:2.8.6"
"vite@npm:^2.9.0":
version: 2.9.0
resolution: "vite@npm:2.9.0"
dependencies:
esbuild: ^0.14.14
esbuild: ^0.14.27
fsevents: ~2.3.2
postcss: ^8.4.6
postcss: ^8.4.12
resolve: ^1.22.0
rollup: ^2.59.0
peerDependencies:
Expand All @@ -21677,7 +21677,7 @@ __metadata:
optional: true
bin:
vite: bin/vite.js
checksum: 4b02d133892c98362c10214b7ad518d74b59745889197a2ba0b63260ed083fcef75a447e8fb58dbd2af8747386274b36017983d93031254df6ead38701950dcc
checksum: 2355a5a7a57a86558fb2378b493c98c97218ffdf5c7555df5531147217c8ec804d66434dfed130034c920cb0913cd5f0fa1f5d7756101601558320349c0e1cee
languageName: node
linkType: hard

Expand Down