@netlify/build 28.4.4 → 28.4.5

package/lib/core/feature_flags.js

@@ -14,7 +14,6 @@ export const DEFAULT_FEATURE_FLAGS = {
     buildbot_zisi_trace_nft: false,
     buildbot_zisi_esbuild_parser: false,
     edge_functions_cache_cli: false,
-    edge_functions_produce_eszip: false,
     edge_functions_system_logger: false,
     // TODO: remove this flag once rolled out to everyone
     // FF link: https://app.launchdarkly.com/default/production/features/plugins_break_builds_with_unsupported_plugin_versions/targeting

package/lib/plugins_core/edge_functions/index.js

@@ -4,21 +4,18 @@ import { bundle, find } from '@netlify/edge-bundler';
 import { pathExists } from 'path-exists';
 import { logFunctionsToBundle } from '../../log/messages/core_steps.js';
 import { tagBundlingError } from './lib/error.js';
-import { parseManifest } from './lib/internal_manifest.js';
 import { validateEdgeFunctionsManifest } from './validate_manifest/validate_edge_functions_manifest.js';
 // TODO: Replace this with a custom cache directory.
 const DENO_CLI_CACHE_DIRECTORY = '.netlify/plugins/deno-cli';
 const IMPORT_MAP_FILENAME = 'edge-functions-import-map.json';
 const coreStep = async function ({ buildDir, constants: { EDGE_FUNCTIONS_DIST: distDirectory, EDGE_FUNCTIONS_SRC: srcDirectory, INTERNAL_EDGE_FUNCTIONS_SRC: internalSrcDirectory, IS_LOCAL: isRunningLocally, }, debug, systemLog, featureFlags, logs, netlifyConfig, }) {
-    const { edge_functions: configDeclarations = [] } = netlifyConfig;
+    const { edge_functions: declarations = [] } = netlifyConfig;
     const distPath = resolve(buildDir, distDirectory);
     const internalSrcPath = resolve(buildDir, internalSrcDirectory);
     const distImportMapPath = join(dirname(internalSrcPath), IMPORT_MAP_FILENAME);
     const srcPath = srcDirectory ? resolve(buildDir, srcDirectory) : undefined;
     const sourcePaths = [internalSrcPath, srcPath].filter(Boolean);
     logFunctions({ internalSrcDirectory, internalSrcPath, logs, srcDirectory, srcPath });
-    const { declarations: internalDeclarations, importMap, layers } = await parseManifest(internalSrcPath, systemLog);
-    const declarations = [...configDeclarations, ...internalDeclarations];
     // If we're running in buildbot and the feature flag is enabled, we set the
     // Deno cache dir to a directory that is persisted between builds.
     const cacheDirectory = !isRunningLocally && featureFlags.edge_functions_cache_cli ? resolve(buildDir, DENO_CLI_CACHE_DIRECTORY) : undefined;
@@ -28,11 +25,10 @@ const coreStep = async function ({ buildDir, constants: { EDGE_FUNCTIONS_DIST: d
         const { manifest } = await bundle(sourcePaths, distPath, declarations, {
             basePath: buildDir,
             cacheDirectory,
+            configPath: join(internalSrcPath, 'manifest.json'),
             debug,
             distImportMapPath,
             featureFlags,
-            importMaps: [importMap].filter(Boolean),
-            layers,
             systemLogger: featureFlags.edge_functions_system_logger ? systemLog : undefined,
         });
         systemLog('Edge Functions manifest:', manifest);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "28.4.4",
+  "version": "28.4.5",
   "description": "Netlify build module",
   "type": "module",
   "exports": "./lib/core/main.js",
@@ -66,12 +66,12 @@
     "@bugsnag/js": "^7.0.0",
     "@netlify/cache-utils": "^5.0.2",
     "@netlify/config": "^20.0.2",
-    "@netlify/edge-bundler": "4.4.3",
-    "@netlify/functions-utils": "^5.0.4",
+    "@netlify/edge-bundler": "5.0.0",
+    "@netlify/functions-utils": "^5.0.5",
     "@netlify/git-utils": "^5.0.2",
     "@netlify/plugins-list": "^6.54.0",
     "@netlify/run-utils": "^5.0.2",
-    "@netlify/zip-it-and-ship-it": "^7.1.2",
+    "@netlify/zip-it-and-ship-it": "^7.1.3",
     "@sindresorhus/slugify": "^2.0.0",
     "ansi-escapes": "^5.0.0",
     "chalk": "^5.0.0",
@@ -149,5 +149,5 @@
       "module": "commonjs"
     }
   },
-  "gitHead": "53a1a1a513008e58b3b720a0bf6f8166ef9a1b00"
+  "gitHead": "c7e107e79b77f3037ca6d10aceadfa208af5ace8"
 }

package/lib/plugins_core/edge_functions/lib/internal_manifest.js

@@ -1,52 +0,0 @@
-import { promises as fs } from 'fs';
-import { dirname, join, resolve } from 'path';
-import { pathToFileURL } from 'url';
-const parseManifest = async (internalSourceDirectory, systemLog) => {
-    const manifestPath = join(internalSourceDirectory, 'manifest.json');
-    try {
-        const data = await fs.readFile(manifestPath);
-        const manifest = JSON.parse(data);
-        if (manifest.version !== 1) {
-            throw new Error('Unsupported manifest version');
-        }
-        const result = {
-            declarations: manifest.functions,
-            layers: manifest.layers,
-        };
-        if (manifest.import_map) {
-            const importMapPath = resolve(dirname(manifestPath), manifest.import_map);
-            const importMap = await readImportMap(importMapPath);
-            return {
-                ...result,
-                importMap: {
-                    baseURL: pathToFileURL(importMapPath),
-                    ...importMap,
-                },
-            };
-        }
-        return result;
-    }
-    catch (error) {
-        if (error.code !== 'ENOENT') {
-            systemLog('Error while parsing internal edge functions manifest:', error);
-        }
-    }
-    return {
-        declarations: [],
-        layers: [],
-    };
-};
-const readImportMap = async (path) => {
-    try {
-        const data = await fs.readFile(path);
-        const importMap = JSON.parse(data);
-        return importMap;
-    }
-    catch {
-        // no-op
-    }
-    return {
-        imports: {},
-    };
-};
-export { parseManifest };