@netlify/edge-bundler 10.1.2 → 11.0.0

package/dist/node/index.d.ts

@@ -6,5 +6,6 @@ export type { EdgeFunction } from './edge_function.js';
 export { findFunctions as find } from './finder.js';
 export { generateManifest } from './manifest.js';
 export type { EdgeFunctionConfig, Manifest } from './manifest.js';
-export { ModuleGraph, serve } from './server/server.js';
+export type { ModuleGraphJson as ModuleGraph } from './vendor/module_graph/module_graph.js';
+export { serve } from './server/server.js';
 export { validateManifest, ManifestValidationError } from './validation/manifest/index.js';

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

@@ -3,16 +3,16 @@
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node" />
-import type { ModuleGraphJson } from '../../deno/vendor/deno.land/x/deno_graph@0.59.2/types.d.js';
 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';
+import type { ModuleGraphJson } from '../vendor/module_graph/module_graph.js';
 export type FormatFunction = (name: string) => string;
-export type ModuleGraph = ModuleGraphJson;
 interface StartServerOptions {
     getFunctionsConfig?: boolean;
+    importMapPaths?: string[];
 }
 interface InspectSettings {
     enabled: boolean;
@@ -27,7 +27,6 @@ interface ServeOptions {
     distImportMapPath?: string;
     featureFlags?: FeatureFlags;
     inspectSettings?: InspectSettings;
-    importMapPaths?: string[];
     onAfterDownload?: OnAfterDownloadHook;
     onBeforeDownload?: OnBeforeDownloadHook;
     formatExportTypeError?: FormatFunction;
@@ -38,7 +37,7 @@ interface ServeOptions {
     userLogger?: LogFunction;
     systemLogger?: LogFunction;
 }
-export declare const serve: ({ basePath, bootstrapURL, certificatePath, debug, distImportMapPath, inspectSettings, featureFlags, formatExportTypeError, formatImportError, importMapPaths, onAfterDownload, onBeforeDownload, port, rootPath, servePath, userLogger, systemLogger, }: ServeOptions) => Promise<(functions: EdgeFunction[], env?: NodeJS.ProcessEnv, options?: StartServerOptions) => Promise<{
+export declare const serve: ({ basePath, bootstrapURL, certificatePath, debug, distImportMapPath, inspectSettings, featureFlags, formatExportTypeError, formatImportError, onAfterDownload, onBeforeDownload, port, rootPath, servePath, userLogger, systemLogger, }: ServeOptions) => Promise<(functions: EdgeFunction[], env?: NodeJS.ProcessEnv, options?: StartServerOptions) => Promise<{
     features: Record<string, boolean>;
     functionsConfig: FunctionConfig[];
     graph: ModuleGraphJson;

package/dist/node/server/server.js

@@ -18,9 +18,10 @@ const cleanDirectory = async (directory, except) => {
     const toBeDeleted = files.filter((file) => !except.includes(join(directory, file)));
     await Promise.all(toBeDeleted.map((file) => unlink(join(directory, file))));
 };
-const prepareServer = ({ basePath, bootstrapURL, deno, distDirectory, distImportMapPath, flags: denoFlags, formatExportTypeError, formatImportError, importMap: baseImportMap, logger, port, rootPath, }) => {
+const prepareServer = ({ basePath, bootstrapURL, deno, distDirectory, distImportMapPath, flags: denoFlags, formatExportTypeError, formatImportError, logger, port, rootPath, }) => {
     const processRef = {};
     const startServer = async (functions, env = {}, options = {}) => {
+        var _a;
         if ((processRef === null || processRef === void 0 ? void 0 : processRef.ps) !== undefined) {
             await killProcess(processRef.ps);
         }
@@ -38,7 +39,8 @@ const prepareServer = ({ basePath, bootstrapURL, deno, distDirectory, distImport
             formatImportError,
         });
         const features = {};
-        const importMap = baseImportMap.clone();
+        const importMap = new ImportMap();
+        await importMap.addFiles((_a = options.importMapPaths) !== null && _a !== void 0 ? _a : [], logger);
         const npmSpecifiersWithExtraneousFiles = [];
         // we keep track of the files that are relevant to the user's code, so we can clean up leftovers from past executions later
         const relevantFiles = [stage2Path];
@@ -138,10 +140,6 @@ formatExportTypeError,
  * a function.
  */
 formatImportError, 
-/**
- * Paths to any additional import map files.
- */
-importMapPaths = [], 
 /**
  * Callback function to be triggered after the Deno CLI has been downloaded.
  */
@@ -205,8 +203,6 @@ systemLogger, }) => {
             flags.push(inspectSettings.address ? `--inspect=${inspectSettings.address}` : '--inspect');
         }
     }
-    const importMap = new ImportMap();
-    await importMap.addFiles(importMapPaths, logger);
     const server = prepareServer({
         basePath,
         bootstrapURL,
@@ -217,7 +213,6 @@ systemLogger, }) => {
         flags,
         formatExportTypeError,
         formatImportError,
-        importMap,
         logger,
         port,
         rootPath,

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

@@ -19,7 +19,6 @@ test('Starts a server and serves requests for edge functions', async () => {
     const server = await serve({
         basePath,
         bootstrapURL: 'https://edge.netlify.com/bootstrap/index-combined.ts',
-        importMapPaths,
         port,
         servePath,
     });
@@ -39,6 +38,7 @@ test('Starts a server and serves requests for edge functions', async () => {
     ];
     const options = {
         getFunctionsConfig: true,
+        importMapPaths,
     };
     const { features, functionsConfig, graph, success, npmSpecifiersWithExtraneousFiles } = await server(functions, {
         very_secret_secret: 'i love netlify',
@@ -97,7 +97,6 @@ test('Serves edge functions in a monorepo setup', async () => {
     const server = await serve({
         basePath,
         bootstrapURL: 'https://edge.netlify.com/bootstrap/index-combined.ts',
-        importMapPaths,
         port,
         rootPath,
         servePath,
@@ -110,6 +109,7 @@ test('Serves edge functions in a monorepo setup', async () => {
     ];
     const options = {
         getFunctionsConfig: true,
+        importMapPaths,
     };
     const { features, functionsConfig, graph, success, npmSpecifiersWithExtraneousFiles } = await server(functions, {
         very_secret_secret: 'i love netlify',

package/dist/node/vendor/module_graph/module_graph.d.ts

@@ -0,0 +1,158 @@
+import type { MediaType } from "./media_type.ts";
+/** Additional meta data that is used to enrich the output of the module
+ * graph. */
+export interface CacheInfo {
+    /** The string path to where the local version of the content is located. For
+     * non `file:` URLs, this is the location of the cached content, otherwise it
+     * is the absolute path to the local file. */
+    local?: string;
+    /** The string path to where a transpiled version of the source content is
+     * located, if any. */
+    emit?: string;
+    /** The string path to where an external source map of the transpiled source
+     * content is located, if any. */
+    map?: string;
+}
+export interface TypesDependency {
+    /** The string URL to the type information for the module. */
+    types: string;
+    /** An optional range which indicates the source of the dependency. */
+    source?: Range;
+}
+export interface LoadResponseModule {
+    /** A module with code has been loaded. */
+    kind: "module";
+    /** The string URL of the resource. If there were redirects, the final
+     * specifier should be set here, otherwise the requested specifier. */
+    specifier: string;
+    /** For remote resources, a record of headers should be set, where the key's
+     * have been normalized to be lower case values. */
+    headers?: Record<string, string>;
+    /** The string value of the loaded resources. */
+    content: string;
+}
+export interface LoadResponseExternal {
+    /** The loaded module is either _external_ or _built-in_ to the runtime. */
+    kind: "external";
+    /** The strung URL of the resource. If there were redirects, the final
+     * specifier should be set here, otherwise the requested specifier. */
+    specifier: string;
+}
+export type LoadResponse = LoadResponseModule | LoadResponseExternal;
+export interface PositionJson {
+    /** The line number of a position within a source file. The number is a zero
+     * based index. */
+    line: number;
+    /** The character number of a position within a source file. The number is a
+     * zero based index. */
+    character: number;
+}
+export interface Range {
+    /** A string URL representing a source of a dependency. */
+    specifier: string;
+    /** The start location of a range of text in a source file. */
+    start?: PositionJson;
+    /** The end location of a range of text in a source file. */
+    end?: PositionJson;
+}
+export interface RangeJson {
+    /** The start location of a range of text in a source file. */
+    start: PositionJson;
+    /** The end location of a range of text in a source file. */
+    end: PositionJson;
+}
+export interface ResolvedDependency {
+    /** The fully resolved string URL of the dependency, which should be
+     * resolvable in the module graph. If there was an error, `error` will be set
+     * and this will be undefined. */
+    specifier?: string;
+    /** Any error encountered when trying to resolved the specifier. If this is
+     * defined, `specifier` will be undefined. */
+    error?: string;
+    /** The range within the source code where the specifier was identified. */
+    span: RangeJson;
+}
+export interface TypesDependencyJson {
+    /** The string specifier that was used for the dependency. */
+    specifier: string;
+    /** An object pointing to the resolved dependency. */
+    dependency: ResolvedDependency;
+}
+/** The kind of module.
+ *
+ * For asserted modules, the value of the `asserted` property is set to the
+ * `type` value of the import attribute.
+ *
+ * Dependency analysis is not performed for asserted or Script modules
+ * currently. Synthetic modules were injected into the graph with their own
+ * dependencies provided. */
+export type ModuleKind = "asserted" | "esm" | "npm" | "external";
+export interface DependencyJson {
+    /** The string specifier that was used for the dependency. */
+    specifier: string;
+    /** An object pointing to the resolved _code_ dependency. */
+    code?: ResolvedDependency;
+    /** An object pointing to the resolved _type_ dependency of a module. This is
+     * populated when the `@deno-types` directive was used to supply a type
+     * definition file for a dependency. */
+    type?: ResolvedDependency;
+    /** A flag indicating if the dependency was dynamic. (e.g.
+     * `await import("mod.ts")`) */
+    isDynamic?: true;
+    assertionType?: string;
+}
+export interface ModuleJson extends CacheInfo {
+    /** The string URL of the module. */
+    specifier: string;
+    /** Any error encountered when attempting to load the module. */
+    error?: string;
+    /** The module kind that was determined when the module was resolved. This is
+     * used by loaders to indicate how a module needs to be loaded at runtime. */
+    kind?: ModuleKind;
+    /** An array of dependencies that were identified in the module. */
+    dependencies?: DependencyJson[];
+    /** If the module had a types dependency, the information about that
+     * dependency. */
+    typesDependency?: TypesDependencyJson;
+    /** The resolved media type of the module, which determines how Deno will
+     * handle the module. */
+    mediaType?: MediaType;
+    /** The size of the source content of the module in bytes. */
+    size?: number;
+}
+export interface GraphImportJson {
+    /** The referrer (URL string) that was used as a base when resolving the
+     * imports added to the graph. */
+    referrer: string;
+    /** An array of resolved dependencies which were imported using the
+     * referrer. */
+    dependencies?: DependencyJson[];
+}
+/** The plain-object representation of a module graph that is suitable for
+ * serialization to JSON. */
+export interface ModuleGraphJson {
+    /** The module specifiers (URL string) of the _roots_ of the module graph of
+     * which the module graph was built for. */
+    roots: string[];
+    /** An array of modules that are part of the module graph. */
+    modules: ModuleJson[];
+    /** External imports that were added to the graph when it was being built.
+     * The key is the referrer which was used as a base to resolve the
+     * dependency. The value is the resolved dependency. */
+    imports?: GraphImportJson[];
+    /** A record/map of any redirects encountered when resolving modules. The
+     * key was the requested module specifier and the value is the redirected
+     * module specifier. */
+    redirects: Record<string, string>;
+}
+export interface Dependency {
+    /** An object pointing to the resolved _code_ dependency. */
+    code?: ResolvedDependency;
+    /** An object pointing to the resolved _type_ dependency of a module. This is
+     * populated when the `@deno-types` directive was used to supply a type
+     * definition file for a dependency. */
+    type?: ResolvedDependency;
+    /** A flag indicating if the dependency was dynamic. (e.g.
+     * `await import("mod.ts")`) */
+    isDynamic?: true;
+}

package/dist/node/vendor/module_graph/module_graph.js

@@ -0,0 +1,2 @@
+// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/edge-bundler",
-  "version": "10.1.2",
+  "version": "11.0.0",
   "description": "Intelligently prepare Netlify Edge Functions for deployment",
   "type": "module",
   "main": "./dist/node/index.js",
@@ -35,11 +35,11 @@
     "test:ci:vitest": "vitest run --coverage",
     "test:ci:deno": "deno test --allow-all deno",
     "test:integration": "node --experimental-modules test/integration/test.js",
-    "vendor": "deno vendor --force --output deno/vendor https://deno.land/x/deno_graph@0.59.2/types.d.ts https://deno.land/x/eszip@v0.55.2/mod.ts https://deno.land/x/retry@v2.0.0/mod.ts https://deno.land/x/std@0.177.0/path/mod.ts"
+    "vendor": "deno vendor --force --output deno/vendor https://deno.land/x/eszip@v0.55.2/mod.ts https://deno.land/x/retry@v2.0.0/mod.ts https://deno.land/x/std@0.177.0/path/mod.ts"
   },
   "config": {
     "eslint": "--ignore-path .gitignore --cache --format=codeframe --max-warnings=0 \"{node,scripts,.github}/**/*.{js,ts,md,html}\" \"*.{js,ts,md,html}\"",
-    "prettier": "--ignore-path .gitignore --loglevel=warn \"{node,scripts,.github}/**/*.{js,ts,md,yml,json,html}\" \"*.{js,ts,yml,json,html}\" \".*.{js,ts,yml,json,html}\" \"!**/package-lock.json\" \"!package-lock.json\""
+    "prettier": "--ignore-path .gitignore --loglevel=warn \"{node,scripts,.github}/**/*.{js,ts,md,yml,json,html}\" \"*.{js,ts,yml,json,html}\" \".*.{js,ts,yml,json,html}\" \"!**/package-lock.json\" \"!package-lock.json\" \"!node/vendor/**\""
   },
   "keywords": [],
   "license": "MIT",
@@ -81,7 +81,7 @@
     "better-ajv-errors": "^1.2.0",
     "common-path-prefix": "^3.0.0",
     "env-paths": "^3.0.0",
-    "esbuild": "0.19.5",
+    "esbuild": "0.19.9",
     "execa": "^6.0.0",
     "find-up": "^6.3.0",
     "get-package-name": "^2.2.0",

package/deno/vendor/deno.land/x/deno_graph@0.59.2/media_type.ts

@@ -1,20 +0,0 @@
-// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
-
-export enum MediaType {
-  JavaScript = "JavaScript",
-  Mjs = "Mjs",
-  Cjs = "Cjs",
-  Jsx = "Jsx",
-  TypeScript = "TypeScript",
-  Mts = "Mts",
-  Cts = "Cts",
-  Dts = "Dts",
-  Dmts = "Dmts",
-  Dcts = "Dcts",
-  Tsx = "Tsx",
-  Json = "Json",
-  Wasm = "Wasm",
-  TsBuildInfo = "TsBuildInfo",
-  SourceMap = "SourceMap",
-  Unknown = "Unknown",
-}

package/deno/vendor/deno.land/x/deno_graph@0.59.2/types.d.ts

@@ -1,182 +0,0 @@
-// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
-
-import type { MediaType } from "./media_type.ts";
-
-/** Additional meta data that is used to enrich the output of the module
- * graph. */
-export interface CacheInfo {
-  /** The string path to where the local version of the content is located. For
-   * non `file:` URLs, this is the location of the cached content, otherwise it
-   * is the absolute path to the local file. */
-  local?: string;
-  /** The string path to where a transpiled version of the source content is
-   * located, if any. */
-  emit?: string;
-  /** The string path to where an external source map of the transpiled source
-   * content is located, if any. */
-  map?: string;
-}
-
-export interface TypesDependency {
-  /** The string URL to the type information for the module. */
-  types: string;
-  /** An optional range which indicates the source of the dependency. */
-  source?: Range;
-}
-
-export interface LoadResponseModule {
-  /** A module with code has been loaded. */
-  kind: "module";
-  /** The string URL of the resource. If there were redirects, the final
-   * specifier should be set here, otherwise the requested specifier. */
-  specifier: string;
-  /** For remote resources, a record of headers should be set, where the key's
-   * have been normalized to be lower case values. */
-  headers?: Record<string, string>;
-  /** The string value of the loaded resources. */
-  content: string;
-}
-
-export interface LoadResponseExternal {
-  /** The loaded module is either _external_ or _built-in_ to the runtime. */
-  kind: "external";
-  /** The strung URL of the resource. If there were redirects, the final
-   * specifier should be set here, otherwise the requested specifier. */
-  specifier: string;
-}
-
-export type LoadResponse = LoadResponseModule | LoadResponseExternal;
-
-export interface PositionJson {
-  /** The line number of a position within a source file. The number is a zero
-   * based index. */
-  line: number;
-  /** The character number of a position within a source file. The number is a
-   * zero based index. */
-  character: number;
-}
-
-export interface Range {
-  /** A string URL representing a source of a dependency. */
-  specifier: string;
-  /** The start location of a range of text in a source file. */
-  start?: PositionJson;
-  /** The end location of a range of text in a source file. */
-  end?: PositionJson;
-}
-
-export interface RangeJson {
-  /** The start location of a range of text in a source file. */
-  start: PositionJson;
-  /** The end location of a range of text in a source file. */
-  end: PositionJson;
-}
-
-export interface ResolvedDependency {
-  /** The fully resolved string URL of the dependency, which should be
-   * resolvable in the module graph. If there was an error, `error` will be set
-   * and this will be undefined. */
-  specifier?: string;
-  /** Any error encountered when trying to resolved the specifier. If this is
-   * defined, `specifier` will be undefined. */
-  error?: string;
-  /** The range within the source code where the specifier was identified. */
-  span: RangeJson;
-}
-
-export interface TypesDependencyJson {
-  /** The string specifier that was used for the dependency. */
-  specifier: string;
-  /** An object pointing to the resolved dependency. */
-  dependency: ResolvedDependency;
-}
-
-/** The kind of module.
- *
- * For asserted modules, the value of the `asserted` property is set to the
- * `type` value of the import attribute.
- *
- * Dependency analysis is not performed for asserted or Script modules
- * currently. Synthetic modules were injected into the graph with their own
- * dependencies provided. */
-export type ModuleKind =
-  | "asserted"
-  | "esm"
-  | "npm"
-  | "external";
-
-export interface DependencyJson {
-  /** The string specifier that was used for the dependency. */
-  specifier: string;
-  /** An object pointing to the resolved _code_ dependency. */
-  code?: ResolvedDependency;
-  /** An object pointing to the resolved _type_ dependency of a module. This is
-   * populated when the `@deno-types` directive was used to supply a type
-   * definition file for a dependency. */
-  type?: ResolvedDependency;
-  /** A flag indicating if the dependency was dynamic. (e.g.
-   * `await import("mod.ts")`) */
-  isDynamic?: true;
-  assertionType?: string;
-}
-
-// todo(dsherret): split this up into separate types based on the "kind"
-
-export interface ModuleJson extends CacheInfo {
-  /** The string URL of the module. */
-  specifier: string;
-  /** Any error encountered when attempting to load the module. */
-  error?: string;
-  /** The module kind that was determined when the module was resolved. This is
-   * used by loaders to indicate how a module needs to be loaded at runtime. */
-  kind?: ModuleKind;
-  /** An array of dependencies that were identified in the module. */
-  dependencies?: DependencyJson[];
-  /** If the module had a types dependency, the information about that
-   * dependency. */
-  typesDependency?: TypesDependencyJson;
-  /** The resolved media type of the module, which determines how Deno will
-   * handle the module. */
-  mediaType?: MediaType;
-  /** The size of the source content of the module in bytes. */
-  size?: number;
-}
-
-export interface GraphImportJson {
-  /** The referrer (URL string) that was used as a base when resolving the
-   * imports added to the graph. */
-  referrer: string;
-  /** An array of resolved dependencies which were imported using the
-   * referrer. */
-  dependencies?: DependencyJson[];
-}
-
-/** The plain-object representation of a module graph that is suitable for
- * serialization to JSON. */
-export interface ModuleGraphJson {
-  /** The module specifiers (URL string) of the _roots_ of the module graph of
-   * which the module graph was built for. */
-  roots: string[];
-  /** An array of modules that are part of the module graph. */
-  modules: ModuleJson[];
-  /** External imports that were added to the graph when it was being built.
-   * The key is the referrer which was used as a base to resolve the
-   * dependency. The value is the resolved dependency. */
-  imports?: GraphImportJson[];
-  /** A record/map of any redirects encountered when resolving modules. The
-   * key was the requested module specifier and the value is the redirected
-   * module specifier. */
-  redirects: Record<string, string>;
-}
-
-export interface Dependency {
-  /** An object pointing to the resolved _code_ dependency. */
-  code?: ResolvedDependency;
-  /** An object pointing to the resolved _type_ dependency of a module. This is
-   * populated when the `@deno-types` directive was used to supply a type
-   * definition file for a dependency. */
-  type?: ResolvedDependency;
-  /** A flag indicating if the dependency was dynamic. (e.g.
-   * `await import("mod.ts")`) */
-  isDynamic?: true;
-}