@netlify/config 21.0.1 → 21.0.3

package/lib/env/main.js

@@ -123,8 +123,7 @@ const getUserEnv = async function ({ api, config, siteInfo, accounts, addons, co
 // Account-wide environment variables
 const getAccountEnv = async function ({ api, siteInfo, accounts, context, }) {
     if (siteInfo.use_envelope) {
-        const envelope = await getEnvelope({ api, accountId: siteInfo.account_slug, siteId: siteInfo.site_id, context });
-        return envelope;
+        return await getEnvelope({ api, accountId: siteInfo.account_slug, context });
     }
     const { site_env: siteEnv = {} } = accounts.find(({ slug }) => slug === siteInfo.account_slug) || {};
     return siteEnv;

package/lib/main.js

@@ -37,19 +37,28 @@ export const resolveConfig = async function (opts) {
     // TODO(kh): remove this mapping and get the extensionApiHost from the opts
     const extensionApiBaseUrl = host === 'api-staging.netlify.com' ? 'https://api-staging.netlifysdk.com' : 'https://api.netlifysdk.com';
     const { config: configOpt, defaultConfig, inlineConfig, configMutations, cwd, context, repositoryRoot, base, branch, siteId, accountId, deployId, buildId, baseRelDir, mode, debug, logs, featureFlags, } = await normalizeOpts(optsA);
-    const { siteInfo, accounts, addons, integrations } = await getSiteInfo({
-        api,
-        context,
-        siteId,
-        accountId,
-        mode,
-        siteFeatureFlagPrefix,
-        offline,
-        featureFlags,
-        testOpts,
-        token,
-        extensionApiBaseUrl,
-    });
+    let { siteInfo, accounts, addons, integrations } = parsedCachedConfig || {};
+    // If we have cached site info, we don't need to fetch it again
+    const useCachedSiteInfo = Boolean(featureFlags?.use_cached_site_info && siteInfo && accounts && addons && integrations);
+    if (!useCachedSiteInfo) {
+        const updatedSiteInfo = await getSiteInfo({
+            api,
+            context,
+            siteId,
+            accountId,
+            mode,
+            siteFeatureFlagPrefix,
+            offline,
+            featureFlags,
+            testOpts,
+            token,
+            extensionApiBaseUrl,
+        });
+        siteInfo = updatedSiteInfo.siteInfo;
+        accounts = updatedSiteInfo.accounts;
+        addons = updatedSiteInfo.addons;
+        integrations = updatedSiteInfo.integrations;
+    }
     const { defaultConfig: defaultConfigA, baseRelDir: baseRelDirA } = parseDefaultConfig({
         defaultConfig,
         base,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/config",
-  "version": "21.0.1",
+  "version": "21.0.3",
   "description": "Netlify config module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -60,7 +60,7 @@
   "dependencies": {
     "@iarna/toml": "^2.2.5",
     "@netlify/headers-parser": "^8.0.0",
-    "@netlify/redirect-parser": "^14.5.0",
+    "@netlify/redirect-parser": "^14.5.1",
     "chalk": "^5.0.0",
     "cron-parser": "^4.1.0",
     "deepmerge": "^4.2.2",
@@ -95,5 +95,5 @@
   "engines": {
     "node": "^14.16.0 || >=16.0.0"
   },
-  "gitHead": "8e40ace9314f5a549797f753389962ca22eab87d"
+  "gitHead": "180306dc6d37736969b5fa951f8588c2c85e6109"
 }