@netlify/build 18.15.1 → 18.17.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "18.15.1",
+  "version": "18.17.0",
   "description": "Netlify build module",
   "main": "src/core/main.js",
   "types": "types/index.d.ts",
@@ -59,9 +59,9 @@
     "@netlify/functions-utils": "^2.0.0",
     "@netlify/git-utils": "^2.0.0",
     "@netlify/plugin-edge-handlers": "^1.11.22",
-    "@netlify/plugins-list": "^4.0.0",
+    "@netlify/plugins-list": "^4.0.1",
     "@netlify/run-utils": "^2.0.0",
-    "@netlify/zip-it-and-ship-it": "^4.24.0",
+    "@netlify/zip-it-and-ship-it": "^4.25.0",
     "@sindresorhus/slugify": "^1.1.0",
     "@ungap/from-entries": "^0.2.1",
     "ansi-escapes": "^4.3.2",

package/src/plugins_core/functions/feature_flags.js

@@ -0,0 +1,9 @@
+'use strict'
+
+const getZisiFeatureFlags = (featureFlags) => ({
+  buildGoSource: featureFlags.buildbot_build_go_functions,
+  defaultEsModulesToEsbuild: featureFlags.buildbot_es_modules_esbuild,
+  parseWithEsbuild: featureFlags.buildbot_zisi_esbuild_parser,
+})
+
+module.exports = { getZisiFeatureFlags }

package/src/plugins_core/functions/index.js

@@ -11,6 +11,7 @@ const { log } = require('../../log/logger')
 const { logBundleResults, logFunctionsNonExistingDir, logFunctionsToBundle } = require('../../log/messages/core_steps')
 
 const { getZipError } = require('./error')
+const { getZisiFeatureFlags } = require('./feature_flags')
 const { getUserAndInternalFunctions, validateFunctionsSrc } = require('./utils')
 
 // Returns `true` if at least one of the functions has been configured to use
@@ -40,20 +41,23 @@ const normalizeFunctionConfig = ({ buildDir, functionConfig = {}, isRunningLocal
   rustTargetDirectory: isRunningLocally ? undefined : resolve(buildDir, '.netlify', 'rust-functions-cache', '[name]'),
 })
 
