@netlify/config 20.17.1 → 20.19.0

package/lib/api/site_info.js

@@ -16,7 +16,11 @@ export const getSiteInfo = async function ({ api, siteId, accountId, mode, conte
     const useV2Endpoint = !!accountId && featureFlags.cli_integration_installations_meta;
     if (useV2Endpoint) {
         if (api === undefined || mode === 'buildbot' || testEnv) {
-            const siteInfo = siteId === undefined ? {} : { id: siteId };
+            const siteInfo = {};
+            if (siteId !== undefined)
+                siteInfo.id = siteId;
+            if (accountId !== undefined)
+                siteInfo.account_id = accountId;
             const integrations = mode === 'buildbot' && !offline
                 ? await getIntegrations({ siteId, testOpts, offline, useV2Endpoint, accountId })
                 : [];
@@ -36,7 +40,11 @@ export const getSiteInfo = async function ({ api, siteId, accountId, mode, conte
         return { siteInfo, accounts, addons, integrations };
     }
     if (api === undefined || mode === 'buildbot' || testEnv) {
-        const siteInfo = siteId === undefined ? {} : { id: siteId };
+        const siteInfo = {};
+        if (siteId !== undefined)
+            siteInfo.id = siteId;
+        if (accountId !== undefined)
+            siteInfo.account_id = accountId;
         const integrations = mode === 'buildbot' && !offline ? await getIntegrations({ siteId, testOpts, offline }) : [];
         return { siteInfo, accounts: [], addons: [], integrations };
     }
@@ -92,8 +100,9 @@ const getIntegrations = async function ({ siteId, accountId, testOpts, offline,
     }
     const { host } = testOpts;
     const baseUrl = new URL(host ? `http://${host}` : `https://api.netlifysdk.com`);
+    // use future state feature flag
     const url = useV2Endpoint
-        ? `${baseUrl}team/${accountId}/integrations/installations/meta?exclude_site_id=${siteId}`
+        ? `${baseUrl}team/${accountId}/integrations/installations/meta/${siteId}`
         : `${baseUrl}site/${siteId}/integrations/safe`;
     try {
         const response = await fetch(url);

package/lib/origin.js

@@ -21,7 +21,7 @@ const addBuildPublishOrigin = function ({ config, config: { build = {} }, origin
     return isTruthy(build.publish) ? { ...config, build: { ...build, publishOrigin: origin } } : config;
 };
 const addConfigPluginOrigin = function ({ config, config: { plugins }, origin }) {
-    return Array.isArray(plugins) ? { ...config, plugins: plugins.map((plugin) => ({ ...plugin, origin })) } : config;
+    return Array.isArray(plugins) ? { ...config, plugins: plugins.map((plugin) => ({ origin, ...plugin })) } : config;
 };
 const addHeadersOrigin = function ({ config, config: { headers }, origin }) {
     return isTruthy(headers) ? { ...config, headersOrigin: origin } : config;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/config",
-  "version": "20.17.1",
+  "version": "20.19.0",
   "description": "Netlify config module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -72,7 +72,7 @@
     "is-plain-obj": "^4.0.0",
     "js-yaml": "^4.0.0",
     "map-obj": "^5.0.0",
-    "netlify": "^13.1.20",
+    "netlify": "^13.1.21",
     "netlify-headers-parser": "^7.1.4",
     "netlify-redirect-parser": "^14.3.0",
     "node-fetch": "^3.3.1",
@@ -95,5 +95,5 @@
   "engines": {
     "node": "^14.16.0 || >=16.0.0"
   },
-  "gitHead": "50efbdfa49d7e84b5ca5357187a07536560b10ad"
+  "gitHead": "4ae7f95ca7b31f392956894d5cd6ecf781349b55"
 }