@netlify/build 22.0.1 → 24.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "22.0.1",
+  "version": "24.0.1",
   "description": "Netlify build module",
   "main": "src/core/main.js",
   "types": "types/index.d.ts",
@@ -54,9 +54,9 @@
   "license": "MIT",
   "dependencies": {
     "@bugsnag/js": "^7.0.0",
-    "@netlify/cache-utils": "^3.0.0",
+    "@netlify/cache-utils": "^4.0.0",
     "@netlify/config": "^16.0.0",
-    "@netlify/functions-utils": "^3.0.0",
+    "@netlify/functions-utils": "^4.0.0",
     "@netlify/git-utils": "^4.0.0",
     "@netlify/plugin-edge-handlers": "^3.0.0",
     "@netlify/plugins-list": "^6.2.0",

package/src/core/constants.js

@@ -2,12 +2,13 @@
 
 const { relative, normalize } = require('path')
 
-const { getCacheDir } = require('@netlify/cache-utils')
 const mapObj = require('map-obj')
 const pathExists = require('path-exists')
 
 const { version } = require('../../package.json')
 
+const cacheUtilsPromise = import('@netlify/cache-utils')
+
 // Retrieve constants passed to plugins
 const getConstants = async function ({
   configPath,
@@ -21,6 +22,7 @@ const getConstants = async function ({
   mode,
 }) {
   const isLocal = mode !== 'buildbot'
+  const { getCacheDir } = await cacheUtilsPromise
   const normalizedCacheDir = getCacheDir({ cacheDir, cwd: buildDir })
 
   const constants = {

package/src/plugins/child/utils.js

@@ -1,26 +1,30 @@
 '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 cacheUtilsPromise = import('@netlify/cache-utils')
+const functionsUtilsPromise = import('@netlify/functions-utils')
 const gitUtilsPromise = import('@netlify/git-utils')
 const runUtilsPromise = import('@netlify/run-utils')
 
 // Retrieve the `utils` argument.
 const getUtils = async function ({ event, constants: { FUNCTIONS_SRC, INTERNAL_FUNCTIONS_SRC, CACHE_DIR }, runState }) {
-  const [{ getGitUtils }, { run, runCommand }] = await Promise.all([gitUtilsPromise, runUtilsPromise])
+  const [cacheUtils, functionsUtils, { getGitUtils }, { run, runCommand }] = await Promise.all([
+    cacheUtilsPromise,
+    functionsUtilsPromise,
+    gitUtilsPromise,
+    runUtilsPromise,
+  ])
   // eslint-disable-next-line fp/no-mutation
   run.command = runCommand
 
   const build = getBuildUtils(event)
-  const cache = getCacheUtils(CACHE_DIR)
-  const functions = getFunctionsUtils(FUNCTIONS_SRC, INTERNAL_FUNCTIONS_SRC)
+  const cache = getCacheUtils(cacheUtils, CACHE_DIR)
+  const functions = getFunctionsUtils(functionsUtils, FUNCTIONS_SRC, INTERNAL_FUNCTIONS_SRC)
   const status = getStatusUtils(runState)
   const utils = { build, cache, run, functions, status }
   addLazyProp(utils, 'git', () => getGitUtils())
@@ -39,15 +43,15 @@ const getBuildUtils = function (event) {
   return { failBuild, failPlugin, cancelBuild }
 }
 
-const getCacheUtils = function (CACHE_DIR) {
-  return cacheBindOpts({ cacheDir: CACHE_DIR })
+const getCacheUtils = function (cacheUtils, CACHE_DIR) {
+  return cacheUtils.bindOpts({ cacheDir: CACHE_DIR })
 }
 
-const getFunctionsUtils = function (FUNCTIONS_SRC, INTERNAL_FUNCTIONS_SRC) {
+const getFunctionsUtils = function (functionsUtils, FUNCTIONS_SRC, INTERNAL_FUNCTIONS_SRC) {
   const functionsDirectories = [INTERNAL_FUNCTIONS_SRC, FUNCTIONS_SRC].filter(Boolean)
-  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 })
+  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 }
 }