@netlify/build 29.20.15 → 29.21.1

package/lib/core/build.js

@@ -271,6 +271,7 @@ const initAndRunBuild = async function ({ pluginsOptions, netlifyConfig, configO
         testOpts,
         featureFlags,
         integrations,
+        context,
     });
     errorParams.pluginsOptions = pluginsOptionsA;
     const { childProcesses, timers: timersB } = await startPlugins({

package/lib/install/missing.d.ts

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

package/lib/install/missing.js

@@ -1,7 +1,9 @@
 import { promises as fs } from 'fs';
-import { normalize } from 'path';
+import { normalize, resolve } from 'path';
+import { execa } from 'execa';
 import { pathExists } from 'path-exists';
 import { isFile } from 'path-type';
+import { logArray, logSubHeader } from '../log/logger.js';
 import { logInstallMissingPlugins, logInstallIntegrations } from '../log/messages/install.js';
 import { addExactDependencies } from './main.js';
 // Automatically install plugins if not already installed.
@@ -18,17 +20,41 @@ 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);
+export const installIntegrationPlugins = async function ({ integrations, autoPluginsDir, mode, logs, context, testOpts, }) {
+    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);
+    logInstallIntegrations(logs, integrations.filter((integration) => integrationsToBuild.every((compiledIntegration) => integration.slug !== compiledIntegration.slug)));
     if (packages.length === 0) {
         return;
     }
     await createAutoPluginsDir(logs, autoPluginsDir);
     await addExactDependencies({ packageRoot: autoPluginsDir, isLocal: mode !== 'buildbot', packages });
 };
