@netlify/edge-bundler 3.0.1 → 3.1.1

package/dist/node/server/server.d.ts

@@ -4,10 +4,14 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import { OnAfterDownloadHook, OnBeforeDownloadHook } from '../bridge.js';
+import { FunctionConfig } from '../config.js';
 import type { EdgeFunction } from '../edge_function.js';
 import { ImportMapFile } from '../import_map.js';
 import { LogFunction } from '../logger.js';
 declare type FormatFunction = (name: string) => string;
+interface StartServerOptions {
+    getFunctionsConfig?: boolean;
+}
 interface InspectSettings {
     enabled: boolean;
     pause: boolean;
@@ -26,7 +30,8 @@ interface ServeOptions {
     port: number;
     systemLogger?: LogFunction;
 }
-declare const serve: ({ certificatePath, debug, distImportMapPath, inspectSettings, formatExportTypeError, formatImportError, importMaps, onAfterDownload, onBeforeDownload, port, systemLogger, }: ServeOptions) => Promise<(newFunctions: EdgeFunction[], env?: NodeJS.ProcessEnv) => Promise<{
+declare const serve: ({ certificatePath, debug, distImportMapPath, inspectSettings, formatExportTypeError, formatImportError, importMaps, onAfterDownload, onBeforeDownload, port, systemLogger, }: ServeOptions) => Promise<(functions: EdgeFunction[], env?: NodeJS.ProcessEnv, options?: StartServerOptions) => Promise<{
+    functionsConfig: FunctionConfig[];
     graph: any;
     success: boolean;
 }>>;

package/dist/node/server/server.js

@@ -1,13 +1,14 @@
 import { tmpName } from 'tmp-promise';
 import { DenoBridge } from '../bridge.js';
+import { getFunctionConfig } from '../config.js';
 import { generateStage2 } from '../formats/javascript.js';
 import { ImportMap } from '../import_map.js';
 import { getLogger } from '../logger.js';
 import { ensureLatestTypes } from '../types.js';
 import { killProcess, waitForServer } from './util.js';
-const prepareServer = ({ deno, distDirectory, flags: denoFlags, formatExportTypeError, formatImportError, port, }) => {
+const prepareServer = ({ deno, distDirectory, flags: denoFlags, formatExportTypeError, formatImportError, importMap, logger, port, }) => {
     const processRef = {};
-    const startIsolate = async (newFunctions, env = {}) => {
+    const startServer = async (functions, env = {}, options = {}) => {
         if ((processRef === null || processRef === void 0 ? void 0 : processRef.ps) !== undefined) {
             await killProcess(processRef.ps);
         }
@@ -15,7 +16,7 @@ const prepareServer = ({ deno, distDirectory, flags: denoFlags, formatExportType
         const stage2Path = await generateStage2({
             distDirectory,
             fileName: 'dev.js',
-            functions: newFunctions,
+            functions,
             formatExportTypeError,
             formatImportError,
             type: 'local',
@@ -40,13 +41,18 @@ const prepareServer = ({ deno, distDirectory, flags: denoFlags, formatExportType
             env,
             extendEnv: false,
         });
+        let functionsConfig = [];
+        if (options.getFunctionsConfig) {
+            functionsConfig = await Promise.all(functions.map((func) => getFunctionConfig(func, importMap, deno, logger)));
+        }
         const success = await waitForServer(port, processRef.ps);
         return {
+            functionsConfig,
             graph,
             success,
         };
     };
-    return startIsolate;
+    return startServer;
 };
 const serve = async ({ certificatePath, debug, distImportMapPath, inspectSettings, formatExportTypeError, formatImportError, importMaps, onAfterDownload, onBeforeDownload, port, systemLogger, }) => {
     const logger = getLogger(systemLogger, debug);
@@ -66,13 +72,7 @@ const serve = async ({ certificatePath, debug, distImportMapPath, inspectSetting
     // Creating an ImportMap instance with any import maps supplied by the user,
     // if any.
     const importMap = new ImportMap(importMaps);
-    const flags = [
-        '--allow-all',
-        '--unstable',
-        `--import-map=${importMap.toDataURL()}`,
-        '--v8-flags=--disallow-code-generation-from-strings',
-        '--no-config',
-    ];
+    const flags = ['--allow-all', '--unstable', `--import-map=${importMap.toDataURL()}`, '--no-config'];
     if (certificatePath) {
         flags.push(`--cert=${certificatePath}`);
     }
@@ -96,6 +96,8 @@ const serve = async ({ certificatePath, debug, distImportMapPath, inspectSetting
         flags,
         formatExportTypeError,
         formatImportError,
+        importMap,
+        logger,
         port,
     });
     if (distImportMapPath) {

package/dist/node/server/server.test.js

@@ -0,0 +1,41 @@
+import { join } from 'path';
+import getPort from 'get-port';
+import fetch from 'node-fetch';
+import { test, expect } from 'vitest';
+import { fixturesDir } from '../../test/util.js';
+import { serve } from '../index.js';
+test('Starts a server and serves requests for edge functions', async () => {
+    const port = await getPort();
+    const server = await serve({
+        port,
+    });
+    const functionPath = join(fixturesDir, 'serve_test', 'echo_env.ts');
+    const functions = [
+        {
+            name: 'echo_env',
+            path: functionPath,
+        },
+    ];
+    const options = {
+        getFunctionsConfig: true,
+    };
+    const { functionsConfig, graph, success } = await server(functions, {
+        very_secret_secret: 'i love netlify',
+    }, options);
+    expect(success).toBe(true);
+    expect(functionsConfig).toEqual([{ path: '/my-function' }]);
+    const graphEntry = graph === null || graph === void 0 ? void 0 : graph.modules.some(
+    // @ts-expect-error TODO: Module graph is currently not typed
+    ({ kind, mediaType, local }) => kind === 'esm' && mediaType === 'TypeScript' && local === functionPath);
+    expect(graphEntry).toBe(true);
+    const response = await fetch(`http://0.0.0.0:${port}/foo`, {
+        headers: {
+            'x-deno-functions': 'echo_env',
+            'x-deno-pass': 'passthrough',
+            'X-NF-Request-ID': 'foo',
+        },
+    });
+    expect(response.status).toBe(200);
+    const body = (await response.json());
+    expect(body.very_secret_secret).toBe('i love netlify');
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/edge-bundler",
-  "version": "3.0.1",
+  "version": "3.1.1",
   "description": "Intelligently prepare Netlify Edge Functions for deployment",
   "type": "module",
   "main": "./dist/node/index.js",

package/dist/node/serving.test.js

@@ -1,31 +0,0 @@
-import { join } from 'path';
-import getPort from 'get-port';
-import fetch from 'node-fetch';
-import { test, expect } from 'vitest';
-import { fixturesDir } from '../test/util.js';
-import { serve } from './index.js';
-test('bundler serving functionality', async () => {
-    const port = await getPort();
-    const server = await serve({
-        port,
-    });
-    const { success } = await server([
-        {
-            name: 'echo_env',
-            path: join(fixturesDir, 'serve_test', 'echo_env.ts'),
-        },
-    ], {
-        very_secret_secret: 'i love netlify',
-    });
-    expect(success).toBe(true);
-    const response = await fetch(`http://0.0.0.0:${port}/foo`, {
-        headers: {
-            'x-deno-functions': 'echo_env',
-            'x-deno-pass': 'passthrough',
-            'X-NF-Request-ID': 'foo',
-        },
-    });
-    expect(response.status).toBe(200);
-    const body = (await response.json());
-    expect(body.very_secret_secret).toBe('i love netlify');
-});