Merge branch 'main' into pr/KubesDavid/466

nitrojs · Sep 5, 2022 · 0ca371f · 0ca371f
2 parents 780d69f + b0a3f43
commit 0ca371f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/rollup/config.ts b/src/rollup/config.ts
@@ -138,6 +138,7 @@ export const getRollupConfig = (nitro: Nitro) => {
   // Build-time environment variables
   const buildEnvVars = {
     NODE_ENV: nitro.options.dev ? 'development' : (nitro.options.preset === 'nitro-prerender' ? 'prerender' : 'production'),
+    prerender: nitro.options.preset === 'nitro-prerender',
     server: true,
     client: false,
     dev: String(nitro.options.dev),

diff --git a/src/types/handler.ts b/src/types/handler.ts
@@ -1,4 +1,4 @@
-import type { Handler, CompatibilityEvent, H3Error } from 'h3'
+import type { Handler, EventHandler, CompatibilityEvent, H3Error } from 'h3'
 
 export interface NitroEventHandler {
   /**
@@ -41,7 +41,7 @@ export interface NitroDevEventHandler {
    * Event handler
    *
    */
-  handler: Handler
+  handler: Handler | EventHandler
 }
 
 export type NitroErrorHandler = (error: H3Error, event: CompatibilityEvent) => void | Promise<void>