@netlify/build 29.20.3 → 29.20.5

package/lib/core/constants.js

@@ -13,9 +13,13 @@ 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: join(packagePath || '', functionsDistDir),
+        // only on local development join with the packagePath as this directory
+        // on buildbot this `functionsDistDir` is an absolute path to `/tmp/zisi-.....` so we cannot join it with the pacakgePath
+        FUNCTIONS_DIST: !isLocal ? functionsDistDir : join(packagePath || '', functionsDistDir),
         // The directory where built Edge Functions are placed before deployment
-        EDGE_FUNCTIONS_DIST: join(packagePath || '', edgeFunctionsDistDir),
+        // only on local development join with the packagePath as this directory
+        // on buildbot this `functionsDistDir` is an absolute path to `/tmp/zisi-.....` so we cannot join it with the pacakgePath
+        EDGE_FUNCTIONS_DIST: !isLocal ? edgeFunctionsDistDir : 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

package/lib/plugins_core/edge_functions/index.js

@@ -8,11 +8,11 @@ import { validateEdgeFunctionsManifest } from './validate_manifest/validate_edge
 // TODO: Replace this with a custom cache directory.
 const DENO_CLI_CACHE_DIRECTORY = '.netlify/plugins/deno-cli';
 const IMPORT_MAP_FILENAME = 'edge-functions-import-map.json';
-const coreStep = async function ({ buildDir, packagePath, constants: { EDGE_FUNCTIONS_DIST: distDirectory, EDGE_FUNCTIONS_SRC: srcDirectory, INTERNAL_EDGE_FUNCTIONS_SRC: internalSrcDirectory, IS_LOCAL: isRunningLocally, }, debug, systemLog, featureFlags, logs, netlifyConfig, edgeFunctionsBootstrapURL, }) {
+const coreStep = async function ({ buildDir, constants: { EDGE_FUNCTIONS_DIST: distDirectory, EDGE_FUNCTIONS_SRC: srcDirectory, INTERNAL_EDGE_FUNCTIONS_SRC: internalSrcDirectory, IS_LOCAL: isRunningLocally, }, debug, systemLog, featureFlags, logs, netlifyConfig, edgeFunctionsBootstrapURL, }) {
     const { edge_functions: declarations = [] } = netlifyConfig;
     const { deno_import_map: userDefinedImportMap } = netlifyConfig.functions['*'];
-    const distPath = resolve(buildDir, packagePath || '', distDirectory);
-    const internalSrcPath = resolve(buildDir, packagePath || '', internalSrcDirectory);
+    const distPath = resolve(buildDir, distDirectory);
+    const internalSrcPath = resolve(buildDir, internalSrcDirectory);
     const distImportMapPath = join(dirname(internalSrcPath), IMPORT_MAP_FILENAME);
     const srcPath = srcDirectory ? resolve(buildDir, srcDirectory) : undefined;
     const sourcePaths = [internalSrcPath, srcPath].filter(Boolean);
@@ -73,12 +73,12 @@ const getMetrics = (manifest) => {
 // one configured by the user or the internal one) exists. We use a dynamic
 // `condition` because the directories might be created by the build command
 // or plugins.
-const hasEdgeFunctionsDirectories = async function ({ buildDir, packagePath, constants: { INTERNAL_EDGE_FUNCTIONS_SRC, EDGE_FUNCTIONS_SRC }, }) {
+const hasEdgeFunctionsDirectories = async function ({ buildDir, constants: { INTERNAL_EDGE_FUNCTIONS_SRC, EDGE_FUNCTIONS_SRC }, }) {
     const hasFunctionsSrc = EDGE_FUNCTIONS_SRC !== undefined && EDGE_FUNCTIONS_SRC !== '';
     if (hasFunctionsSrc) {
         return true;
     }
-    const internalFunctionsSrc = resolve(buildDir, packagePath || '', INTERNAL_EDGE_FUNCTIONS_SRC);
+    const internalFunctionsSrc = resolve(buildDir, INTERNAL_EDGE_FUNCTIONS_SRC);
     return await pathExists(internalFunctionsSrc);
 };
 const logFunctions = async ({ internalSrcDirectory, internalSrcPath, logs, srcDirectory: userFunctionsSrc, srcPath, }) => {

package/lib/plugins_core/functions/index.js

@@ -39,10 +39,10 @@ const zipFunctionsAndLogResults = async ({ buildDir, childEnv, featureFlags, fun
     }
 };
 // Plugin to package Netlify functions with @netlify/zip-it-and-ship-it
-const coreStep = async function ({ childEnv, constants: { INTERNAL_FUNCTIONS_SRC: relativeInternalFunctionsSrc, IS_LOCAL: isRunningLocally, FUNCTIONS_SRC: relativeFunctionsSrc, FUNCTIONS_DIST: relativeFunctionsDist, }, buildDir, packagePath, logs, netlifyConfig, featureFlags, repositoryRoot, userNodeVersion, systemLog, }) {
+const coreStep = async function ({ childEnv, constants: { INTERNAL_FUNCTIONS_SRC: relativeInternalFunctionsSrc, IS_LOCAL: isRunningLocally, FUNCTIONS_SRC: relativeFunctionsSrc, FUNCTIONS_DIST: relativeFunctionsDist, }, buildDir, logs, netlifyConfig, featureFlags, repositoryRoot, userNodeVersion, systemLog, }) {
     const functionsSrc = relativeFunctionsSrc === undefined ? undefined : resolve(buildDir, relativeFunctionsSrc);
-    const functionsDist = resolve(buildDir, packagePath || '', relativeFunctionsDist);
-    const internalFunctionsSrc = resolve(buildDir, packagePath || '', relativeInternalFunctionsSrc);
+    const functionsDist = resolve(buildDir, relativeFunctionsDist);
+    const internalFunctionsSrc = resolve(buildDir, relativeInternalFunctionsSrc);
     const internalFunctionsSrcExists = await pathExists(internalFunctionsSrc);
     const functionsSrcExists = await validateFunctionsSrc({ functionsSrc, relativeFunctionsSrc });
     const [userFunctions = [], internalFunctions = []] = await getUserAndInternalFunctions({
@@ -95,12 +95,12 @@ const coreStep = async function ({ childEnv, constants: { INTERNAL_FUNCTIONS_SRC
 // one configured by the user or the internal one) exists. We use a dynamic
 // `condition` because the directories might be created by the build command
 // or plugins.
-const hasFunctionsDirectories = async function ({ buildDir, packagePath, constants: { INTERNAL_FUNCTIONS_SRC, FUNCTIONS_SRC }, }) {
+const hasFunctionsDirectories = async function ({ buildDir, constants: { INTERNAL_FUNCTIONS_SRC, FUNCTIONS_SRC } }) {
     const hasFunctionsSrc = FUNCTIONS_SRC !== undefined && FUNCTIONS_SRC !== '';
     if (hasFunctionsSrc) {
         return true;
     }
-    const internalFunctionsSrc = resolve(buildDir, packagePath || '', INTERNAL_FUNCTIONS_SRC);
+    const internalFunctionsSrc = resolve(buildDir, INTERNAL_FUNCTIONS_SRC);
     return await pathExists(internalFunctionsSrc);
 };
 export const bundleFunctions = {

package/package.json

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