@netlify/build 29.15.6 → 29.16.1

package/lib/core/build.js

@@ -53,7 +53,7 @@ const tExecBuild = async function ({ config, defaultConfig, cachedConfig, cached
         testOpts,
         featureFlags,
     });
-    const { netlifyConfig, configPath, headersPath, redirectsPath, buildDir, repositoryRoot: repositoryRootA, packageJson, userNodeVersion, childEnv, context: contextA, branch: branchA, token: tokenA, api, siteInfo, timers: timersA, } = await loadConfig({
+    const { netlifyConfig, configPath, headersPath, redirectsPath, buildDir, repositoryRoot: repositoryRootA, packageJson, userNodeVersion, childEnv, context: contextA, branch: branchA, token: tokenA, api, siteInfo, timers: timersA, integrations, } = await loadConfig({
         configOpts,
         cachedConfig,
         cachedConfigPath,
@@ -128,6 +128,7 @@ const tExecBuild = async function ({ config, defaultConfig, cachedConfig, cached
         timeline,
         devCommand,
         quiet,
+        integrations,
         explicitSecretKeys,
     });
     return {
@@ -143,7 +144,7 @@ const tExecBuild = async function ({ config, defaultConfig, cachedConfig, cached
 };
 export const execBuild = measureDuration(tExecBuild, 'total', { parentTag: 'build_site' });
 // Runs a build then report any plugin statuses
-export const runAndReportBuild = async function ({ pluginsOptions, netlifyConfig, configOpts, siteInfo, configPath, outputConfigPath, headersPath, redirectsPath, buildDir, repositoryRoot, nodePath, packageJson, userNodeVersion, childEnv, context, branch, buildbotServerSocket, constants, dry, mode, api, errorMonitor, deployId, errorParams, logs, debug, systemLog, verbose, timers, sendStatus, saveConfig, testOpts, featureFlags, timeline, devCommand, quiet, explicitSecretKeys, }) {
+export const runAndReportBuild = async function ({ pluginsOptions, netlifyConfig, configOpts, siteInfo, configPath, outputConfigPath, headersPath, redirectsPath, buildDir, repositoryRoot, nodePath, packageJson, userNodeVersion, childEnv, context, branch, buildbotServerSocket, constants, dry, mode, api, errorMonitor, deployId, errorParams, logs, debug, systemLog, verbose, timers, sendStatus, saveConfig, testOpts, featureFlags, timeline, devCommand, quiet, integrations, explicitSecretKeys, }) {
     try {
         const { stepsCount, netlifyConfig: netlifyConfigA, statuses, pluginsOptions: pluginsOptionsA, failedPlugins, timers: timersA, configMutations, metrics, } = await initAndRunBuild({
             pluginsOptions,
@@ -182,6 +183,7 @@ export const runAndReportBuild = async function ({ pluginsOptions, netlifyConfig
             timeline,
             devCommand,
             quiet,
+            integrations,
             explicitSecretKeys,
         });
         await Promise.all([
@@ -243,7 +245,7 @@ export const runAndReportBuild = async function ({ pluginsOptions, netlifyConfig
     }
 };
 // Initialize plugin processes then runs a build
-const initAndRunBuild = async function ({ pluginsOptions, netlifyConfig, configOpts, siteInfo, configPath, outputConfigPath, headersPath, redirectsPath, buildDir, repositoryRoot, nodePath, packageJson, userNodeVersion, childEnv, context, branch, dry, mode, api, errorMonitor, deployId, errorParams, logs, debug, systemLog, verbose, sendStatus, saveConfig, timers, testOpts, buildbotServerSocket, constants, featureFlags, timeline, devCommand, quiet, explicitSecretKeys, }) {
+const initAndRunBuild = async function ({ pluginsOptions, netlifyConfig, configOpts, siteInfo, configPath, outputConfigPath, headersPath, redirectsPath, buildDir, repositoryRoot, nodePath, packageJson, userNodeVersion, childEnv, context, branch, dry, mode, api, errorMonitor, deployId, errorParams, logs, debug, systemLog, verbose, sendStatus, saveConfig, timers, testOpts, buildbotServerSocket, constants, featureFlags, timeline, devCommand, quiet, integrations, explicitSecretKeys, }) {
     const { pluginsOptions: pluginsOptionsA, timers: timersA } = await getPluginsOptions({
         pluginsOptions,
         netlifyConfig,
@@ -260,6 +262,7 @@ const initAndRunBuild = async function ({ pluginsOptions, netlifyConfig, configO
         timers,
         testOpts,
         featureFlags,
+        integrations,
     });
     errorParams.pluginsOptions = pluginsOptionsA;
     const { childProcesses, timers: timersB } = await startPlugins({

package/lib/core/config.js

@@ -38,7 +38,7 @@ export const getConfigOpts = function ({ config, defaultConfig, cwd, repositoryR
 };
 // Retrieve configuration object
 const tLoadConfig = async function ({ configOpts, cachedConfig, cachedConfigPath, envOpt, debug, logs, nodePath, quiet, }) {
-    const { configPath, headersPath, redirectsPath, buildDir, repositoryRoot, config: netlifyConfig, context: contextA, branch: branchA, token: tokenA, api, siteInfo, env, } = await resolveInitialConfig(configOpts, cachedConfig, cachedConfigPath);
+    const { configPath, headersPath, redirectsPath, buildDir, repositoryRoot, config: netlifyConfig, context: contextA, branch: branchA, token: tokenA, api, siteInfo, env, integrations, } = await resolveInitialConfig(configOpts, cachedConfig, cachedConfigPath);
     if (!quiet) {
         logConfigInfo({ logs, configPath, buildDir, netlifyConfig, context: contextA, debug });
     }
@@ -61,6 +61,7 @@ const tLoadConfig = async function ({ configOpts, cachedConfig, cachedConfigPath
         token: tokenA,
         api: apiA,
         siteInfo,
+        integrations,
     };
 };
 export const loadConfig = measureDuration(tLoadConfig, 'resolve_config');

package/lib/install/missing.js

@@ -2,7 +2,7 @@ import { promises as fs } from 'fs';
 import { normalize } from 'path';
 import { pathExists } from 'path-exists';
 import { isFile } from 'path-type';
-import { logInstallMissingPlugins } from '../log/messages/install.js';
+import { logInstallMissingPlugins, logInstallIntegrations } from '../log/messages/install.js';
 import { addExactDependencies } from './main.js';
 // Automatically install plugins if not already installed.
 // Since this is done under the hood, we always use `npm` with specific `npm`
@@ -15,6 +15,15 @@ export const installMissingPlugins = async function ({ missingPlugins, autoPlugi
     await createAutoPluginsDir(logs, autoPluginsDir);
     await addExactDependencies({ packageRoot: autoPluginsDir, isLocal: mode !== 'buildbot', packages });
 };
+export const installIntegrationPlugins = async function ({ integrations, autoPluginsDir, mode, logs }) {
+    const packages = integrations.map(getIntegrationPackage);
+    logInstallIntegrations(logs, integrations);
+    await createAutoPluginsDir(logs, autoPluginsDir);
+    await addExactDependencies({ packageRoot: autoPluginsDir, isLocal: mode !== 'buildbot', packages });
+};
+const getIntegrationPackage = function ({ version }) {
+    return `${version}/packages/buildhooks.tgz`;
+};
 // We pin the version without using semver ranges ^ nor ~
 const getPackage = function ({ packageName, expectedVersion }) {
     return `${packageName}@${expectedVersion}`;

package/lib/log/messages/compatibility.js

@@ -12,11 +12,22 @@ export const logRuntime = (logs, pluginOptions) => {
         logSubHeader(logs, `Using Next.js Runtime - v${nextRuntime.pluginPackageJson.version}`);
     }
 };
+export const logLoadingIntegration = (logs, pluginOptions) => {
+    const loadingPlugins = pluginOptions
+        .filter((plugin) => plugin.isIntegration)
+        .map((pluginOptions) => pluginOptions.integration?.slug ?? 'no-slug');
+    if (loadingPlugins.length === 0) {
+        return;
+    }
+    logSubHeader(logs, 'Loading integrations');
+    logArray(logs, loadingPlugins);
+};
 export const logLoadingPlugins = function (logs, pluginsOptions, debug) {
     const loadingPlugins = pluginsOptions
         .filter(isNotCorePlugin)
         // We don't want to show runtimes as plugins
         .filter((plugin) => !isRuntime(plugin))
+        .filter((p) => !p.isIntegration)
         .map((pluginOptions) => getPluginDescription(pluginOptions, debug));
     if (loadingPlugins.length === 0) {
         return;

package/lib/log/messages/install.js

@@ -12,6 +12,13 @@ export const logInstallMissingPlugins = function (logs, packages) {
         logSubHeader(logs, `Using Next.js Runtime - v${nextRuntime.pluginPackageJson.version}`);
     }
 };
+export const logInstallIntegrations = function (logs, integrations) {
+    if (integrations.length === 0) {
+        return;
+    }
+    logSubHeader(logs, 'Installing integrations');
+    logArray(logs, integrations.map((integration) => integration.slug));
+};
 export const logInstallLocalPluginsDeps = function (logs, localPluginsOptions) {
     const packages = localPluginsOptions.map(getPackageName);
     logSubHeader(logs, 'Installing local plugins dependencies');

package/lib/plugins/options.js

@@ -8,7 +8,7 @@ import { getPackageJson } from '../utils/package.js';
 import { useManifest } from './manifest/main.js';
 import { resolvePluginsPath } from './resolve.js';
 // Load core plugins and user plugins
-const tGetPluginsOptions = async function ({ pluginsOptions, netlifyConfig: { plugins }, siteInfo, buildDir, nodePath, packageJson, userNodeVersion, mode, api, logs, debug, sendStatus, testOpts, featureFlags, }) {
+const tGetPluginsOptions = async function ({ pluginsOptions, netlifyConfig: { plugins }, siteInfo, buildDir, nodePath, packageJson, userNodeVersion, mode, api, logs, debug, sendStatus, testOpts, featureFlags, integrations, }) {
     const pluginsOptionsA = await resolvePluginsPath({
         pluginsOptions,
         siteInfo,
@@ -23,6 +23,7 @@ const tGetPluginsOptions = async function ({ pluginsOptions, netlifyConfig: { pl
         sendStatus,
         testOpts,
         featureFlags,
+        integrations,
     });
     const pluginsOptionsB = await Promise.all(pluginsOptionsA.map((pluginOptions) => loadPluginFiles({ pluginOptions, debug })));
     const pluginsOptionsC = pluginsOptionsB.filter(isNotRedundantCorePlugin);

package/lib/plugins/resolve.js

@@ -1,5 +1,5 @@
 import { addErrorInfo } from '../error/info.js';
-import { installMissingPlugins } from '../install/missing.js';
+import { installMissingPlugins, installIntegrationPlugins } from '../install/missing.js';
 import { resolvePath, tryResolvePath } from '../utils/resolve.js';
 import { addExpectedVersions } from './expected_version.js';
 import { addPluginsNodeVersion } from './node_version.js';
@@ -9,7 +9,7 @@ import { addPinnedVersions } from './pinned_version.js';
 //  - local plugin
 //  - external plugin already installed in `node_modules`, most likely through `package.json`
 //  - automatically installed by us, to `.netlify/plugins/`
-export const resolvePluginsPath = async function ({ pluginsOptions, siteInfo, buildDir, nodePath, packageJson, userNodeVersion, mode, api, logs, debug, sendStatus, testOpts, featureFlags, }) {
+export const resolvePluginsPath = async function ({ pluginsOptions, siteInfo, buildDir, nodePath, packageJson, userNodeVersion, mode, api, logs, debug, sendStatus, testOpts, featureFlags, integrations, }) {
     const autoPluginsDir = getAutoPluginsDir(buildDir);
     const pluginsOptionsA = await Promise.all(pluginsOptions.map((pluginOptions) => resolvePluginPath({ pluginOptions, buildDir, autoPluginsDir })));
     const pluginsOptionsB = addPluginsNodeVersion({
@@ -35,7 +35,11 @@ export const resolvePluginsPath = async function ({ pluginsOptions, siteInfo, bu
         mode,
         logs,
     });
-    return pluginsOptionsE;
+    let integrationPluginOptions = [];
+    if (featureFlags.build_fetch_integrations) {
+        integrationPluginOptions = await handleIntegrations({ integrations, autoPluginsDir, mode, logs });
+    }
+    return [...pluginsOptionsE, ...integrationPluginOptions];
 };
 // Find the path to the directory used to install plugins automatically.
 // It is a subdirectory of `buildDir`, so that the plugin can require the
@@ -95,7 +99,19 @@ const handleMissingPlugins = async function ({ pluginsOptions, autoPluginsDir, m
         return pluginsOptions;
     }
     await installMissingPlugins({ missingPlugins, autoPluginsDir, mode, logs });
-    return await Promise.all(pluginsOptions.map((pluginOptions) => resolveMissingPluginPath({ pluginOptions, autoPluginsDir })));
+    return Promise.all(pluginsOptions.map((pluginOptions) => resolveMissingPluginPath({ pluginOptions, autoPluginsDir })));
+};
+const handleIntegrations = async function ({ integrations, autoPluginsDir, mode, logs }) {
+    const toInstall = integrations.filter((integration) => integration.has_build);
+    await installIntegrationPlugins({ integrations: toInstall, autoPluginsDir, mode, logs });
+    return Promise.all(toInstall.map((integration) => resolveIntegration({
+        integration,
+        autoPluginsDir,
+    })));
+};
+const resolveIntegration = async function ({ integration, autoPluginsDir }) {
+    const pluginPath = await resolvePath(`${integration.slug}-buildhooks`, autoPluginsDir);
+    return { pluginPath, packageName: `${integration.slug}-buildhooks`, isIntegration: true, integration };
 };
 // Resolve the plugins that just got automatically installed
 const resolveMissingPluginPath = async function ({ pluginOptions, pluginOptions: { packageName }, autoPluginsDir }) {

package/lib/plugins/spawn.js

@@ -1,7 +1,7 @@
 import { fileURLToPath } from 'url';
 import { execaNode } from 'execa';
 import { addErrorInfo } from '../error/info.js';
-import { logRuntime, logLoadingPlugins, logOutdatedPlugins, logIncompatiblePlugins, } from '../log/messages/compatibility.js';
+import { logRuntime, logLoadingPlugins, logOutdatedPlugins, logIncompatiblePlugins, logLoadingIntegration, } from '../log/messages/compatibility.js';
 import { measureDuration } from '../time/main.js';
 import { getEventFromChild } from './ipc.js';
 import { getSpawnInfo } from './options.js';
@@ -16,6 +16,7 @@ const tStartPlugins = async function ({ pluginsOptions, buildDir, childEnv, logs
     if (!quiet) {
         logRuntime(logs, pluginsOptions);
         logLoadingPlugins(logs, pluginsOptions, debug);
+        logLoadingIntegration(logs, pluginsOptions);
     }
     logOutdatedPlugins(logs, pluginsOptions);
     logIncompatiblePlugins(logs, pluginsOptions);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "29.15.6",
+  "version": "29.16.1",
   "description": "Netlify build module",
   "type": "module",
   "exports": "./lib/core/main.js",
@@ -65,8 +65,8 @@
     "@bugsnag/js": "^7.0.0",
     "@honeycombio/opentelemetry-node": "^0.4.0",
     "@netlify/cache-utils": "^5.1.5",
-    "@netlify/config": "^20.5.2",
-    "@netlify/edge-bundler": "8.16.3",
+    "@netlify/config": "^20.6.0",
+    "@netlify/edge-bundler": "8.16.4",
     "@netlify/framework-info": "^9.8.10",
     "@netlify/functions-utils": "^5.2.18",
     "@netlify/git-utils": "^5.1.1",
@@ -137,7 +137,7 @@
     "process-exists": "^5.0.0",
     "sinon": "^13.0.0",
     "tmp-promise": "^3.0.2",
-    "tsd": "^0.24.1",
+    "tsd": "^0.28.0",
     "yarn": "^1.22.4"
   },
   "engines": {
@@ -148,5 +148,5 @@
       "module": "commonjs"
     }
   },
-  "gitHead": "185a994a728ca2b03edd7989456de67495657bfe"
+  "gitHead": "6cd25aebae914d1eb6e6dbae9bc95c49c734a588"
 }