@netlify/build 29.55.3 → 29.55.4

package/lib/core/build.js

@@ -263,6 +263,10 @@ export const runAndReportBuild = async function ({ pluginsOptions, netlifyConfig
 };
 // Initialize plugin processes then runs a build
 const initAndRunBuild = async function ({ pluginsOptions, netlifyConfig, defaultConfig, configOpts, siteInfo, configPath, outputConfigPath, headersPath, redirectsPath, buildDir, packagePath, repositoryRoot, nodePath, packageJson, userNodeVersion, childEnv, context, branch, dry, mode, api, token, errorMonitor, deployId, errorParams, logs, debug, systemLog, systemLogFile, verbose, sendStatus, saveConfig, timers, testOpts, buildbotServerSocket, constants, featureFlags, timeline, devCommand, quiet, integrations, explicitSecretKeys, edgeFunctionsBootstrapURL, eventHandlers, }) {
+    const pluginsEnv = {
+        ...childEnv,
+        ...getBlobsEnvironmentContext({ api, deployId: deployId, siteId: siteInfo?.id, token }),
+    };
     const { pluginsOptions: pluginsOptionsA, timers: timersA } = await getPluginsOptions({
         pluginsOptions,
         netlifyConfig,
@@ -283,11 +287,8 @@ const initAndRunBuild = async function ({ pluginsOptions, netlifyConfig, default
         integrations,
         context,
         systemLog,
+        pluginsEnv,
     });
-    const pluginsEnv = {
-        ...childEnv,
-        ...getBlobsEnvironmentContext({ api, deployId: deployId, siteId: siteInfo?.id, token }),
-    };
     if (pluginsOptionsA?.length) {
         const buildPlugins = {};
         for (const plugin of pluginsOptionsA) {

package/lib/install/missing.d.ts

@@ -4,11 +4,13 @@ export function installMissingPlugins({ missingPlugins, autoPluginsDir, mode, lo
     mode: any;
     logs: any;
 }): Promise<void>;
-export function installIntegrationPlugins({ integrations, autoPluginsDir, mode, logs, context, testOpts, }: {
+export function installIntegrationPlugins({ integrations, autoPluginsDir, mode, logs, context, testOpts, pluginsEnv, buildDir, }: {
     integrations: any;
     autoPluginsDir: any;
     mode: any;
     logs: any;
     context: any;
     testOpts: any;
+    pluginsEnv: any;
+    buildDir: any;
 }): Promise<void>;

package/lib/install/missing.js

@@ -20,13 +20,13 @@ 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, context, testOpts, }) {
+export const installIntegrationPlugins = async function ({ integrations, autoPluginsDir, mode, logs, context, testOpts, pluginsEnv, buildDir, }) {
     const integrationsToBuild = integrations.filter((integration) => typeof integration.dev !== 'undefined' && context === 'dev');
     if (integrationsToBuild.length) {
         logSubHeader(logs, 'Building integrations');
         logArray(logs, integrationsToBuild.map(({ slug, dev: { path } }) => `${slug} from ${path}`));
     }
-    const packages = (await Promise.all(integrations.map((integration) => getIntegrationPackage({ integration, context, testOpts })))).filter(Boolean);
+    const packages = (await Promise.all(integrations.map((integration) => getIntegrationPackage({ integration, context, testOpts, buildDir, pluginsEnv })))).filter(Boolean);
     logInstallIntegrations(logs, integrations.filter((integration) => integrationsToBuild.every((compiledIntegration) => integration.slug !== compiledIntegration.slug)));
     if (packages.length === 0) {
         return;
@@ -34,15 +34,15 @@ export const installIntegrationPlugins = async function ({ integrations, autoPlu
     await createAutoPluginsDir(logs, autoPluginsDir);
     await addExactDependencies({ packageRoot: autoPluginsDir, isLocal: mode !== 'buildbot', packages });
 };
-const getIntegrationPackage = async function ({ integration: { version, dev }, context, testOpts = {} }) {
+const getIntegrationPackage = async function ({ integration: { version, dev }, context, testOpts = {}, buildDir, pluginsEnv, }) {
     if (typeof version !== 'undefined') {
         return `${version}/packages/buildhooks.tgz`;
     }
     if (typeof dev !== 'undefined' && context === 'dev') {
         const { path } = dev;
-        const integrationDir = testOpts.cwd ? resolve(testOpts.cwd, path) : resolve(path);
+        const integrationDir = testOpts.cwd ? resolve(testOpts.cwd, path) : resolve(buildDir, path);
         try {
-            const res = await execa('npm', ['run', 'build'], { cwd: integrationDir });
+            const res = await execa('npm', ['run', 'build'], { cwd: integrationDir, env: pluginsEnv });
             // This is horrible and hacky, but `npm run build` will
             // return status code 0 even if it fails
             if (!res.stdout.includes('Build complete!')) {
@@ -50,7 +50,7 @@ const getIntegrationPackage = async function ({ integration: { version, dev }, c
             }
         }
         catch (e) {
-            throw new Error(`Failed to build integration`);
+            throw new Error(`Failed to build integration. Error:\n\n${e.stack}`);
         }
         return undefined;
     }

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, packagePath, nodePath, packageJson, userNodeVersion, mode, api, logs, debug, sendStatus, testOpts, featureFlags, integrations, context, systemLog, }) {
+const tGetPluginsOptions = async function ({ pluginsOptions, netlifyConfig: { plugins }, siteInfo, buildDir, packagePath, nodePath, packageJson, userNodeVersion, mode, api, logs, debug, sendStatus, testOpts, featureFlags, integrations, context, systemLog, pluginsEnv, }) {
     const pluginsOptionsA = await resolvePluginsPath({
         pluginsOptions,
         siteInfo,
@@ -27,6 +27,7 @@ const tGetPluginsOptions = async function ({ pluginsOptions, netlifyConfig: { pl
         integrations,
         context,
         systemLog,
+        pluginsEnv,
     });
     const pluginsOptionsB = await Promise.all(pluginsOptionsA.map((pluginOptions) => loadPluginFiles({ pluginOptions, debug })));
     const pluginsOptionsC = pluginsOptionsB.filter(isNotRedundantCorePlugin);

package/lib/plugins/resolve.d.ts

@@ -1,4 +1,4 @@
-export function resolvePluginsPath({ pluginsOptions, siteInfo, buildDir, packagePath, nodePath, packageJson, userNodeVersion, mode, api, logs, debug, sendStatus, testOpts, featureFlags, integrations, context, systemLog, }: {
+export function resolvePluginsPath({ pluginsOptions, siteInfo, buildDir, packagePath, nodePath, packageJson, userNodeVersion, mode, api, logs, debug, sendStatus, testOpts, featureFlags, integrations, context, systemLog, pluginsEnv, }: {
     pluginsOptions: any;
     siteInfo: any;
     buildDir: any;
@@ -16,4 +16,5 @@ export function resolvePluginsPath({ pluginsOptions, siteInfo, buildDir, package
     integrations: any;
     context: any;
     systemLog: any;
+    pluginsEnv: any;
 }): Promise<any[]>;

package/lib/plugins/resolve.js

@@ -11,7 +11,7 @@ const AUTO_PLUGINS_DIR = '.netlify/plugins/';
 //  - 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, packagePath, nodePath, packageJson, userNodeVersion, mode, api, logs, debug, sendStatus, testOpts, featureFlags, integrations, context, systemLog, }) {
+export const resolvePluginsPath = async function ({ pluginsOptions, siteInfo, buildDir, packagePath, nodePath, packageJson, userNodeVersion, mode, api, logs, debug, sendStatus, testOpts, featureFlags, integrations, context, systemLog, pluginsEnv, }) {
     const autoPluginsDir = getAutoPluginsDir(buildDir, packagePath);
     const pluginsOptionsA = await Promise.all(pluginsOptions.map((pluginOptions) => resolvePluginPath({ pluginOptions, buildDir, autoPluginsDir })));
     const pluginsOptionsB = await addPluginsNodeVersion({
@@ -50,6 +50,7 @@ export const resolvePluginsPath = async function ({ pluginsOptions, siteInfo, bu
         buildDir,
         context,
         testOpts,
+        pluginsEnv,
     });
     return [...pluginsOptionsE, ...integrationPluginOptions];
 };
@@ -117,9 +118,18 @@ const handleMissingPlugins = async function ({ pluginsOptions, autoPluginsDir, m
     await installMissingPlugins({ missingPlugins, autoPluginsDir, mode, logs });
     return Promise.all(pluginsOptions.map((pluginOptions) => resolveMissingPluginPath({ pluginOptions, autoPluginsDir })));
 };
-const handleIntegrations = async function ({ integrations, autoPluginsDir, mode, logs, buildDir, context, testOpts }) {
+const handleIntegrations = async function ({ integrations, autoPluginsDir, mode, logs, buildDir, context, testOpts, pluginsEnv, }) {
     const toInstall = integrations.filter((integration) => integration.has_build);
-    await installIntegrationPlugins({ integrations: toInstall, autoPluginsDir, mode, logs, context, testOpts });
+    await installIntegrationPlugins({
+        integrations: toInstall,
+        autoPluginsDir,
+        mode,
+        logs,
+        context,
+        testOpts,
+        buildDir,
+        pluginsEnv,
+    });
     if (toInstall.length === 0) {
         return [];
     }
@@ -134,7 +144,7 @@ const handleIntegrations = async function ({ integrations, autoPluginsDir, mode,
 const resolveIntegration = async function ({ integration, autoPluginsDir, buildDir, context, testOpts }) {
     if (typeof integration.dev !== 'undefined' && context === 'dev') {
         const { path } = integration.dev;
-        const integrationDir = testOpts.cwd ? resolve(testOpts.cwd, path) : resolve(path);
+        const integrationDir = testOpts.cwd ? resolve(testOpts.cwd, path) : resolve(buildDir, path);
         const pluginPath = await resolvePath(`${integrationDir}/.ntli/build`, buildDir);
         return { pluginPath, packageName: `${integration.slug}`, isIntegration: true, integration, loadedFrom: 'local' };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "29.55.3",
+  "version": "29.55.4",
   "description": "Netlify build module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -165,5 +165,5 @@
   "engines": {
     "node": "^14.16.0 || >=16.0.0"
   },
-  "gitHead": "447f98f929b3b9988e82144fabf73255c6daedd6"
+  "gitHead": "6ecd378b02bd7ad6f083cd495ad3001e7493c8a5"
 }