update Vike usage

brillout · Dec 7, 2023 · 937f972 · 937f972
1 parent d083cca
commit 937f972
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 5 deletions.
diff --git a/examples/authentication/package.json b/examples/authentication/package.json
@@ -23,7 +23,7 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.3.3",
     "vite": "^5.0.6",
-    "vike": "^0.4.142"
+    "vike": "^0.4.149"
   },
   "imports": {
     "#app/*": "./*.ts",

diff --git a/examples/authentication/server/index.ts b/examples/authentication/server/index.ts
@@ -43,8 +43,9 @@ async function startServer() {
     const pageContext = await renderPage(pageContextInit)
     const { httpResponse } = pageContext
     if (!httpResponse) return next()
-    const { statusCode, contentType } = httpResponse
-    res.status(statusCode).type(contentType)
+    const { statusCode, headers } = httpResponse
+    res.status(statusCode)
+    headers.forEach(([name, value]) => res.setHeader(name, value))
     httpResponse.pipe(res)
   })
 

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/test-e2e.config.mjs b/test-e2e.config.mjs
@@ -68,7 +68,13 @@ function getCiJobs() {
 }
 
 function tolerateError({ logSource, logText }) {
-  return isRollupEmptyChunkWarning() || isSveltekitTypesGenWarning()
+  return (
+    isRollupEmptyChunkWarning() ||
+    isSveltekitTypesGenWarning() ||
+    isCJSVikeWarning() ||
+    isCJSViteWarning() ||
+    isVikeOldDesignWarning()
+  )
 
   function isRollupEmptyChunkWarning() {
     return logSource === 'stderr' && logText.includes('Generated an empty chunk: "hooks"')
@@ -77,4 +83,29 @@ function tolerateError({ logSource, logText }) {
   function isSveltekitTypesGenWarning() {
     return logSource === 'stderr' && logText.includes('Cannot find base config file "./.svelte-kit/tsconfig.json"')
   }
+
+  function isCJSVikeWarning() {
+    return (
+      logSource === 'stderr' &&
+      logText.includes('We recommend setting ') &&
+      logText.includes('/package.json#type to "module", see https://vike.dev/CJS')
+    )
+  }
+  function isCJSViteWarning() {
+    return (
+      logSource === 'stderr' &&
+      logText.includes(
+        "The CJS build of Vite's Node API is deprecated. See https://vitejs.dev/guide/troubleshooting.html#vite-cjs-node-api-deprecated for more details."
+      )
+    )
+  }
+
+  function isVikeOldDesignWarning() {
+    return (
+      logSource === 'stderr' &&
+      logText.includes(
+        'You are using the old deprecated design, update to the new V1 design, see https://vike.dev/migration/v1-design'
+      )
+    )
+  }
 }