@netlify/build 20.0.2 → 20.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "20.0.2",
+  "version": "20.2.0",
   "description": "Netlify build module",
   "main": "src/core/main.js",
   "types": "types/index.d.ts",
@@ -58,8 +58,8 @@
     "@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.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/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_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 }),