@netlify/config 20.6.0 → 20.6.2

package/lib/api/site_info.js

@@ -9,7 +9,8 @@ import { ERROR_CALL_TO_ACTION } from '../log/messages.js';
 // Requires knowing the `siteId` and having the access `token`.
 // Silently ignore API errors. For example the network connection might be down,
 // but local builds should still work regardless.
-export const getSiteInfo = async function ({ api, siteId, mode, siteFeatureFlagPrefix, featureFlags = {}, testOpts: { env: testEnv = true } = {}, }) {
+export const getSiteInfo = async function ({ api, siteId, mode, siteFeatureFlagPrefix, featureFlags = {}, testOpts = {}, }) {
+    const { env: testEnv = true } = testOpts;
     if (api === undefined || mode === 'buildbot' || !testEnv) {
         const siteInfo = siteId === undefined ? {} : { id: siteId };
         return { siteInfo, accounts: [], addons: [] };
@@ -17,14 +18,14 @@ export const getSiteInfo = async function ({ api, siteId, mode, siteFeatureFlagP
     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 }));
+        promises.push(getIntegrations({ api, ownerType: 'site', ownerId: siteId, testOpts }));
     }
     const [siteInfo, accounts, addons, integrations = []] = await Promise.all(promises);
     if (siteInfo.use_envelope) {
         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: integrations };
 };
 const getSite = async function (api, siteId, siteFeatureFlagPrefix = null) {
     if (siteId === undefined) {
@@ -59,13 +60,15 @@ const getAddons = async function (api, siteId) {
         throwUserError(`Failed retrieving addons for site ${siteId}: ${error.message}. ${ERROR_CALL_TO_ACTION}`);
     }
 };
-const getIntegrations = async function ({ api, ownerType, ownerId }) {
+const getIntegrations = async function ({ api, ownerType, ownerId, testOpts }) {
     if (ownerId === undefined) {
         return [];
     }
+    const { host } = testOpts;
+    const baseUrl = host ? `http://${host}` : `https://api.netlifysdk.com`;
     try {
-        const token = api.accessToken();
-        const response = await fetch(`https://api.netlifysdk.com/${ownerType}/${ownerId}/integrations`, {
+        const token = api.accessToken;
+        const response = await fetch(`${baseUrl}/${ownerType}/${ownerId}/integrations`, {
             headers: {
                 Authorization: `Bearer ${token}`,
             },

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.0",
+  "version": "20.6.2",
   "description": "Netlify config module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -94,5 +94,5 @@
   "engines": {
     "node": "^14.16.0 || >=16.0.0"
   },
-  "gitHead": "34f833bce745039add76a082f8dcfd682f9f7de0"
+  "gitHead": "487f1b282fed53beeb3ea17db151a741535ba8fc"
 }