-const getIntegrationPackage = function ({ version }) {
-    return `${version}/packages/buildhooks.tgz`;
+const getIntegrationPackage = async function ({ integration: { version, dev }, context, testOpts = {} }) {
+    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);
+        try {
+            const res = await execa('npm', ['run', 'build'], { cwd: integrationDir });
+            // This is horrible and hacky, but `npm run build` will
+            // return status code 0 even if it fails
+            if (!res.stdout.includes('Build complete!')) {
+                throw new Error(res.stdout);
+            }
+        }
+        catch (e) {
+            throw new Error(`Failed to build integration`);
+        }
+        return undefined;
+    }
+    return undefined;
 };
 // We pin the version without using semver ranges ^ nor ~
 const getPackage = function ({ packageName, expectedVersion }) {

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, }) {
+const tGetPluginsOptions = async function ({ pluginsOptions, netlifyConfig: { plugins }, siteInfo, buildDir, packagePath, nodePath, packageJson, userNodeVersion, mode, api, logs, debug, sendStatus, testOpts, featureFlags, integrations, context, }) {
     const pluginsOptionsA = await resolvePluginsPath({
         pluginsOptions,
         siteInfo,
@@ -25,6 +25,7 @@ const tGetPluginsOptions = async function ({ pluginsOptions, netlifyConfig: { pl
         testOpts,
         featureFlags,
         integrations,
+        context,
     });
     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, }: {
+export function resolvePluginsPath({ pluginsOptions, siteInfo, buildDir, packagePath, nodePath, packageJson, userNodeVersion, mode, api, logs, debug, sendStatus, testOpts, featureFlags, integrations, context, }: {
     pluginsOptions: any;
     siteInfo: any;
     buildDir: any;
@@ -14,4 +14,5 @@ export function resolvePluginsPath({ pluginsOptions, siteInfo, buildDir, package
     testOpts: any;
     featureFlags: any;
     integrations: any;
+    context: 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, }) {
+export const resolvePluginsPath = async function ({ pluginsOptions, siteInfo, buildDir, packagePath, nodePath, packageJson, userNodeVersion, mode, api, logs, debug, sendStatus, testOpts, featureFlags, integrations, context, }) {
     const autoPluginsDir = getAutoPluginsDir(buildDir, packagePath);
     const pluginsOptionsA = await Promise.all(pluginsOptions.map((pluginOptions) => resolvePluginPath({ pluginOptions, buildDir, autoPluginsDir })));
     const pluginsOptionsB = addPluginsNodeVersion({
@@ -38,8 +38,16 @@ export const resolvePluginsPath = async function ({ pluginsOptions, siteInfo, bu
         logs,
     });
     let integrationPluginOptions = [];
-    if (featureFlags.buildbot_fetch_integrations) {
-        integrationPluginOptions = await handleIntegrations({ integrations, autoPluginsDir, mode, logs });
+    if (featureFlags.buildbot_fetch_integrations || featureFlags.cli_fetch_integrations) {
+        integrationPluginOptions = await handleIntegrations({
+            integrations,
+            autoPluginsDir,
+            mode,
+            logs,
+            buildDir,
+            context,
+            testOpts,
+        });
     }
     return [...pluginsOptionsE, ...integrationPluginOptions];
 };
@@ -107,18 +115,25 @@ 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 }) {
+const handleIntegrations = async function ({ integrations, autoPluginsDir, mode, logs, buildDir, context, testOpts }) {
     const toInstall = integrations.filter((integration) => integration.has_build);
-    await installIntegrationPlugins({ integrations: toInstall, autoPluginsDir, mode, logs });
+    await installIntegrationPlugins({ integrations: toInstall, autoPluginsDir, mode, logs, context, testOpts });
     if (toInstall.length === 0) {
         return [];
     }
     return Promise.all(toInstall.map((integration) => resolveIntegration({
         integration,
         autoPluginsDir,
+        buildDir,
+        context,
     })));
 };
-const resolveIntegration = async function ({ integration, autoPluginsDir }) {
+const resolveIntegration = async function ({ integration, autoPluginsDir, buildDir, context }) {
+    if (typeof integration.dev !== 'undefined' && context === 'dev') {
+        const { path } = integration.dev;
+        const pluginPath = await resolvePath(`${path}/.ntli/build`, buildDir);
+        return { pluginPath, packageName: `${integration.slug}`, isIntegration: true, integration, loadedFrom: 'local' };
+    }
     const pluginPath = await resolvePath(`${integration.slug}-buildhooks`, autoPluginsDir);
     return { pluginPath, packageName: `${integration.slug}-buildhooks`, isIntegration: true, integration };
 };

package/lib/utils/resolve.js

@@ -21,7 +21,7 @@ export const resolvePath = async function (path, basedir) {
         // `resolve` sometimes gives unhelpful error messages.
         // https://github.com/browserify/resolve/issues/223
     }
-    catch {
+    catch (e) {
         return require.resolve(path, { paths: [basedir] });
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "29.20.15",
+  "version": "29.21.1",
   "description": "Netlify build module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -67,14 +67,14 @@
     "@bugsnag/js": "^7.0.0",
     "@honeycombio/opentelemetry-node": "^0.5.0",
     "@netlify/cache-utils": "^5.1.5",
-    "@netlify/config": "^20.8.1",
+    "@netlify/config": "^20.9.0",
     "@netlify/edge-bundler": "8.20.0",
     "@netlify/framework-info": "^9.8.10",
-    "@netlify/functions-utils": "^5.2.28",
+    "@netlify/functions-utils": "^5.2.29",
     "@netlify/git-utils": "^5.1.1",
     "@netlify/plugins-list": "^6.71.0",
     "@netlify/run-utils": "^5.1.1",
-    "@netlify/zip-it-and-ship-it": "9.18.0",
+    "@netlify/zip-it-and-ship-it": "9.18.1",
     "@opentelemetry/api": "^1.4.1",
     "@sindresorhus/slugify": "^2.0.0",
     "ansi-escapes": "^6.0.0",
@@ -145,5 +145,5 @@
   "engines": {
     "node": "^14.16.0 || >=16.0.0"
   },
-  "gitHead": "e3d86a42f6211965e2eea2f3fc41a3eb57ece4e8"
+  "gitHead": "4baa4dcd273945fb3b4dbe1779ec293011943e73"
 }