@netlify/edge-bundler 2.0.5 → 2.1.0

package/deno/lib/stage2.ts

@@ -6,7 +6,30 @@ import type { InputFunction, WriteStage2Options } from '../../shared/stage2.ts'
 import { PUBLIC_SPECIFIER, STAGE2_SPECIFIER, virtualRoot } from './consts.ts'
 import { inlineModule, loadFromVirtualRoot, loadWithRetry } from './common.ts'
 
-const getFunctionReference = (basePath: string, func: InputFunction, index: number) => {
+interface FunctionReference {
+  exportLine: string
+  importLine: string
+  metadata: {
+    url: URL
+  }
+  name: string
+}
+
+const getMetadata = (references: FunctionReference[]) => {
+  const functions = references.reduce(
+    (acc, { metadata, name }) => ({
+      ...acc,
+      [name]: metadata,
+    }),
+    {},
+  )
+
+  return {
+    functions,
+  }
+}
+
+const getFunctionReference = (basePath: string, func: InputFunction, index: number): FunctionReference => {
   const importName = `func${index}`
   const exportLine = `"${func.name}": ${importName}`
   const url = getVirtualPath(basePath, func.path)
@@ -14,16 +37,22 @@ const getFunctionReference = (basePath: string, func: InputFunction, index: numb
   return {
     exportLine,
     importLine: `import ${importName} from "${url}";`,
+    metadata: {
+      url,
+    },
+    name: func.name,
   }
 }
 
-const getStage2Entry = (basePath: string, functions: InputFunction[]) => {
+export const getStage2Entry = (basePath: string, functions: InputFunction[]) => {
   const lines = functions.map((func, index) => getFunctionReference(basePath, func, index))
   const importLines = lines.map(({ importLine }) => importLine).join('\n')
   const exportLines = lines.map(({ exportLine }) => exportLine).join(', ')
-  const exportDeclaration = `export const functions = {${exportLines}};`
+  const metadata = getMetadata(lines)
+  const functionsExport = `export const functions = {${exportLines}};`
+  const metadataExport = `export const metadata = ${JSON.stringify(metadata)};`
 
-  return [importLines, exportDeclaration].join('\n\n')
+  return [importLines, functionsExport, metadataExport].join('\n\n')
 }
 
 const getVirtualPath = (basePath: string, filePath: string) => {

package/dist/node/formats/eszip.js

@@ -12,7 +12,7 @@ const bundleESZIP = async ({ basePath, buildID, debug, deno, distDirectory, func
         functions,
         importMapURL: importMap.toDataURL(),
     };
-    const flags = ['--allow-all'];
+    const flags = ['--allow-all', '--no-config'];
     if (!debug) {
         flags.push('--quiet');
     }

package/dist/node/formats/javascript.d.ts

@@ -22,4 +22,9 @@ interface GenerateStage2Options {
 }
 declare const generateStage2: ({ distDirectory, fileName, formatExportTypeError, formatImportError, functions, type, }: GenerateStage2Options) => Promise<string>;
 declare const getBootstrapURL: () => string;
-export { bundleJS as bundle, generateStage2, getBootstrapURL };
+interface GetLocalEntryPointOptions {
+    formatExportTypeError?: FormatFunction;
+    formatImportError?: FormatFunction;
+}
+declare const getLocalEntryPoint: (functions: EdgeFunction[], { formatExportTypeError, formatImportError, }: GetLocalEntryPointOptions) => string;
+export { bundleJS as bundle, generateStage2, getBootstrapURL, getLocalEntryPoint };

package/dist/node/formats/javascript.js

@@ -10,7 +10,7 @@ const bundleJS = async ({ buildID, debug, deno, distDirectory, functions, import
     const stage2Path = await generateStage2({ distDirectory, functions, fileName: `${buildID}-pre.js` });
     const extension = '.js';
     const jsBundlePath = join(distDirectory, `${buildID}${extension}`);
-    const flags = [`--import-map=${importMap.toDataURL()}`];
+    const flags = [`--import-map=${importMap.toDataURL()}`, '--no-config'];
     if (!debug) {
         flags.push('--quiet');
     }
@@ -42,22 +42,29 @@ const getBootstrapURL = () => { var _a; return (_a = env.NETLIFY_EDGE_BOOTSTRAP)
 // a valid default export.
 const getLocalEntryPoint = (functions, { formatExportTypeError = defaultFormatExportTypeError, formatImportError = defaultFormatImpoortError, }) => {
     const bootImport = `import { boot } from "${getBootstrapURL()}";`;
-    const declaration = `const functions = {};`;
-    const imports = functions.map((func) => `
-  try {
-    const { default: func } = await import("${pathToFileURL(func.path)}");
-
-    if (typeof func === "function") {
-      functions["${func.name}"] = func;
-    } else {
-      console.log(${JSON.stringify(formatExportTypeError(func.name))});
-    }
-  } catch (error) {
-    console.log(${JSON.stringify(formatImportError(func.name))});
-    console.error(error);
-  }
-  `);
-    const bootCall = `boot(functions);`;
+    const declaration = `const functions = {}; const metadata = { functions: {} };`;
+    const imports = functions.map((func) => {
+        const url = pathToFileURL(func.path);
+        const metadata = {
+            url,
+        };
+        return `
+      try {
+        const { default: func } = await import("${url}");
+    
+        if (typeof func === "function") {
+          functions["${func.name}"] = func;
+          metadata.functions["${func.name}"] = ${JSON.stringify(metadata)}
+        } else {
+          console.log(${JSON.stringify(formatExportTypeError(func.name))});
+        }
+      } catch (error) {
+        console.log(${JSON.stringify(formatImportError(func.name))});
+        console.error(error);
+      }
+      `;
+    });
+    const bootCall = `boot(functions, metadata);`;
     return [bootImport, declaration, ...imports, bootCall].join('\n\n');
 };
 const getProductionEntryPoint = (functions) => {
@@ -77,4 +84,4 @@ const getProductionEntryPoint = (functions) => {
     const defaultExport = 'boot(functions);';
     return [bootImport, importLines, exportDeclaration, defaultExport].join('\n\n');
 };
-export { bundleJS as bundle, generateStage2, getBootstrapURL };
+export { bundleJS as bundle, generateStage2, getBootstrapURL, getLocalEntryPoint };

package/dist/node/server/server.js

@@ -71,6 +71,7 @@ const serve = async ({ certificatePath, debug, distImportMapPath, inspectSetting
         '--unstable',
         `--import-map=${importMap.toDataURL()}`,
         '--v8-flags=--disallow-code-generation-from-strings',
+        '--no-config',
     ];
     if (certificatePath) {
         flags.push(`--cert=${certificatePath}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/edge-bundler",
-  "version": "2.0.5",
+  "version": "2.1.0",
   "description": "Intelligently prepare Netlify Edge Functions for deployment",
   "type": "module",
   "main": "./dist/node/index.js",
@@ -28,7 +28,9 @@
     "test:dev": "run-s build test:dev:*",
     "test:ci": "run-s build test:ci:*",
     "test:dev:ava": "ava",
-    "test:ci:ava": "nyc -r lcovonly -r text -r json ava"
+    "test:dev:deno": "deno test --allow-all test/deno",
+    "test:ci:ava": "nyc -r lcovonly -r text -r json ava",
+    "test:ci:deno": "deno test --allow-all test/deno"
   },
   "config": {
     "eslint": "--ignore-path .gitignore --cache --format=codeframe --max-warnings=0 \"{node,scripts,.github}/**/*.{js,ts,md,html}\" \"*.{js,ts,md,html}\"",
@@ -36,8 +38,8 @@
   },
   "ava": {
     "files": [
-      "test/**/*.ts",
-      "!test/fixtures/**"
+      "test/node/**/*.ts",
+      "!test/node/fixtures/**"
     ],
     "extensions": {
       "ts": "module"
@@ -55,7 +57,7 @@
   },
   "author": "Netlify Inc.",
   "directories": {
-    "test": "test"
+    "test": "test/node"
   },
   "devDependencies": {
     "@ava/typescript": "^3.0.1",