@netlify/build 29.20.1 → 29.20.3

package/lib/core/constants.js

@@ -1,4 +1,4 @@
-import { relative, normalize } from 'path';
+import { relative, normalize, join } from 'path';
 import { getCacheDir } from '@netlify/cache-utils';
 import mapObj from 'map-obj';
 import { pathExists } from 'path-exists';
@@ -13,9 +13,9 @@ export const getConstants = async function ({ configPath, buildDir, packagePath,
         // In monorepos this is the path that is used to point to a package that should be deployed
         PACKAGE_PATH: packagePath,
         // The directory where built serverless functions are placed before deployment
-        FUNCTIONS_DIST: functionsDistDir,
+        FUNCTIONS_DIST: join(packagePath || '', functionsDistDir),
         // The directory where built Edge Functions are placed before deployment
-        EDGE_FUNCTIONS_DIST: edgeFunctionsDistDir,
+        EDGE_FUNCTIONS_DIST: join(packagePath || '', edgeFunctionsDistDir),
         // Path to the Netlify build cache folder
         CACHE_DIR: normalizedCacheDir,
         // Boolean indicating whether the build was run locally (Netlify CLI) or in the production CI
@@ -30,10 +30,10 @@ export const getConstants = async function ({ configPath, buildDir, packagePath,
         NETLIFY_API_HOST: apiHost,
         // The directory where internal functions (i.e. generated programmatically
         // via plugins or others) live
-        INTERNAL_FUNCTIONS_SRC: `${buildDir}/${INTERNAL_FUNCTIONS_SRC}`,
+        INTERNAL_FUNCTIONS_SRC: join(buildDir, packagePath || '', INTERNAL_FUNCTIONS_SRC),
         // The directory where internal Edge Functions (i.e. generated programmatically
         // via plugins or others) live
-        INTERNAL_EDGE_FUNCTIONS_SRC: `${buildDir}/${INTERNAL_EDGE_FUNCTIONS_SRC}`,
+        INTERNAL_EDGE_FUNCTIONS_SRC: join(buildDir, packagePath || '', INTERNAL_EDGE_FUNCTIONS_SRC),
     };
     const constantsA = await addMutableConstants({ constants, buildDir, netlifyConfig });
     return constantsA;

package/lib/steps/run_core_steps.js

@@ -39,7 +39,7 @@ const getBuildSteps = function (buildSteps) {
     const allSteps = getSteps([]).steps.filter(({ coreStepId }) => buildSteps.includes(coreStepId));
     return allSteps;
 };
-const executeBuildStep = async function ({ config, packagePath, defaultConfig, cachedConfig, debug, nodePath, functionsDistDir, edgeFunctionsDistDir, errorMonitor, mode, logs, errorParams, featureFlags, buildSteps, repositoryRoot, systemLog, }) {
+const executeBuildStep = async function ({ config, packagePath, defaultConfig, cachedConfig, debug, nodePath, functionsDistDir, edgeFunctionsDistDir, errorMonitor, mode, logs, errorParams, featureFlags, buildSteps, repositoryRoot, systemLog, edgeFunctionsBootstrapURL, }) {
     const configOpts = getConfigOpts({
         config,
         defaultConfig,
@@ -79,6 +79,7 @@ const executeBuildStep = async function ({ config, packagePath, defaultConfig, c
             buildSteps,
             repositoryRoot: repositoryRootA,
             systemLog,
+            edgeFunctionsBootstrapURL,
         });
         return {
             netlifyConfig: netlifyConfigA,
@@ -100,7 +101,7 @@ const executeBuildStep = async function ({ config, packagePath, defaultConfig, c
         throw error;
     }
 };
-const runBuildStep = async function ({ netlifyConfig, buildDir, nodePath, constants, logs, debug, featureFlags, childEnv, buildSteps, repositoryRoot, systemLog, }) {
+const runBuildStep = async function ({ netlifyConfig, buildDir, nodePath, constants, logs, debug, featureFlags, childEnv, buildSteps, repositoryRoot, systemLog, edgeFunctionsBootstrapURL, }) {
     const { netlifyConfig: netlifyConfigA, configMutations } = await runSteps({
         steps: getBuildSteps(buildSteps),
         buildDir,
@@ -114,6 +115,7 @@ const runBuildStep = async function ({ netlifyConfig, buildDir, nodePath, consta
         childEnv,
         repositoryRoot,
         systemLog,
+        edgeFunctionsBootstrapURL,
     });
     return { netlifyConfig: netlifyConfigA, configMutations };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "29.20.1",
+  "version": "29.20.3",
   "description": "Netlify build module",
   "type": "module",
   "exports": "./lib/core/main.js",
@@ -148,5 +148,5 @@
       "module": "commonjs"
     }
   },
-  "gitHead": "b37569f9014233c7294f9e0b406cbabce76917a3"
+  "gitHead": "fc41c8cb9b132dbda8615408067a6618878041aa"
 }

package/types/netlify_plugin_constants.d.ts

@@ -13,6 +13,13 @@ export interface NetlifyPluginConstants {
    * `undefined` if no `netlify/functions` directory exists in the base directory and if not specified by the user.
    */
   FUNCTIONS_SRC?: string
+
+  /**
+   * the directory inside a mono repository where it collects the settings from.
+   * This is the value of the package directory field of the build settings
+   * `undefined` if none is set.
+   */
+  PACKAGE_PATH?: string
   /**
    * the directory where internal Edge Functions source code lives. This is where build plugins should place auto-generated functions.
    * `undefined` if the version of @netlify/build does not support internal Edge Functions