@netlify/build 20.0.3 → 20.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "20.0.3",
+  "version": "20.3.0",
   "description": "Netlify build module",
   "main": "src/core/main.js",
   "types": "types/index.d.ts",
@@ -59,7 +59,7 @@
     "@netlify/functions-utils": "^3.0.0",
     "@netlify/git-utils": "^3.0.0",
     "@netlify/plugin-edge-handlers": "^3.0.0",
-    "@netlify/plugins-list": "^5.0.0",
+    "@netlify/plugins-list": "^6.0.1",
     "@netlify/run-utils": "^3.0.0",
     "@netlify/zip-it-and-ship-it": "^5.2.0",
     "@sindresorhus/slugify": "^1.1.0",

package/src/core/feature_flags.js

@@ -16,10 +16,12 @@ const getFeatureFlag = function (name) {
 // Default values for feature flags
 const DEFAULT_FEATURE_FLAGS = {
   buildbot_build_go_functions: false,
+  buildbot_create_functions_manifest: false,
   buildbot_es_modules_esbuild: false,
   buildbot_zisi_trace_nft: false,
   buildbot_zisi_esbuild_parser: false,
   buildbot_scheduled_functions: false,
+  zisi_parse_isc: false,
 }
 
 module.exports = { normalizeCliFeatureFlags, DEFAULT_FEATURE_FLAGS }

package/src/core/flags.js

@@ -134,7 +134,12 @@ Default: false`,
   },
   debug: {
     boolean: true,
-    describe: 'Print debugging information',
+    describe: 'Print user-facing debugging information',
+    hidden: true,
+  },
+  verbose: {
+    boolean: true,
+    describe: 'Print internal debugging information',
     hidden: true,
   },
   sendStatus: {

package/src/core/main.js

@@ -163,6 +163,7 @@ const tExecBuild = async function ({
   baseRelDir,
   env: envOpt,
   debug,
+  verbose,
   nodePath,
   functionsDistDir,
   cacheDir,
@@ -273,6 +274,7 @@ const tExecBuild = async function ({
     errorParams,
     logs,
     debug,
+    verbose,
     timers: timersA,
     sendStatus,
     saveConfig,
@@ -321,6 +323,7 @@ const runAndReportBuild = async function ({
   errorParams,
   logs,
   debug,
+  verbose,
   timers,
   sendStatus,
   saveConfig,
@@ -360,6 +363,7 @@ const runAndReportBuild = async function ({
       errorParams,
       logs,
       debug,
+      verbose,
       timers,
       sendStatus,
       saveConfig,
@@ -451,6 +455,7 @@ const initAndRunBuild = async function ({
   errorParams,
   logs,
   debug,
+  verbose,
   sendStatus,
   saveConfig,
   timers,
@@ -521,6 +526,7 @@ const initAndRunBuild = async function ({
       errorParams,
       logs,
       debug,
+      verbose,
       saveConfig,
       timers: timersB,
       testOpts,
@@ -573,6 +579,7 @@ const runBuild = async function ({
   errorParams,
   logs,
   debug,
+  verbose,
   saveConfig,
   timers,
   testOpts,
@@ -583,7 +590,9 @@ const runBuild = async function ({
     childProcesses,
     packageJson,
     timers,
+    logs,
     debug,
+    verbose,
   })
 
   const { steps, events } = getSteps(pluginsSteps)
@@ -623,6 +632,7 @@ const runBuild = async function ({
     configOpts,
     logs,
     debug,
+    verbose,
     saveConfig,
     timers: timersA,
     testOpts,

package/src/core/normalize_flags.js

@@ -41,6 +41,7 @@ const getDefaultFlags = function ({ env: envOpt = {} }, combinedEnv) {
     mode: REQUIRE_MODE,
     offline: false,
     telemetry: false,
+    verbose: Boolean(combinedEnv.NETLIFY_BUILD_DEBUG),
     functionsDistDir: DEFAULT_FUNCTIONS_DIST,
     cacheDir: DEFAULT_CACHE_DIR,
     deployId: combinedEnv.DEPLOY_ID,

package/src/log/messages/ipc.js

@@ -0,0 +1,50 @@
+'use strict'
+
+const { log } = require('../logger')
+
+const logVerbose = function (logs, verbose, message) {
+  if (!verbose) {
+    return
+  }
+
+  log(logs, message)
+}
+
+const logSendingEventToChild = function (logs, verbose) {
+  logVerbose(logs, verbose, 'Step starting.')
+}
+
+const logSentEventToChild = function (logs, verbose) {
+  logVerbose(logs, verbose, 'Step started.')
+}
+
+const logPluginMethodStart = function (verbose) {
+  logVerbose(undefined, verbose, 'Plugin logic started.')
+}
+
+const logPluginMethodEnd = function (verbose) {
+  logVerbose(undefined, verbose, 'Plugin logic ended.')
+}
+
+const logSendingEventToParent = function (verbose, error) {
+  const message = error instanceof Error ? `Step erroring.\n${error.stack}` : 'Stop closing.'
+  logVerbose(undefined, verbose, message)
+}
+
+const logReceivedEventFromChild = function (logs, verbose) {
+  logVerbose(logs, verbose, 'Step ended.')
+}
+
+const logStepCompleted = function (logs, verbose) {
+  logVerbose(logs, verbose, 'Step completed.')
+}
+
+module.exports = {
+  logSendingEventToChild,
+  logSentEventToChild,
+  logPluginMethodStart,
+  logPluginMethodEnd,
+  logSendingEventToParent,
+  logReceivedEventFromChild,
+  logStepCompleted,
+}

package/src/plugins/child/error.js

@@ -8,11 +8,11 @@ const { normalizeError } = require('../../error/parse/normalize')
 const { sendEventToParent } = require('../ipc')
 
 // Handle any top-level error and communicate it back to parent
-const handleError = async function (error) {
+const handleError = async function (error, verbose) {
   const errorA = normalizeError(error)
   addDefaultErrorInfo(errorA, { type: 'pluginInternal' })
   const errorPayload = errorToJson(errorA)
-  await sendEventToParent('error', errorPayload)
+  await sendEventToParent('error', errorPayload, verbose, errorA)
 }
 
 // On uncaught exceptions and unhandled rejections, print the stack trace.

package/src/plugins/child/load.js

@@ -11,7 +11,7 @@ const { validatePlugin } = require('./validate')
 // This also validates the plugin.
 // Do it when parent requests it using the `load` event.
 // Also figure out the list of plugin steps. This is also passed to the parent.
-const load = async function ({ pluginPath, inputs, packageJson }) {
+const load = async function ({ pluginPath, inputs, packageJson, verbose }) {
   const tsNodeService = registerTypeScript(pluginPath)
   const logic = await getLogic({ pluginPath, inputs, tsNodeService })
 
@@ -21,7 +21,7 @@ const load = async function ({ pluginPath, inputs, packageJson }) {
   const events = Object.keys(methods)
 
   // Context passed to every event handler
-  const context = { methods, inputs, packageJson }
+  const context = { methods, inputs, packageJson, verbose }
 
   return { events, context }
 }

package/src/plugins/child/main.js

@@ -9,33 +9,42 @@ const { run } = require('./run')
 
 // Boot plugin child process.
 const bootPlugin = async function () {
+  const state = { context: { verbose: false } }
+
   try {
     handleProcessErrors()
     setInspectColors()
 
-    const state = {}
     // We need to fire them in parallel because `process.send()` can be slow
     // to await, i.e. parent might send `load` event before child `ready` event
     // returns.
-    await Promise.all([handleEvents(state), sendEventToParent('ready')])
+    await Promise.all([handleEvents(state), sendEventToParent('ready', {}, false)])
   } catch (error) {
-    await handleError(error)
+    await handleError(error, state.context.verbose)
   }
 }
 
 // Wait for events from parent to perform plugin methods
 const handleEvents = async function (state) {
-  await getEventsFromParent((callId, eventName, payload) => handleEvent(callId, eventName, payload, state))
+  await getEventsFromParent((callId, eventName, payload) => handleEvent({ callId, eventName, payload, state }))
 }
 
 // Each event can pass `context` information to the next event
-const handleEvent = async function (callId, eventName, payload, state) {
+const handleEvent = async function ({
+  callId,
+  eventName,
+  payload,
+  state,
+  state: {
+    context: { verbose },
+  },
+}) {
   try {
     const { context, ...response } = await EVENTS[eventName](payload, state.context)
     state.context = { ...state.context, ...context }
-    await sendEventToParent(callId, response)
+    await sendEventToParent(callId, response, verbose)
   } catch (error) {
-    await handleError(error)
+    await handleError(error, verbose)
   }
 }
 

package/src/plugins/child/run.js

@@ -1,12 +1,16 @@
 'use strict'
 
 const { getNewEnvChanges, setEnvChanges } = require('../../env/changes')
+const { logPluginMethodStart, logPluginMethodEnd } = require('../../log/messages/ipc')
 
 const { cloneNetlifyConfig, getConfigMutations } = require('./diff')
 const { getUtils } = require('./utils')
 
 // Run a specific plugin event handler
-const run = async function ({ event, error, constants, envChanges, netlifyConfig }, { methods, inputs, packageJson }) {
+const run = async function (
+  { event, error, constants, envChanges, netlifyConfig },
+  { methods, inputs, packageJson, verbose },
+) {
   const method = methods[event]
   const runState = {}
   const utils = getUtils({ event, constants, runState })
@@ -14,7 +18,11 @@ const run = async function ({ event, error, constants, envChanges, netlifyConfig
   const runOptions = { utils, constants, inputs, netlifyConfig: netlifyConfigCopy, packageJson, error }
 
   const envBefore = setEnvChanges(envChanges)
+
+  logPluginMethodStart(verbose)
   await method(runOptions)
+  logPluginMethodEnd(verbose)
+
   const newEnvChanges = getNewEnvChanges(envBefore, netlifyConfig, netlifyConfigCopy)
 
   const configMutations = getConfigMutations(netlifyConfig, netlifyConfigCopy, event)

package/src/plugins/ipc.js

@@ -8,16 +8,23 @@ const { v4: uuidv4 } = require('uuid')
 
 const { jsonToError, errorToJson } = require('../error/build')
 const { addErrorInfo } = require('../error/info')
+const {
+  logSendingEventToChild,
+  logSentEventToChild,
+  logReceivedEventFromChild,
+  logSendingEventToParent,
+} = require('../log/messages/ipc')
 
 // Send event from child to parent process then wait for response
 // We need to fire them in parallel because `process.send()` can be slow
 // to await, i.e. child might send response before parent start listening for it
-const callChild = async function (childProcess, eventName, payload) {
+const callChild = async function ({ childProcess, eventName, payload, logs, verbose }) {
   const callId = uuidv4()
   const [response] = await Promise.all([
     getEventFromChild(childProcess, callId),
-    sendEventToChild(childProcess, callId, eventName, payload),
+    sendEventToChild({ childProcess, callId, eventName, payload, logs, verbose }),
   ])
+  logReceivedEventFromChild(logs, verbose)
   return response
 }
 
@@ -84,9 +91,13 @@ Plugin methods should instead:
   - on failure: call utils.build.failPlugin() or utils.build.failBuild()`
 
 // Send event from parent to child process
-const sendEventToChild = async function (childProcess, callId, eventName, payload) {
+const sendEventToChild = async function ({ childProcess, callId, eventName, payload, logs, verbose }) {
+  logSendingEventToChild(logs, verbose)
+
   const payloadA = serializePayload(payload)
   await promisify(childProcess.send.bind(childProcess))([callId, eventName, payloadA])
+
+  logSentEventToChild(logs, verbose)
 }
 
 // Respond to events from parent to child process.
@@ -109,7 +120,8 @@ const getEventsFromParent = function (callback) {
 }
 
 // Send event from child to parent process
-const sendEventToParent = async function (callId, payload) {
+const sendEventToParent = async function (callId, payload, verbose, error) {
+  logSendingEventToParent(verbose, error)
   await promisify(process.send.bind(process))([callId, payload])
 }
 

package/src/plugins/list.js

@@ -1,9 +1,11 @@
 'use strict'
 
-const { pluginsList: oldPluginsList, pluginsUrl } = require('@netlify/plugins-list')
 const got = require('got')
 const isPlainObj = require('is-plain-obj')
 
+// TODO: use static `import` after migrating this repository to pure ES modules
+const netlifyPluginsList = import('@netlify/plugins-list')
+
 const { logPluginsList } = require('../log/messages/plugins')
 const { logPluginsFetchError } = require('../log/messages/plugins')
 
@@ -16,14 +18,16 @@ const { CONDITIONS } = require('./compatibility')
 // make this request is somewhat ok (in the 100ms range).
 // We only fetch this plugins list when needed, i.e. we defer it as much as
 // possible.
-const getPluginsList = async function ({ debug, logs, testOpts: { pluginsListUrl = pluginsUrl } }) {
+const getPluginsList = async function ({ debug, logs, testOpts: { pluginsListUrl } }) {
   // We try not to mock in integration tests. However, sending a request for
   // each test would be too slow and make tests unreliable.
   if (pluginsListUrl === 'test') {
     return []
   }
 
-  const pluginsList = await fetchPluginsList({ logs, pluginsListUrl })
+  const { pluginsUrl } = await netlifyPluginsList
+  const pluginsListUrlA = pluginsListUrl === undefined ? pluginsUrl : pluginsListUrl
+  const pluginsList = await fetchPluginsList({ logs, pluginsListUrl: pluginsListUrlA })
   const pluginsListA = normalizePluginsList(pluginsList)
   logPluginsList({ pluginsList: pluginsListA, debug, logs })
   return pluginsListA
@@ -46,6 +50,7 @@ const fetchPluginsList = async function ({ logs, pluginsListUrl }) {
     //    buildbot release.
   } catch (error) {
     logPluginsFetchError(logs, error.message)
+    const { pluginsList: oldPluginsList } = await netlifyPluginsList
     return oldPluginsList
   }
 }

package/src/plugins/load.js

@@ -8,16 +8,16 @@ const { callChild } = require('./ipc')
 
 // Retrieve all plugins steps
 // Can use either a module name or a file path to the plugin.
-const loadPlugins = async function ({ pluginsOptions, childProcesses, packageJson, timers, debug }) {
+const loadPlugins = async function ({ pluginsOptions, childProcesses, packageJson, timers, logs, debug, verbose }) {
   return pluginsOptions.length === 0
     ? { pluginsSteps: [], timers }
-    : await loadAllPlugins({ pluginsOptions, childProcesses, packageJson, timers, debug })
+    : await loadAllPlugins({ pluginsOptions, childProcesses, packageJson, timers, logs, debug, verbose })
 }
 
-const tLoadAllPlugins = async function ({ pluginsOptions, childProcesses, packageJson, debug }) {
+const tLoadAllPlugins = async function ({ pluginsOptions, childProcesses, packageJson, logs, debug, verbose }) {
   const pluginsSteps = await Promise.all(
     pluginsOptions.map((pluginOptions, index) =>
-      loadPlugin(pluginOptions, { childProcesses, index, packageJson, debug }),
+      loadPlugin(pluginOptions, { childProcesses, index, packageJson, logs, debug, verbose }),
     ),
   )
   const pluginsStepsA = pluginsSteps.flat()
@@ -31,13 +31,19 @@ const loadAllPlugins = measureDuration(tLoadAllPlugins, 'load_plugins')
 // Do it by executing the plugin `load` event handler.
 const loadPlugin = async function (
   { packageName, pluginPackageJson, pluginPackageJson: { version } = {}, pluginPath, inputs, loadedFrom, origin },
-  { childProcesses, index, packageJson, debug },
+  { childProcesses, index, packageJson, logs, debug, verbose },
 ) {
   const { childProcess } = childProcesses[index]
   const loadEvent = 'load'
 
   try {
-    const { events } = await callChild(childProcess, 'load', { pluginPath, inputs, packageJson })
+    const { events } = await callChild({
+      childProcess,
+      eventName: 'load',
+      payload: { pluginPath, inputs, packageJson, verbose },
+      logs,
+      verbose: false,
+    })
     const pluginSteps = events.map((event) => ({
       event,
       packageName,

package/src/plugins_core/functions/feature_flags.js

@@ -1,9 +1,11 @@
 'use strict'
 
 const getZisiFeatureFlags = (featureFlags) => ({
+  ...featureFlags,
   buildGoSource: featureFlags.buildbot_build_go_functions,
   defaultEsModulesToEsbuild: featureFlags.buildbot_es_modules_esbuild,
   nftTranspile: featureFlags.buildbot_nft_transpile_esm || featureFlags.buildbot_zisi_trace_nft,
+  parseISC: featureFlags.zisi_parse_isc,
   parseWithEsbuild: featureFlags.buildbot_zisi_esbuild_parser,
   traceWithNft: featureFlags.buildbot_zisi_trace_nft,
 })

package/src/plugins_core/functions/index.js

@@ -51,8 +51,8 @@ const getZisiParameters = ({
   isRunningLocally,
   repositoryRoot,
 }) => {
-  const isManifestEnabled = featureFlags.functionsBundlingManifest === true
-  const manifest = isManifestEnabled && isRunningLocally ? join(functionsDist, 'manifest.json') : undefined
+  const isManifestEnabled = isRunningLocally || featureFlags.buildbot_create_functions_manifest === true
+  const manifest = isManifestEnabled ? join(functionsDist, 'manifest.json') : undefined
   const config = mapObject(functionsConfig, (expression, object) => [
     expression,
     normalizeFunctionConfig({ buildDir, featureFlags, functionConfig: object, isRunningLocally }),

package/src/steps/plugin.js

@@ -1,6 +1,7 @@
 'use strict'
 
 const { addErrorInfo } = require('../error/info')
+const { logStepCompleted } = require('../log/messages/ipc')
 const { pipePluginOutput, unpipePluginOutput } = require('../log/stream')
 const { callChild } = require('../plugins/ipc')
 const { getSuccessStatus } = require('../status/success')
@@ -28,6 +29,7 @@ const firePluginStep = async function ({
   error,
   logs,
   debug,
+  verbose,
 }) {
   const listeners = pipePluginOutput(childProcess, logs)
 
@@ -37,12 +39,12 @@ const firePluginStep = async function ({
       newEnvChanges,
       configMutations: newConfigMutations,
       status,
-    } = await callChild(childProcess, 'run', {
-      event,
-      error,
-      envChanges,
-      netlifyConfig,
-      constants,
+    } = await callChild({
+      childProcess,
+      eventName: 'run',
+      payload: { event, error, envChanges, netlifyConfig, constants },
+      logs,
+      verbose,
     })
     const {
       netlifyConfig: netlifyConfigA,
@@ -80,6 +82,7 @@ const firePluginStep = async function ({
     return { newError }
   } finally {
     await unpipePluginOutput(childProcess, logs, listeners)
+    logStepCompleted(logs, verbose)
   }
 }
 

package/src/steps/run_step.js

@@ -50,6 +50,7 @@ const runStep = async function ({
   redirectsPath,
   logs,
   debug,
+  verbose,
   saveConfig,
   timers,
   testOpts,
@@ -110,6 +111,7 @@ const runStep = async function ({
     error,
     logs,
     debug,
+    verbose,
     saveConfig,
     timers,
     errorParams,
@@ -237,6 +239,7 @@ const tFireStep = function ({
   error,
   logs,
   debug,
+  verbose,
   saveConfig,
   errorParams,
   configOpts,
@@ -293,6 +296,7 @@ const tFireStep = function ({
     error,
     logs,
     debug,
+    verbose,
   })
 }
 

package/src/steps/run_steps.js

@@ -36,6 +36,7 @@ const runSteps = async function ({
   configOpts,
   logs,
   debug,
+  verbose,
   saveConfig,
   timers,
   testOpts,
@@ -128,6 +129,7 @@ const runSteps = async function ({
         redirectsPath: redirectsPathA,
         logs,
         debug,
+        verbose,
         saveConfig,
         timers: timersA,
         testOpts,