Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-22 05:35:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf(nuxt): use fallthrough cache for prerender (#26104)

Browse Source
This commit is contained in:
Daniel Roe 2024-03-06 14:29:07 +00:00 committed by GitHub
parent 2e8d47c269
commit bc44dfc484
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/nuxt/package.json
View File

@ -109,6 +109,7 @@
"unimport": "^3.7.1",
"unplugin": "^1.8.2",
"unplugin-vue-router": "^0.7.0",
"unstorage": "^1.10.1",
"untyped": "^1.4.2",
"vue": "^3.4.21",
"vue-bundle-renderer": "^2.0.0",

14
packages/nuxt/src/core/nitro.ts
View File

@ -1,3 +1,4 @@
import { pathToFileURL } from 'node:url'
import { existsSync, promises as fsp, readFileSync } from 'node:fs'
import { cpus } from 'node:os'
import { join, normalize, relative, resolve } from 'pathe'
@ -6,7 +7,7 @@ import { randomUUID } from 'uncrypto'
import { joinURL, withTrailingSlash } from 'ufo'
import { build, copyPublicAssets, createDevServer, createNitro, prepare, prerender, scanHandlers, writeTypes } from 'nitropack'
import type { Nitro, NitroConfig } from 'nitropack'
import { findPath, logger, resolveIgnorePatterns, resolveNuxtModule } from '@nuxt/kit'
import { findPath, logger, resolveIgnorePatterns, resolveNuxtModule, resolvePath } from '@nuxt/kit'
import escapeRE from 'escape-string-regexp'
import { defu } from 'defu'
import fsExtra from 'fs-extra'
@ -392,11 +393,12 @@ export async function initNitro (nuxt: Nuxt & { _nitro?: Nitro }) {
}
})
// Set prerender-only options
nitro.options._config.storage ||= {}
nitro.options._config.storage['internal:nuxt:prerender'] = { driver: 'memory' }
nitro.options._config.storage['internal:nuxt:prerender:island'] = { driver: 'lruCache', max: 1000 }
nitro.options._config.storage['internal:nuxt:prerender:payload'] = { driver: 'lruCache', max: 1000 }
nitro.options._config.storage = defu(nitro.options._config.storage, {
'internal:nuxt:prerender': {
driver: pathToFileURL(await resolvePath(join(distDir, 'core/runtime/nitro/cache-driver'))).href,
base: resolve(nuxt.options.buildDir, 'cache/nitro/prerender')
}
})
// Expose nitro to modules and kit
nuxt._nitro = nitro

27
packages/nuxt/src/core/runtime/nitro/cache-driver.ts Normal file
View File

@ -0,0 +1,27 @@
import { defineDriver } from 'unstorage'
import fsDriver from 'unstorage/drivers/fs-lite'
import lruCache from 'unstorage/drivers/lru-cache'
// Ensure we don't try to write/read from directory index for `/` paths
const normalizeFsKey = (item: string) => item.indexOf(':') === -1 ? `${item}:index` : item
export default defineDriver((opts: { base: string }) => {
const fs = fsDriver({ base: opts.base })
const lru = lruCache({ max: 1000 })
return {
...fs, // fall back to file system - only the bottom three methods are used in renderer
async setItem (key, value, opts) {
await Promise.all([
fs.setItem(normalizeFsKey(key), value, opts),
lru.setItem(key, value, opts)
])
},
async hasItem (key, opts) {
return await lru.hasItem(key, opts) || await fs.hasItem(normalizeFsKey(key), opts)
},
async getItem (key, opts) {
return await lru.getItem(key, opts) || await fs.getItem(normalizeFsKey(key), opts)
},
}
})

3
pnpm-lock.yaml
View File

@ -395,6 +395,9 @@ importers:
unplugin-vue-router:
specifier: ^0.7.0
version: 0.7.0(rollup@4.12.1)(vue-router@4.3.0)(vue@3.4.21)
unstorage:
specifier: ^1.10.1
version: 1.10.1
untyped:
specifier: ^1.4.2
version: 1.4.2