@netlify/build 28.1.99-test4 → 28.2.1

package/lib/core/main.js

@@ -1,5 +1,6 @@
 import { handleBuildError } from '../error/handle.js';
 import { reportError } from '../error/report.js';
+import { getSystemLogger } from '../log/logger.js';
 import { logTimer, logBuildSuccess } from '../log/messages/core.js';
 import { trackBuildComplete } from '../telemetry/main.js';
 import { reportTimers } from '../time/report.js';
@@ -16,6 +17,7 @@ export { runCoreSteps } from '../steps/run_core_steps.js';
 export default async function buildSite(flags = {}) {
     const { errorMonitor, framework, mode, logs, debug, systemLogFile, testOpts, statsdOpts, dry, telemetry, buildId, deployId, ...flagsA } = startBuild(flags);
     const errorParams = { errorMonitor, mode, logs, debug, testOpts };
+    const systemLog = getSystemLogger(logs, debug, systemLogFile);
     try {
         const { pluginsOptions, netlifyConfig: netlifyConfigA, siteInfo, userNodeVersion, stepsCount, timers, durationNs, configMutations, } = await execBuild({
             ...flagsA,
@@ -37,6 +39,7 @@ export default async function buildSite(flags = {}) {
             timers,
             durationNs,
             statsdOpts,
+            systemLog,
         });
         const { success, severityCode, status } = getSeverity('success');
         await telemetryReport({
@@ -76,12 +79,12 @@ export default async function buildSite(flags = {}) {
     }
 }
 // Logs and reports that a build successfully ended
-const handleBuildSuccess = async function ({ framework, dry, logs, timers, durationNs, statsdOpts }) {
+const handleBuildSuccess = async function ({ framework, dry, logs, timers, durationNs, statsdOpts, systemLog }) {
     if (dry) {
         return;
     }
     logBuildSuccess(logs);
-    logTimer(logs, durationNs, 'Netlify Build');
+    logTimer(logs, durationNs, 'Netlify Build', systemLog);
     await reportTimers({ timers, statsdOpts, framework });
 };
 // Handles the calls and errors of telemetry reports

package/lib/error/type.js

@@ -110,7 +110,6 @@ const TYPES = {
     pluginValidation: {
         title: ({ location: { packageName } }) => `Plugin "${packageName}" internal error`,
         stackType: 'stack',
-        showErrorProps: true,
         locationType: 'buildFail',
         severity: 'warning',
     },
@@ -127,7 +126,6 @@ const TYPES = {
     ipc: {
         title: ({ location: { packageName } }) => `Plugin "${packageName}" internal error`,
         stackType: 'none',
-        showErrorProps: true,
         locationType: 'buildFail',
         severity: 'warning',
     },

package/lib/log/messages/core.js

@@ -28,10 +28,11 @@ export const logBuildSuccess = function (logs) {
     logHeader(logs, 'Netlify Build Complete');
     logMessage(logs, '');
 };
-export const logTimer = function (logs, durationNs, timerName) {
+export const logTimer = function (logs, durationNs, timerName, systemLog) {
     const durationMs = roundTimerToMillisecs(durationNs);
     const duration = prettyMs(durationMs);
     log(logs, THEME.dimWords(`(${timerName} completed in ${duration})`));
+    systemLog(`Build step duration: ${timerName} completed in ${durationMs}ms`);
 };
 export const logMissingSideFile = function (logs, sideFile, publish) {
     logWarning(logs, `

package/lib/plugins/ipc.js

@@ -35,11 +35,6 @@ export const getEventFromChild = async function (childProcess, callId) {
     try {
         return await Promise.race([getMessage(messagePromise), getError(errorPromise), getExit(exitPromise)]);
     }
-    catch (error) {
-        error.stdout = childProcess.stdoutArray.join('');
-        error.stderr = childProcess.stderrArray.join('');
-        throw error;
-    }
     finally {
         messagePromise.cancel();
         errorPromise.cancel();

package/lib/plugins/spawn.js

@@ -32,14 +32,6 @@ const startPlugin = async function ({ pluginDir, nodePath, buildDir, childEnv })
         extendEnv: false,
         serialization: 'advanced',
     });
-    childProcess.stdoutArray = [];
-    childProcess.stdout.on('data', (data) => {
-        childProcess.stdoutArray.push(data);
-    });
-    childProcess.stderrArray = [];
-    childProcess.stderr.on('data', (data) => {
-        childProcess.stderrArray.push(data);
-    });
     try {
         await getEventFromChild(childProcess, 'ready');
         return { childProcess };

package/lib/plugins_core/edge_functions/index.js

@@ -17,7 +17,7 @@ const coreStep = async function ({ buildDir, constants: { EDGE_FUNCTIONS_DIST: d
     const srcPath = srcDirectory ? resolve(buildDir, srcDirectory) : undefined;
     const sourcePaths = [internalSrcPath, srcPath].filter(Boolean);
     logFunctions({ internalSrcDirectory, internalSrcPath, logs, srcDirectory, srcPath });
-    const { declarations: internalDeclarations, importMap } = await parseManifest(internalSrcPath, systemLog);
+    const { declarations: internalDeclarations, importMap, layers } = await parseManifest(internalSrcPath, systemLog);
     const declarations = [...configDeclarations, ...internalDeclarations];
     // If we're running in buildbot and the feature flag is enabled, we set the
     // Deno cache dir to a directory that is persisted between builds.
@@ -32,6 +32,7 @@ const coreStep = async function ({ buildDir, constants: { EDGE_FUNCTIONS_DIST: d
             distImportMapPath,
             featureFlags,
             importMaps: [importMap].filter(Boolean),
+            layers,
             systemLogger: featureFlags.edge_functions_system_logger ? systemLog : undefined,
         });
         systemLog('Edge Functions manifest:', manifest);

package/lib/plugins_core/edge_functions/lib/internal_manifest.js

@@ -11,6 +11,7 @@ const parseManifest = async (internalSourceDirectory, systemLog) => {
         }
         const result = {
             declarations: manifest.functions,
+            layers: manifest.layers,
         };
         if (manifest.import_map) {
             const importMapPath = resolve(dirname(manifestPath), manifest.import_map);
@@ -32,6 +33,7 @@ const parseManifest = async (internalSourceDirectory, systemLog) => {
     }
     return {
         declarations: [],
+        layers: [],
     };
 };
 const readImportMap = async (path) => {

package/lib/plugins_core/edge_functions/validate_manifest/validate_edge_functions_manifest.js

@@ -35,6 +35,17 @@ const routesSchema = {
     },
     additionalProperties: false,
 };
+const layersSchema = {
+    $async: true,
+    type: 'object',
+    required: ['flag', 'name'],
+    properties: {
+        flag: { type: 'string' },
+        name: { type: 'string' },
+        local: { type: 'string' },
+    },
+    additionalProperties: false,
+};
 const edgeManifestSchema = {
     $async: true,
     type: 'object',
@@ -52,6 +63,10 @@ const edgeManifestSchema = {
             type: 'array',
             items: routesSchema,
         },
+        layers: {
+            type: 'array',
+            items: layersSchema,
+        },
         bundler_version: { type: 'string' },
     },
     additionalProperties: false,

package/lib/steps/return.js

@@ -2,7 +2,7 @@ import { logTimer } from '../log/messages/core.js';
 import { logStepSuccess } from '../log/messages/steps.js';
 import { handleStepError } from './error.js';
 // Retrieve the return value of a step
-export const getStepReturn = function ({ event, packageName, newError, newEnvChanges, newStatus, coreStep, coreStepName: timerName = `${packageName} ${event}`, childEnv, mode, api, errorMonitor, deployId, netlifyConfig, configMutations, headersPath, redirectsPath, logs, debug, timers, durationNs, testOpts, }) {
+export const getStepReturn = function ({ event, packageName, newError, newEnvChanges, newStatus, coreStep, coreStepName: timerName = `${packageName} ${event}`, childEnv, mode, api, errorMonitor, deployId, netlifyConfig, configMutations, headersPath, redirectsPath, logs, debug, timers, durationNs, testOpts, systemLog, }) {
     if (newError !== undefined) {
         return handleStepError({
             event,
@@ -20,6 +20,6 @@ export const getStepReturn = function ({ event, packageName, newError, newEnvCha
         });
     }
     logStepSuccess(logs);
-    logTimer(logs, durationNs, timerName);
+    logTimer(logs, durationNs, timerName, systemLog);
     return { newEnvChanges, netlifyConfig, configMutations, headersPath, redirectsPath, newStatus, timers };
 };

package/lib/steps/run_step.js

@@ -83,6 +83,7 @@ export const runStep = async function ({ event, childProcess, packageName, coreS
         timers: timersA,
         durationNs,
         testOpts,
+        systemLog,
     });
     return { ...newValues, newIndex: index + 1 };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "28.1.99-test4",
+  "version": "28.2.1",
   "description": "Netlify build module",
   "type": "module",
   "exports": "./lib/core/main.js",
@@ -64,14 +64,14 @@
   "license": "MIT",
   "dependencies": {
     "@bugsnag/js": "^7.0.0",
-    "@netlify/cache-utils": "^5.0.1",
-    "@netlify/config": "^19.1.2",
-    "@netlify/edge-bundler": "^3.1.1",
-    "@netlify/functions-utils": "^5.0.2",
-    "@netlify/git-utils": "^5.0.1",
+    "@netlify/cache-utils": "^5.0.2",
+    "@netlify/config": "^20.0.1",
+    "@netlify/edge-bundler": "4.3.0",
+    "@netlify/functions-utils": "^5.0.4",
+    "@netlify/git-utils": "^5.0.2",
     "@netlify/plugins-list": "^6.54.0",
-    "@netlify/run-utils": "^5.0.1",
-    "@netlify/zip-it-and-ship-it": "^8.0.0",
+    "@netlify/run-utils": "^5.0.2",
+    "@netlify/zip-it-and-ship-it": "^7.1.2",
     "@sindresorhus/slugify": "^2.0.0",
     "ajv": "^8.11.0",
     "ajv-errors": "^3.0.0",
@@ -119,7 +119,7 @@
     "yargs": "^17.6.0"
   },
   "devDependencies": {
-    "@netlify/nock-udp": "^3.0.0",
+    "@netlify/nock-udp": "^3.0.1",
     "@types/node": "^14.18.31",
     "@types/statsd-client": "^0.4.3",
     "atob": "^2.1.2",
@@ -149,5 +149,6 @@
     "compilerOptions": {
       "module": "commonjs"
     }
-  }
+  },
+  "gitHead": "68feefc0d483a887c91c7647aa74f3eed65c3d93"
 }