netlify-cli 17.10.2 → 17.11.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "17.10.2",
+  "version": "17.11.0",
   "author": "Netlify Inc.",
   "type": "module",
   "engines": {
@@ -49,7 +49,7 @@
     "@netlify/build": "29.31.0",
     "@netlify/build-info": "7.11.3",
     "@netlify/config": "20.10.0",
-    "@netlify/edge-bundler": "10.1.3",
+    "@netlify/edge-bundler": "11.0.0",
     "@netlify/local-functions-proxy": "1.1.1",
     "@netlify/zip-it-and-ship-it": "9.28.1",
     "@octokit/rest": "19.0.13",

package/src/commands/deploy/deploy.js

@@ -359,9 +359,7 @@ deployTimeout,
 // @ts-expect-error TS(7031) FIXME: Binding element 'deployToProduction' implicitly ha... Remove this comment to see the full error message
 deployToProduction, 
 // @ts-expect-error TS(7031) FIXME: Binding element 'functionsConfig' implicitly has a... Remove this comment to see the full error message
-functionsConfig, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'functionsFolder' implicitly has a... Remove this comment to see the full error message
-functionsFolder, 
+functionsConfig, functionsFolder, 
 // @ts-expect-error TS(7031) FIXME: Binding element 'options' implicitly has an 'a... Remove this comment to see the full error message
 options, 
 // @ts-expect-error TS(7031) FIXME: Binding element 'packagePath' implicitly has an 'a... Remove this comment to see the full error message
@@ -390,12 +388,11 @@ title, }) => {
         const draft = !deployToProduction && !alias;
         results = await api.createSiteDeploy({ siteId, title, body: { draft, branch: alias } });
         deployId = results.id;
-        // @ts-expect-error TS(2345) FIXME: Argument of type '{ base: any; packagePath: any; }... Remove this comment to see the full error message
-        const internalFunctionsFolder = await getInternalFunctionsDir({ base: site.root, packagePath });
+        const internalFunctionsFolder = await getInternalFunctionsDir({ base: site.root, packagePath, ensureExists: true });
         // The order of the directories matter: zip-it-and-ship-it will prioritize
         // functions from the rightmost directories. In this case, we want user
         // functions to take precedence over internal functions.
-        const functionDirectories = [internalFunctionsFolder, functionsFolder].filter(Boolean);
+        const functionDirectories = [internalFunctionsFolder, functionsFolder].filter((folder) => Boolean(folder));
         const manifestPath = skipFunctionsCache ? null : await getFunctionsManifestPath({ base: site.root, packagePath });
         const redirectsPath = `${deployFolder}/_redirects`;
         const headersPath = `${deployFolder}/_headers`;
@@ -414,11 +411,10 @@ title, }) => {
         config.headers = headers;
         uploadDeployBlobs({ deployId, siteId, silent, options, cachedConfig: command.netlify.cachedConfig });
         results = await deploySite(api, siteId, deployFolder, {
+            // @ts-expect-error FIXME
             config,
-            // @ts-expect-error TS(2322) FIXME: Type 'any[]' is not assignable to type 'never[]'.
             fnDir: functionDirectories,
             functionsConfig,
-            // @ts-expect-error TS(2322) FIXME: Type '(event: any) => void' is not assignable to t... Remove this comment to see the full error message
             statusCb: silent ? () => { } : deployProgressCb(),
             deployTimeout,
             syncFileLimit: SYNC_FILE_LIMIT,
@@ -640,6 +636,7 @@ workingDir, }) => {
         siteEnv,
     });
     const results = await runDeploy({
+        // @ts-expect-error FIXME
         alias,
         api,
         command,

package/src/commands/serve/serve.js

@@ -40,6 +40,9 @@ export const serve = async (options, command) => {
         site,
         siteInfo,
     });
+    if (!site.root) {
+        throw new Error('Site root not found');
+    }
     // Ensure the internal functions directory exists so that the functions
     // server and registry are initialized, and any functions created by
     // Netlify Build are loaded.

package/src/lib/blobs/blobs.js

@@ -12,7 +12,7 @@ const printLocalBlobsNotice = () => {
     log(`${NETLIFYDEVLOG} Netlify Blobs running in sandbox mode for local development. Refer to https://ntl.fyi/local-blobs for more information.`);
 };
 const startBlobsServer = async (debug, projectRoot, token) => {
-    const directory = path.resolve(projectRoot, getPathInProject(['blobs-serves']));
+    const directory = path.resolve(projectRoot, getPathInProject(['blobs-serve']));
     const server = new BlobsServer({
         debug,
         directory,

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

@@ -10,7 +10,6 @@ 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 { getInternalFunctions } from './internal.js';
 import { EdgeFunctionsRegistry } from './registry.js';
 const headersSymbol = Symbol('Edge Functions Headers');
 const LOCAL_HOST = '127.0.0.1';
@@ -111,9 +110,6 @@ settings,
 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, }) => {
-    const { functions: internalFunctions, 
-    // @ts-expect-error TS(2339) FIXME: Property 'importMap' does not exist on type '{ fun... Remove this comment to see the full error message
-    importMap, path: internalFunctionsPath, } = await getInternalFunctions(projectDir);
     const userFunctionsPath = config.build.edge_functions;
     const isolatePort = await getAvailablePort();
     const buildFeatureFlags = {
@@ -132,18 +128,13 @@ state, }) => {
         env: configEnv,
         featureFlags: buildFeatureFlags,
         getUpdatedConfig,
-        importMaps: [importMap].filter(Boolean),
         inspectSettings,
-        internalDirectory: internalFunctionsPath,
-        internalFunctions,
         port: isolatePort,
         projectDir,
         repositoryRoot,
     });
-    const hasEdgeFunctions = userFunctionsPath !== undefined || internalFunctionsPath;
-    // @ts-expect-error TS(7006) FIXME: Parameter 'req' implicitly has an 'any' type.
     return async (req) => {
-        if (req.headers[headers.Passthrough] !== undefined || !hasEdgeFunctions) {
+        if (req.headers[headers.Passthrough] !== undefined) {
             return;
         }
         const [geoLocation, registry] = await Promise.all([
@@ -199,22 +190,14 @@ env: configEnv,
 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 'importMaps' implicitly has an 'an... Remove this comment to see the full error message
-importMaps, 
 // @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 'internalDirectory' implicitly has... Remove this comment to see the full error message
-internalDirectory, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'internalFunctions' implicitly has... Remove this comment to see the full error message
-internalFunctions, 
 // @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, }) => {
-    // Merging internal with user-defined import maps.
-    const importMapPaths = [...importMaps, config.functions['*'].deno_import_map];
     try {
         const distImportMapPath = getPathInProject([DIST_IMPORT_MAP_PATH]);
         const servePath = resolve(projectDir, getPathInProject([EDGE_FUNCTIONS_SERVE_FOLDER]));
@@ -228,7 +211,6 @@ repositoryRoot, }) => {
             featureFlags,
             formatExportTypeError: (name) => `${NETLIFYDEVERR} ${chalk.red('Failed')} to load Edge Function ${chalk.yellow(name)}. The file does not seem to have a function as the default export.`,
             formatImportError: (name) => `${NETLIFYDEVERR} ${chalk.red('Failed')} to run Edge Function ${chalk.yellow(name)}:`,
-            importMapPaths,
             inspectSettings,
             port,
             rootPath: repositoryRoot,
@@ -242,8 +224,7 @@ repositoryRoot, }) => {
             directories: [directory].filter(Boolean),
             env: configEnv,
             getUpdatedConfig,
-            internalDirectories: [internalDirectory].filter(Boolean),
-            internalFunctions,
+            importMapFromTOML: config.functions['*'].deno_import_map,
             projectDir,
             runIsolate,
             servePath,

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

@@ -1,9 +1,14 @@
+import { readFile } from 'fs/promises';
+import { join } from 'path';
 import { fileURLToPath } from 'url';
 import { NETLIFYDEVERR, NETLIFYDEVLOG, NETLIFYDEVWARN, nonNullable, chalk, log, warn, watchDebounced, isNodeError, } from '../../utils/command-helpers.js';
+import { getPathInProject } from '../settings.js';
+import { INTERNAL_EDGE_FUNCTIONS_FOLDER } from './consts.js';
 const featureFlags = { edge_functions_correct_order: true };
 export class EdgeFunctionsRegistry {
-    constructor({ bundler, config, configPath, directories, env, getUpdatedConfig, internalDirectories, internalFunctions, projectDir, runIsolate, servePath, }) {
+    constructor({ bundler, config, configPath, directories, env, getUpdatedConfig, importMapFromTOML, projectDir, runIsolate, servePath, }) {
         this.buildError = null;
+        this.declarationsFromDeployConfig = [];
         this.dependencyPaths = new Map();
         this.directoryWatchers = new Map();
         this.functionPaths = new Map();
@@ -14,11 +19,11 @@ export class EdgeFunctionsRegistry {
         this.bundler = bundler;
         this.configPath = configPath;
         this.directories = directories;
-        this.internalDirectories = internalDirectories;
         this.getUpdatedConfig = getUpdatedConfig;
         this.runIsolate = runIsolate;
         this.servePath = servePath;
-        this.declarationsFromDeployConfig = internalFunctions;
+        this.projectDir = projectDir;
+        this.importMapFromTOML = importMapFromTOML;
         this.declarationsFromTOML = EdgeFunctionsRegistry.getDeclarationsFromTOML(config);
         this.env = EdgeFunctionsRegistry.getEnvironmentVariables(env);
         this.buildError = null;
@@ -28,7 +33,7 @@ export class EdgeFunctionsRegistry {
         this.userFunctions = [];
         this.internalFunctions = [];
         this.initialScan = this.doInitialScan();
-        this.setupWatchers(projectDir);
+        this.setupWatchers();
     }
     async doInitialScan() {
         await this.scanForFunctions();
@@ -306,13 +311,40 @@ export class EdgeFunctionsRegistry {
         }
         const { functionsConfig, graph, npmSpecifiersWithExtraneousFiles, success } = await this.runIsolate(this.functions, this.env, {
             getFunctionsConfig: true,
+            importMapPaths: [this.importMapFromTOML, this.importMapFromDeployConfig].filter(nonNullable),
         });
         return { functionsConfig, graph, npmSpecifiersWithExtraneousFiles, success };
     }
+    get internalDirectory() {
+        return join(this.projectDir, getPathInProject([INTERNAL_EDGE_FUNCTIONS_FOLDER]));
+    }
+    async readDeployConfig() {
+        const manifestPath = join(this.internalDirectory, 'manifest.json');
+        try {
+            const contents = await readFile(manifestPath, 'utf8');
+            const manifest = JSON.parse(contents);
+            return manifest;
+        }
+        catch { }
+    }
+    async scanForDeployConfig() {
+        const deployConfig = await this.readDeployConfig();
+        if (!deployConfig) {
+            return;
+        }
+        if (deployConfig.version !== 1) {
+            throw new Error('Unsupported manifest format');
+        }
+        this.declarationsFromDeployConfig = deployConfig.functions;
+        this.importMapFromDeployConfig = deployConfig.import_map
+            ? join(this.internalDirectory, deployConfig.import_map)
+            : undefined;
+    }
     async scanForFunctions() {
         const [internalFunctions, userFunctions] = await Promise.all([
-            this.bundler.find(this.internalDirectories),
+            this.bundler.find([this.internalDirectory]),
             this.bundler.find(this.directories),
+            this.scanForDeployConfig(),
         ]);
         const functions = [...internalFunctions, ...userFunctions];
         const newFunctions = functions.filter((func) => {
@@ -327,7 +359,7 @@ export class EdgeFunctionsRegistry {
         this.userFunctions = userFunctions;
         return { all: functions, new: newFunctions, deleted: deletedFunctions };
     }
-    async setupWatchers(projectDir) {
+    async setupWatchers() {
         if (!this.configPath) {
             return;
         }
@@ -344,16 +376,16 @@ export class EdgeFunctionsRegistry {
         // directories, they might be importing files that are located in
         // parent directories. So we watch the entire project directory for
         // changes.
-        await this.setupWatcherForDirectory(projectDir);
+        await this.setupWatcherForDirectory();
     }
-    async setupWatcherForDirectory(directory) {
+    async setupWatcherForDirectory() {
         const ignored = [`${this.servePath}/**`];
-        const watcher = await watchDebounced(directory, {
+        const watcher = await watchDebounced(this.projectDir, {
             ignored,
             onAdd: () => this.checkForAddedOrDeletedFunctions(),
             onChange: (paths) => this.handleFileChange(paths),
             onUnlink: () => this.checkForAddedOrDeletedFunctions(),
         });
-        this.directoryWatchers.set(directory, watcher);
+        this.directoryWatchers.set(this.projectDir, watcher);
     }
 }

package/src/lib/functions/netlify-function.js

@@ -51,7 +51,6 @@ export default class NetlifyFunction {
         this.name = name;
         this.displayName = displayName ?? name;
         this.projectRoot = projectRoot;
-        // @ts-expect-error TS(2339) FIXME: Property 'runtime' does not exist on type 'Netlify... Remove this comment to see the full error message
         this.runtime = runtime;
         this.timeoutBackground = timeoutBackground;
         this.timeoutSynchronous = timeoutSynchronous;
@@ -142,7 +141,9 @@ export default class NetlifyFunction {
             return { includedFiles, srcFilesDiff };
         }
         catch (error) {
-            this.buildError = error;
+            if (error instanceof Error) {
+                this.buildError = error;
+            }
             return { error };
         }
     }
@@ -164,7 +165,6 @@ export default class NetlifyFunction {
     async invoke(event = {}, context = {}) {
         await this.buildQueue;
         if (this.buildError) {
-            // @ts-expect-error TS(2339) FIXME: Property 'buildError' does not exist on type 'Netl... Remove this comment to see the full error message
             return { result: null, error: { errorMessage: this.buildError.message } };
         }
         const timeout = this.isBackground ? this.timeoutBackground : this.timeoutSynchronous;

package/src/lib/functions/registry.js

@@ -13,6 +13,7 @@ import runtimes from './runtimes/index.js';
 export const DEFAULT_FUNCTION_URL_EXPRESSION = /^\/.netlify\/(functions|builders)\/([^/]+).*/;
 const TYPES_PACKAGE = '@netlify/functions';
 const ZIP_EXTENSION = '.zip';
+const isInternalFunction = (func) => func.mainFile.includes(getPathInProject([INTERNAL_FUNCTIONS_FOLDER]));
 /**
  * @typedef {"buildError" | "extracted" | "loaded" | "missing-types-package" | "reloaded" | "reloading" | "removed"} FunctionEvent
  */
@@ -149,7 +150,6 @@ export class FunctionsRegistry {
                     ? `rename the function file to ${chalk.underline(newFilename)}. Refer to https://ntl.fyi/functions-runtime for more information`
                     : `refer to https://ntl.fyi/functions-runtime`;
                 const warning = `The function is using the legacy CommonJS format. To start using ES modules, ${action}.`;
-                // @ts-expect-error TS(2322) FIXME: Type 'string' is not assignable to type 'never'.
                 FunctionsRegistry.logEvent(event, { func, warnings: [warning] });
             }
             else {
@@ -230,14 +230,7 @@ export class FunctionsRegistry {
     }
     /**
      * Logs an event associated with functions.
-     *
-     * @param {FunctionEvent} event
-     * @param {object} data
-     * @param {NetlifyFunction} [data.func]
-     * @param {string[]} [data.warnings]
-     * @returns
      */
-    // @ts-expect-error TS(7006) FIXME: Parameter 'event' implicitly has an 'any' type.
     static logEvent(event, { func, warnings = [] }) {
         let warningsText = '';
         if (warnings.length !== 0) {
@@ -280,18 +273,13 @@ export class FunctionsRegistry {
     }
     /**
      * Adds a function to the registry
-     *
-     * @param {string} name
-     * @param {NetlifyFunction} funcBeforeHook
-     * @param {boolean} [isReload]
-     * @returns
      */
-    // @ts-expect-error TS(7006) FIXME: Parameter 'name' implicitly has an 'any' type.
     async registerFunction(name, funcBeforeHook, isReload = false) {
         const { runtime } = funcBeforeHook;
         // The `onRegister` hook allows runtimes to modify the function before it's
         // registered, or to prevent it from being registered altogether if the
         // hook returns `null`.
+        // @ts-expect-error FIXME
         const func = typeof runtime.onRegister === 'function' ? runtime.onRegister(funcBeforeHook) : funcBeforeHook;
         if (func === null) {
             return;
@@ -339,31 +327,24 @@ export class FunctionsRegistry {
     /**
      * A proxy to zip-it-and-ship-it's `listFunctions` method. It exists just so
      * that we can mock it in tests.
-     * @param  {Parameters<listFunctions>} args
-     * @returns
      */
-    // @ts-expect-error TS(7019) FIXME: Rest parameter 'args' implicitly has an 'any[]' ty... Remove this comment to see the full error message
     // eslint-disable-next-line class-methods-use-this
     async listFunctions(...args) {
-        // @ts-expect-error TS(2556) FIXME: A spread argument must either have a tuple type or... Remove this comment to see the full error message
         return await listFunctions(...args);
     }
     /**
      * Takes a list of directories and scans for functions. It keeps tracks of
      * any functions in those directories that we've previously seen, and takes
      * care of registering and unregistering functions as they come and go.
-     *
-     * @param {string[]} relativeDirs
      */
-    // @ts-expect-error TS(7006) FIXME: Parameter 'relativeDirs' implicitly has an 'any' t... Remove this comment to see the full error message
     async scan(relativeDirs) {
-        // @ts-expect-error TS(7006) FIXME: Parameter 'dir' implicitly has an 'any' type.
-        const directories = relativeDirs.filter(Boolean).map((dir) => (isAbsolute(dir) ? dir : join(this.projectRoot, dir)));
+        const directories = relativeDirs
+            .filter((dir) => Boolean(dir))
+            .map((dir) => (isAbsolute(dir) ? dir : join(this.projectRoot, dir)));
         // check after filtering to filter out [undefined] for example
         if (directories.length === 0) {
             return;
         }
-        // @ts-expect-error TS(7006) FIXME: Parameter 'path' implicitly has an 'any' type.
         await Promise.all(directories.map((path) => FunctionsRegistry.prepareDirectoryScan(path)));
         const functions = await this.listFunctions(directories, {
             featureFlags: {
@@ -373,10 +354,18 @@ export class FunctionsRegistry {
             // @ts-expect-error TS(2339) FIXME: Property 'config' does not exist on type 'Function... Remove this comment to see the full error message
             config: this.config.functions,
         });
+        // user-defined functions take precedence over internal functions,
+        // so we want to ignore any internal functions where there's a user-defined one with the same name
+        const ignoredFunctions = new Set(functions
+            .filter((func) => isInternalFunction(func) &&
+            this.functions.has(func.name) &&
+            !isInternalFunction(this.functions.get(func.name)))
+            .map((func) => func.name));
         // Before registering any functions, we look for any functions that were on
         // the previous list but are missing from the new one. We unregister them.
         const deletedFunctions = [...this.functions.values()].filter((oldFunc) => {
-            const isFound = functions.some((newFunc) => newFunc.name === oldFunc.name && newFunc.mainFile === oldFunc.mainFile);
+            const isFound = functions.some((newFunc) => ignoredFunctions.has(newFunc.name) ||
+                (newFunc.name === oldFunc.name && newFunc.mainFile === oldFunc.mainFile));
             return !isFound;
         });
         await Promise.all(deletedFunctions.map((func) => this.unregisterFunction(func)));
@@ -386,6 +375,9 @@ export class FunctionsRegistry {
         // where the last ones precede the previous ones. This is why
         // we reverse the array so we get the right functions precedence in the CLI.
         functions.reverse().map(async ({ displayName, mainFile, name, runtime: runtimeName }) => {
+            if (ignoredFunctions.has(name)) {
+                return;
+            }
             const runtime = runtimes[runtimeName];
             // If there is no matching runtime, it means this function is not yet
             // supported in Netlify Dev.
@@ -400,7 +392,6 @@ export class FunctionsRegistry {
                 blobsContext: this.blobsContext,
                 // @ts-expect-error TS(2339) FIXME: Property 'config' does not exist on type 'Function... Remove this comment to see the full error message
                 config: this.config,
-                // @ts-expect-error TS(7006) FIXME: Parameter 'directory' implicitly has an 'any' type... Remove this comment to see the full error message
                 directory: directories.find((directory) => mainFile.startsWith(directory)),
                 mainFile,
                 name,
@@ -430,7 +421,6 @@ export class FunctionsRegistry {
             }
             FunctionsRegistry.logEvent('removed', { func });
         });
-        // @ts-expect-error TS(7006) FIXME: Parameter 'path' implicitly has an 'any' type.
         await Promise.all(directories.map((path) => this.setupDirectoryWatcher(path)));
     }
     /**

package/src/lib/functions/runtimes/index.js

@@ -1,40 +1,6 @@
 import * as go from './go/index.js';
 import * as js from './js/index.js';
 import * as rust from './rust/index.js';
-/* eslint-enable import/no-namespace */
-/**
- * @callback BuildFunction
- * @param {object} func
- * @returns {Promise<{srcFiles: string[], buildPath?: string}>}
- */
-/**
- * @callback GetBuildFunction
- * @param  {{ config: object, context: object, errorExit: function, func: object, functionsDirectory: string, projectRoot: string }} params
- * @returns {Promise<BuildFunction>}
- */
-/**
- * @callback InvokeFunction
- * @param  {{ context: object, event: object, func: object, timeout: number }} params
- * @returns {Promise<{ body: object, statusCode: number }>}
- */
-/**
- * @callback OnDirectoryScanFunction
- * @param  {{ directory: string }} params
- * @returns {Promise<undefined>}
- */
-/**
- * @callback OnRegisterFunction
- * @param  {object} func
- * @returns {object|null}
- */
-/**
- * @typedef {object} Runtime
- * @property {GetBuildFunction} getBuildFunction
- * @property {InvokeFunction} invokeFunction
- * @property {OnDirectoryScanFunction} [onDirectoryScan]
- * @property {OnRegisterFunction} [onRegister]
- * @property {string} name
- */
 const runtimes = {
     [go.name]: go,
     [js.name]: js,

package/src/lib/functions/server.js

@@ -125,7 +125,7 @@ export const createHandler = function (options) {
             'client-ip': [remoteAddress],
             'x-nf-client-connection-ip': [remoteAddress],
             'x-nf-account-id': [options.accountId],
-            'x-nf-site-id': [options?.siteInfo?.id] ?? 'unlinked',
+            'x-nf-site-id': [options?.siteInfo?.id ?? 'unlinked'],
             [efHeaders.Geo]: Buffer.from(JSON.stringify(geoLocation)).toString('base64'),
         }).reduce((prev, [key, value]) => ({ ...prev, [key]: Array.isArray(value) ? value : [value] }), {});
         const rawQuery = new URLSearchParams(requestQuery).toString();
@@ -228,7 +228,6 @@ const getFunctionsServer = (options) => {
 // @ts-expect-error TS(7006) FIXME: Parameter 'options' implicitly has an 'any' type.
 export const startFunctionsServer = async (options) => {
     const { blobsContext, capabilities, command, config, debug, loadDistFunctions, settings, site, siteInfo, siteUrl, timeouts, } = options;
-    // @ts-expect-error TS(2345) FIXME: Argument of type '{ base: any; }' is not assignabl... Remove this comment to see the full error message
     const internalFunctionsDir = await getInternalFunctionsDir({ base: site.root });
     const functionsDirectories = [];
     let manifest;

package/src/utils/deploy/deploy-site.js

@@ -42,7 +42,6 @@ skipFunctionsCache, statusCb = () => {
 }, syncFileLimit = DEFAULT_SYNC_LIMIT, tmpDir = temporaryDirectory(), 
 // @ts-expect-error TS(2525) FIXME: Initializer provides no value for this binding ele... Remove this comment to see the full error message
 workingDir, } = {}) => {
-    // @ts-expect-error TS(2554) FIXME: Expected 0 arguments, but got 1.
     statusCb({
         type: 'hashing',
         msg: `Hashing files...`,
@@ -85,7 +84,6 @@ workingDir, } = {}) => {
         functionsCount > 0 && `${functionsCount} functions`,
         edgeFunctionsCount > 0 && 'edge functions',
     ]);
-    // @ts-expect-error TS(2554) FIXME: Expected 0 arguments, but got 1.
     statusCb({
         type: 'hashing',
         msg: `Finished hashing ${stats}`,
@@ -108,7 +106,6 @@ instead of manual deployment.
 
 For more information, visit https://ntl.fyi/cli-native-modules.`);
     }
-    // @ts-expect-error TS(2554) FIXME: Expected 0 arguments, but got 1.
     statusCb({
         type: 'create-deploy',
         msg: 'CDN diffing files...',
@@ -132,7 +129,6 @@ For more information, visit https://ntl.fyi/cli-native-modules.`);
     if (deployParams.body.async)
         deploy = await waitForDiff(api, deploy.id, siteId, deployTimeout);
     const { required: requiredFiles, required_functions: requiredFns } = deploy;
-    // @ts-expect-error TS(2554) FIXME: Expected 0 arguments, but got 1.
     statusCb({
         type: 'create-deploy',
         msg: `CDN requesting ${requiredFiles.length} files${Array.isArray(requiredFns) ? ` and ${requiredFns.length} functions` : ''}`,
@@ -142,14 +138,12 @@ For more information, visit https://ntl.fyi/cli-native-modules.`);
     const functionsUploadList = getUploadList(requiredFns, fnShaMap);
     const uploadList = [...filesUploadList, ...functionsUploadList];
     await uploadFiles(api, deployId, uploadList, { concurrentUpload, statusCb, maxRetry });
-    // @ts-expect-error TS(2554) FIXME: Expected 0 arguments, but got 1.
     statusCb({
         type: 'wait-for-deploy',
         msg: 'Waiting for deploy to go live...',
         phase: 'start',
     });
     deploy = await waitForDeploy(api, deployId, siteId, deployTimeout);
-    // @ts-expect-error TS(2554) FIXME: Expected 0 arguments, but got 1.
     statusCb({
         type: 'wait-for-deploy',
         msg: draft ? 'Draft deploy is live!' : 'Deploy is live!',