netlify-cli 17.19.2 → 17.19.4

package/dist/commands/base-command.d.ts

@@ -63,6 +63,10 @@ export default class BaseCommand extends Command {
         pathPrefix?: string;
         scheme?: string;
     }): ReturnType<typeof resolveConfig>;
+    /**
+     * get a path inside the `.netlify` project folder
+     */
+    getPathInProject(...paths: string[]): string;
     /**
      * Returns the context that should be used in case one hasn't been explicitly
      * set. The default context is `dev` most of the time, but some commands may

package/dist/commands/base-command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base-command.d.ts","sourceRoot":"","sources":["../../src/commands/base-command.ts"],"names":[],"mappings":"AAKA,OAAO,EAAiB,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAG5D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,OAAO,EAAE,IAAI,EAAU,MAAM,WAAW,CAAA;AAgCjD,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,YAAY,CAAA;AAEhD,KAAK,SAAS,GAAG;IACf,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAClC,CAAA;AAwFD,0EAA0E;AAC1E,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,OAAO;;IAC9C,4DAA4D;IAE5D,OAAO,EAAE,cAAc,CAAA;IACvB,SAAS,EAAE,SAAS,CAAyC;IAE7D,OAAO,EAAE,OAAO,CAAA;IAEhB;;;;OAIG;IAGH,UAAU,SAAgB;IAE1B;;;OAGG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,uEAAuE;IACvE,gBAAgB,CAAC,EAAE,MAAM,CAAA;IAEzB;;;OAGG;IACH,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW;IAqDxC,mIAAmI;IACnI,aAAa;IAKb,mFAAmF;IACnF,QAAQ,EAAE,MAAM,EAAE,CAAK;IACvB,oCAAoC;IACpC,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE;IAK9B,iEAAiE;IACjE,UAAU,IAAI,IAAI;IAgIlB,kEAAkE;IAC5D,KAAK,CAAC,MAAM,CAAC,EAAE,OAAO;IAwBtB,YAAY,CAAC,aAAa,CAAC,EAAE,MAAM;IAQnC,uBAAuB;IA4D7B,8CAA8C;IAC9C,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAOpD;;OAEG;YACW,IAAI;IA4KlB,iDAAiD;IAC3C,SAAS,CAAC,MAAM,EAAE;QACtB,GAAG,EAAE,MAAM,CAAA;QACX,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;QAErB,KAAK,CAAC,EAAE,GAAG,CAAA;QACX,OAAO,CAAC,EAAE,OAAO,CAAA;QACjB,2EAA2E;QAC3E,cAAc,CAAC,EAAE,MAAM,CAAA;QACvB,WAAW,CAAC,EAAE,MAAM,CAAA;QACpB,cAAc,CAAC,EAAE,MAAM,CAAA;QACvB,IAAI,CAAC,EAAE,MAAM,CAAA;QACb,UAAU,CAAC,EAAE,MAAM,CAAA;QACnB,MAAM,CAAC,EAAE,MAAM,CAAA;KAChB,GAAG,UAAU,CAAC,OAAO,aAAa,CAAC;IA+CpC;;;;OAIG;IACH,iBAAiB,IAAI,YAAY,GAAG,KAAK;IAIzC;;OAEG;IACH,cAAc,CAAC,CAAC,GAAG,IAAI,GAAG,OAAO,GAAG,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,CAAC;CAGjE"}
+{"version":3,"file":"base-command.d.ts","sourceRoot":"","sources":["../../src/commands/base-command.ts"],"names":[],"mappings":"AAKA,OAAO,EAAiB,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAG5D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,OAAO,EAAE,IAAI,EAAU,MAAM,WAAW,CAAA;AAgCjD,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,YAAY,CAAA;AAEhD,KAAK,SAAS,GAAG;IACf,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAClC,CAAA;AAwFD,0EAA0E;AAC1E,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,OAAO;;IAC9C,4DAA4D;IAE5D,OAAO,EAAE,cAAc,CAAA;IACvB,SAAS,EAAE,SAAS,CAAyC;IAE7D,OAAO,EAAE,OAAO,CAAA;IAEhB;;;;OAIG;IAGH,UAAU,SAAgB;IAE1B;;;OAGG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,uEAAuE;IACvE,gBAAgB,CAAC,EAAE,MAAM,CAAA;IAEzB;;;OAGG;IACH,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW;IAqDxC,mIAAmI;IACnI,aAAa;IAKb,mFAAmF;IACnF,QAAQ,EAAE,MAAM,EAAE,CAAK;IACvB,oCAAoC;IACpC,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE;IAK9B,iEAAiE;IACjE,UAAU,IAAI,IAAI;IAgIlB,kEAAkE;IAC5D,KAAK,CAAC,MAAM,CAAC,EAAE,OAAO;IAwBtB,YAAY,CAAC,aAAa,CAAC,EAAE,MAAM;IAQnC,uBAAuB;IA4D7B,8CAA8C;IAC9C,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAOpD;;OAEG;YACW,IAAI;IA4KlB,iDAAiD;IAC3C,SAAS,CAAC,MAAM,EAAE;QACtB,GAAG,EAAE,MAAM,CAAA;QACX,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;QAErB,KAAK,CAAC,EAAE,GAAG,CAAA;QACX,OAAO,CAAC,EAAE,OAAO,CAAA;QACjB,2EAA2E;QAC3E,cAAc,CAAC,EAAE,MAAM,CAAA;QACvB,WAAW,CAAC,EAAE,MAAM,CAAA;QACpB,cAAc,CAAC,EAAE,MAAM,CAAA;QACvB,IAAI,CAAC,EAAE,MAAM,CAAA;QACb,UAAU,CAAC,EAAE,MAAM,CAAA;QACnB,MAAM,CAAC,EAAE,MAAM,CAAA;KAChB,GAAG,UAAU,CAAC,OAAO,aAAa,CAAC;IA+CpC;;OAEG;IACH,gBAAgB,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM;IAI5C;;;;OAIG;IACH,iBAAiB,IAAI,YAAY,GAAG,KAAK;IAIzC;;OAEG;IACH,cAAc,CAAC,CAAC,GAAG,IAAI,GAAG,OAAO,GAAG,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,CAAC;CAGjE"}

package/dist/commands/base-command.js

@@ -558,6 +558,12 @@ class BaseCommand extends Command {
             error(message, { exit: true });
         }
     }
+    /**
+     * get a path inside the `.netlify` project folder
+     */
+    getPathInProject(...paths) {
+        return join(this.workspacePackage || '', '.netlify', ...paths);
+    }
     /**
      * Returns the context that should be used in case one hasn't been explicitly
      * set. The default context is `dev` most of the time, but some commands may

package/dist/commands/blobs/blobs.js

@@ -11,7 +11,7 @@ const blobs = (_options, command) => {
 export const createBlobsCommand = (program) => {
     program
         .command('blobs:delete')
-        .description(`(Beta) Deletes an object with a given key, if it exists, from a Netlify Blobs store`)
+        .description(`Deletes an object with a given key, if it exists, from a Netlify Blobs store`)
         .argument('<store>', 'Name of the store')
         .argument('<key>', 'Object key')
         .alias('blob:delete')
@@ -22,7 +22,7 @@ export const createBlobsCommand = (program) => {
     });
     program
         .command('blobs:get')
-        .description(`(Beta) Reads an object with a given key from a Netlify Blobs store and, if it exists, prints the content to the terminal or saves it to a file`)
+        .description(`Reads an object with a given key from a Netlify Blobs store and, if it exists, prints the content to the terminal or saves it to a file`)
         .argument('<store>', 'Name of the store')
         .argument('<key>', 'Object key')
         .option('-o, --output <path>', 'Defines the filesystem path where the blob data should be persisted')
@@ -34,7 +34,7 @@ export const createBlobsCommand = (program) => {
     });
     program
         .command('blobs:list')
-        .description(`(Beta) Lists objects in a Netlify Blobs store`)
+        .description(`Lists objects in a Netlify Blobs store`)
         .argument('<store>', 'Name of the store')
         .option('-d, --directories', `Indicates that keys with the '/' character should be treated as directories, returning a list of sub-directories at a given level rather than all the keys inside them`)
         .option('-p, --prefix <prefix>', `A string for filtering down the entries; when specified, only the entries whose key starts with that prefix are returned`)
@@ -47,7 +47,7 @@ export const createBlobsCommand = (program) => {
     });
     program
         .command('blobs:set')
-        .description(`(Beta) Writes to a Netlify Blobs store an object with the data provided in the command or the contents of a file defined by the 'input' parameter`)
+        .description(`Writes to a Netlify Blobs store an object with the data provided in the command or the contents of a file defined by the 'input' parameter`)
         .argument('<store>', 'Name of the store')
         .argument('<key>', 'Object key')
         .argument('[value...]', 'Object value')
@@ -61,7 +61,7 @@ export const createBlobsCommand = (program) => {
     return program
         .command('blobs')
         .alias('blob')
-        .description(`(Beta) Manage objects in Netlify Blobs`)
+        .description(`Manage objects in Netlify Blobs`)
         .addExamples([
         'netlify blobs:get my-store my-key',
         'netlify blobs:set my-store my-key This will go in a blob',

package/dist/commands/deploy/deploy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../src/commands/deploy/deploy.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAgCxC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AA4tB5C,eAAO,MAAM,MAAM,YAAmB,YAAY,WAAW,WAAW,kBAoHvE,CAAA"}
+{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../src/commands/deploy/deploy.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAgCxC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AA+tB5C,eAAO,MAAM,MAAM,YAAmB,YAAY,WAAW,WAAW,kBAoHvE,CAAA"}

package/dist/commands/deploy/deploy.js

@@ -49,18 +49,8 @@ const triggerDeploy = async ({ api, options, siteData, siteId }) => {
         }
     }
 };
-/**
- * Retrieves the folder containing the static files that need to be deployed
- * @param {object} config
- * @param {import('../base-command.js').default} config.command The process working directory
- * @param {object} config.config
- * @param {import('commander').OptionValues} config.options
- * @param {object} config.site
- * @param {object} config.siteData
- * @returns {Promise<string>}
- */
-// @ts-expect-error TS(7031) FIXME: Binding element 'command' implicitly has an 'any' ... Remove this comment to see the full error message
-const getDeployFolder = async ({ command, config, options, site, siteData }) => {
+/** Retrieves the folder containing the static files that need to be deployed */
+const getDeployFolder = async ({ command, config, options, site, siteData, }) => {
     let deployFolder;
     // if the `--dir .` flag is provided we should resolve it to the working directory.
     // - in regular sites this is the `process.cwd`
@@ -91,25 +81,20 @@ const getDeployFolder = async ({ command, config, options, site, siteData }) =>
     }
     return deployFolder;
 };
