fix: add demo and use base path

ascorbic · ascorbic · commit c6b5e6fbdf1d · 2022-04-05T10:25:57.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 node_modules
-dist
+dist
+.netlify
diff --git a/README.md b/README.md
@@ -79,18 +79,17 @@ export const handler = async (request, { next }) => {
   try {
     return await handleRequest(request)
   } catch (err) {
-    return {
-      body: 'Internal Server Error',
-      statusCode: 500,
-    }
+    return new Response(err.message || 'Internal Server Error', {
+      status: err.status || 500,
+    })
   }
 }
 ```
 
 You can then build it using the vite CLI:
 
 ```shell
-vite build --ssr = handler.js
+vite build --ssr handler.js
 ```
 
 This will generate the Edge Function `.netlify/edge-functions/handler/index.js` and a manifest file `.netlify/edge-functions/manifest.json` that defines the `handler` function.
diff --git a/demo/handler.js b/demo/handler.js
@@ -0,0 +1,14 @@
+import staticFiles from '@static-manifest'
+
+export const handler = async (request, { next }) => {
+  // Handle static files
+
+  const { pathname } = new URL(request.url)
+
+  // If your framework generates client assets in a subdirectory, you can add these too
+  if (staticFiles.includes(pathname) || pathname.startsWith('assets/')) {
+    return next()
+  }
+
+  return new Response('Hello World!')
+}
diff --git a/demo/index.html b/demo/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Document</title>
+</head>
+<body>
+    Hi
+</body>
+</html>
diff --git a/demo/public/favicon.ico b/demo/public/favicon.ico
diff --git a/demo/vite.config.js b/demo/vite.config.js
@@ -0,0 +1,6 @@
+import { defineConfig } from 'vite'
+import netlifyEdge from '../dist/index.js'
+
+export default defineConfig({
+  plugins: [netlifyEdge()],
+})
diff --git a/netlify.toml b/netlify.toml
@@ -0,0 +1,3 @@
+[build]
+publish = "demo/dist"
+command = "npm run build:demo"
diff --git a/package.json b/package.json
@@ -8,7 +8,10 @@
   "type": "module",
   "scripts": {
     "build": "tsc",
-    "prepublishOnly": "npm run build"
+    "prepublishOnly": "npm run build",
+    "build:demo": "npm run build:client && npm run build:ssr",
+    "build:client": "vite build demo",
+    "build:ssr": "vite build demo --ssr handler.js"
   },
   "devDependencies": {
     "@types/node": "^17.0.23",
diff --git a/src/index.ts b/src/index.ts
@@ -14,7 +14,7 @@ const netlifyEdge = ({
   generateStaticManifest = true,
   generateEdgeFunctionsManifest = true,
   additionalStaticPaths = [],
-}: NetlifyEdgePluginOptions): Plugin => {
+}: NetlifyEdgePluginOptions = {}): Plugin => {
   let resolvedConfig: ResolvedConfig
   let originalPublicDir: string
   const staticManifestModuleId = '@static-manifest'
@@ -29,6 +29,20 @@ const netlifyEdge = ({
         config.build.outDir ||= edgeFunctionsDir
         return {
           publicDir: false,
+          ssr: {
+            target: 'webworker',
+            noExternal: true,
+          },
+          output: {
+            format: 'es',
+          },
+          build: {
+            rollupOptions: {
+              output: {
+                format: 'es',
+              },
+            },
+          },
         }
       }
     },
@@ -44,9 +58,9 @@ const netlifyEdge = ({
       if (generateStaticManifest && id === resolvedStaticManifestModuleId) {
         const files = glob
           .sync('**/*', {
-            cwd: path.resolve(originalPublicDir),
+            cwd: path.resolve(resolvedConfig.root, originalPublicDir),
           })
-          .map((file) => `/${encodeURIComponent(file)}`)
+          .map((file) => `${resolvedConfig.base}${encodeURIComponent(file)}`)
 
         return `export default new Set(${JSON.stringify([
           ...files,

-Original file line number
+Diff line change
@@ @@ -1,2 +1,3 @@ @@
 node_modules
 -dist
 +dist
 +.netlify
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[build]`
	`2`	`+publish = "demo/dist"`
	`3`	`+command = "npm run build:demo"`