@netlify/build 20.3.1 → 22.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "20.3.1",
+  "version": "22.0.0",
   "description": "Netlify build module",
   "main": "src/core/main.js",
   "types": "types/index.d.ts",
@@ -60,7 +60,7 @@
     "@netlify/git-utils": "^3.0.0",
     "@netlify/plugin-edge-handlers": "^3.0.0",
     "@netlify/plugins-list": "^6.2.0",
-    "@netlify/run-utils": "^3.0.0",
+    "@netlify/run-utils": "^4.0.0",
     "@netlify/zip-it-and-ship-it": "^5.2.0",
     "@sindresorhus/slugify": "^1.1.0",
     "ansi-escapes": "^4.3.2",

package/src/plugins/child/run.js

@@ -13,7 +13,7 @@ const run = async function (
 ) {
   const method = methods[event]
   const runState = {}
-  const utils = getUtils({ event, constants, runState })
+  const utils = await getUtils({ event, constants, runState })
   const netlifyConfigCopy = cloneNetlifyConfig(netlifyConfig)
   const runOptions = { utils, constants, inputs, netlifyConfig: netlifyConfigCopy, packageJson, error }
 

package/src/plugins/child/utils.js

@@ -1,20 +1,29 @@
 'use strict'
 
+const { bindOpts: cacheBindOpts } = require('@netlify/cache-utils')
+const { add: functionsAdd, list: functionsList, listAll: functionsListAll } = require('@netlify/functions-utils')
+
 const { failBuild, failPlugin, cancelBuild, failPluginWithWarning } = require('../error')
 const { isSoftFailEvent } = require('../events')
 
 const { addLazyProp } = require('./lazy')
 const { show } = require('./status')
 
+const gitUtilsPromise = import('@netlify/git-utils')
+const runUtilsPromise = import('@netlify/run-utils')
+
 // Retrieve the `utils` argument.
-const getUtils = function ({ event, constants: { FUNCTIONS_SRC, INTERNAL_FUNCTIONS_SRC, CACHE_DIR }, runState }) {
+const getUtils = async function ({ event, constants: { FUNCTIONS_SRC, INTERNAL_FUNCTIONS_SRC, CACHE_DIR }, runState }) {
+  const [{ getGitUtils }, { run, runCommand }] = await Promise.all([gitUtilsPromise, runUtilsPromise])
+  // eslint-disable-next-line fp/no-mutation
+  run.command = runCommand
+
   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, INTERNAL_FUNCTIONS_SRC))
-  addLazyProp(utils, 'status', getStatusUtils.bind(null, runState))
+  const cache = getCacheUtils(CACHE_DIR)
+  const functions = getFunctionsUtils(FUNCTIONS_SRC, INTERNAL_FUNCTIONS_SRC)
+  const status = getStatusUtils(runState)
+  const utils = { build, cache, run, functions, status }
+  addLazyProp(utils, 'git', () => getGitUtils())
   return utils
 }
 
@@ -30,29 +39,15 @@ const getBuildUtils = function (event) {
   return { failBuild, failPlugin, cancelBuild }
 }
 
-const getGitUtils = function () {
-  // eslint-disable-next-line node/global-require
-  return require('@netlify/git-utils')()
-}
-
 const getCacheUtils = function (CACHE_DIR) {
-  // eslint-disable-next-line node/global-require
-  const cacheUtils = require('@netlify/cache-utils')
-  return cacheUtils.bindOpts({ cacheDir: CACHE_DIR })
-}
-
-const getRunUtils = function () {
-  // eslint-disable-next-line node/global-require
-  return require('@netlify/run-utils')
+  return cacheBindOpts({ cacheDir: CACHE_DIR })
 }
 
 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, INTERNAL_FUNCTIONS_SRC, { fail: failBuild })
-  const list = functionsUtils.list.bind(null, functionsDirectories, { fail: failBuild })
-  const listAll = functionsUtils.listAll.bind(null, functionsDirectories, { fail: failBuild })
+  const add = (src) => functionsAdd(src, INTERNAL_FUNCTIONS_SRC, { fail: failBuild })
+  const list = functionsList.bind(null, functionsDirectories, { fail: failBuild })
+  const listAll = functionsListAll.bind(null, functionsDirectories, { fail: failBuild })
   return { add, list, listAll }
 }