@netlify/config 20.8.0-rc.0 → 20.8.1

package/lib/base.js

@@ -3,7 +3,7 @@ import { resolvePath } from './files.js';
  * Retrieve the first `base` directory used to load the first config file.
  */
 export const getInitialBase = function ({ repositoryRoot, 
-// @ts-expect-error TODO: enhance later
+// @ts-expect-error TODO: enhance the types later on, just moved the file to .ts
 defaultConfig: { build: { base: defaultBase } = {} }, inlineConfig: { build: { base: initialBase = defaultBase } = {} }, }) {
     return resolveBase(repositoryRoot, initialBase);
 };

package/lib/edge_functions.js

@@ -1,9 +1,11 @@
 import { isString, validProperties } from './validate/helpers.js';
 const cacheValues = ['manual', 'off'];
+const methodValues = ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS'];
+const isMethod = (value) => typeof value === 'string' && methodValues.includes(value.toUpperCase());
 export const validations = [
     {
         property: 'edge_functions.*',
-        ...validProperties(['path', 'excludedPath', 'pattern', 'excludedPattern', 'function', 'cache'], []),
+        ...validProperties(['path', 'excludedPath', 'pattern', 'excludedPattern', 'function', 'cache', 'method'], []),
         example: () => ({ edge_functions: [{ path: '/hello', function: 'hello' }] }),
     },
     {
@@ -76,4 +78,10 @@ export const validations = [
         message: `must be one of: ${cacheValues.join(', ')}`,
         example: () => ({ edge_functions: [{ cache: cacheValues[0], path: '/hello', function: 'hello' }] }),
     },
+    {
+        property: 'edge_functions.*.method',
+        check: (value) => isMethod(value) || (Array.isArray(value) && value.length !== 0 && value.every(isMethod)),
+        message: `must be one of or array of: ${methodValues.join(', ')}`,
+        example: () => ({ edge_functions: [{ method: ['PUT', 'DELETE'], path: '/hello', function: 'hello' }] }),
+    },
 ];

package/lib/files.js

@@ -27,7 +27,6 @@ export const resolveConfigPaths = function (options) {
     const baseRel = options.baseRelDir ? options.buildDir : options.repositoryRoot;
     const config = resolvePaths({
         config: options.config,
-        packagePath: options.packagePath,
         propNames: FILE_PATH_CONFIG_PROPS,
         baseRel,
         repositoryRoot: options.repositoryRoot,
@@ -39,28 +38,22 @@ export const resolveConfigPaths = function (options) {
         packagePath: options.packagePath,
     });
 };
-const resolvePaths = function ({ config, propNames, baseRel, packagePath, repositoryRoot, }) {
-    return propNames.reduce((configA, propName) => resolvePathProp(configA, propName, baseRel, repositoryRoot, packagePath), config);
+const resolvePaths = function ({ config, propNames, baseRel, repositoryRoot, }) {
+    return propNames.reduce((configA, propName) => resolvePathProp(configA, propName, baseRel, repositoryRoot), config);
 };
-const resolvePathProp = function (config, propName, baseRel, repositoryRoot, packagePath) {
+const resolvePathProp = function (config, propName, baseRel, repositoryRoot) {
     const path = getProperty(config, propName);
     if (!isTruthy(path)) {
         deleteProperty(config, propName);
         return config;
     }
-    return setProperty(config, propName, resolvePath(repositoryRoot, baseRel, path, propName, packagePath));
+    return setProperty(config, propName, resolvePath(repositoryRoot, baseRel, path, propName));
 };
-export const resolvePath = (repositoryRoot, baseRel, originalPath, propName, 
-// @ts-expect-error depends on the survey outcome see comment below
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-packagePath) => {
+export const resolvePath = (repositoryRoot, baseRel, originalPath, propName) => {
     if (!isTruthy(originalPath)) {
         return;
     }
     const path = originalPath.replace(LEADING_SLASH_REGEXP, '');
-    // TODO: Based on survey outcome: https://netlify.slack.com/archives/C05556LEX28/p1691423437855069
-    // If we like option B then:
-    // const pathA = resolve(baseRel, packagePath || '', path)
     const pathA = resolve(baseRel, path);
     validateInsideRoot(originalPath, pathA, repositoryRoot, propName);
     return pathA;

package/lib/path.js

@@ -6,6 +6,7 @@ const FILENAME = 'netlify.toml';
 /**
  * Configuration location can be:
  * - a local path with the --config CLI flag
+ * - a `netlify.*` file in the `repositoryRoot/{base}/{packagePath}`
  * - a `netlify.*` file in the `repositoryRoot/{base}`
  * - a `netlify.*` file in the `repositoryRoot`
  * - a `netlify.*` file in the current directory or any parent
@@ -33,7 +34,8 @@ const searchBaseConfigFile = function (repoRoot, base, packagePath) {
     if (base === undefined && packagePath === undefined) {
         return;
     }
-    return searchConfigFile(join(base ? base : repoRoot, packagePath || ''));
+    const cwd = join(base ? base : repoRoot, packagePath || '');
+    return searchConfigFile(cwd);
 };
 /**
  * Look for several file extensions for `netlify.*`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/config",
-  "version": "20.8.0-rc.0",
+  "version": "20.8.1",
   "description": "Netlify config module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -72,8 +72,8 @@
     "map-obj": "^5.0.0",
     "netlify": "^13.1.10",
     "netlify-headers-parser": "^7.1.2",
+    "netlify-redirect-parser": "^14.2.0",
     "node-fetch": "^3.3.1",
-    "netlify-redirect-parser": "^14.1.3",
     "omit.js": "^2.0.2",
     "p-locate": "^6.0.0",
     "path-type": "^5.0.0",
@@ -93,5 +93,6 @@
   },
   "engines": {
     "node": "^14.16.0 || >=16.0.0"
-  }
+  },
+  "gitHead": "0eb6dbbfd00ba11941b1ef638811eded8a030a17"
 }