fix: reduce the usage of getSiteInfo if we already have a cachedConfig

packages/config/src/main.ts

@@ -74,19 +74,33 @@ export const resolveConfig = async function (opts) {
     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,

packages/config/tests/api/fixtures/cached_config/netlify.toml

@@ -0,0 +1,2 @@
+[build]
+command = "echo command"

packages/config/tests/api/tests.js

@@ -470,3 +470,50 @@ test('baseRelDir is true if build.base is overridden', async (t) => {
     .runConfigServer([SITE_INFO_BASE_REL_DIR, FETCH_INTEGRATIONS_EMPTY_RESPONSE])
   t.snapshot(normalizeOutput(output))
 })
+
+test('It does not fetch site info if cachedConfig is provided, use_cached_site_info is true and there is siteInfo, accounts, addons and integrations on cachedConfig', async (t) => {
+  const cachedConfig = await new Fixture('./fixtures/cached_config').runWithConfigAsObject()
+  const { requests } = await new Fixture('./fixtures/cached_config')
+    .withFlags({
+      cachedConfig,
+      siteId: 'test',
+      mode: 'dev',
+      token: 'test',
+      accountId: 'account1',
+      featureFlags: {
+        use_cached_site_info: true,
+      },
+    })
+    .runConfigServer([SITE_INFO_DATA, SITE_INTEGRATIONS_RESPONSE, TEAM_INSTALLATIONS_META_RESPONSE])
+
+  t.assert(requests.length === 0)
+})
+
+test('It fetches site info if cachedConfig is provided, use_cached_site_info is true and there is no siteInfo, accounts, addons or integrations on cachedConfig', async (t) => {
+  const cachedConfig = await new Fixture('./fixtures/cached_config').runWithConfigAsObject()
+  const { requests } = await new Fixture('./fixtures/cached_config')
+    .withFlags({
+      cachedConfig,
+      siteId: 'test',
+      mode: 'dev',
+      token: 'test',
+      accountId: 'account1',
+      featureFlags: {
+        use_cached_site_info: true,
+      },
+    })
+    .runConfigServer([SITE_INFO_DATA, SITE_INTEGRATIONS_RESPONSE, TEAM_INSTALLATIONS_META_RESPONSE])
+
+  t.assert(requests.length === 0)
+})
+
+test('It fetches site info if cachedConfig is provided, use_cached_site_info is false', async (t) => {
+  const cachedConfig = await new Fixture('./fixtures/cached_config').runWithConfigAsObject()
+  const { requests } = await new Fixture('./fixtures/cached_config')
+    .withFlags({
+      cachedConfig,
+    })
+    .runConfigServer([SITE_INFO_DATA, SITE_INTEGRATIONS_RESPONSE, TEAM_INSTALLATIONS_META_RESPONSE])
+
+  t.assert(requests.length === 0)
+})