@netlify/edge-bundler 9.0.0 → 9.1.0

package/dist/node/npm_dependencies.d.ts

@@ -15,7 +15,7 @@ export declare const vendorNPMSpecifiers: ({ basePath, directory, functions, imp
     cleanup: () => Promise<void>;
     directory: string;
     importMap: {
-        baseURL: import("node:url").URL;
+        baseURL: import("url").URL;
         imports: Record<string, string>;
     };
 } | undefined>;

package/dist/node/npm_dependencies.js

@@ -49,7 +49,7 @@ export const getDependencyTrackerPlugin = (specifiers, importMap, baseURL) => ({
             if (specifier.startsWith(npmPrefix)) {
                 return { external: true };
             }
-            const isLocalImport = specifier.startsWith(path.sep) || specifier.startsWith('.');
+            const isLocalImport = specifier.startsWith(path.sep) || specifier.startsWith('.') || path.isAbsolute(specifier);
             // If this is a local import, return so that esbuild visits that path.
             if (isLocalImport) {
                 return result;
@@ -115,7 +115,6 @@ export const vendorNPMSpecifiers = async ({ basePath, directory, functions, impo
     if (specifiers.size === 0) {
         return;
     }
-    logger.user('You are using npm modules in Edge Functions, which is an experimental feature. Learn more at https://ntl.fyi/edge-functions-npm.');
     // To bundle an entire module and all its dependencies, create a barrel file
     // where we re-export everything from that specifier. We do this for every
     // specifier, and each of these files will become entry points to esbuild.

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

@@ -6,6 +6,7 @@
 import { OnAfterDownloadHook, OnBeforeDownloadHook } from '../bridge.js';
 import { FunctionConfig } from '../config.js';
 import type { EdgeFunction } from '../edge_function.js';
+import type { FeatureFlags } from '../feature_flags.js';
 import { LogFunction } from '../logger.js';
 export type FormatFunction = (name: string) => string;
 interface StartServerOptions {
@@ -22,6 +23,7 @@ interface ServeOptions {
     certificatePath?: string;
     debug?: boolean;
     distImportMapPath?: string;
+    featureFlags?: FeatureFlags;
     inspectSettings?: InspectSettings;
     importMapPaths?: string[];
     onAfterDownload?: OnAfterDownloadHook;
@@ -32,7 +34,8 @@ interface ServeOptions {
     servePath: string;
     systemLogger?: LogFunction;
 }
-export declare const serve: ({ basePath, bootstrapURL, certificatePath, debug, distImportMapPath, inspectSettings, formatExportTypeError, formatImportError, importMapPaths, onAfterDownload, onBeforeDownload, port, servePath, systemLogger, }: ServeOptions) => Promise<(functions: EdgeFunction[], env?: NodeJS.ProcessEnv, options?: StartServerOptions) => Promise<{
+export declare const serve: ({ basePath, bootstrapURL, certificatePath, debug, distImportMapPath, inspectSettings, featureFlags, formatExportTypeError, formatImportError, importMapPaths, onAfterDownload, onBeforeDownload, port, servePath, systemLogger, }: ServeOptions) => Promise<(functions: EdgeFunction[], env?: NodeJS.ProcessEnv, options?: StartServerOptions) => Promise<{
+    features: Record<string, boolean>;
     functionsConfig: FunctionConfig[];
     graph: any;
     success: boolean;

package/dist/node/server/server.js

@@ -6,7 +6,7 @@ import { getLogger } from '../logger.js';
 import { vendorNPMSpecifiers } from '../npm_dependencies.js';
 import { ensureLatestTypes } from '../types.js';
 import { killProcess, waitForServer } from './util.js';
-const prepareServer = ({ basePath, bootstrapURL, deno, distDirectory, distImportMapPath, flags: denoFlags, formatExportTypeError, formatImportError, importMap: baseImportMap, logger, port, }) => {
+const prepareServer = ({ basePath, bootstrapURL, deno, distDirectory, distImportMapPath, featureFlags, flags: denoFlags, formatExportTypeError, formatImportError, importMap: baseImportMap, logger, port, }) => {
     const processRef = {};
     const startServer = async (functions, env = {}, options = {}) => {
         if ((processRef === null || processRef === void 0 ? void 0 : processRef.ps) !== undefined) {
@@ -21,16 +21,20 @@ const prepareServer = ({ basePath, bootstrapURL, deno, distDirectory, distImport
             formatExportTypeError,
             formatImportError,
         });
+        const features = {};
         const importMap = baseImportMap.clone();
-        const vendor = await vendorNPMSpecifiers({
-            basePath,
-            directory: distDirectory,
-            functions: functions.map(({ path }) => path),
-            importMap,
-            logger,
-        });
-        if (vendor) {
-            importMap.add(vendor.importMap);
+        if (featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.edge_functions_npm_modules) {
+            const vendor = await vendorNPMSpecifiers({
+                basePath,
+                directory: distDirectory,
+                functions: functions.map(({ path }) => path),
+                importMap,
+                logger,
+            });
+            if (vendor) {
+                features.npmModules = true;
+                importMap.add(vendor.importMap);
+            }
         }
         try {
             // This command will print a JSON object with all the modules found in
@@ -62,6 +66,7 @@ const prepareServer = ({ basePath, bootstrapURL, deno, distDirectory, distImport
         }
         const success = await waitForServer(port, processRef.ps);
         return {
+            features,
             functionsConfig,
             graph,
             success,
@@ -69,7 +74,7 @@ const prepareServer = ({ basePath, bootstrapURL, deno, distDirectory, distImport
     };
     return startServer;
 };
-export const serve = async ({ basePath, bootstrapURL, certificatePath, debug, distImportMapPath, inspectSettings, formatExportTypeError, formatImportError, importMapPaths = [], onAfterDownload, onBeforeDownload, port, servePath, systemLogger, }) => {
+export const serve = async ({ basePath, bootstrapURL, certificatePath, debug, distImportMapPath, inspectSettings, featureFlags, formatExportTypeError, formatImportError, importMapPaths = [], onAfterDownload, onBeforeDownload, port, servePath, systemLogger, }) => {
     const logger = getLogger(systemLogger, debug);
     const deno = new DenoBridge({
         debug,
@@ -107,6 +112,7 @@ export const serve = async ({ basePath, bootstrapURL, certificatePath, debug, di
         deno,
         distDirectory: servePath,
         distImportMapPath,
+        featureFlags,
         flags,
         formatExportTypeError,
         formatImportError,

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

@@ -39,9 +39,10 @@ test('Starts a server and serves requests for edge functions', async () => {
     const options = {
         getFunctionsConfig: true,
     };
-    const { functionsConfig, graph, success } = await server(functions, {
+    const { features, functionsConfig, graph, success } = await server(functions, {
         very_secret_secret: 'i love netlify',
     }, options);
+    expect(features).toEqual({});
     expect(success).toBe(true);
     expect(functionsConfig).toEqual([{ path: '/my-function' }, {}, { path: '/global-netlify' }]);
     for (const key in functions) {

package/package.json

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