@netlify/build 29.4.89-test → 29.5.0

package/lib/core/build.js

@@ -1,3 +1,4 @@
+import { supportedRuntimes } from '@netlify/framework-info';
 import { getErrorInfo } from '../error/info.js';
 import { startErrorMonitor } from '../error/monitor/start.js';
 import { getBufferLogs, getSystemLogger } from '../log/logger.js';
@@ -30,7 +31,7 @@ export const startBuild = function (flags) {
     const errorMonitor = startErrorMonitor({ flags: flagsA, logs, bugsnagKey });
     return { ...flagsA, errorMonitor, logs, timers };
 };
-const tExecBuild = async function ({ config, defaultConfig, cachedConfig, cachedConfigPath, outputConfigPath, cwd, repositoryRoot, apiHost, token, siteId, context, branch, baseRelDir, env: envOpt, debug, systemLogFile, verbose, nodePath, functionsDistDir, edgeFunctionsDistDir, cacheDir, dry, mode, offline, deployId, buildId, testOpts, errorMonitor, errorParams, logs, timers, buildbotServerSocket, sendStatus, saveConfig, featureFlags, timeline, devCommand, quiet, }) {
+const tExecBuild = async function ({ config, defaultConfig, cachedConfig, cachedConfigPath, outputConfigPath, cwd, repositoryRoot, apiHost, token, siteId, context, branch, baseRelDir, env: envOpt, debug, systemLogFile, verbose, nodePath, functionsDistDir, edgeFunctionsDistDir, cacheDir, dry, mode, offline, deployId, buildId, testOpts, errorMonitor, errorParams, logs, timers, buildbotServerSocket, sendStatus, saveConfig, featureFlags, timeline, devCommand, quiet, framework, }) {
     const configOpts = getConfigOpts({
         config,
         defaultConfig,
@@ -61,6 +62,16 @@ const tExecBuild = async function ({ config, defaultConfig, cachedConfig, cached
         timers,
         quiet,
     });
+    if (featureFlags.build_automatic_runtime && framework) {
+        const runtime = supportedRuntimes[framework];
+        if (runtime !== undefined) {
+            const skip = childEnv[runtime.skipFlag] === 'true';
+            const installed = netlifyConfig.plugins.some((plugin) => plugin.package === runtime.package);
+            if (!installed && !skip) {
+                netlifyConfig.plugins.push({ package: runtime.package });
+            }
+        }
+    }
     const constants = await getConstants({
         configPath,
         buildDir,

package/lib/core/main.js

@@ -31,6 +31,7 @@ export default async function buildSite(flags = {}) {
             debug,
             testOpts,
             errorParams,
+            framework,
         });
         await handleBuildSuccess({
             framework,
@@ -74,7 +75,7 @@ export default async function buildSite(flags = {}) {
             testOpts,
             errorParams,
         });
-        await reportError({ error, framework, statsdOpts });
+        await reportError(error, statsdOpts, framework);
         return { success, severityCode, logs };
     }
 }
@@ -85,7 +86,7 @@ const handleBuildSuccess = async function ({ framework, dry, logs, timers, durat
     }
     logBuildSuccess(logs);
     logTimer(logs, durationNs, 'Netlify Build', systemLog);
-    await reportTimers({ timers, statsdOpts, framework });
+    await reportTimers(timers, statsdOpts, framework);
 };
 // Handles the calls and errors of telemetry reports
 const telemetryReport = async function ({ deployId, buildId, status, stepsCount, pluginsOptions, durationNs, siteInfo, telemetry, userNodeVersion, framework, testOpts, errorParams, }) {

package/lib/error/report.js

@@ -1,11 +1,13 @@
 import { isNetlifyMaintainedPlugin } from '../plugins/internal.js';
-import { closeClient, normalizeTagName, startClient } from '../report/statsd.js';
+import { closeClient, formatTags, normalizeTagName, startClient, validateStatsDOptions, } from '../report/statsd.js';
 import { getErrorInfo } from './info.js';
 const TOP_PARENT_TAG = 'run_netlify_build';
-// Record error rates of the build phase for monitoring.
-// Sends to statsd daemon.
-export const reportError = async function ({ error, statsdOpts: { host, port }, framework, }) {
-    if (host === undefined) {
+/**
+ * Record error rates of the build phase for monitoring.
+ * Sends to statsd daemon.
+ */
+export const reportError = async function (error, statsdOpts, framework) {
+    if (!validateStatsDOptions(statsdOpts)) {
         return;
     }
     const [errorInfo] = getErrorInfo(error);
@@ -16,12 +18,12 @@ export const reportError = async function ({ error, statsdOpts: { host, port },
     }
     const parent = pluginName ? pluginName : TOP_PARENT_TAG;
     const stage = pluginName ? errorInfo.location?.event : errorInfo.stage;
-    const client = await startClient(host, port);
-    const frameworkTag = framework === undefined ? {} : { framework };
-    client.increment('buildbot.build.stage.error', 1, {
-        stage: stage ?? 'system',
-        parent,
-        ...frameworkTag,
-    });
+    const statsDTags = { stage: stage ?? 'system', parent };
+    // Do not add a framework tag if empty string or null/undefined
+    if (framework) {
+        statsDTags.framework = framework;
+    }
+    const client = await startClient(statsdOpts);
+    client.increment('buildbot.build.stage.error', 1, formatTags(statsDTags));
     await closeClient(client);
 };

package/lib/plugins_core/functions/index.js

@@ -7,9 +7,11 @@ import { getZipError } from './error.js';
 import { getUserAndInternalFunctions, validateFunctionsSrc } from './utils.js';
 import { getZisiParameters } from './zisi.js';
 // Get a list of all unique bundlers in this run
-const getBundlers = (results = []) => Array.from(new Set(results
+const getBundlers = (results = []) => 
+// using a Set to filter duplicates
+new Set(results
     .map((bundle) => (bundle.runtime === "js" /* RuntimeType.JAVASCRIPT */ ? bundle.bundler : null))
-    .filter(Boolean)));
+    .filter(Boolean));
 const zipFunctionsAndLogResults = async ({ buildDir, childEnv, featureFlags, functionsConfig, functionsDist, functionsSrc, internalFunctionsSrc, isRunningLocally, logs, repositoryRoot, }) => {
     const zisiParameters = getZisiParameters({
         buildDir,
@@ -26,7 +28,7 @@ const zipFunctionsAndLogResults = async ({ buildDir, childEnv, featureFlags, fun
         log(logs, '');
         const sourceDirectories = [internalFunctionsSrc, functionsSrc].filter(Boolean);
         const results = await zipItAndShipIt.zipFunctions(sourceDirectories, functionsDist, zisiParameters);
-        const bundlers = getBundlers(results);
+        const bundlers = Array.from(getBundlers(results));
         logBundleResults({ logs, results });
         return { bundlers };
     }

package/lib/plugins_core/functions/zisi.js

@@ -11,7 +11,15 @@ export const getZisiParameters = ({ buildDir, childEnv, featureFlags, functionsC
     const zisiFeatureFlags = getZisiFeatureFlags(featureFlags);
     // Only internal functions are allowed to have a json config file
     const configFileDirectories = [resolve(internalFunctionsSrc)];
-    return { basePath: buildDir, config, manifest, featureFlags: zisiFeatureFlags, repositoryRoot, configFileDirectories };
+    return {
+        basePath: buildDir,
+        config,
+        manifest,
+        featureFlags: zisiFeatureFlags,
+        repositoryRoot,
+        configFileDirectories,
+        internalSrcFolder: internalFunctionsSrc,
+    };
 };
 // The function configuration keys returned by @netlify/config are not an exact
 // match to the properties that @netlify/zip-it-and-ship-it expects. We do that
@@ -19,6 +27,7 @@ export const getZisiParameters = ({ buildDir, childEnv, featureFlags, functionsC
 export const normalizeFunctionConfig = ({ buildDir, functionConfig = {}, isRunningLocally, nodeVersion }) => ({
     externalNodeModules: functionConfig.external_node_modules,
     includedFiles: functionConfig.included_files,
+    name: functionConfig.name,
     includedFilesBasePath: buildDir,
     ignoredNodeModules: functionConfig.ignored_node_modules,
     nodeVersion,

package/lib/report/statsd.js

@@ -1,17 +1,47 @@
 import { promisify } from 'util';
 import slugify from '@sindresorhus/slugify';
 import { StatsD } from 'hot-shots';
-export const startClient = async function (host, port) {
-    return new StatsD({ host, port, cacheDns: true });
+export const validateStatsDOptions = function (statsdOpts) {
+    return !!(statsdOpts && statsdOpts.host && statsdOpts.port);
 };
+/**
+ * Start a new StatsD Client and a new UDP socket
+ */
+export const startClient = async function (statsdOpts) {
+    const { host, port } = statsdOpts;
+    return new StatsD({
+        host,
+        port,
+        // This caches the dns resolution for subsequent sends of metrics for this instance
+        // Because we only try to send the metrics on close, this comes only into effect if `bufferFlushInterval` time is exceeded
+        cacheDns: true,
+        // set the maxBufferSize to infinite and the bufferFlushInterval very high, so that we only
+        // send the metrics on close or if more than 10 seconds past by
+        maxBufferSize: Infinity,
+        bufferFlushInterval: 10_000,
+    });
+};
+/**
+ * Close the StatsD Client
+ *
+ * UDP packets are buffered and flushed every 10 seconds and
+ * closing the client forces all buffered metrics to be flushed.
+ */
 export const closeClient = async function (client) {
     await promisify(client.close.bind(client))();
 };
-// Make sure the timer name does not include special characters.
-// For example, the `packageName` of local plugins includes dots.
+/**
+ * Make sure the timer name does not include special characters.
+ * For example, the `packageName` of local plugins includes dots.
+ */
 export const normalizeTagName = function (name) {
     return slugify(name, { separator: '_' });
 };
+/**
+ * Formats and flattens the tags as array
+ * We do this because we might send the same tag with different values `{ tag: ['a', 'b'] }`
+ * which cannot be represented in an flattened object and `hot-shots` also supports tags as array in the format `['tag:a', 'tag:b']`
+ */
 export const formatTags = function (tags) {
     return Object.entries(tags)
         .map(([key, value]) => {

package/lib/time/report.js

@@ -1,27 +1,30 @@
-import { closeClient, formatTags, startClient } from '../report/statsd.js';
+import { closeClient, formatTags, startClient, validateStatsDOptions, } from '../report/statsd.js';
 import { addAggregatedTimers } from './aggregate.js';
 import { roundTimerToMillisecs } from './measure.js';
-// Record the duration of a build phase, for monitoring.
-// Sends to statsd daemon.
-export const reportTimers = async function ({ timers, statsdOpts: { host, port }, framework, }) {
-    if (host === undefined) {
+/**
+ * Record the duration of a build phase, for monitoring.
+ * Sends to statsd daemon.
+ */
+export const reportTimers = async function (timers, statsdOpts, framework) {
+    if (!validateStatsDOptions(statsdOpts)) {
         return;
     }
-    const timersA = addAggregatedTimers(timers);
-    await sendTimers({ timers: timersA, statsdOpts: { host, port }, framework });
+    await sendTimers(addAggregatedTimers(timers), statsdOpts, framework);
 };
-const sendTimers = async function ({ timers, statsdOpts: { host, port }, framework, }) {
-    const client = await startClient(host, port);
+const sendTimers = async function (timers, statsdOpts, framework) {
+    const client = await startClient(statsdOpts);
     timers.forEach((timer) => {
-        sendTimer({ timer, client, framework });
+        sendTimer(timer, client, framework);
     });
     await closeClient(client);
 };
-const sendTimer = function ({ timer: { metricName, stageTag, parentTag, durationNs, tags }, client, framework, }) {
+const sendTimer = function (timer, client, framework) {
+    const { metricName, stageTag, parentTag, durationNs, tags } = timer;
     const durationMs = roundTimerToMillisecs(durationNs);
-    const statsdTags = { stage: stageTag, parent: parentTag, ...tags };
-    if (framework != undefined) {
-        statsdTags.framework = framework;
+    const statsDTags = { stage: stageTag, parent: parentTag, ...tags };
+    // Do not add a framework tag if empty string or null/undefined
+    if (framework) {
+        statsDTags.framework = framework;
     }
-    client.distribution(metricName, durationMs, formatTags(statsdTags));
+    client.distribution(metricName, durationMs, formatTags(statsDTags));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "29.4.89-test",
+  "version": "29.5.0",
   "description": "Netlify build module",
   "type": "module",
   "exports": "./lib/core/main.js",
@@ -66,12 +66,12 @@
     "@bugsnag/js": "^7.0.0",
     "@netlify/cache-utils": "^5.1.0",
     "@netlify/config": "^20.3.0",
-    "@netlify/edge-bundler": "8.0.0",
-    "@netlify/functions-utils": "^5.1.1",
+    "@netlify/edge-bundler": "8.1.2",
+    "@netlify/functions-utils": "^5.1.4",
     "@netlify/git-utils": "^5.1.0",
     "@netlify/plugins-list": "^6.61.0",
     "@netlify/run-utils": "^5.1.0",
-    "@netlify/zip-it-and-ship-it": "^8.2.0",
+    "@netlify/zip-it-and-ship-it": "^8.4.0",
     "@sindresorhus/slugify": "^2.0.0",
     "ansi-escapes": "^5.0.0",
     "chalk": "^5.0.0",
@@ -147,5 +147,6 @@
     "compilerOptions": {
       "module": "commonjs"
     }
-  }
+  },
+  "gitHead": "fb15bd56d47418bc03b2e94fc87de89d3e18a7a9"
 }