@netlify/config 23.0.7 → 23.0.9

package/lib/main.js

@@ -108,7 +108,7 @@ export const resolveConfig = async function (opts) {
         siteId,
         accountId,
         token,
-        cwd,
+        buildDir,
         extensionApiBaseUrl,
         testOpts,
         offline,

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

@@ -5,12 +5,12 @@ interface AutoInstallOptions {
     siteId: string;
     accountId: string;
     token: string;
-    cwd: string;
+    buildDir: string;
     integrations: IntegrationResponse[];
     offline: boolean;
     testOpts: any;
     mode: ModeOption;
     extensionApiBaseUrl: string;
 }
-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, }: AutoInstallOptions): Promise<IntegrationResponse[]>;
 export {};

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

@@ -3,10 +3,16 @@ 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');
+    try {
+        const require = createRequire(join(directory, 'package.json'));
+        return require('./package.json');
+    }
+    catch {
+        // Gracefully fail if no package.json found in buildDir
+        return {};
+    }
 }
-export async function handleAutoInstallExtensions({ featureFlags, siteId, accountId, token, cwd, integrations, offline, testOpts = {}, mode, extensionApiBaseUrl, }) {
+export async function handleAutoInstallExtensions({ featureFlags, siteId, accountId, token, buildDir, integrations, offline, testOpts = {}, mode, extensionApiBaseUrl, }) {
     if (!featureFlags?.auto_install_required_extensions) {
         return integrations;
     }
@@ -14,7 +20,7 @@ export async function handleAutoInstallExtensions({ featureFlags, siteId, accoun
         console.error("Failed to auto install extension(s): Missing 'accountId'", {
             accountId,
             siteId,
-            cwd,
+            buildDir,
             offline,
             mode,
         });
@@ -24,7 +30,7 @@ export async function handleAutoInstallExtensions({ featureFlags, siteId, accoun
         console.error("Failed to auto install extension(s): Missing 'siteId'", {
             accountId,
             siteId,
-            cwd,
+            buildDir,
             offline,
             mode,
         });
@@ -34,17 +40,17 @@ export async function handleAutoInstallExtensions({ featureFlags, siteId, accoun
         console.error("Failed to auto install extension(s): Missing 'token'", {
             accountId,
             siteId,
-            cwd,
+            buildDir,
             offline,
             mode,
         });
         return integrations;
     }
-    if (!cwd) {
-        console.error("Failed to auto install extension(s): Missing 'cwd'", {
+    if (!buildDir) {
+        console.error("Failed to auto install extension(s): Missing 'buildDir'", {
             accountId,
             siteId,
-            cwd,
+            buildDir,
             offline,
             mode,
         });
@@ -54,22 +60,29 @@ export async function handleAutoInstallExtensions({ featureFlags, siteId, accoun
         console.error("Failed to auto install extension(s): Running as 'offline'", {
             accountId,
             siteId,
-            cwd,
+            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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/config",
-  "version": "23.0.7",
+  "version": "23.0.9",
   "description": "Netlify config module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -59,9 +59,9 @@
   "license": "MIT",
   "dependencies": {
     "@iarna/toml": "^2.2.5",
-    "@netlify/api": "^14.0.2",
-    "@netlify/headers-parser": "^9.0.0",
-    "@netlify/redirect-parser": "^15.0.1",
+    "@netlify/api": "^14.0.3",
+    "@netlify/headers-parser": "^9.0.1",
+    "@netlify/redirect-parser": "^15.0.2",
     "chalk": "^5.0.0",
     "cron-parser": "^4.1.0",
     "deepmerge": "^4.2.2",
@@ -79,11 +79,11 @@
     "p-locate": "^6.0.0",
     "path-type": "^6.0.0",
     "tomlify-j0.4": "^3.0.0",
-    "validate-npm-package-name": "^4.0.0",
+    "validate-npm-package-name": "^5.0.0",
     "yargs": "^17.6.0"
   },
   "devDependencies": {
-    "@types/node": "^14.18.53",
+    "@types/node": "^18.0.0",
     "ava": "^5.0.0",
     "c8": "^10.0.0",
     "has-ansi": "^6.0.0",
@@ -94,5 +94,5 @@
   "engines": {
     "node": ">=18.14.0"
   },
-  "gitHead": "f85f7e9a41f2c1698a320402d09072ee04f4dc6d"
+  "gitHead": "44309b889269b8555b19127ed9988bc5972cb4ec"
 }