@netlify/edge-bundler 0.12.0 → 1.2.0

package/deno/bundle.ts

@@ -1,4 +1,4 @@
-import { writeStage2 } from 'https://625d32be1b90870009edfc99--edge-bootstrap.netlify.app/bundler/mod.ts'
+import { writeStage2 } from 'https://628282fb528ce20008ed7664--edge-bootstrap.netlify.app/bundler/mod.ts'
 
 const [payload] = Deno.args
 const { basePath, destPath, functions } = JSON.parse(payload)

package/dist/formats/javascript.js

@@ -5,7 +5,7 @@ import { pathToFileURL } from 'url';
 import del from 'del';
 import { wrapBundleError } from '../bundle_error.js';
 import { getFileHash } from '../utils/sha256.js';
-const BOOTSTRAP_LATEST = 'https://625d32be1b90870009edfc99--edge-bootstrap.netlify.app/bootstrap/index-combined.ts';
+const BOOTSTRAP_LATEST = 'https://628282fb528ce20008ed7664--edge-bootstrap.netlify.app/bootstrap/index-combined.ts';
 const bundle = async (options) => {
     try {
         return await bundleJS(options);

package/dist/manifest.js

@@ -9,7 +9,7 @@ const generateManifest = ({ bundles = [], declarations = [], functions }) => {
         if (func === undefined) {
             return;
         }
-        const pattern = 'pattern' in declaration ? new RegExp(declaration.pattern) : globToRegExp(declaration.path);
+        const pattern = getRegularExpression(declaration);
         const serializablePattern = pattern.source.replace(/\\\//g, '/');
         return {
             function: func.name,
@@ -27,6 +27,19 @@ const generateManifest = ({ bundles = [], declarations = [], functions }) => {
     };
     return manifest;
 };
+const getRegularExpression = (declaration) => {
+    if ('pattern' in declaration) {
+        return new RegExp(declaration.pattern);
+    }
+    // We use the global flag so that `globToRegExp` will not wrap the expression
+    // with `^` and `$`. We'll do that ourselves.
+    const regularExpression = globToRegExp(declaration.path, { flags: 'g' });
+    // Wrapping the expression source with `^` and `$`. Also, adding an optional
+    // trailing slash, so that a declaration of `path: "/foo"` matches requests
+    // for both `/foo` and `/foo/`.
+    const normalizedSource = `^${regularExpression.source}\\/?$`;
+    return new RegExp(normalizedSource);
+};
 const writeManifest = ({ bundles, declarations = [], distDirectory, functions }) => {
     const manifest = generateManifest({ bundles, declarations, functions });
     const manifestPath = join(distDirectory, 'manifest.json');

package/dist/server/server.d.ts

@@ -2,9 +2,16 @@ import { LifecycleHook } from '../bridge.js';
 import type { EdgeFunction } from '../edge_function.js';
 import { ImportMapFile } from '../import_map.js';
 declare type FormatFunction = (name: string) => string;
+interface InspectSettings {
+    enabled: boolean;
+    pause: boolean;
+    address?: string;
+}
 interface ServeOptions {
+    certificatePath?: string;
     debug?: boolean;
     distImportMapPath?: string;
+    inspectSettings?: InspectSettings;
     importMaps?: ImportMapFile[];
     onAfterDownload?: LifecycleHook;
     onBeforeDownload?: LifecycleHook;
@@ -12,7 +19,7 @@ interface ServeOptions {
     formatImportError?: FormatFunction;
     port: number;
 }
-declare const serve: ({ debug, distImportMapPath, formatExportTypeError, formatImportError, importMaps, onAfterDownload, onBeforeDownload, port, }: ServeOptions) => Promise<(newFunctions: EdgeFunction[]) => Promise<{
+declare const serve: ({ certificatePath, debug, distImportMapPath, inspectSettings, formatExportTypeError, formatImportError, importMaps, onAfterDownload, onBeforeDownload, port, }: ServeOptions) => Promise<(newFunctions: EdgeFunction[]) => Promise<{
     graph: any;
     success: boolean;
 }>>;

package/dist/server/server.js

@@ -3,7 +3,7 @@ import { DenoBridge } from '../bridge.js';
 import { generateStage2 } from '../formats/javascript.js';
 import { ImportMap } from '../import_map.js';
 import { killProcess, waitForServer } from './util.js';
-const prepareServer = ({ deno, distDirectory, flags, formatExportTypeError, formatImportError, port, }) => {
+const prepareServer = ({ deno, distDirectory, flags: denoFlags, formatExportTypeError, formatImportError, port, }) => {
     const processRef = {};
     const startIsolate = async (newFunctions) => {
         if ((processRef === null || processRef === void 0 ? void 0 : processRef.ps) !== undefined) {
@@ -29,7 +29,8 @@ const prepareServer = ({ deno, distDirectory, flags, formatExportTypeError, form
         catch {
             // no-op
         }
-        await deno.runInBackground(['run', ...flags, stage2Path, port.toString()], true, processRef);
+        const bootstrapFlags = ['--port', port.toString()];
+        await deno.runInBackground(['run', ...denoFlags, stage2Path, ...bootstrapFlags], true, processRef);
         const success = await waitForServer(port, processRef.ps);
         return {
             graph,
@@ -38,7 +39,8 @@ const prepareServer = ({ deno, distDirectory, flags, formatExportTypeError, form
     };
     return startIsolate;
 };
-const serve = async ({ debug, distImportMapPath, formatExportTypeError, formatImportError, importMaps, onAfterDownload, onBeforeDownload, port, }) => {
+// eslint-disable-next-line complexity, max-statements
+const serve = async ({ certificatePath, debug, distImportMapPath, inspectSettings, formatExportTypeError, formatImportError, importMaps, onAfterDownload, onBeforeDownload, port, }) => {
     const deno = new DenoBridge({
         debug,
         onAfterDownload,
@@ -53,13 +55,31 @@ const serve = async ({ debug, distImportMapPath, formatExportTypeError, formatIm
     // if any.
     const importMap = new ImportMap(importMaps);
     const flags = ['--allow-all', '--unstable', `--import-map=${importMap.toDataURL()}`];
+    if (certificatePath) {
+        flags.push(`--cert=${certificatePath}`);
+    }
     if (debug) {
         flags.push('--log-level=debug');
     }
     else {
         flags.push('--quiet');
     }
-    const server = await prepareServer({ deno, distDirectory, flags, formatExportTypeError, formatImportError, port });
+    if (inspectSettings && inspectSettings.enabled) {
+        if (inspectSettings.pause) {
+            flags.push(inspectSettings.address ? `--inspect-brk=${inspectSettings.address}` : '--inspect-brk');
+        }
+        else {
+            flags.push(inspectSettings.address ? `--inspect=${inspectSettings.address}` : '--inspect');
+        }
+    }
+    const server = await prepareServer({
+        deno,
+        distDirectory,
+        flags,
+        formatExportTypeError,
+        formatImportError,
+        port,
+    });
     if (distImportMapPath) {
         await importMap.writeToFile(distImportMapPath);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/edge-bundler",
-  "version": "0.12.0",
+  "version": "1.2.0",
   "description": "Intelligently prepare Netlify Edge Functions for deployment",
   "type": "module",
   "main": "./dist/index.js",
@@ -48,9 +48,9 @@
   },
   "keywords": [],
   "license": "MIT",
-  "repository": "netlify-labs/edge-bundler",
+  "repository": "netlify/edge-bundler",
   "bugs": {
-    "url": "https://github.com/netlify-labs/edge-bundler/issues"
+    "url": "https://github.com/netlify/edge-bundler/issues"
   },
   "author": "Netlify Inc.",
   "directories": {
@@ -66,10 +66,12 @@
     "@types/semver": "^7.3.9",
     "@types/sinon": "^10.0.8",
     "@types/uuid": "^8.3.4",
+    "archiver": "^5.3.1",
     "ava": "^4.0.1",
     "husky": "^7.0.4",
+    "nock": "^13.2.4",
     "nyc": "^15.0.0",
-    "sinon": "^12.0.1",
+    "sinon": "^13.0.0",
     "ts-node": "^10.4.0",
     "typescript": "^4.5.4"
   },