-/**
- * @param {string} deployFolder
- */
-// @ts-expect-error TS(7006) FIXME: Parameter 'deployFolder' implicitly has an 'any' t... Remove this comment to see the full error message
 const validateDeployFolder = async (deployFolder) => {
-    /** @type {import('fs').Stats} */
     let stats;
     try {
         stats = await stat(deployFolder);
     }
     catch (error_) {
-        // @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
-        if (error_.code === 'ENOENT') {
-            return error(`No such directory ${deployFolder}! Did you forget to run a build?`);
-        }
-        // Improve the message of permission errors
-        // @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
-        if (error_.code === 'EACCES') {
-            return error('Permission error when trying to access deploy folder');
+        if (error_ && typeof error_ === 'object' && 'code' in error_) {
+            if (error_.code === 'ENOENT') {
+                return error(`The deploy directory "${deployFolder}" has not been found. Did you forget to run 'netlify build'?`);
+            }
+            // Improve the message of permission errors
+            if (error_.code === 'EACCES') {
+                return error('Permission error when trying to access deploy folder');
+            }
         }
         throw error_;
     }
@@ -118,18 +103,8 @@ const validateDeployFolder = async (deployFolder) => {
     }
     return stats;
 };
-/**
- * get the functions directory
- * @param {object} config
- * @param {object} config.config
- * @param {import('commander').OptionValues} config.options
- * @param {object} config.site
- * @param {object} config.siteData
- * @param {string} config.workingDir // The process working directory
- * @returns {string|undefined}
- */
-// @ts-expect-error TS(7031) FIXME: Binding element 'config' implicitly has an 'any' t... Remove this comment to see the full error message
-const getFunctionsFolder = ({ config, options, site, siteData, workingDir }) => {
+/** get the functions directory */
+const getFunctionsFolder = ({ config, options, site, siteData, workingDir, }) => {
     let functionsFolder;
     // Support "functions" and "Functions"
     const funcConfig = config.functionsDirectory;
@@ -144,13 +119,7 @@ const getFunctionsFolder = ({ config, options, site, siteData, workingDir }) =>
     }
     return functionsFolder;
 };
-/**
- *
- * @param {string|undefined} functionsFolder
- */
-// @ts-expect-error TS(7006) FIXME: Parameter 'functionsFolder' implicitly has an 'any... Remove this comment to see the full error message
 const validateFunctionsFolder = async (functionsFolder) => {
-    /** @type {import('fs').Stats|undefined} */
     let stats;
     if (functionsFolder) {
         // we used to hard error if functions folder is specified but doesn't exist
@@ -159,14 +128,14 @@ const validateFunctionsFolder = async (functionsFolder) => {
             stats = await stat(functionsFolder);
         }
         catch (error_) {
-            // @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
-            if (error_.code === 'ENOENT') {
-                log(`Functions folder "${functionsFolder}" specified but it doesn't exist! Will proceed without deploying functions`);
-            }
-            // Improve the message of permission errors
-            // @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
-            if (error_.code === 'EACCES') {
-                error('Permission error when trying to access functions folder');
+            if (error_ && typeof error_ === 'object' && 'code' in error_) {
+                if (error_.code === 'ENOENT') {
+                    log(`Functions folder "${functionsFolder}" specified but it doesn't exist! Will proceed without deploying functions`);
+                }
+                // Improve the message of permission errors
+                if (error_.code === 'EACCES') {
+                    error('Permission error when trying to access functions folder');
+                }
             }
         }
     }
@@ -175,8 +144,7 @@ const validateFunctionsFolder = async (functionsFolder) => {
     }
     return stats;
 };
-// @ts-expect-error TS(7031) FIXME: Binding element 'deployFolder' implicitly has an '... Remove this comment to see the full error message
-const validateFolders = async ({ deployFolder, functionsFolder }) => {
+const validateFolders = async ({ deployFolder, functionsFolder, }) => {
     const deployFolderStat = await validateDeployFolder(deployFolder);
     const functionsFolderStat = await validateFunctionsFolder(functionsFolder);
     return { deployFolderStat, functionsFolderStat };
@@ -348,9 +316,7 @@ const runDeploy = async ({
 // @ts-expect-error TS(7031) FIXME: Binding element 'alias' implicitly has an 'any' ty... Remove this comment to see the full error message
 alias, 
 // @ts-expect-error TS(7031) FIXME: Binding element 'api' implicitly has an 'any' type... Remove this comment to see the full error message
-api, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'command' implicitly has an 'any' ... Remove this comment to see the full error message
-command, 
+api, command, 
 // @ts-expect-error TS(7031) FIXME: Binding element 'config' implicitly has an 'any' t... Remove this comment to see the full error message
 config, 
 // @ts-expect-error TS(7031) FIXME: Binding element 'deployFolder' implicitly has an '... Remove this comment to see the full error message
@@ -418,7 +384,7 @@ title, }) => {
             cachedConfig: command.netlify.cachedConfig,
             packagePath: command.workspacePackage,
         });
-        results = await deploySite(api, siteId, deployFolder, {
+        results = await deploySite(command, api, siteId, deployFolder, {
             // @ts-expect-error FIXME
             config,
             fnDir: functionDirectories,

package/dist/commands/dev/dev.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../../src/commands/dev/dev.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAU,MAAM,WAAW,CAAA;AA4BhD,OAAO,WAAW,MAAM,oBAAoB,CAAA;AA4D5C,eAAO,MAAM,GAAG,YAAmB,YAAY,WAAW,WAAW,kBAwJpE,CAAA;AAED,eAAO,MAAM,gBAAgB,YAAa,WAAW,gBAuGpD,CAAA"}
+{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../../src/commands/dev/dev.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAU,MAAM,WAAW,CAAA;AA0BhD,OAAO,WAAW,MAAM,oBAAoB,CAAA;AA4D5C,eAAO,MAAM,GAAG,YAAmB,YAAY,WAAW,WAAW,kBAyJpE,CAAA;AAED,eAAO,MAAM,gBAAgB,YAAa,WAAW,gBAuGpD,CAAA"}

package/dist/commands/dev/dev.js

@@ -1,7 +1,7 @@
 import process from 'process';
-import { Option } from 'commander';
 // @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module '@net... Remove this comment to see the full error message
 import { applyMutations } from '@netlify/config';
+import { Option } from 'commander';
 import { BLOBS_CONTEXT_VARIABLE, encodeBlobsContext, getBlobsContext } from '../../lib/blobs/blobs.js';
 import { promptEditorHelper } from '../../lib/edge-functions/editor-helper.js';
 import { startFunctionsServer } from '../../lib/functions/server.js';
@@ -170,6 +170,7 @@ export const dev = async (options, command) => {
     await startProxyServer({
         addonsUrls,
         blobsContext,
+        command,
         config: mutatedConfig,
         configPath: configPathOverride,
         debug: options.debug,

package/dist/commands/serve/serve.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["../../../src/commands/serve/serve.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAwBxC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAG5C,eAAO,MAAM,KAAK,YAAmB,YAAY,WAAW,WAAW,uBA2ItE,CAAA"}
+{"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["../../../src/commands/serve/serve.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAwBxC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAG5C,eAAO,MAAM,KAAK,YAAmB,YAAY,WAAW,WAAW,uBA4ItE,CAAA"}

package/dist/commands/serve/serve.js

@@ -106,6 +106,7 @@ export const serve = async (options, command) => {
     // @ts-expect-error TS(2345) FIXME: Argument of type '{ addonsUrls: { [k: string]: any... Remove this comment to see the full error message
     const url = await startProxyServer({
         addonsUrls,
+        command,
         config,
         configPath: configPathOverride,
         debug: options.debug,

package/dist/lib/edge-functions/deploy.d.ts

@@ -2,10 +2,7 @@
  * @param {string} workingDir
  * @param {*} file
  */
-export declare const deployFileNormalizer: (workingDir: any, file: any) => any;
-/**
- * @param {string} workingDir
- */
-export declare const getDistPathIfExists: (workingDir: any) => Promise<string | undefined>;
-export declare const isEdgeFunctionFile: (filePath: any) => any;
+export declare const deployFileNormalizer: (workingDir: string, file: any) => any;
+export declare const getDistPathIfExists: (workingDir: string) => Promise<string | undefined>;
+export declare const isEdgeFunctionFile: (filePath: string) => boolean;
 //# sourceMappingURL=deploy.d.ts.map

package/dist/lib/edge-functions/deploy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../src/lib/edge-functions/deploy.ts"],"names":[],"mappings":"AASA;;;GAGG;AAEH,eAAO,MAAM,oBAAoB,qCAShC,CAAA;AAED;;GAEG;AAEH,eAAO,MAAM,mBAAmB,kDAa/B,CAAA;AAGD,eAAO,MAAM,kBAAkB,wBAA2D,CAAA"}
+{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../src/lib/edge-functions/deploy.ts"],"names":[],"mappings":"AASA;;;GAGG;AAEH,eAAO,MAAM,oBAAoB,eAAgB,MAAM,mBAStD,CAAA;AAED,eAAO,MAAM,mBAAmB,eAAsB,MAAM,gCAa3D,CAAA;AAED,eAAO,MAAM,kBAAkB,aAAc,MAAM,YAA+C,CAAA"}

package/dist/lib/edge-functions/deploy.js

@@ -17,10 +17,6 @@ export const deployFileNormalizer = (workingDir, file) => {
         normalizedPath,
     };
 };
-/**
- * @param {string} workingDir
- */
-// @ts-expect-error TS(7006) FIXME: Parameter 'workingDir' implicitly has an 'any' typ... Remove this comment to see the full error message
 export const getDistPathIfExists = async (workingDir) => {
     try {
         const absoluteDistPath = join(workingDir, distPath);
@@ -34,5 +30,4 @@ export const getDistPathIfExists = async (workingDir) => {
         // no-op
     }
 };
-// @ts-expect-error TS(7006) FIXME: Parameter 'filePath' implicitly has an 'any' type.
 export const isEdgeFunctionFile = (filePath) => filePath.startsWith(`${PUBLIC_URL_PATH}/`);

package/dist/lib/edge-functions/proxy.d.ts

@@ -1,4 +1,7 @@
 import type { IncomingMessage } from 'http';
+import BaseCommand from '../../commands/base-command.js';
+import { $TSFixMe } from '../../commands/types.js';
+import { BlobsContext } from '../blobs/blobs.js';
 declare const headersSymbol: unique symbol;
 export declare const handleProxyRequest: (req: any, proxyReq: any) => void;
 interface SiteInfo {
@@ -8,47 +11,26 @@ interface SiteInfo {
 }
 export declare const createSiteInfoHeader: (siteInfo: SiteInfo, localURL: string) => string;
 export declare const createAccountInfoHeader: (accountInfo?: {}) => string;
-/**
- *
- * @param {object} config
- * @param {*} config.accountId
- * @param {import("../blobs/blobs.js").BlobsContext} config.blobsContext
- * @param {*} config.config
- * @param {*} config.configPath
- * @param {*} config.debug
- * @param {*} config.env
- * @param {*} config.geoCountry
- * @param {*} config.geolocationMode
- * @param {*} config.getUpdatedConfig
- * @param {*} config.inspectSettings
- * @param {*} config.mainPort
- * @param {boolean=} config.offline
- * @param {*} config.passthroughPort
- * @param {*} config.projectDir
- * @param {*} config.settings
- * @param {*} config.siteInfo
- * @param {*} config.state
- * @returns
- */
-export declare const initializeProxy: ({ accountId, blobsContext, config, configPath, debug, env: configEnv, geoCountry, geolocationMode, getUpdatedConfig, inspectSettings, mainPort, offline, passthroughPort, projectDir, repositoryRoot, settings, siteInfo, state, }: {
-    accountId: any;
-    blobsContext: any;
-    config: any;
-    configPath: any;
-    debug: any;
-    env: any;
-    geoCountry: any;
-    geolocationMode: any;
-    getUpdatedConfig: any;
-    inspectSettings: any;
-    mainPort: any;
-    offline: any;
-    passthroughPort: any;
-    projectDir: any;
-    repositoryRoot: any;
-    settings: any;
-    siteInfo: any;
-    state: any;
+export declare const initializeProxy: ({ accountId, blobsContext, command, config, configPath, debug, env: configEnv, geoCountry, geolocationMode, getUpdatedConfig, inspectSettings, mainPort, offline, passthroughPort, projectDir, repositoryRoot, settings, siteInfo, state, }: {
+    accountId: string;
+    blobsContext: BlobsContext;
+    command: BaseCommand;
+    config: $TSFixMe;
+    configPath: string;
+    debug: boolean;
+    env: $TSFixMe;
+    offline: $TSFixMe;
+    geoCountry: $TSFixMe;
+    geolocationMode: $TSFixMe;
+    getUpdatedConfig: $TSFixMe;
+    inspectSettings: $TSFixMe;
+    mainPort: $TSFixMe;
+    passthroughPort: $TSFixMe;
+    projectDir: string;
+    repositoryRoot?: string | undefined;
+    settings: $TSFixMe;
+    siteInfo: $TSFixMe;
+    state: $TSFixMe;
 }) => Promise<(req: IncomingMessage & {
     [headersSymbol]: Record<string, string>;
 }) => Promise<string | undefined>>;

package/dist/lib/edge-functions/proxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../../src/lib/edge-functions/proxy.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAA;AAiB3C,QAAA,MAAM,aAAa,eAAmC,CAAA;AA4BtD,eAAO,MAAM,kBAAkB,mCAI9B,CAAA;AAKD,UAAU,QAAQ;IAChB,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,MAAM,CAAA;CACZ;AAED,eAAO,MAAM,oBAAoB,aAAc,QAAQ,YAAY,MAAM,WAKxE,CAAA;AAED,eAAO,MAAM,uBAAuB,8BAMnC,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;oBA4DP,eAAe,GAAG;IAAE,eAAe,EAAE,OAAO,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,iCAkDjF,CAAA;AAGD,eAAO,MAAM,sBAAsB,uBAA4C,CAAA"}
+{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../../src/lib/edge-functions/proxy.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAA;AAM3C,OAAO,WAAW,MAAM,gCAAgC,CAAA;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAGlD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAShD,QAAA,MAAM,aAAa,eAAmC,CAAA;AA4BtD,eAAO,MAAM,kBAAkB,mCAI9B,CAAA;AAKD,UAAU,QAAQ;IAChB,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,MAAM,CAAA;CACZ;AAED,eAAO,MAAM,oBAAoB,aAAc,QAAQ,YAAY,MAAM,WAKxE,CAAA;AAED,eAAO,MAAM,uBAAuB,8BAMnC,CAAA;AAED,eAAO,MAAM,eAAe;eAqBf,MAAM;kBACH,YAAY;aACjB,WAAW;YACZ,QAAQ;gBACJ,MAAM;WACX,OAAO;SACT,QAAQ;aACJ,QAAQ;gBACL,QAAQ;qBACH,QAAQ;sBACP,QAAQ;qBACT,QAAQ;cACf,QAAQ;qBACD,QAAQ;gBACb,MAAM;;cAER,QAAQ;cACR,QAAQ;WACX,QAAQ;oBAyBI,eAAe,GAAG;IAAE,eAAe,EAAE,OAAO,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,iCAkDjF,CAAA;AAGD,eAAO,MAAM,sBAAsB,uBAA4C,CAAA"}

package/dist/lib/edge-functions/proxy.js

@@ -6,11 +6,10 @@ import getAvailablePort from 'get-port';
 import { NETLIFYDEVERR, chalk, error as printError } from '../../utils/command-helpers.js';
 import { getFeatureFlagsFromSiteInfo } from '../../utils/feature-flags.js';
 import { getGeoLocation } from '../geo-location.js';
-import { getPathInProject } from '../settings.js';
 import { startSpinner, stopSpinner } from '../spinner.js';
 import { getBootstrapURL } from './bootstrap.js';
 import { DIST_IMPORT_MAP_PATH, EDGE_FUNCTIONS_SERVE_FOLDER } from './consts.js';
-import { headers, getFeatureFlagsHeader, getInvocationMetadataHeader } from './headers.js';
+import { getFeatureFlagsHeader, getInvocationMetadataHeader, headers } from './headers.js';
 import { EdgeFunctionsRegistry } from './registry.js';
 const headersSymbol = Symbol('Edge Functions Headers');
 const LOCAL_HOST = '127.0.0.1';
@@ -52,65 +51,7 @@ export const createAccountInfoHeader = (accountInfo = {}) => {
     const accountString = JSON.stringify(account);
     return Buffer.from(accountString).toString('base64');
 };
-/**
- *
- * @param {object} config
- * @param {*} config.accountId
- * @param {import("../blobs/blobs.js").BlobsContext} config.blobsContext
- * @param {*} config.config
- * @param {*} config.configPath
- * @param {*} config.debug
- * @param {*} config.env
- * @param {*} config.geoCountry
- * @param {*} config.geolocationMode
- * @param {*} config.getUpdatedConfig
- * @param {*} config.inspectSettings
- * @param {*} config.mainPort
- * @param {boolean=} config.offline
- * @param {*} config.passthroughPort
- * @param {*} config.projectDir
- * @param {*} config.settings
- * @param {*} config.siteInfo
- * @param {*} config.state
- * @returns
- */
-export const initializeProxy = async ({ 
-// @ts-expect-error TS(7031) FIXME: Binding element 'accountId' implicitly has an 'any... Remove this comment to see the full error message
-accountId, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'blobsContext' implicitly has an '... Remove this comment to see the full error message
-blobsContext, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'config' implicitly has an 'any' t... Remove this comment to see the full error message
-config, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'configPath' implicitly has an 'an... Remove this comment to see the full error message
-configPath, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'debug' implicitly has an 'any' ty... Remove this comment to see the full error message
-debug, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'configEnv' implicitly has an 'any... Remove this comment to see the full error message
-env: configEnv, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'geoCountry' implicitly has an 'an... Remove this comment to see the full error message
-geoCountry, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'geolocationMode' implicitly has a... Remove this comment to see the full error message
-geolocationMode, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'getUpdatedConfig' implicitly has ... Remove this comment to see the full error message
-getUpdatedConfig, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'inspectSettings' implicitly has a... Remove this comment to see the full error message
-inspectSettings, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'mainPort' implicitly has an 'any'... Remove this comment to see the full error message
-mainPort, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'offline' implicitly has an 'any' ... Remove this comment to see the full error message
-offline, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'passthroughPort' implicitly has a... Remove this comment to see the full error message
-passthroughPort, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'projectDir' implicitly has an 'an... Remove this comment to see the full error message
-projectDir, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'repositoryRoot' implicitly has an... Remove this comment to see the full error message
-repositoryRoot, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'settings' implicitly has an 'any'... Remove this comment to see the full error message
-settings, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'siteInfo' implicitly has an 'any'... Remove this comment to see the full error message
-siteInfo, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'state' implicitly has an 'any' ty... Remove this comment to see the full error message
-state, }) => {
+export const initializeProxy = async ({ accountId, blobsContext, command, config, configPath, debug, env: configEnv, geoCountry, geolocationMode, getUpdatedConfig, inspectSettings, mainPort, offline, passthroughPort, projectDir, repositoryRoot, settings, siteInfo, state, }) => {
     const userFunctionsPath = config.build.edge_functions;
     const isolatePort = await getAvailablePort();
     const runtimeFeatureFlags = ['edge_functions_bootstrap_failure_mode', 'edge_functions_bootstrap_populate_environment'];
@@ -120,6 +61,7 @@ state, }) => {
     // the network if needed. We don't want to wait for that to be completed, or
     // the command will be left hanging.
     const server = prepareServer({
+        command,
         config,
         configPath,
         debug,
@@ -174,32 +116,10 @@ state, }) => {
 };
 // @ts-expect-error TS(7006) FIXME: Parameter 'req' implicitly has an 'any' type.
 export const isEdgeFunctionsRequest = (req) => req[headersSymbol] !== undefined;
-const prepareServer = async ({ 
-// @ts-expect-error TS(7031) FIXME: Binding element 'config' implicitly has an 'any' t... Remove this comment to see the full error message
-config, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'configPath' implicitly has an 'an... Remove this comment to see the full error message
-configPath, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'debug' implicitly has an 'any' ty... Remove this comment to see the full error message
-debug, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'directory' implicitly has an 'any... Remove this comment to see the full error message
-directory, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'configEnv' implicitly has an 'any... Remove this comment to see the full error message
-env: configEnv, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'featureFlags' implicitly has an '... Remove this comment to see the full error message
-featureFlags, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'getUpdatedConfig' implicitly has ... Remove this comment to see the full error message
-getUpdatedConfig, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'inspectSettings' implicitly has a... Remove this comment to see the full error message
-inspectSettings, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'port' implicitly has an 'any' typ... Remove this comment to see the full error message
-port, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'projectDir' implicitly has an 'an... Remove this comment to see the full error message
-projectDir, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'repositoryRoot' implicitly has an... Remove this comment to see the full error message
-repositoryRoot, }) => {
+const prepareServer = async ({ command, config, configPath, debug, directory, env: configEnv, featureFlags, getUpdatedConfig, inspectSettings, port, projectDir, repositoryRoot, }) => {
     try {
-        const distImportMapPath = getPathInProject([DIST_IMPORT_MAP_PATH]);
-        const servePath = resolve(projectDir, getPathInProject([EDGE_FUNCTIONS_SERVE_FOLDER]));
+        const distImportMapPath = command.getPathInProject(DIST_IMPORT_MAP_PATH);
+        const servePath = resolve(projectDir, command.getPathInProject(EDGE_FUNCTIONS_SERVE_FOLDER));
         await rm(servePath, { force: true, recursive: true });
         const runIsolate = await bundler.serve({
             ...getDownloadUpdateFunctions(),
@@ -216,6 +136,7 @@ repositoryRoot, }) => {
             servePath,
         });
         const registry = new EdgeFunctionsRegistry({
+            command,
             bundler,
             config,
             configPath,

package/dist/lib/edge-functions/registry.d.ts

@@ -1,11 +1,13 @@
 import type { Declaration } from '@netlify/edge-bundler';
+import BaseCommand from '../../commands/base-command.js';
 import type { FeatureFlags } from '../../utils/feature-flags.js';
-interface Config {
+export interface Config {
     edge_functions?: Declaration[];
     [key: string]: unknown;
 }
 type RunIsolate = Awaited<ReturnType<typeof import('@netlify/edge-bundler').serve>>;
 interface EdgeFunctionsRegistryOptions {
+    command: BaseCommand;
     bundler: typeof import('@netlify/edge-bundler');
     config: Config;
     configPath: string;
@@ -45,7 +47,8 @@ export declare class EdgeFunctionsRegistry {
     private runIsolate;
     private servePath;
     private projectDir;
-    constructor({ bundler, config, configPath, directories, env, featureFlags, getUpdatedConfig, importMapFromTOML, projectDir, runIsolate, servePath, }: EdgeFunctionsRegistryOptions);
+    private command;
+    constructor({ bundler, command, config, configPath, directories, env, featureFlags, getUpdatedConfig, importMapFromTOML, projectDir, runIsolate, servePath, }: EdgeFunctionsRegistryOptions);
     private doInitialScan;
     private get functions();
     private build;

package/dist/lib/edge-functions/registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../../src/lib/edge-functions/registry.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAuD,MAAM,uBAAuB,CAAA;AAa7G,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAOhE,UAAU,MAAM;IACd,cAAc,CAAC,EAAE,WAAW,EAAE,CAAA;IAC9B,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACvB;AAGD,KAAK,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,cAAc,uBAAuB,EAAE,KAAK,CAAC,CAAC,CAAA;AAInF,UAAU,4BAA4B;IACpC,OAAO,EAAE,cAAc,uBAAuB,CAAC,CAAA;IAC/C,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,OAAO,CAAA;IACd,WAAW,EAAE,MAAM,EAAE,CAAA;IACrB,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,EAAE,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IACzD,YAAY,EAAE,YAAY,CAAA;IAC1B,gBAAgB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAA;IACvC,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,UAAU,CAAA;IACtB,SAAS,EAAE,MAAM,CAAA;IACjB,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAC3B;AAkCD,qBAAa,qBAAqB;IACzB,yBAAyB,CAAC,EAAE,MAAM,CAAA;IAEzC,OAAO,CAAC,UAAU,CAAqB;IACvC,OAAO,CAAC,OAAO,CAAwC;IACvD,OAAO,CAAC,UAAU,CAAQ;IAC1B,OAAO,CAAC,iBAAiB,CAAC,CAAQ;IAClC,OAAO,CAAC,4BAA4B,CAAoB;IACxD,OAAO,CAAC,oBAAoB,CAAe;IAG3C,OAAO,CAAC,eAAe,CAAiC;IAExD,OAAO,CAAC,WAAW,CAAU;IAC7B,OAAO,CAAC,iBAAiB,CAAkD;IAC3E,OAAO,CAAC,GAAG,CAAwB;IACnC,OAAO,CAAC,YAAY,CAAc;IAElC,OAAO,CAAC,aAAa,CAAqB;IAC1C,OAAO,CAAC,iBAAiB,CAAqB;IAK9C,OAAO,CAAC,aAAa,CAA4B;IAEjD,OAAO,CAAC,gBAAgB,CAAuB;IAC/C,OAAO,CAAC,WAAW,CAAe;IAClC,OAAO,CAAC,QAAQ,CAAwB;IACxC,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,UAAU,CAAY;IAC9B,OAAO,CAAC,SAAS,CAAQ;IACzB,OAAO,CAAC,UAAU,CAAQ;gBAEd,EACV,OAAO,EACP,MAAM,EACN,UAAU,EACV,WAAW,EACX,GAAG,EACH,YAAY,EACZ,gBAAgB,EAChB,iBAAiB,EACjB,UAAU,EACV,UAAU,EACV,SAAS,GACV,EAAE,4BAA4B;YAmBjB,aAAa;IAc3B,OAAO,KAAK,SAAS,GAEpB;YAEa,KAAK;IAmEnB;;;;;OAKG;IACH,OAAO,CAAC,WAAW;YA0BL,+BAA+B;IAsB7C,OAAO,CAAC,MAAM,CAAC,uBAAuB;IAMtC,OAAO,CAAC,cAAc;IAMtB,OAAO,CAAC,MAAM,CAAC,uBAAuB;YAoBxB,gBAAgB;IAoCxB,UAAU;IAIhB;;OAEG;IACH,OAAO,CAAC,QAAQ;IA2ChB;;;OAGG;IACH,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;;;;;;;;;;;;IAuC5C;;;OAGG;IACH,OAAO,CAAC,YAAY;IA0CpB;;;OAGG;YACW,QAAQ;IAqBtB,OAAO,KAAK,iBAAiB,GAE5B;YAEa,gBAAgB;YAShB,mBAAmB;YAgBnB,gBAAgB;YA+BhB,aAAa;YAwBb,wBAAwB;CAWvC"}
+{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../../src/lib/edge-functions/registry.ts"],"names":[],"mappings":"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"}

package/dist/lib/edge-functions/registry.js

@@ -3,13 +3,18 @@ import { join } from 'path';
 import { fileURLToPath } from 'url';
 import { NETLIFYDEVERR, NETLIFYDEVLOG, NETLIFYDEVWARN, nonNullable, chalk, log, warn, watchDebounced, isNodeError, } from '../../utils/command-helpers.js';
 import { MultiMap } from '../../utils/multimap.js';
-import { getPathInProject } from '../settings.js';
 import { INTERNAL_EDGE_FUNCTIONS_FOLDER } from './consts.js';
 /**
- * Helper method which, given a edge bundler graph module and an index of modules by path, traverses its dependency tree
- * and returns an array of all of ist local dependencies
+ * Given an Edge Bundler module graph and an index of modules by path,
+ * traverses its dependency tree and returns an array of all of its
+ * local dependencies.
  */
-function traverseLocalDependencies({ dependencies = [] }, modulesByPath) {
+function traverseLocalDependencies({ dependencies = [], specifier }, modulesByPath, cache) {
+    // If we've already traversed this specifier, return the cached list of
+    // dependencies.
+    if (cache[specifier] !== undefined) {
+        return cache[specifier];
+    }
     return dependencies.flatMap((dependency) => {
         // We're interested in tracking local dependencies, so we only look at
         // specifiers with the `file:` protocol.
@@ -21,16 +26,17 @@ function traverseLocalDependencies({ dependencies = [] }, modulesByPath) {
         const { specifier: dependencyURL } = dependency.code;
         const dependencyPath = fileURLToPath(dependencyURL);
         const dependencyModule = modulesByPath.get(dependencyPath);
-        // No module indexed for this dependency
+        // No module indexed for this dependency.
         if (dependencyModule === undefined) {
             return [dependencyPath];
         }
-        // Keep traversing the child dependencies and return the current dependency path
-        return [...traverseLocalDependencies(dependencyModule, modulesByPath), dependencyPath];
+        // Keep traversing the child dependencies and return the current dependency path.
+        cache[specifier] = [...traverseLocalDependencies(dependencyModule, modulesByPath, cache), dependencyPath];
+        return cache[specifier];
     });
 }
 export class EdgeFunctionsRegistry {
-    constructor({ bundler, config, configPath, directories, env, featureFlags, getUpdatedConfig, importMapFromTOML, projectDir, runIsolate, servePath, }) {
+    constructor({ bundler, command, config, configPath, directories, env, featureFlags, getUpdatedConfig, importMapFromTOML, projectDir, runIsolate, servePath, }) {
         this.buildError = null;
         this.declarationsFromDeployConfig = [];
         // Mapping file URLs to names of functions that use them as dependencies.
@@ -44,6 +50,7 @@ export class EdgeFunctionsRegistry {
         this.functionPaths = new Map();
         this.manifest = null;
         this.routes = [];
+        this.command = command;
         this.bundler = bundler;
         this.configPath = configPath;
         this.directories = directories;
@@ -305,9 +312,10 @@ export class EdgeFunctionsRegistry {
                 functionModules.add({ functionName, module });
             }
         });
+        const dependencyCache = {};
         // We start from our functions and we traverse through their dependency tree
         functionModules.forEach(({ functionName, module }) => {
-            const traversedPaths = traverseLocalDependencies(module, modulesByPath);
+            const traversedPaths = traverseLocalDependencies(module, modulesByPath, dependencyCache);
             traversedPaths.forEach((dependencyPath) => {
                 this.dependencyPaths.add(dependencyPath, functionName);
             });
@@ -332,7 +340,7 @@ export class EdgeFunctionsRegistry {
         return { functionsConfig, graph, npmSpecifiersWithExtraneousFiles, success };
     }
     get internalDirectory() {
-        return join(this.projectDir, getPathInProject([INTERNAL_EDGE_FUNCTIONS_FOLDER]));
+        return join(this.projectDir, this.command.getPathInProject(INTERNAL_EDGE_FUNCTIONS_FOLDER));
     }
     async readDeployConfig() {
         const manifestPath = join(this.internalDirectory, 'manifest.json');