@netlify/config 17.0.19 → 18.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/config",
-  "version": "17.0.19",
+  "version": "18.0.1",
   "description": "Netlify config module",
   "type": "module",
   "exports": "./src/main.js",
@@ -73,7 +73,7 @@
     "path-type": "^5.0.0",
     "toml": "^3.0.0",
     "tomlify-j0.4": "^3.0.0",
-    "validate-npm-package-name": "^3.0.0",
+    "validate-npm-package-name": "^4.0.0",
     "yargs": "^17.3.1"
   },
   "devDependencies": {

package/src/case.js

@@ -9,8 +9,8 @@ const normalizeBuildCase = function ({
   base = Base,
   Command,
   command = Command,
-  Edge_handlers: EdgeHandlers,
-  edge_handlers: edgeHandlers = EdgeHandlers,
+  Edge_functions: EdgeFunctions,
+  edge_functions: edgeFunctions = EdgeFunctions,
   Environment,
   environment = Environment,
   Functions,
@@ -27,7 +27,7 @@ const normalizeBuildCase = function ({
     ...build,
     base,
     command,
-    edge_handlers: edgeHandlers,
+    edge_functions: edgeFunctions,
     environment,
     functions,
     ignore,

package/src/context.js

@@ -54,14 +54,14 @@ const addNamespacedProperty = function (contextConfig, [key, value]) {
 }
 
 const isBuildProperty = function (key, value) {
-  return BUILD_PROPERTIES.has(key) && !isFunctionsConfig(key, value) && !isEdgeHandlersConfig(key, value)
+  return BUILD_PROPERTIES.has(key) && !isFunctionsConfig(key, value) && !isEdgeFunctionsConfig(key, value)
 }
 
 // All properties in `config.build.*`
 const BUILD_PROPERTIES = new Set([
   'base',
   'command',
-  'edge_handlers',
+  'edge_functions',
   'environment',
   'functions',
   'ignore',
@@ -75,10 +75,10 @@ const isFunctionsConfig = function (key, value) {
   return key === 'functions' && isPlainObj(value)
 }
 
-// `config.edge_handlers` is an array of objects while
-// `config.build.edge_handlers` is a string.
-const isEdgeHandlersConfig = function (key, value) {
-  return key === 'edge_handlers' && Array.isArray(value)
+// `config.edge_functions` is an array of objects while
+// `config.build.edge_functions` is a string.
+const isEdgeFunctionsConfig = function (key, value) {
+  return key === 'edge_functions' && Array.isArray(value)
 }
 
 // Ensure that `inlineConfig` has higher priority than context properties by

package/src/files.js

@@ -18,7 +18,7 @@ export const resolveConfigPaths = async function ({ config, repositoryRoot, buil
 
 // All file paths in the configuration file are are relative to `buildDir`
 // (if `baseRelDir` is `true`).
-const FILE_PATH_CONFIG_PROPS = ['functionsDirectory', 'build.publish', 'build.edge_handlers']
+const FILE_PATH_CONFIG_PROPS = ['functionsDirectory', 'build.publish', 'build.edge_functions']
 
 const resolvePaths = function (config, propNames, baseRel, repositoryRoot) {
   return propNames.reduce((configA, propName) => resolvePathProp(configA, propName, baseRel, repositoryRoot), config)
@@ -90,9 +90,9 @@ const DEFAULT_PATHS = [
     propName: 'functions.directory',
   },
   {
-    getConfig: (directory) => ({ build: { edge_handlers: directory } }),
-    defaultPath: 'netlify/edge-handlers',
-    propName: 'build.edge_handlers',
+    getConfig: (directory) => ({ build: { edge_functions: directory } }),
+    defaultPath: 'netlify/edge-functions',
+    propName: 'build.edge_functions',
   },
 ]
 

package/src/log/cleanup.js

@@ -9,7 +9,7 @@ export const cleanupConfig = function ({
     command,
     commandOrigin,
     environment = {},
-    edge_handlers: edgeHandlers,
+    edge_functions: edgeFunctions,
     ignore,
     processing,
     publish,
@@ -30,7 +30,7 @@ export const cleanupConfig = function ({
     command,
     commandOrigin,
     environment: environmentA,
-    edge_handlers: edgeHandlers,
+    edge_functions: edgeFunctions,
     ignore,
     processing,
     publish,

package/src/mutations/apply.js

@@ -51,7 +51,7 @@ const denormalizeFunctionsTopProps = function (
 // List of properties that are not read-only.
 const MUTABLE_PROPS = {
   'build.command': { lastEvent: 'onPreBuild' },
-  'build.edge_handlers': { lastEvent: 'onPostBuild' },
+  'build.edge_functions': { lastEvent: 'onPostBuild' },
   'build.environment': { lastEvent: 'onPostBuild' },
   'build.environment.*': { lastEvent: 'onPostBuild' },
   'build.functions': { lastEvent: 'onBuild' },
@@ -70,7 +70,7 @@ const MUTABLE_PROPS = {
   'build.publish': { lastEvent: 'onPostBuild' },
   'build.services': { lastEvent: 'onPostBuild' },
   'build.services.*': { lastEvent: 'onPostBuild' },
-  edge_handlers: { lastEvent: 'onPostBuild' },
+  edge_functions: { lastEvent: 'onPostBuild' },
   'functions.*': { lastEvent: 'onBuild', denormalize: denormalizeFunctionsTopProps },
   'functions.*.*': { lastEvent: 'onBuild' },
   headers: { lastEvent: 'onPostBuild' },

package/src/options/base.js

@@ -26,7 +26,7 @@ export const getBaseOverride = async function ({ repositoryRoot, cwd }) {
   // return an absolute path
   const base = relative(repositoryRoot, dirname(basePath))
   // When `base` is explicitely overridden, `baseRelDir: true` makes more sense
-  // since we want `publish`, `functions` and `edge_handlers` to be relative to it.
+  // since we want `publish`, `functions` and `edge_functions` to be relative to it.
   return { base, baseRelDir: true }
 }
 

package/src/validate/validations.js

@@ -102,6 +102,17 @@ export const PRE_NORMALIZE_VALIDATIONS = [
       functions: { ignored_node_modules: ['module-one', 'module-two'] },
     }),
   },
+  {
+    property: 'edge_functions',
+    check: isArrayOfObjects,
+    message: 'must be an array of objects.',
+    example: () => ({
+      edge_functions: [
+        { path: '/hello', function: 'hello' },
+        { path: '/auth', function: 'auth' },
+      ],
+    }),
+  },
 ]
 
 const EXAMPLE_PORT = 80
@@ -172,10 +183,10 @@ export const POST_NORMALIZE_VALIDATIONS = [
     example: () => ({ build: { functions: 'functions' } }),
   },
   {
-    property: 'build.edge_handlers',
+    property: 'build.edge_functions',
     check: isString,
     message: 'must be a string.',
-    example: () => ({ build: { edge_handlers: 'edge-handlers' } }),
+    example: () => ({ build: { edge_functions: 'edge-functions' } }),
   },
   {
     property: 'functions.*',
@@ -242,5 +253,40 @@ export const POST_NORMALIZE_VALIDATIONS = [
       functions: { directory: 'my-functions' },
     }),
   },
+  {
+    property: 'edge_functions.*',
+    ...validProperties(['path', 'function'], []),
+    example: () => ({ edge_functions: [{ path: '/hello', function: 'hello' }] }),
+  },
+  {
+    property: 'edge_functions.*',
+    check: (edgeFunction) => edgeFunction.path !== undefined,
+    message: '"path" property is required.',
+    example: () => ({ edge_functions: [{ path: '/hello', function: 'hello' }] }),
+  },
+  {
+    property: 'edge_functions.*',
+    check: (edgeFunction) => edgeFunction.function !== undefined,
+    message: '"function" property is required.',
+    example: () => ({ edge_functions: [{ path: '/hello', function: 'hello' }] }),
+  },
+  {
+    property: 'edge_functions.*.path',
+    check: isString,
+    message: 'must be a string.',
+    example: () => ({ edge_functions: [{ path: '/hello', function: 'hello' }] }),
+  },
+  {
+    property: 'edge_functions.*.function',
+    check: isString,
+    message: 'must be a string.',
+    example: () => ({ edge_functions: [{ path: '/hello', function: 'hello' }] }),
+  },
+  {
+    property: 'edge_functions.*.path',
+    check: (pathName) => pathName.startsWith('/'),
+    message: 'must be a valid path.',
+    example: () => ({ edge_functions: [{ path: '/hello', function: 'hello' }] }),
+  },
 ]
 /* eslint-enable max-lines */