further improve @cloudflare/vite-plugin bug catcher (closes #2930) (#2932)

Author: brillout

packages/vike/shared-server-client/assertVirtualFileExports.ts

@@ -0,0 +1,22 @@
+export { assertVirtualFileExports }
+
+import { assert } from './utils.js'
+
+function assertVirtualFileExports<ModuleExports>(
+  moduleExports: ModuleExports,
+  test: (moduleExports: ModuleExports) => boolean,
+  moduleId?: string,
+) {
+  if (!moduleExports || !test(moduleExports)) {
+    /* https://github.com/vikejs/vike/issues/2903#issuecomment-3642285811
+    throw getProjectError('@cloudflare/vite-plugin error https://github.com/vikejs/vike/issues/2903#issuecomment-3642285811')
+    /*/
+    assert(false, { moduleExports, moduleExportsKeys: getKeys(moduleExports), moduleId })
+    //*/
+  }
+}
+
+function getKeys(obj: any) {
+  if (obj === undefined) return null
+  return [...Object.getOwnPropertyNames(obj), ...Object.getOwnPropertySymbols(obj), ...Object.keys(obj)]
+}

packages/vike/shared-server-client/getPageFiles/parseVirtualFileExportsGlobalEntry.ts

@@ -12,12 +12,14 @@ import type {
   PageConfigGlobalRuntimeSerialized,
   PageConfigRuntimeSerialized,
 } from '../page-configs/serialize/PageConfigSerialized.js'
+import { assertVirtualFileExports } from '../assertVirtualFileExports.js'
 
 function parseVirtualFileExportsGlobalEntry(virtualFileExportsGlobalEntry: unknown): {
   pageFilesAll: PageFile[]
   pageConfigs: PageConfigRuntime[]
   pageConfigGlobal: PageConfigGlobalRuntime
 } {
+  assertVirtualFileExports(virtualFileExportsGlobalEntry, (moduleExports: any) => 'pageFilesLazy' in moduleExports)
   assert(hasProp(virtualFileExportsGlobalEntry, 'pageFilesLazy', 'object'))
   assert(hasProp(virtualFileExportsGlobalEntry, 'pageFilesEager', 'object'))
   assert(hasProp(virtualFileExportsGlobalEntry, 'pageFilesExportNamesLazy', 'object'))

packages/vike/shared-server-client/page-configs/loadAndParseVirtualFilePageEntry.ts

@@ -1,13 +1,14 @@
 export { loadAndParseVirtualFilePageEntry }
 
-import { assert, objectAssign } from '../utils.js'
+import { objectAssign } from '../utils.js'
 import type {
   ConfigValues,
   PageConfigRuntime,
   PageConfigRuntimeLoaded,
   VirtualFileExportsPageEntry,
 } from '../../types/PageConfig.js'
 import { parseConfigValuesSerialized } from './serialize/parsePageConfigsSerialized.js'
+import { assertVirtualFileExports } from '../assertVirtualFileExports.js'
 
 async function loadAndParseVirtualFilePageEntry(
   pageConfig: PageConfigRuntime,
@@ -22,9 +23,11 @@ async function loadAndParseVirtualFilePageEntry(
   }
   const { moduleId, moduleExportsPromise } = pageConfig.loadVirtualFilePageEntry()
   const moduleExports = await moduleExportsPromise
-  // `configValuesLoaded` is sometimes `undefined` https://github.com/vikejs/vike/discussions/2092
-  // `configValuesLoaded.configValuesSerialized` is sometimes `undefined` https://github.com/vikejs/vike/issues/2903
-  if (!moduleExports?.configValuesSerialized) assert(false, { moduleExports, moduleId })
+  /* `moduleExports` is sometimes `undefined` https://github.com/vikejs/vike/discussions/2092
+  assert(moduleExports)
+  //*/
+  // Catch @cloudflare/vite-plugin bug
+  assertVirtualFileExports(moduleExports, () => 'configValuesSerialized' in moduleExports, moduleId)
   const virtualFileExportsPageEntry = moduleExports
   const configValues = parseVirtualFileExportsPageEntry(virtualFileExportsPageEntry)
   Object.assign(pageConfig.configValues, configValues)