@netlify/build 23.0.1 → 24.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "23.0.1",
+  "version": "24.0.0",
   "description": "Netlify build module",
   "main": "src/core/main.js",
   "types": "types/index.d.ts",

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,20 +1,20 @@
 'use strict'
 
-const { bindOpts: cacheBindOpts } = require('@netlify/cache-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 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 [functionsUtils, { getGitUtils }, { run, runCommand }] = await Promise.all([
+  const [cacheUtils, functionsUtils, { getGitUtils }, { run, runCommand }] = await Promise.all([
+    cacheUtilsPromise,
     functionsUtilsPromise,
     gitUtilsPromise,
     runUtilsPromise,
@@ -23,7 +23,7 @@ const getUtils = async function ({ event, constants: { FUNCTIONS_SRC, INTERNAL_F
   run.command = runCommand
 
   const build = getBuildUtils(event)
-  const cache = getCacheUtils(CACHE_DIR)
+  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 }
@@ -43,8 +43,8 @@ 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 (functionsUtils, FUNCTIONS_SRC, INTERNAL_FUNCTIONS_SRC) {