@netlify/build 27.11.4 → 27.12.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "27.11.4",
+  "version": "27.12.0",
   "description": "Netlify build module",
   "type": "module",
   "exports": "./src/core/main.js",
@@ -59,11 +59,11 @@
     "@netlify/edge-bundler": "^1.12.1",
     "@netlify/cache-utils": "^4.0.0",
     "@netlify/config": "^18.1.4",
-    "@netlify/functions-utils": "^4.2.3",
+    "@netlify/functions-utils": "^4.2.4",
     "@netlify/git-utils": "^4.0.0",
     "@netlify/plugins-list": "^6.36.0",
     "@netlify/run-utils": "^4.0.0",
-    "@netlify/zip-it-and-ship-it": "5.13.4",
+    "@netlify/zip-it-and-ship-it": "^5.13.5",
     "@sindresorhus/slugify": "^2.0.0",
     "@types/node": "^16.0.0",
     "ajv": "^8.11.0",

package/src/log/messages/compatibility.js

@@ -5,9 +5,20 @@ import { getPluginOrigin } from '../description.js'
 import { logArray, logSubHeader, logWarningArray, logWarningSubHeader } from '../logger.js'
 import { THEME } from '../theme.js'
 
+export const logRuntime = (logs, pluginOptions) => {
+  const runtimes = pluginOptions.filter(isRuntime)
+
+  // Once we have more runtimes, this hardcoded check should be removed
+  if (runtimes.length > 1) {
+    logSubHeader(logs, 'Using Next.js Runtime')
+  }
+}
+
 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))
     .map((pluginOptions) => getPluginDescription(pluginOptions, debug))
 
   if (loadingPlugins.length === 0) {
@@ -23,6 +34,11 @@ const isNotCorePlugin = function ({ origin }) {
   return origin !== 'core'
 }
 
+const isRuntime = function ({ packageName }) {
+  // Make this a bit more robust in the future
+  return ['@netlify/next-runtime'].includes(packageName)
+}
+
 const getPluginDescription = function (
   {
     packageName,

package/src/plugins/spawn.js

@@ -3,7 +3,12 @@ import { fileURLToPath } from 'url'
 import { execaNode } from 'execa'
 
 import { addErrorInfo } from '../error/info.js'
-import { logLoadingPlugins, logOutdatedPlugins, logIncompatiblePlugins } from '../log/messages/compatibility.js'
+import {
+  logRuntime,
+  logLoadingPlugins,
+  logOutdatedPlugins,
+  logIncompatiblePlugins,
+} from '../log/messages/compatibility.js'
 import { measureDuration } from '../time/main.js'
 
 import { getEventFromChild } from './ipc.js'
@@ -18,6 +23,7 @@ const CHILD_MAIN_FILE = fileURLToPath(new URL('child/main.js', import.meta.url))
 //  - logs can be buffered which allows manipulating them for log shipping,
 //    transforming and parallel plugins
 const tStartPlugins = async function ({ pluginsOptions, buildDir, childEnv, logs, debug }) {
+  logRuntime(logs, pluginsOptions)
   logLoadingPlugins(logs, pluginsOptions, debug)
   logOutdatedPlugins(logs, pluginsOptions)
   logIncompatiblePlugins(logs, pluginsOptions)

package/src/plugins_core/deploy/buildbot_client.js

@@ -84,7 +84,18 @@ const getDeployDir = function ({ buildDir, repositoryRoot, constants: { PUBLISH_
 
 // We distinguish between user errors and system errors during deploys
 const handleDeployError = function (error, errorType) {
-  const errorA = new Error(`Deploy did not succeed: ${error}`)
+  const errorIs422 = error !== undefined && error.code === '422'
+
+  const errMsg = errorIs422
+    ? `
+    File upload failed because of mismatched SHAs.
+    This can happen when files are changed after the deployment process has started but before they are uploaded.
+
+    Error: ${error}
+    `
+    : `Deploy did not succeed: ${error}`
+
+  const errorA = new Error(errMsg)
   const errorInfo =
     errorType === 'user' ? { type: 'resolveConfig' } : { type: 'coreStep', location: { coreStepName: 'Deploy site' } }
   addErrorInfo(errorA, errorInfo)