@netlify/edge-bundler 1.10.0 → 1.12.1

package/deno/bundle.ts

@@ -1,4 +1,4 @@
-import { writeStage2 } from 'https://62d144a15553b50009af7ac6--edge.netlify.com/bundler/mod.ts'
+import { writeStage2 } from 'https://62ea8d05a6858300091547ed--edge.netlify.com/bundler/mod.ts'
 
 const [payload] = Deno.args
 const { basePath, destPath, functions, imports } = JSON.parse(payload)

package/dist/bridge.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import { ExecaChildProcess } from 'execa';
 import { Logger } from './logger.js';
 declare type OnBeforeDownloadHook = () => void | Promise<void>;
@@ -17,6 +18,8 @@ interface ProcessRef {
 }
 interface RunOptions {
     pipeOutput?: boolean;
+    env?: NodeJS.ProcessEnv;
+    extendEnv?: boolean;
 }
 declare class DenoBridge {
     cacheDirectory: string;
@@ -41,9 +44,9 @@ declare class DenoBridge {
         global: boolean;
         path: string;
     }>;
-    getEnvironmentVariables(): Record<string, string>;
-    run(args: string[], { pipeOutput }?: RunOptions): Promise<import("execa").ExecaReturnValue<string>>;
-    runInBackground(args: string[], pipeOutput?: boolean, ref?: ProcessRef): Promise<void>;
+    getEnvironmentVariables(inputEnv?: NodeJS.ProcessEnv): NodeJS.ProcessEnv;
+    run(args: string[], { pipeOutput, env: inputEnv, extendEnv }?: RunOptions): Promise<import("execa").ExecaReturnValue<string>>;
+    runInBackground(args: string[], ref?: ProcessRef, { pipeOutput, env: inputEnv, extendEnv }?: RunOptions): Promise<void>;
 }
 export { DenoBridge };
 export type { DenoOptions, OnAfterDownloadHook, OnBeforeDownloadHook, ProcessRef };

package/dist/bridge.js

@@ -2,6 +2,7 @@ import { promises as fs } from 'fs';
 import path from 'path';
 import process from 'process';
 import { execa } from 'execa';
+import pathKey from 'path-key';
 import semver from 'semver';
 import { download } from './downloader.js';
 import { getPathInHome } from './home_path.js';
@@ -116,27 +117,29 @@ class DenoBridge {
         const downloadedPath = await this.getRemoteBinary();
         return { global: false, path: downloadedPath };
     }
-    getEnvironmentVariables() {
-        const env = {};
+    getEnvironmentVariables(inputEnv = {}) {
+        const env = { ...inputEnv };
         if (this.denoDir !== undefined) {
             env.DENO_DIR = this.denoDir;
         }
+        // Ensure PATH is always set as otherwise we are not able to find the global deno binary
+        env[pathKey()] = inputEnv[pathKey({ env: inputEnv })] || process.env[pathKey()];
         return env;
     }
     // Runs the Deno CLI in the background and returns a reference to the child
     // process, awaiting its execution.
-    async run(args, { pipeOutput } = {}) {
+    async run(args, { pipeOutput, env: inputEnv, extendEnv = true } = {}) {
         const { path: binaryPath } = await this.getBinaryPath();
-        const env = this.getEnvironmentVariables();
-        const options = { env };
+        const env = this.getEnvironmentVariables(inputEnv);
+        const options = { env, extendEnv };
         return DenoBridge.runWithBinary(binaryPath, args, options, pipeOutput);
     }
     // Runs the Deno CLI in the background, assigning a reference of the child
     // process to a `ps` property in the `ref` argument, if one is supplied.
-    async runInBackground(args, pipeOutput, ref) {
+    async runInBackground(args, ref, { pipeOutput, env: inputEnv, extendEnv = true } = {}) {
         const { path: binaryPath } = await this.getBinaryPath();
-        const env = this.getEnvironmentVariables();
-        const options = { env };
+        const env = this.getEnvironmentVariables(inputEnv);
+        const options = { env, extendEnv };
         const ps = DenoBridge.runWithBinary(binaryPath, args, options, pipeOutput);
         if (ref !== undefined) {
             // eslint-disable-next-line no-param-reassign

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://62d144a15553b50009af7ac6--edge.netlify.com/bootstrap/index-combined.ts';
+const BOOTSTRAP_LATEST = 'https://62ea8d05a6858300091547ed--edge.netlify.com/bootstrap/index-combined.ts';
 const bundleJS = async ({ buildID, debug, deno, distDirectory, functions, importMap, }) => {
     const stage2Path = await generateStage2({ distDirectory, functions, fileName: `${buildID}-pre.js` });
     const extension = '.js';

package/dist/server/server.d.ts

@@ -1,3 +1,7 @@
+/// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node" />
 import { OnAfterDownloadHook, OnBeforeDownloadHook } from '../bridge.js';
 import type { EdgeFunction } from '../edge_function.js';
 import { ImportMapFile } from '../import_map.js';
@@ -21,7 +25,7 @@ interface ServeOptions {
     port: number;
     systemLogger?: LogFunction;
 }
-declare const serve: ({ certificatePath, debug, distImportMapPath, inspectSettings, formatExportTypeError, formatImportError, importMaps, onAfterDownload, onBeforeDownload, port, systemLogger, }: ServeOptions) => Promise<(newFunctions: EdgeFunction[]) => Promise<{
+declare const serve: ({ certificatePath, debug, distImportMapPath, inspectSettings, formatExportTypeError, formatImportError, importMaps, onAfterDownload, onBeforeDownload, port, systemLogger, }: ServeOptions) => Promise<(newFunctions: EdgeFunction[], env?: NodeJS.ProcessEnv) => Promise<{
     graph: any;
     success: boolean;
 }>>;

package/dist/server/server.js

@@ -7,7 +7,7 @@ import { ensureLatestTypes } from '../types.js';
 import { killProcess, waitForServer } from './util.js';
 const prepareServer = ({ deno, distDirectory, flags: denoFlags, formatExportTypeError, formatImportError, port, }) => {
     const processRef = {};
-    const startIsolate = async (newFunctions) => {
+    const startIsolate = async (newFunctions, env = {}) => {
         if ((processRef === null || processRef === void 0 ? void 0 : processRef.ps) !== undefined) {
             await killProcess(processRef.ps);
         }
@@ -32,7 +32,14 @@ const prepareServer = ({ deno, distDirectory, flags: denoFlags, formatExportType
             // no-op
         }
         const bootstrapFlags = ['--port', port.toString()];
-        await deno.runInBackground(['run', ...denoFlags, stage2Path, ...bootstrapFlags], true, processRef);
+        // We set `extendEnv: false` to avoid polluting the edge function context
+        // with variables from the user's system, since those will not be available
+        // in the production environment.
+        await deno.runInBackground(['run', ...denoFlags, stage2Path, ...bootstrapFlags], processRef, {
+            pipeOutput: true,
+            env,
+            extendEnv: false,
+        });
         const success = await waitForServer(port, processRef.ps);
         return {
             graph,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/edge-bundler",
-  "version": "1.10.0",
+  "version": "1.12.1",
   "description": "Intelligently prepare Netlify Edge Functions for deployment",
   "type": "module",
   "main": "./dist/index.js",
@@ -87,6 +87,7 @@
     "node-fetch": "^3.1.1",
     "node-stream-zip": "^1.15.0",
     "p-wait-for": "^4.1.0",
+    "path-key": "^4.0.0",
     "semver": "^7.3.5",
     "tmp-promise": "^3.0.3",
     "uuid": "^8.3.2"