@netlify/config 23.0.8 → 23.0.10

package/lib/main.js

@@ -108,11 +108,12 @@ export const resolveConfig = async function (opts) {
         siteId,
         accountId,
         token,
-        cwd,
+        buildDir,
         extensionApiBaseUrl,
         testOpts,
         offline,
         mode,
+        debug,
     });
     const mergedIntegrations = await mergeIntegrations({
         apiIntegrations: updatedIntegrations,

package/lib/utils/extensions/auto-install-extensions.d.ts

@@ -5,12 +5,13 @@ interface AutoInstallOptions {
     siteId: string;
     accountId: string;
     token: string;
-    cwd: string;
+    buildDir: string;
     integrations: IntegrationResponse[];
     offline: boolean;
     testOpts: any;
     mode: ModeOption;
     extensionApiBaseUrl: string;
+    debug?: boolean;
 }
-export declare function handleAutoInstallExtensions({ featureFlags, siteId, accountId, token, cwd, integrations, offline, testOpts, mode, extensionApiBaseUrl, }: AutoInstallOptions): Promise<IntegrationResponse[]>;
+export declare function handleAutoInstallExtensions({ featureFlags, siteId, accountId, token, buildDir, integrations, offline, testOpts, mode, extensionApiBaseUrl, debug, }: AutoInstallOptions): Promise<IntegrationResponse[]>;
 export {};

package/lib/utils/extensions/auto-install-extensions.js

@@ -3,73 +3,57 @@ import { join } from 'path';
 import { getIntegrations } from '../../api/site_info.js';
 import { fetchAutoInstallableExtensionsMeta, installExtension } from './utils.js';
 function getPackageJSON(directory) {
-    const require = createRequire(join(directory, 'package.json'));
-    return require('./package.json');
-}
-export async function handleAutoInstallExtensions({ featureFlags, siteId, accountId, token, cwd, integrations, offline, testOpts = {}, mode, extensionApiBaseUrl, }) {
-    if (!featureFlags?.auto_install_required_extensions) {
-        return integrations;
-    }
-    if (!accountId) {
-        console.error("Failed to auto install extension(s): Missing 'accountId'", {
-            accountId,
-            siteId,
-            cwd,
-            offline,
-            mode,
-        });
-        return integrations;
-    }
-    if (!siteId) {
-        console.error("Failed to auto install extension(s): Missing 'siteId'", {
-            accountId,
-            siteId,
-            cwd,
-            offline,
-            mode,
-        });
-        return integrations;
+    try {
+        const require = createRequire(join(directory, 'package.json'));
+        return require('./package.json');
     }
-    if (!token) {
-        console.error("Failed to auto install extension(s): Missing 'token'", {
-            accountId,
-            siteId,
-            cwd,
-            offline,
-            mode,
-        });
-        return integrations;
+    catch {
+        // Gracefully fail if no package.json found in buildDir
+        return {};
     }
-    if (!cwd) {
-        console.error("Failed to auto install extension(s): Missing 'cwd'", {
-            accountId,
-            siteId,
-            cwd,
-            offline,
-            mode,
-        });
+}
+export async function handleAutoInstallExtensions({ featureFlags, siteId, accountId, token, buildDir, integrations, offline, testOpts = {}, mode, extensionApiBaseUrl, debug = false, }) {
+    if (!featureFlags?.auto_install_required_extensions) {
         return integrations;
     }
-    if (offline) {
-        console.error("Failed to auto install extension(s): Running as 'offline'", {
-            accountId,
-            siteId,
-            cwd,
-            offline,
-            mode,
-        });
+    if (!accountId || !siteId || !token || !buildDir || offline) {
+        const reason = !accountId
+            ? 'Missing accountId'
+            : !siteId
+                ? 'Missing siteId'
+                : !token
+                    ? 'Missing token'
+                    : !buildDir
+                        ? 'Missing buildDir'
+                        : 'Running as offline';
+        if (debug) {
+            console.error(`Failed to auto install extension(s): ${reason}`, {
+                accountId,
+                siteId,
+                buildDir,
+                offline,
+                mode,
+            });
+        }
         return integrations;
     }
     try {
-        const packageJson = getPackageJSON(cwd);
+        const packageJson = getPackageJSON(buildDir);
         if (!packageJson?.dependencies ||
             typeof packageJson?.dependencies !== 'object' ||
             Object.keys(packageJson?.dependencies)?.length === 0) {
             return integrations;
         }
         const autoInstallableExtensions = await fetchAutoInstallableExtensionsMeta();
-        const extensionsToInstall = autoInstallableExtensions.filter((ext) => {
-            return !integrations?.some((integration) => integration.slug === ext.slug);
+        const enabledExtensionSlugs = new Set((integrations ?? []).map(({ slug }) => slug));
+        const extensionsToInstallCandidates = autoInstallableExtensions.filter(({ slug }) => !enabledExtensionSlugs.has(slug));
+        const extensionsToInstall = extensionsToInstallCandidates.filter(({ packages }) => {
+            for (const pkg of packages) {
+                if (packageJson?.dependencies && Object.hasOwn(packageJson.dependencies, pkg)) {
+                    return true;
+                }
+            }
+            return false;
         });
         if (extensionsToInstall.length === 0) {
             return integrations;

package/lib/utils/extensions/utils.js

@@ -34,11 +34,17 @@ export const installExtension = async ({ netlifyToken, accountId, slug, hostSite
  * @returns Array of extensions with their associated packages
  */
 export async function fetchAutoInstallableExtensionsMeta() {
-    const url = new URL(`/meta/auto-installable`, process.env.EXTENSION_API_BASE_URL ?? EXTENSION_API_BASE_URL);
-    const response = await fetch(url.toString());
-    if (!response.ok) {
-        throw new Error(`Failed to fetch extensions meta`);
+    try {
+        const url = new URL(`/meta/auto-installable`, process.env.EXTENSION_API_BASE_URL ?? EXTENSION_API_BASE_URL);
+        const response = await fetch(url.toString());
+        if (!response.ok) {
+            throw new Error(`Failed to fetch extensions meta`);
+        }
+        const data = await response.json();
+        return data;
+    }
+    catch (error) {
+        console.error(`Failed to fetch auto-installable extensions meta: ${error.message}`, error);
+        return [];
     }
-    const data = await response.json();
-    return data;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/config",
-  "version": "23.0.8",
+  "version": "23.0.10",
   "description": "Netlify config module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -94,5 +94,5 @@
   "engines": {
     "node": ">=18.14.0"
   },
-  "gitHead": "df148594017a78f0f419591da402311ed08e4d64"
+  "gitHead": "4a0f587ae4efe1c2e62c25c11374e3fbaa9aebce"
 }