@netlify/edge-bundler 9.4.1 → 10.0.0

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

@@ -1,5 +1,6 @@
 import { readFile } from 'fs/promises';
 import { join } from 'path';
+import process from 'process';
 import getPort from 'get-port';
 import fetch from 'node-fetch';
 import { v4 as uuidv4 } from 'uuid';
@@ -21,9 +22,6 @@ test('Starts a server and serves requests for edge functions', async () => {
         importMapPaths,
         port,
         servePath,
-        featureFlags: {
-            edge_functions_npm_modules: true,
-        },
     });
     const functions = [
         {
@@ -89,3 +87,52 @@ test('Starts a server and serves requests for edge functions', async () => {
     const identidadeBarrelFile = await readFile(join(servePath, 'bundled-pt-committee__identidade.js'), 'utf-8');
     expect(identidadeBarrelFile).toContain(`/// <reference types="${join('..', '..', 'node_modules', '@types', 'pt-committee__identidade', 'index.d.ts')}" />`);
 });
+test('Serves edge functions in a monorepo setup', async () => {
+    const rootPath = join(fixturesDir, 'monorepo_npm_module');
+    const basePath = join(rootPath, 'packages', 'frontend');
+    const paths = {
+        user: join(basePath, 'functions'),
+    };
+    const port = await getPort();
+    const importMapPaths = [join(basePath, 'import_map.json')];
+    const servePath = join(basePath, '.netlify', 'edge-functions-serve');
+    const server = await serve({
+        basePath,
+        bootstrapURL: 'https://edge.netlify.com/bootstrap/index-combined.ts',
+        importMapPaths,
+        port,
+        rootPath,
+        servePath,
+    });
+    const functions = [
+        {
+            name: 'func1',
+            path: join(paths.user, 'func1.ts'),
+        },
+    ];
+    const options = {
+        getFunctionsConfig: true,
+    };
+    const { features, functionsConfig, graph, success, npmSpecifiersWithExtraneousFiles } = await server(functions, {
+        very_secret_secret: 'i love netlify',
+    }, options);
+    expect(features).toEqual({ npmModules: true });
+    expect(success).toBe(true);
+    expect(functionsConfig).toEqual([{ path: '/func1' }]);
+    expect(npmSpecifiersWithExtraneousFiles).toEqual(['child-1']);
+    for (const key in functions) {
+        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 === functions[key].path);
+        expect(graphEntry).toBe(true);
+    }
+    const response1 = await fetch(`http://0.0.0.0:${port}/func1`, {
+        headers: {
+            'x-nf-edge-functions': 'func1',
+            'x-ef-passthrough': 'passthrough',
+            'X-NF-Request-ID': uuidv4(),
+        },
+    });
+    expect(response1.status).toBe(200);
+    expect(await response1.text()).toBe(`<parent-1><child-1>JavaScript</child-1></parent-1>, <parent-2><child-2><grandchild-1>APIs<cwd>${process.cwd()}</cwd></grandchild-1></child-2></parent-2>, <parent-3><child-2><grandchild-1>Markup<cwd>${process.cwd()}</cwd></grandchild-1></child-2></parent-3>`);
+});

package/dist/node/serving.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/node/serving.test.js

@@ -0,0 +1,31 @@
+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');
+});

package/dist/node/utils/fs.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Returns all the directories obtained by traversing `inner` and its parents
+ * all the way to `outer`, inclusive.
+ */
+export declare const pathsBetween: (inner: string, outer: string, paths?: string[]) => string[];

package/dist/node/utils/fs.js

@@ -0,0 +1,12 @@
+import path from 'path';
+/**
+ * Returns all the directories obtained by traversing `inner` and its parents
+ * all the way to `outer`, inclusive.
+ */
+export const pathsBetween = (inner, outer, paths = []) => {
+    const parent = path.dirname(inner);
+    if (inner === outer || inner === parent) {
+        return [...paths, outer];
+    }
+    return [inner, ...pathsBetween(parent, outer)];
+};

package/dist/test/util.js

@@ -55,7 +55,7 @@ const runESZIP = async (eszipPath, vendorDirectory) => {
     const extractCommand = execa('deno', [
         'run',
         '--allow-all',
-        'https://deno.land/x/eszip@v0.40.0/eszip.ts',
+        'https://deno.land/x/eszip@v0.55.2/eszip.ts',
         'x',
         eszipPath,
         tmpDir.path,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/edge-bundler",
-  "version": "9.4.1",
+  "version": "10.0.0",
   "description": "Intelligently prepare Netlify Edge Functions for deployment",
   "type": "module",
   "main": "./dist/node/index.js",
@@ -80,7 +80,7 @@
     "better-ajv-errors": "^1.2.0",
     "common-path-prefix": "^3.0.0",
     "env-paths": "^3.0.0",
-    "esbuild": "0.19.4",
+    "esbuild": "0.19.5",
     "execa": "^6.0.0",
     "find-up": "^6.3.0",
     "get-package-name": "^2.2.0",