@netlify/config 20.6.1 → 20.6.3

package/lib/api/site_info.js

@@ -11,11 +11,16 @@ import { ERROR_CALL_TO_ACTION } from '../log/messages.js';
 // but local builds should still work regardless.
 export const getSiteInfo = async function ({ api, siteId, mode, siteFeatureFlagPrefix, featureFlags = {}, testOpts = {}, }) {
     const { env: testEnv = true } = testOpts;
+    const fetchIntegrations = featureFlags.buildbot_fetch_integrations;
     if (api === undefined || mode === 'buildbot' || !testEnv) {
         const siteInfo = siteId === undefined ? {} : { id: siteId };
-        return { siteInfo, accounts: [], addons: [] };
+        let integrations = [];
+        if (fetchIntegrations && api !== undefined && !testEnv) {
+            // we still want to fetch integrations within buildbot
+            integrations = await getIntegrations({ api, ownerType: 'site', ownerId: siteId, testOpts });
+        }
+        return { siteInfo, accounts: [], addons: [], integrations };
     }
-    const fetchIntegrations = featureFlags.buildbot_fetch_integrations;
     const promises = [getSite(api, siteId, siteFeatureFlagPrefix), getAccounts(api), getAddons(api, siteId)];
     if (fetchIntegrations) {
         promises.push(getIntegrations({ api, ownerType: 'site', ownerId: siteId, testOpts }));
@@ -25,7 +30,7 @@ export const getSiteInfo = async function ({ api, siteId, mode, siteFeatureFlagP
         const envelope = await getEnvelope({ api, accountId: siteInfo.account_slug, siteId });
         siteInfo.build_settings.env = envelope;
     }
-    return { siteInfo, accounts, addons, integrations: integrations };
+    return { siteInfo, accounts, addons, integrations };
 };
 const getSite = async function (api, siteId, siteFeatureFlagPrefix = null) {
     if (siteId === undefined) {

package/lib/edge_functions.js

@@ -18,6 +18,12 @@ export const validations = [
         message: '"path" and "pattern" are mutually exclusive.',
         example: () => ({ edge_functions: [{ path: '/hello', function: 'hello' }] }),
     },
+    {
+        property: 'edge_functions.*',
+        check: (edgeFunction) => !(edgeFunction.excludedPath !== undefined && edgeFunction.excludedPattern !== undefined),
+        message: '"excludedPath" and "excludedPattern" are mutually exclusive.',
+        example: () => ({ edge_functions: [{ path: '/hello/*', function: 'hello', excludedPath: '/hello/no' }] }),
+    },
     {
         property: 'edge_functions.*',
         check: (edgeFunction) => edgeFunction.function !== undefined,
@@ -38,14 +44,6 @@ export const validations = [
             edge_functions: [{ path: '/products/*', excludedPath: ['/products/*.jpg'], function: 'customise' }],
         }),
     },
-    {
-        property: 'edge_functions.*',
-        check: (value) => value.excludedPath === undefined || value.path !== undefined,
-        message: '"excludedPath" can only be specified together with "path".',
-        example: () => ({
-            edge_functions: [{ path: '/products/*', excludedPath: ['/products/*.jpg'], function: 'customise' }],
-        }),
-    },
     {
         property: 'edge_functions.*.pattern',
         check: isString,
@@ -57,15 +55,7 @@ export const validations = [
         check: (value) => isString(value) || (Array.isArray(value) && value.every(isString)),
         message: 'must be a string or array of strings.',
         example: () => ({
-            edge_functions: [{ path: '/products/(.*)', excludedPath: ['/products/(.*)\\.jpg'], function: 'customise' }],
-        }),
-    },
-    {
-        property: 'edge_functions.*.excludedPattern',
-        check: (value) => value.excludedPattern === undefined || value.pattern !== undefined,
-        message: '"excludedPattern" can only be specified together with "pattern".',
-        example: () => ({
-            edge_functions: [{ path: '/products/(.*)', excludedPath: ['/products/(.*)\\.jpg'], function: 'customise' }],
+            edge_functions: [{ path: '/products/(.*)', excludedPattern: ['^/products/(.*)\\.jpg$'], function: 'customise' }],
         }),
     },
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/config",
-  "version": "20.6.1",
+  "version": "20.6.3",
   "description": "Netlify config module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -94,5 +94,5 @@
   "engines": {
     "node": "^14.16.0 || >=16.0.0"
   },
-  "gitHead": "955ef6d9b44d9dd92cef78ba80b15f416044bfc9"
+  "gitHead": "28f104de3b83def70a633289c72c70c9c7360ce0"
 }