@netlify/edge-bundler 3.0.0 → 3.1.0

package/dist/node/bundler.test.js

@@ -2,7 +2,7 @@ import { promises as fs } from 'fs';
 import { join, resolve } from 'path';
 import process from 'process';
 import { pathToFileURL } from 'url';
-import del from 'del';
+import { deleteAsync } from 'del';
 import tmp from 'tmp-promise';
 import { test, expect } from 'vitest';
 import { fixturesDir } from '../test/util.js';
@@ -277,5 +277,5 @@ test('Ignores any user-defined `deno.json` files', async () => {
             },
         ],
     })).not.toThrow();
-    await del([tmpDir.path, denoConfigPath, importMapFile.path], { force: true });
+    await deleteAsync([tmpDir.path, denoConfigPath, importMapFile.path], { force: true });
 });

package/dist/node/config.js

@@ -34,6 +34,7 @@ export const getFunctionConfig = async (func, importMap, deno, log) => {
     // the exit code to know exactly what happened and guide people accordingly.
     const { exitCode, stderr, stdout } = await deno.run([
         'run',
+        '--allow-env',
         '--allow-net',
         '--allow-read',
         `--allow-write=${collector.path}`,

package/dist/node/config.test.js

@@ -1,7 +1,7 @@
 import { promises as fs } from 'fs';
 import { join, resolve } from 'path';
 import { pathToFileURL } from 'url';
-import del from 'del';
+import { deleteAsync } from 'del';
 import { stub } from 'sinon';
 import tmp from 'tmp-promise';
 import { test, expect } from 'vitest';
@@ -66,7 +66,7 @@ test('`getFunctionConfig` extracts configuration properties from function file',
             name: 'func5',
             source: `
           export default async () => new Response("Hello from function two")
-    
+
           export const config = () => {
             throw new Error('uh-oh')
           }
@@ -118,7 +118,7 @@ test('`getFunctionConfig` extracts configuration properties from function file',
             expect(logger.user.callCount).toBe(0);
         }
     }
-    await del(tmpDir, { force: true });
+    await deleteAsync(tmpDir, { force: true });
 });
 test('Ignores function paths from the in-source `config` function if the feature flag is off', async () => {
     const userDirectory = resolve(fixturesDir, 'with_config', 'netlify', 'edge-functions');

package/dist/node/formats/javascript.js

@@ -2,7 +2,7 @@ import { promises as fs } from 'fs';
 import { join } from 'path';
 import { env } from 'process';
 import { pathToFileURL } from 'url';
-import del from 'del';
+import { deleteAsync } from 'del';
 import { wrapBundleError } from '../bundle_error.js';
 import { getFileHash } from '../utils/sha256.js';
 const BOOTSTRAP_LATEST = 'https://633ac6453c579c0008ede8d8--edge.netlify.com/bootstrap/index-combined.ts';
@@ -27,7 +27,7 @@ const bundleJS = async ({ buildID, debug, deno, distDirectory, functions, import
 const defaultFormatExportTypeError = (name) => `The Edge Function "${name}" has failed to load. Does it have a function as the default export?`;
 const defaultFormatImpoortError = (name) => `There was an error with Edge Function "${name}".`;
 const generateStage2 = async ({ distDirectory, fileName, formatExportTypeError, formatImportError, functions, type = 'production', }) => {
-    await del(distDirectory, { force: true });
+    await deleteAsync(distDirectory, { force: true });
     await fs.mkdir(distDirectory, { recursive: true });
     const entryPoint = type === 'local'
         ? getLocalEntryPoint(functions, { formatExportTypeError, formatImportError })

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);
@@ -96,6 +102,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/dist/node/stage_2.test.js

@@ -2,7 +2,7 @@ import { promises as fs } from 'fs';
 import { join } from 'path';
 import process from 'process';
 import { pathToFileURL } from 'url';
-import del from 'del';
+import { deleteAsync } from 'del';
 import { execa } from 'execa';
 import tmp from 'tmp-promise';
 import { test, expect } from 'vitest';
@@ -43,6 +43,6 @@ test('`getLocalEntryPoint` returns a valid stage 2 file for local development',
         expect(responses[func.name]).toBe(func.response);
         expect(metadata.functions[func.name].url).toBe(pathToFileURL(func.path).toString());
     }
-    await del(tmpDir, { force: true });
+    await deleteAsync(tmpDir, { force: true });
     delete process.env.NETLIFY_EDGE_BOOTSTRAP;
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/edge-bundler",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "description": "Intelligently prepare Netlify Edge Functions for deployment",
   "type": "module",
   "main": "./dist/node/index.js",
@@ -49,8 +49,8 @@
     "test": "test/node"
   },
   "devDependencies": {
-    "@commitlint/cli": "^16.0.0",
-    "@commitlint/config-conventional": "^16.0.0",
+    "@commitlint/cli": "^17.0.0",
+    "@commitlint/config-conventional": "^17.0.0",
     "@netlify/eslint-config-node": "^4.1.7",
     "@types/glob-to-regexp": "^0.4.1",
     "@types/node": "^14.18.32",
@@ -73,7 +73,7 @@
   "dependencies": {
     "@import-maps/resolve": "^1.0.1",
     "common-path-prefix": "^3.0.0",
-    "del": "^6.0.0",
+    "del": "^7.0.0",
     "env-paths": "^3.0.0",
     "execa": "^6.0.0",
     "find-up": "^6.3.0",

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');
-});