@netlify/build 18.8.0-rc → 18.9.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "18.8.0-rc",
+  "version": "18.9.1",
   "description": "Netlify build module",
   "main": "src/core/main.js",
   "bin": {
@@ -57,9 +57,9 @@
     "@netlify/functions-utils": "^2.0.0",
     "@netlify/git-utils": "^2.0.0",
     "@netlify/plugin-edge-handlers": "^1.11.22",
-    "@netlify/plugins-list": "^3.5.0",
+    "@netlify/plugins-list": "^3.6.0",
     "@netlify/run-utils": "^2.0.0",
-    "@netlify/zip-it-and-ship-it": "4.21.0-rc",
+    "@netlify/zip-it-and-ship-it": "^4.21.0",
     "@sindresorhus/slugify": "^1.1.0",
     "@ungap/from-entries": "^0.2.1",
     "ansi-escapes": "^4.3.2",
@@ -69,7 +69,7 @@
     "execa": "^5.1.1",
     "figures": "^3.2.0",
     "filter-obj": "^2.0.1",
-    "got": "^9.6.0",
+    "got": "^10.0.0",
     "indent-string": "^4.0.0",
     "is-plain-obj": "^3.0.0",
     "js-yaml": "^4.0.0",

package/src/commands/run_command.js

@@ -159,7 +159,7 @@ const runCommand = async function ({
 //
 // Otherwise, most failures will make the build fail. This includes:
 //   - the build command failed
-//   - Functions, Builders or Edge handlers bundling failed
+//   - Functions or Edge handlers bundling failed
 //   - the deploy failed (deploying files to our CDN)
 //   - a plugin `onPreBuild`, `onBuild` or `onPostBuild` event handler failed.
 //     This includes uncaught exceptions and using `utils.build.failBuild()`
@@ -173,8 +173,8 @@ const runCommand = async function ({
 //
 // Finally, some plugins (only core plugins for the moment) might be enabled or
 // not depending on whether a specific action is happening during the build,
-// such as creating a file. For example, the Functions, Builders and Edge handlers core
-// plugins are disabled if no Functions, Builders or Edge handlers directory is specified
+// such as creating a file. For example, the Functions and Edge handlers core
+// plugins are disabled if no Functions or Edge handlers directory is specified
 // or available. However, one might be created by a build plugin, in which case,
 // those core plugins should be triggered. We use a dynamic `condition()` to
 // model this behavior.

package/src/core/config.js

@@ -111,13 +111,7 @@ const resolveInitialConfig = async function (configOpts, cachedConfig, cachedCon
   try {
     return await resolveConfig({ ...configOpts, cachedConfig, cachedConfigPath })
   } catch (error) {
-    if (error.type === 'userError') {
-      // We need to mutate the `error` directly to preserve its `name`, `stack`, etc.
-      // eslint-disable-next-line fp/no-delete
-      delete error.type
-      addErrorInfo(error, { type: 'resolveConfig' })
-    }
-    throw error
+    throw getConfigError(error, 'resolveConfig')
   }
 }
 
@@ -139,16 +133,22 @@ const resolveUpdatedConfig = async function (configOpts, configMutations) {
   try {
     return await resolveConfig({ ...configOpts, configMutations, debug: false })
   } catch (error) {
-    if (error.type === 'configMutation') {
-      // We need to mutate the `error` directly to preserve its `name`, `stack`, etc.
-      // eslint-disable-next-line fp/no-delete
-      delete error.type
-      addErrorInfo(error, { type: 'pluginValidation' })
-    }
-    throw error
+    throw getConfigError(error, 'pluginValidation')
   }
 }
 
+const getConfigError = function (error, type) {
+  if (error.type !== 'userError') {
+    return error
+  }
+
+  // We need to mutate the `error` directly to preserve its `name`, `stack`, etc.
+  // eslint-disable-next-line fp/no-delete
+  delete error.type
+  addErrorInfo(error, { type })
+  return error
+}
+
 // If the configuration was changed, persist it to `netlify.toml`.
 // If `netlify.toml` does not exist, create it inside repository root.
 // This is only done when `saveConfig` is `true`. This allows performing this

package/src/core/constants.js

@@ -43,16 +43,12 @@ const getConstants = async function ({
     // The directory where internal functions (i.e. generated programmatically
     // via plugins or others) live
     INTERNAL_FUNCTIONS_SRC: `${buildDir}/${INTERNAL_FUNCTIONS_SRC}`,
-    // The directory where internal builders (i.e. generated programmatically
-    // via plugins or others) live
-    INTERNAL_BUILDERS_SRC: `${buildDir}/${INTERNAL_BUILDERS_SRC}`,
   }
   const constantsA = await addMutableConstants({ constants, buildDir, netlifyConfig })
   return constantsA
 }
 
 const INTERNAL_FUNCTIONS_SRC = '.netlify/functions-internal'
-const INTERNAL_BUILDERS_SRC = '.netlify/builders-internal'
 
 // Retrieve constants which might change during the build if a plugin modifies
 // `netlifyConfig` or creates some default directories.
@@ -63,9 +59,6 @@ const addMutableConstants = async function ({
   netlifyConfig: {
     build: { publish, edge_handlers: edgeHandlers },
     functionsDirectory,
-    builders: {
-      '*': { directory: buildersDirectory },
-    },
   },
 }) {
   const constantsA = {
@@ -74,8 +67,6 @@ const addMutableConstants = async function ({
     PUBLISH_DIR: publish,
     // The directory where function source code lives
     FUNCTIONS_SRC: functionsDirectory,
-    // The directory where builders source code lives
-    BUILDERS_SRC: buildersDirectory,
     // The directory where edge handlers source code lives
     EDGE_HANDLERS_SRC: edgeHandlers,
   }
@@ -104,7 +95,6 @@ const DEFAULT_PATHS = [
   // @todo Remove once we drop support for the legacy default functions directory.
   { constantName: 'FUNCTIONS_SRC', defaultPath: 'netlify-automatic-functions' },
   { constantName: 'FUNCTIONS_SRC', defaultPath: 'netlify/functions' },
-  { constantName: 'BUILDERS_SRC', defaultPath: 'netlify/builders' },
   { constantName: 'EDGE_HANDLERS_SRC', defaultPath: 'netlify/edge-handlers' },
 ]
 
@@ -154,8 +144,6 @@ const CONSTANT_PATHS = new Set([
   'FUNCTIONS_SRC',
   'FUNCTIONS_DIST',
   'INTERNAL_FUNCTIONS_SRC',
-  'BUILDERS_SRC',
-  'INTERNAL_BUILDERS_SRC',
   'EDGE_HANDLERS_SRC',
   'CACHE_DIR',
 ])

package/src/core/feature_flags.js

@@ -18,7 +18,7 @@ const getFeatureFlag = function (name) {
 // Default values for feature flags
 const DEFAULT_FEATURE_FLAGS = {
   zisiEsbuildDynamicImports: env.NETLIFY_EXPERIMENTAL_PROCESS_DYNAMIC_IMPORTS === 'true',
-  buildbot_build_plugins_system_node_version: false,
+  netlify_build_warning_missing_headers: false,
 }
 
 module.exports = { normalizeCliFeatureFlags, DEFAULT_FEATURE_FLAGS }

package/src/core/flags.js

@@ -104,13 +104,7 @@ Default: Current Node.js binary`,
   },
   functionsDistDir: {
     string: true,
-    describe: `Path to the directory where packaged regular functions are kept.
-Default: automatically guessed`,
-    hidden: true,
-  },
-  buildersDistDir: {
-    string: true,
-    describe: `Path to the directory where packaged builders functions are kept.
+    describe: `Path to the directory where packaged functions are kept.
 Default: automatically guessed`,
     hidden: true,
   },

package/src/core/main.js

@@ -24,6 +24,7 @@ const { getConfigOpts, loadConfig } = require('./config')
 const { getConstants } = require('./constants')
 const { doDryRun } = require('./dry')
 const { warnOnLingeringProcesses } = require('./lingering')
+const { warnOnMissingSideFiles } = require('./missing_side_file')
 const { normalizeFlags } = require('./normalize_flags')
 const { getSeverity } = require('./severity')
 
@@ -528,7 +529,10 @@ const initAndRunBuild = async function ({
       featureFlags,
     })
 
-    await warnOnLingeringProcesses({ mode, logs, testOpts })
+    await Promise.all([
+      warnOnMissingSideFiles({ buildDir, netlifyConfig: netlifyConfigA, logs, featureFlags }),
+      warnOnLingeringProcesses({ mode, logs, testOpts }),
+    ])
 
     return {
       commandsCount,

package/src/core/missing_side_file.js

@@ -0,0 +1,38 @@
+'use strict'
+
+const { relative } = require('path')
+
+const pathExists = require('path-exists')
+
+const { logMissingSideFile } = require('../log/messages/core')
+
+// Some files like `_headers` and `_redirects` must be copied to the publish
+// directory to be used in production. When those are present in the repository
+// but not in the publish directory, this most likely indicates that the build
+// command accidentally forgot to copy those. We then print a warning message.
+const warnOnMissingSideFiles = async function ({
+  buildDir,
+  netlifyConfig: {
+    build: { publish },
+  },
+  logs,
+  featureFlags,
+}) {
+  if (!featureFlags.netlify_build_warning_missing_headers) {
+    return
+  }
+
+  await Promise.all(SIDE_FILES.map((sideFile) => warnOnMissingSideFile({ logs, sideFile, buildDir, publish })))
+}
+
+const SIDE_FILES = ['_headers', '_redirects']
+
+const warnOnMissingSideFile = async function ({ logs, sideFile, buildDir, publish }) {
+  if (!(await pathExists(`${buildDir}/${sideFile}`)) || (await pathExists(`${publish}/${sideFile}`))) {
+    return
+  }
+
+  logMissingSideFile(logs, sideFile, relative(buildDir, publish))
+}
+
+module.exports = { warnOnMissingSideFiles }

package/src/core/normalize_flags.js

@@ -42,7 +42,6 @@ const getDefaultFlags = function ({ env: envOpt = {} }, combinedEnv) {
     offline: false,
     telemetry: false,
     functionsDistDir: DEFAULT_FUNCTIONS_DIST,
-    buildersDistDir: DEFAULT_BUILDERS_DIST,
     cacheDir: DEFAULT_CACHE_DIR,
     deployId: combinedEnv.DEPLOY_ID,
     buildId: combinedEnv.BUILD_ID,
@@ -65,7 +64,6 @@ const computeTelemetry = function (flags, envOpts) {
 
 const REQUIRE_MODE = 'require'
 const DEFAULT_FUNCTIONS_DIST = '.netlify/functions/'
-const DEFAULT_BUILDERS_DIST = '.netlify/builders/'
 const DEFAULT_CACHE_DIR = '.netlify/cache/'
 const DEFAULT_STATSD_PORT = 8125
 

package/src/log/messages/config.js

@@ -36,7 +36,6 @@ const TEST_FLAGS = ['buffer', 'telemetry']
 const INTERNAL_FLAGS = [
   'nodePath',
   'functionsDistDir',
-  'buildersDistDir',
   'defaultConfig',
   'cachedConfigPath',
   'sendStatus',

package/src/log/messages/core.js

@@ -42,6 +42,14 @@ const logTimer = function (logs, durationNs, timerName) {
   log(logs, THEME.dimWords(`(${timerName} completed in ${duration})`))
 }
 
+const logMissingSideFile = function (logs, sideFile, publish) {
+  logWarning(
+    logs,
+    `
+A "${sideFile}" file is present in the repository but is missing in the publish directory "${publish}".`,
+  )
+}
+
 // @todo use `terminal-link` (https://github.com/sindresorhus/terminal-link)
 // instead of `ansi-escapes` once
 // https://github.com/jamestalmage/supports-hyperlinks/pull/12 is fixed
@@ -68,5 +76,6 @@ module.exports = {
   logBuildError,
   logBuildSuccess,
   logTimer,
+  logMissingSideFile,
   logLingeringProcesses,
 }

package/src/plugins/list.js

@@ -33,7 +33,7 @@ const getPluginsList = async function ({ debug, logs, testOpts: { pluginsListUrl
 
 const fetchPluginsList = async function ({ logs, pluginsListUrl }) {
   try {
-    const { body } = await got(pluginsListUrl, { json: true, timeout: PLUGINS_LIST_TIMEOUT })
+    const { body } = await got(pluginsListUrl, { responseType: 'json', timeout: PLUGINS_LIST_TIMEOUT })
 
     if (!isValidPluginsList(body)) {
       throw new Error(`Request succeeded but with an invalid response:\n${JSON.stringify(body, null, 2)}`)

package/src/telemetry/main.js

@@ -60,8 +60,7 @@ const trackBuildComplete = async function ({
 const track = async function ({ payload, config: { origin, writeKey, timeout } }) {
   const url = `${origin}/track`
   await got.post(url, {
-    json: true,
-    body: payload,
+    json: payload,
     timeout,
     retry: 0,
     headers: { Authorization: `Basic ${writeKey}` },