Unverified Commit c76b0fe2 authored by Niklas Mischkulnig's avatar Niklas Mischkulnig Committed by GitHub

Pass shouldCache to all manifest loading calls (#89713)

A few calls were missing `shouldCache`
parent a1cb030e
...@@ -122,7 +122,7 @@ export function loadManifestFromRelativePath<T extends object>({ ...@@ -122,7 +122,7 @@ export function loadManifestFromRelativePath<T extends object>({
projectDir: string projectDir: string
distDir: string distDir: string
manifest: string manifest: string
shouldCache?: boolean shouldCache: boolean
cache?: Map<string, unknown> cache?: Map<string, unknown>
skipParse?: boolean skipParse?: boolean
handleMissing?: boolean handleMissing?: boolean
......
...@@ -347,6 +347,7 @@ export abstract class RouteModule< ...@@ -347,6 +347,7 @@ export abstract class RouteModule<
: loadManifestFromRelativePath<RequiredServerFilesManifest>({ : loadManifestFromRelativePath<RequiredServerFilesManifest>({
projectDir, projectDir,
distDir: this.distDir, distDir: this.distDir,
shouldCache: true,
manifest: `${SERVER_FILES_MANIFEST}.json`, manifest: `${SERVER_FILES_MANIFEST}.json`,
}), }),
this.isDev this.isDev
...@@ -356,11 +357,13 @@ export abstract class RouteModule< ...@@ -356,11 +357,13 @@ export abstract class RouteModule<
distDir: this.distDir, distDir: this.distDir,
manifest: BUILD_ID_FILE, manifest: BUILD_ID_FILE,
skipParse: true, skipParse: true,
shouldCache: true,
}), }),
loadManifestFromRelativePath<any>({ loadManifestFromRelativePath<any>({
projectDir, projectDir,
distDir: this.distDir, distDir: this.distDir,
manifest: DYNAMIC_CSS_MANIFEST, manifest: DYNAMIC_CSS_MANIFEST,
shouldCache: !this.isDev,
handleMissing: true, handleMissing: true,
}), }),
] ]
...@@ -628,7 +631,7 @@ export abstract class RouteModule< ...@@ -628,7 +631,7 @@ export abstract class RouteModule<
// onRequestError below // onRequestError below
ensureInstrumentationRegistered(absoluteProjectDir, this.distDir) ensureInstrumentationRegistered(absoluteProjectDir, this.distDir)
} }
const manifests = await this.loadManifests(srcPage, absoluteProjectDir) const manifests = this.loadManifests(srcPage, absoluteProjectDir)
const { routesManifest, prerenderManifest, serverFilesManifest } = manifests const { routesManifest, prerenderManifest, serverFilesManifest } = manifests
const { basePath, i18n, rewrites } = routesManifest const { basePath, i18n, rewrites } = routesManifest
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment