@netlify/build 20.0.0 → 20.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "20.0.0",
+  "version": "20.0.4",
   "description": "Netlify build module",
   "main": "src/core/main.js",
   "types": "types/index.d.ts",
@@ -58,10 +58,10 @@
     "@netlify/config": "^16.0.0",
     "@netlify/functions-utils": "^3.0.0",
     "@netlify/git-utils": "^3.0.0",
-    "@netlify/plugin-edge-handlers": "^2.0.0",
-    "@netlify/plugins-list": "^5.0.0",
+    "@netlify/plugin-edge-handlers": "^3.0.0",
+    "@netlify/plugins-list": "^6.0.1",
     "@netlify/run-utils": "^3.0.0",
-    "@netlify/zip-it-and-ship-it": "^5.1.0",
+    "@netlify/zip-it-and-ship-it": "^5.2.0",
     "@sindresorhus/slugify": "^1.1.0",
     "ansi-escapes": "^4.3.2",
     "chalk": "^4.1.2",

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/types/index.d.ts

@@ -4,3 +4,4 @@ export { OnBuild, OnEnd, OnError, OnPostBuild, OnPreBuild, OnSuccess } from './n
 export { NetlifyConfig } from './config/netlify_config'
 export { NetlifyPluginUtils } from './options'
 export { NetlifyPluginConstants } from './netlify_plugin_constants'
+export { ListedFunction, ListedFunctionFile } from './options/netlify_plugin_functions_util'

package/types/options/netlify_plugin_functions_util.d.ts

@@ -0,0 +1,32 @@
+import type { listFunctions, listFunctionsFiles } from '@netlify/zip-it-and-ship-it'
+
+type Resolved<T> = T extends Promise<infer U> ? U : T
+
+export type ListedFunction = Resolved<ReturnType<typeof listFunctions>>[0]
+export type ListedFunctionFile = Resolved<ReturnType<typeof listFunctionsFiles>>[0]
+
+export interface NetlifyPluginFunctionsUtil {
+  /**
+   * Returns the list of Netlify Functions main files as a Promise resolving to an array of objects with the following properties:
+   *
+   * - `name`: Function name, as used in the URL `https://{hostname}/.netlify/functions/{name}`
+   * - `mainFile`: absolute path to the Function's main file
+   * - `extension`: file extension of the Function's main file. For Go Functions, this might be an empty string.  For Node.js Functions, this is either `.js` or `.zip`.
+   * - `runtime` `"js" | "go"`: Function's language runtime. TypeScript Functions use the "js" runtime
+   */
+  list(): Promise<Array<ListedFunction>>
+
+  /**
+   * Same as `list()` except it also returns the files required by the Functions' main files. This is much slower. The object have the following additional member:
+   *
+   * - `srcFile`: absolute path to the file
+   */
+  listAll(): Promise<Array<ListedFunctionFile>>
+
+  /**
+   * Add a Functions file or directory to a build.
+   *
+   * @param path Path to the function file or directory.
+   */
+  add(path: string): Promise<void>
+}

package/types/options/netlify_plugin_utils.d.ts

@@ -1,5 +1,6 @@
 import { NetlifyPluginBuildUtil } from './netlify_plugin_build_util'
 import { NetlifyPluginCacheUtil } from './netlify_plugin_cache_util'
+import { NetlifyPluginFunctionsUtil } from './netlify_plugin_functions_util'
 import { NetlifyPluginGitUtil } from './netlify_plugin_git_util'
 import { NetlifyPluginRunUtil } from './netlify_plugin_run_util'
 import { NetlifyPluginStatusUtil } from './netlify_plugin_status_util'
@@ -10,4 +11,5 @@ export interface NetlifyPluginUtils {
   cache: NetlifyPluginCacheUtil
   run: NetlifyPluginRunUtil
   git: NetlifyPluginGitUtil
+  functions: NetlifyPluginFunctionsUtil
 }