-const getZisiParameters = ({ buildDir, featureFlags, functionsConfig, functionsDist, isRunningLocally }) => {
+const getZisiParameters = ({
+  buildDir,
+  featureFlags,
+  functionsConfig,
+  functionsDist,
+  isRunningLocally,
+  repositoryRoot,
+}) => {
   const isManifestEnabled = featureFlags.functionsBundlingManifest === true
   const manifest = isManifestEnabled && isRunningLocally ? join(functionsDist, 'manifest.json') : undefined
   const config = mapObject(functionsConfig, (expression, object) => [
     expression,
     normalizeFunctionConfig({ buildDir, featureFlags, functionConfig: object, isRunningLocally }),
   ])
-  const zisiFeatureFlags = {
-    buildGoSource: featureFlags.buildbot_build_go_functions,
-    defaultEsModulesToEsbuild: featureFlags.buildbot_es_modules_esbuild,
-    parseWithEsbuild: featureFlags.buildbot_zisi_esbuild_parser,
-  }
+  const zisiFeatureFlags = getZisiFeatureFlags(featureFlags)
 
-  return { basePath: buildDir, config, manifest, featureFlags: zisiFeatureFlags }
+  return { basePath: buildDir, config, manifest, featureFlags: zisiFeatureFlags, repositoryRoot }
 }
 
 const zipFunctionsAndLogResults = async ({
@@ -65,8 +69,16 @@ const zipFunctionsAndLogResults = async ({
   internalFunctionsSrc,
   isRunningLocally,
   logs,
+  repositoryRoot,
 }) => {
-  const zisiParameters = getZisiParameters({ buildDir, featureFlags, functionsConfig, functionsDist, isRunningLocally })
+  const zisiParameters = getZisiParameters({
+    buildDir,
+    featureFlags,
+    functionsConfig,
+    functionsDist,
+    isRunningLocally,
+    repositoryRoot,
+  })
   const bundler = isUsingEsbuild(functionsConfig) ? 'esbuild' : 'zisi'
 
   try {
@@ -97,6 +109,7 @@ const coreStep = async function ({
   logs,
   netlifyConfig,
   featureFlags,
+  repositoryRoot,
 }) {
   const functionsSrc = relativeFunctionsSrc === undefined ? undefined : resolve(buildDir, relativeFunctionsSrc)
   const functionsDist = resolve(buildDir, relativeFunctionsDist)
@@ -104,6 +117,7 @@ const coreStep = async function ({
   const internalFunctionsSrcExists = await pathExists(internalFunctionsSrc)
   const functionsSrcExists = await validateFunctionsSrc({ functionsSrc, logs, relativeFunctionsSrc })
   const [userFunctions = [], internalFunctions = []] = await getUserAndInternalFunctions({
+    featureFlags,
     functionsSrc,
     functionsSrcExists,
     internalFunctionsSrc,
@@ -140,6 +154,7 @@ const coreStep = async function ({
     internalFunctionsSrc,
     isRunningLocally,
     logs,
+    repositoryRoot,
   })
 
   return {

package/src/plugins_core/functions/utils.js

@@ -10,16 +10,22 @@ const pStat = promisify(stat)
 
 const { addErrorInfo } = require('../../error/info')
 
-const getFunctionPaths = async function (functionsSrc) {
+const { getZisiFeatureFlags } = require('./feature_flags')
+
+// Returns the `mainFile` of each function found in `functionsSrc`, relative to
+// `functionsSrc`.
+const getRelativeFunctionMainFiles = async function ({ featureFlags, functionsSrc }) {
   if (functionsSrc === undefined) {
     return []
   }
 
-  const functions = await listFunctions(functionsSrc)
+  const zisiFeatureFlags = getZisiFeatureFlags(featureFlags)
+  const functions = await listFunctions(functionsSrc, { featureFlags: zisiFeatureFlags })
   return functions.map(({ mainFile }) => relative(functionsSrc, mainFile))
 }
 
 const getUserAndInternalFunctions = ({
+  featureFlags,
   functionsSrc,
   functionsSrcExists,
   internalFunctionsSrc,
@@ -30,7 +36,7 @@ const getUserAndInternalFunctions = ({
     internalFunctionsSrcExists ? internalFunctionsSrc : undefined,
   ]
 
-  return Promise.all(paths.map((path) => path && getFunctionPaths(path)))
+  return Promise.all(paths.map((path) => path && getRelativeFunctionMainFiles({ featureFlags, functionsSrc: path })))
 }
 
 // Returns `true` if the functions directory exists and is valid. Returns

package/types/config/build.d.ts

@@ -2,7 +2,7 @@ import { JSONValue } from '../utils/json_value'
 
 interface NetlifyPlugin {
   package: string
-  inputs: JSONValue
+  inputs: Partial<Record<string, JSONValue>>
 }
 
 /* eslint-disable camelcase -- some properties are named in snake case in this API */

package/types/netlify_plugin_options.d.ts

@@ -1,7 +1,8 @@
 import { NetlifyConfig } from './config/netlify_config'
 import { NetlifyPluginUtils } from './options/netlify_plugin_utils'
+import { JSONValue } from './utils/json_value'
 
-export interface NetlifyPluginOptions {
+export interface NetlifyPluginOptions<TInputs extends Record<string, JSONValue> = Partial<Record<string, JSONValue>>> {
   constants: {
     /**
      * path to the Netlify configuration file.
@@ -42,7 +43,7 @@ export interface NetlifyPluginOptions {
   /**
    * If your plugin requires additional values from the user, you can specify these requirements in an `inputs` array in the plugin’s [`manifest.yml` file](https://docs.netlify.com/configure-builds/build-plugins/create-plugins/#anatomy-of-a-plugin).
    */
-  inputs: Partial<Record<string, string>>
+  inputs: TInputs
   /**
    * @see https://docs.netlify.com/configure-builds/build-plugins/create-plugins/#netlifyconfig
    */
@@ -51,6 +52,6 @@ export interface NetlifyPluginOptions {
    * When an event handler executes, the contents of the `package.json` in a site's base directory get passed to a plugin.
    * The data fields are normalized to prevent plugin errors. If the site has no `package.json`, the argument is an empty object.
    */
-  packageJson: Partial<Record<string, string>>
+  packageJson: Partial<Record<string, JSONValue>>
   utils: NetlifyPluginUtils
 }