@netlify/build 18.11.1 → 18.13.1-rc

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "18.11.1",
+  "version": "18.13.1-rc",
   "description": "Netlify build module",
   "main": "src/core/main.js",
   "bin": {
@@ -59,7 +59,7 @@
     "@netlify/plugin-edge-handlers": "^1.11.22",
     "@netlify/plugins-list": "^3.6.0",
     "@netlify/run-utils": "^2.0.0",
-    "@netlify/zip-it-and-ship-it": "^4.22.0",
+    "@netlify/zip-it-and-ship-it": "^4.23.0",
     "@sindresorhus/slugify": "^1.1.0",
     "@ungap/from-entries": "^0.2.1",
     "ansi-escapes": "^4.3.2",

package/src/core/feature_flags.js

@@ -1,7 +1,5 @@
 'use strict'
 
-const { env } = require('process')
-
 // From CLI `--featureFlags=a,b,c` to programmatic `{ a: true, b: true, c: true }`
 const normalizeCliFeatureFlags = function (cliFeatureFlags) {
   return Object.assign({}, ...cliFeatureFlags.split(',').filter(isNotEmpty).map(getFeatureFlag))
@@ -17,8 +15,8 @@ const getFeatureFlag = function (name) {
 
 // Default values for feature flags
 const DEFAULT_FEATURE_FLAGS = {
-  zisiEsbuildDynamicImports: env.NETLIFY_EXPERIMENTAL_PROCESS_DYNAMIC_IMPORTS === 'true',
   buildbot_es_modules_esbuild: false,
+  buildbot_zisi_esbuild_parser: false,
 }
 
 module.exports = { normalizeCliFeatureFlags, DEFAULT_FEATURE_FLAGS }

package/src/plugins/child/utils.js

@@ -7,13 +7,13 @@ const { addLazyProp } = require('./lazy')
 const { show } = require('./status')
 
 // Retrieve the `utils` argument.
-const getUtils = function ({ event, constants: { FUNCTIONS_SRC, CACHE_DIR }, runState }) {
+const getUtils = function ({ event, constants: { FUNCTIONS_SRC, INTERNAL_FUNCTIONS_SRC, CACHE_DIR }, runState }) {
   const build = getBuildUtils(event)
   const utils = { build }
   addLazyProp(utils, 'git', getGitUtils)
   addLazyProp(utils, 'cache', getCacheUtils.bind(null, CACHE_DIR))
   addLazyProp(utils, 'run', getRunUtils)
-  addLazyProp(utils, 'functions', getFunctionsUtils.bind(null, FUNCTIONS_SRC))
+  addLazyProp(utils, 'functions', getFunctionsUtils.bind(null, FUNCTIONS_SRC, INTERNAL_FUNCTIONS_SRC))
   addLazyProp(utils, 'status', getStatusUtils.bind(null, runState))
   return utils
 }
@@ -46,12 +46,13 @@ const getRunUtils = function () {
   return require('@netlify/run-utils')
 }
 
-const getFunctionsUtils = function (FUNCTIONS_SRC) {
+const getFunctionsUtils = function (FUNCTIONS_SRC, INTERNAL_FUNCTIONS_SRC) {
+  const functionsDirectories = [INTERNAL_FUNCTIONS_SRC, FUNCTIONS_SRC].filter(Boolean)
   // eslint-disable-next-line node/global-require
   const functionsUtils = require('@netlify/functions-utils')
-  const add = (src) => functionsUtils.add(src, FUNCTIONS_SRC, { fail: failBuild })
-  const list = functionsUtils.list.bind(null, FUNCTIONS_SRC, { fail: failBuild })
-  const listAll = functionsUtils.listAll.bind(null, FUNCTIONS_SRC, { fail: failBuild })
+  const add = (src) => functionsUtils.add(src, INTERNAL_FUNCTIONS_SRC, { fail: failBuild })
+  const list = functionsUtils.list.bind(null, functionsDirectories, { fail: failBuild })
+  const listAll = functionsUtils.listAll.bind(null, functionsDirectories, { fail: failBuild })
   return { add, list, listAll }
 }
 

package/src/plugins_core/functions/index.js

@@ -25,7 +25,7 @@ const isUsingEsbuild = (functionsConfig = {}) =>
 // The function configuration keys returned by @netlify/config are not an exact
 // match to the properties that @netlify/zip-it-and-ship-it expects. We do that
 // translation here.
-const normalizeFunctionConfig = ({ buildDir, featureFlags, functionConfig = {}, isRunningLocally }) => ({
+const normalizeFunctionConfig = ({ buildDir, functionConfig = {}, isRunningLocally }) => ({
   externalNodeModules: functionConfig.external_node_modules,
   includedFiles: functionConfig.included_files,
   includedFilesBasePath: buildDir,
@@ -38,11 +38,6 @@ const normalizeFunctionConfig = ({ buildDir, featureFlags, functionConfig = {},
   // `esbuild` into `esbuild_zisi`, which zip-it-and-ship-it understands.
   nodeBundler: functionConfig.node_bundler === 'esbuild' ? 'esbuild_zisi' : functionConfig.node_bundler,
 
-  // With the `zisiEsbuildDynamicImports` feature flag, zip-it-and-ship-it will
-  // resolve dynamic import expressions by injecting shim files to make the
-  // expressions resolve to the right paths at runtime.
-  processDynamicNodeImports: Boolean(featureFlags.zisiEsbuildDynamicImports),
-
   // If the build is running in buildbot, we set the Rust target directory to a
   // path that will get cached in between builds, allowing us to speed up the
   // build process.
@@ -58,6 +53,7 @@ const getZisiParameters = ({ buildDir, featureFlags, functionsConfig, functionsD
   ])
   const zisiFeatureFlags = {
     defaultEsModulesToEsbuild: featureFlags.buildbot_es_modules_esbuild,
+    parseWithEsbuild: featureFlags.buildbot_zisi_esbuild_parser,
   }
 
   return { basePath: buildDir, config, manifest, featureFlags: zisiFeatureFlags }