@netlify/build 28.2.1 → 28.3.0

package/lib/plugins_core/edge_functions/validate_manifest/validate_edge_functions_manifest.js

@@ -1,94 +1,21 @@
 import { promises as fs } from 'fs';
 import { join, resolve } from 'path';
-import Ajv from 'ajv';
-import ajvErrors from 'ajv-errors';
+import { ManifestValidationError, validateManifest } from '@netlify/edge-bundler';
 import { addErrorInfo } from '../../../error/info.js';
-const ajv = new Ajv({ allErrors: true });
-ajvErrors(ajv);
-// regex pattern for manifest route pattern
-// checks if the pattern string starts with ^ and ends with $
-// we define this format in edge-bundler:
-// https://github.com/netlify/edge-bundler/blob/main/src/manifest.ts#L66
-const normalizedPatternRegex = /^\^.*\$$/;
-ajv.addFormat('regexPattern', {
-    async: true,
-    validate: (data) => normalizedPatternRegex.test(data),
-});
-const bundlesSchema = {
-    $async: true,
-    type: 'object',
-    required: ['asset', 'format'],
-    properties: {
-        asset: { type: 'string' },
-        format: { type: 'string' },
-    },
-    additionalProperties: false,
-};
-const routesSchema = {
-    $async: true,
-    type: 'object',
-    required: ['function', 'pattern'],
-    properties: {
-        name: { type: 'string' },
-        function: { type: 'string' },
-        pattern: { type: 'string', format: 'regexPattern', errorMessage: `must match format ${normalizedPatternRegex}` },
-    },
-    additionalProperties: false,
-};
-const layersSchema = {
-    $async: true,
-    type: 'object',
-    required: ['flag', 'name'],
-    properties: {
-        flag: { type: 'string' },
-        name: { type: 'string' },
-        local: { type: 'string' },
-    },
-    additionalProperties: false,
-};
-const edgeManifestSchema = {
-    $async: true,
-    type: 'object',
-    required: ['bundles', 'routes', 'bundler_version'],
-    properties: {
-        bundles: {
-            type: 'array',
-            items: bundlesSchema,
-        },
-        routes: {
-            type: 'array',
-            items: routesSchema,
-        },
-        post_cache_routes: {
-            type: 'array',
-            items: routesSchema,
-        },
-        layers: {
-            type: 'array',
-            items: layersSchema,
-        },
-        bundler_version: { type: 'string' },
-    },
-    additionalProperties: false,
-    errorMessage: "Couldn't validate Edge Functions manifest.json",
-};
-const validateManifest = async (manifestData) => {
-    const validate = ajv.compile(edgeManifestSchema);
-    await validate(manifestData);
-};
 export const validateEdgeFunctionsManifest = async function ({ buildDir, constants: { EDGE_FUNCTIONS_DIST: distDirectory }, }) {
+    const edgeFunctionsDistPath = resolve(buildDir, distDirectory);
+    const manifestPath = join(edgeFunctionsDistPath, 'manifest.json');
+    const data = await fs.readFile(manifestPath);
+    // @ts-expect-error TypeScript is not aware that parse can handle Buffer
+    const manifestData = JSON.parse(data);
     try {
-        const edgeFunctionsDistPath = resolve(buildDir, distDirectory);
-        const manifestPath = join(edgeFunctionsDistPath, 'manifest.json');
-        const data = await fs.readFile(manifestPath);
-        const manifestData = JSON.parse(data);
-        await validateManifest(manifestData);
+        validateManifest(manifestData);
     }
     catch (error) {
-        const isValidationErr = error instanceof Ajv.ValidationError;
-        const parsedErr = isValidationErr ? error.errors : error;
-        addErrorInfo(parsedErr, { type: 'coreStep' });
-        throw new Error(isValidationErr ? JSON.stringify(parsedErr, null, 2) : parsedErr);
+        if (error instanceof ManifestValidationError) {
+            addErrorInfo(error, { type: 'coreStep' });
+        }
+        throw error;
     }
     return {};
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "28.2.1",
+  "version": "28.3.0",
   "description": "Netlify build module",
   "type": "module",
   "exports": "./lib/core/main.js",
@@ -66,15 +66,13 @@
     "@bugsnag/js": "^7.0.0",
     "@netlify/cache-utils": "^5.0.2",
     "@netlify/config": "^20.0.1",
-    "@netlify/edge-bundler": "4.3.0",
+    "@netlify/edge-bundler": "4.4.1",
     "@netlify/functions-utils": "^5.0.4",
     "@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",
     "@sindresorhus/slugify": "^2.0.0",
-    "ajv": "^8.11.0",
-    "ajv-errors": "^3.0.0",
     "ansi-escapes": "^5.0.0",
     "chalk": "^5.0.0",
     "clean-stack": "^4.0.0",
@@ -150,5 +148,5 @@
       "module": "commonjs"
     }
   },
-  "gitHead": "68feefc0d483a887c91c7647aa74f3eed65c3d93"
+  "gitHead": "40509d63b9e4b640bc3e4f7a5be052f8b978deea"
 }