netlify-cli 17.10.1 → 17.11.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "17.10.1",
+  "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",
@@ -115,7 +115,6 @@
     "lodash": "4.17.21",
     "log-symbols": "5.1.0",
     "log-update": "5.0.1",
-    "minimist": "1.2.8",
     "multiparty": "4.2.3",
     "netlify": "13.1.11",
     "netlify-headers-parser": "7.1.2",

package/src/commands/base-command.js

@@ -1,3 +1,15 @@
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _BaseCommand_noBaseOptions;
 import { existsSync } from 'fs';
 import { join, relative, resolve } from 'path';
 import process from 'process';
@@ -41,33 +53,22 @@ const HELP_SEPARATOR_WIDTH = 5;
  * workspace aware.
  */
 const COMMANDS_WITHOUT_WORKSPACE_OPTIONS = new Set(['api', 'recipes', 'completion', 'status', 'switch', 'login', 'lm']);
-/**
- * Formats a help list correctly with the correct indent
- * @param {string[]} textArray
- * @returns
- */
-// @ts-expect-error TS(7006) FIXME: Parameter 'textArray' implicitly has an 'any' type... Remove this comment to see the full error message
+/** Formats a help list correctly with the correct indent */
 const formatHelpList = (textArray) => textArray.join('\n').replace(/^/gm, ' '.repeat(HELP_INDENT_WIDTH));
-/**
- * Get the duration between a start time and the current time
- * @param {bigint} startTime
- * @returns
- */
-// @ts-expect-error TS(7006) FIXME: Parameter 'startTime' implicitly has an 'any' type... Remove this comment to see the full error message
-const getDuration = function (startTime) {
+/** Get the duration between a start time and the current time */
+const getDuration = (startTime) => {
     const durationNs = process.hrtime.bigint() - startTime;
     return Math.round(Number(durationNs / BigInt(NANO_SECS_TO_MSECS)));
 };
 /**
  * Retrieves a workspace package based of the filter flag that is provided.
  * If the filter flag does not match a workspace package or is not defined then it will prompt with an autocomplete to select a package
- * @param {Project} project
- * @param {string=} filter
- * @returns {Promise<string>}
  */
-// @ts-expect-error TS(7006) FIXME: Parameter 'project' implicitly has an 'any' type.
 async function selectWorkspace(project, filter) {
-    // @ts-expect-error TS(7006) FIXME: Parameter 'pkg' implicitly has an 'any' type.
+    // don't show prompt for workspace selection if there is only one package
+    if (project.workspace?.packages && project.workspace.packages.length === 1) {
+        return project.workspace.packages[0].path;
+    }
     const selected = project.workspace?.packages.find((pkg) => {
         if (project.relativeBaseDirectory &&
             project.relativeBaseDirectory.length !== 0 &&
@@ -86,9 +87,7 @@ async function selectWorkspace(project, filter) {
             message: 'Select the site you want to work with',
             // @ts-expect-error TS(7006) FIXME: Parameter '_' implicitly has an 'any' type.
             source: (/** @type {string} */ _, input = '') => (project.workspace?.packages || [])
-                // @ts-expect-error TS(7006) FIXME: Parameter 'pkg' implicitly has an 'any' type.
                 .filter((pkg) => pkg.path.includes(input))
-                // @ts-expect-error TS(7006) FIXME: Parameter 'pkg' implicitly has an 'any' type.
                 .map((pkg) => ({
                 name: `${pkg.name ? `${chalk.bold(pkg.name)}  ` : ''}${pkg.path}  ${chalk.dim(`--filter ${pkg.name || pkg.path}`)}`,
                 value: pkg.path,
@@ -105,10 +104,9 @@ async function getRepositoryRoot(cwd) {
     }
 }
 /** Base command class that provides tracking and config initialization */
-export default class BaseCommand extends Command {
+class BaseCommand extends Command {
     constructor() {
         super(...arguments);
-        /** @type {{ startTime: bigint, payload?: any}} */
         this.analytics = { startTime: process.hrtime.bigint() };
         /**
          * The working directory that is used for reading the `netlify.toml` file and storing the state.
@@ -118,18 +116,16 @@ export default class BaseCommand extends Command {
         // here we actually want to disable the lint rule as its value is set
         // eslint-disable-next-line workspace/no-process-cwd
         this.workingDir = process.cwd();
-        /** @private */
-        this.noBaseOptions = false;
-        /** @type {string[]} The examples list for the command (used inside doc generation and help page) */
+        _BaseCommand_noBaseOptions.set(this, false
+        /** don't show help options on command overview (mostly used on top commands like `addons` where options only apply on children) */
+        );
+        /** The examples list for the command (used inside doc generation and help page) */
         this.examples = [];
     }
     /**
      * IMPORTANT this function will be called for each command!
      * Don't do anything expensive in there.
-     * @param {string} name The command name
-     * @returns
      */
-    // @ts-expect-error TS(7006) FIXME: Parameter 'name' implicitly has an 'any' type.
     createCommand(name) {
         const base = new BaseCommand(name)
             // If  --silent or --json flag passed disable logger
@@ -167,22 +163,15 @@ export default class BaseCommand extends Command {
     }
     /** don't show help options on command overview (mostly used on top commands like `addons` where options only apply on children) */
     noHelpOptions() {
-        this.noBaseOptions = true;
+        __classPrivateFieldSet(this, _BaseCommand_noBaseOptions, true, "f");
         return this;
     }
-    /**
-     * Set examples for the command
-     * @param {string[]} examples
-     */
-    // @ts-expect-error TS(7006) FIXME: Parameter 'examples' implicitly has an 'any' type.
+    /** Set examples for the command  */
     addExamples(examples) {
         this.examples = examples;
         return this;
     }
-    /**
-     * Overrides the help output of commander with custom styling
-     * @returns {import('commander').Help}
-     */
+    /** Overrides the help output of commander with custom styling */
     createHelp() {
         const help = super.createHelp();
         help.commandUsage = (command) => {
@@ -209,12 +198,7 @@ export default class BaseCommand extends Command {
                 .sort((a, b) => a.name().localeCompare(b.name())) || []);
         };
         help.longestSubcommandTermLength = (command) => getCommands(command).reduce((max, cmd) => Math.max(max, cmd.name().length), 0);
-        /**
-         * override the longestOptionTermLength to react on hide options flag
-         * @param {BaseCommand} command
-         * @param {import('commander').Help} helper
-         * @returns {number}
-         */
+        /** override the longestOptionTermLength to react on hide options flag */
         help.longestOptionTermLength = (command, helper) => 
         // @ts-expect-error TS(2551) FIXME: Property 'noBaseOptions' does not exist on type 'C... Remove this comment to see the full error message
         (command.noBaseOptions === false &&
@@ -224,14 +208,7 @@ export default class BaseCommand extends Command {
             const parentCommand = this.name() === 'netlify' ? command : command.parent;
             const termWidth = helper.padWidth(command, helper);
             const helpWidth = helper.helpWidth || FALLBACK_HELP_CMD_WIDTH;
-            /**
-             * formats a term correctly
-             * @param {string} term
-             * @param {string} [description]
-             * @param {boolean} [isCommand]
-             * @returns {string}
-             */
-            // @ts-expect-error TS(7006) FIXME: Parameter 'term' implicitly has an 'any' type.
+            // formats a term correctly
             const formatItem = (term, description, isCommand = false) => {
                 const bang = isCommand ? `${HELP_$} ` : '';
                 if (description) {
@@ -241,22 +218,17 @@ export default class BaseCommand extends Command {
                 }
                 return `${bang}${term}`;
             };
-            /** @type {string[]} */
-            // @ts-expect-error TS(7034) FIXME: Variable 'output' implicitly has type 'any[]' in s... Remove this comment to see the full error message
             let output = [];
             // Description
             const [topDescription, ...commandDescription] = (helper.commandDescription(command) || '').split('\n');
             if (topDescription.length !== 0) {
-                // @ts-expect-error TS(7005) FIXME: Variable 'output' implicitly has an 'any[]' type.
                 output = [...output, topDescription, ''];
             }
             // on the parent help command the version should be displayed
             if (this.name() === 'netlify') {
-                // @ts-expect-error TS(7005) FIXME: Variable 'output' implicitly has an 'any[]' type.
                 output = [...output, chalk.bold('VERSION'), formatHelpList([formatItem(USER_AGENT)]), ''];
             }
             // Usage
-            // @ts-expect-error TS(7005) FIXME: Variable 'output' implicitly has an 'any[]' type.
             output = [...output, chalk.bold('USAGE'), helper.commandUsage(command), ''];
             // Arguments
             const argumentList = helper
@@ -265,7 +237,7 @@ export default class BaseCommand extends Command {
             if (argumentList.length !== 0) {
                 output = [...output, chalk.bold('ARGUMENTS'), formatHelpList(argumentList), ''];
             }
-            if (command.noBaseOptions === false) {
+            if (__classPrivateFieldGet(command, _BaseCommand_noBaseOptions, "f") === false) {
                 // Options
                 const optionList = helper
                     .visibleOptions(command)
@@ -302,14 +274,9 @@ export default class BaseCommand extends Command {
         };
         return help;
     }
-    /**
-     * Will be called on the end of an action to track the metrics
-     * @param {*} [error_]
-     */
-    // @ts-expect-error TS(7006) FIXME: Parameter 'error_' implicitly has an 'any' type.
+    /** Will be called on the end of an action to track the metrics */
     async onEnd(error_) {
-        // @ts-expect-error TS(2339) FIXME: Property 'payload' does not exist on type '{ start... Remove this comment to see the full error message
-        const { payload, startTime } = this.analytics;
+        const { payload = {}, startTime } = this.analytics;
         const duration = getDuration(startTime);
         const status = error_ === undefined ? 'success' : 'error';
         const command = Array.isArray(this.args) ? this.args[0] : this.name();
@@ -324,7 +291,6 @@ export default class BaseCommand extends Command {
         }
         catch { }
         if (error_ !== undefined) {
-            // @ts-expect-error TS(2345) FIXME: Argument of type 'string | Error' is not assignabl... Remove this comment to see the full error message
             error(error_ instanceof Error ? error_ : format(error_), { exit: false });
             exit(1);
         }
@@ -387,23 +353,16 @@ export default class BaseCommand extends Command {
         log();
         return accessToken;
     }
-    /**
-     * Adds some data to the analytics payload
-     * @param {Record<string, unknown>} payload
-     */
-    // @ts-expect-error TS(7006) FIXME: Parameter 'payload' implicitly has an 'any' type.
+    /** Adds some data to the analytics payload */
     setAnalyticsPayload(payload) {
-        // @ts-expect-error TS(2339) FIXME: Property 'payload' does not exist on type '{ start... Remove this comment to see the full error message
-        const newPayload = { ...this.analytics.payload, ...payload };
-        // @ts-expect-error TS(2322) FIXME: Type '{ payload: any; startTime: bigint; }' is not... Remove this comment to see the full error message
-        this.analytics = { ...this.analytics, payload: newPayload };
+        this.analytics = {
+            ...this.analytics,
+            payload: { ...this.analytics.payload, ...payload },
+        };
     }
     /**
      * Initializes the options and parses the configuration needs to be called on start of a command function
-     * @param {BaseCommand} actionCommand The command of the action that is run (`this.` gets the parent command)
-     * @private
      */
-    // @ts-expect-error TS(7006) FIXME: Parameter 'actionCommand' implicitly has an 'any' ... Remove this comment to see the full error message
     async init(actionCommand) {
         debug(`${actionCommand.name()}:init`)('start');
         const flags = actionCommand.opts();
@@ -431,7 +390,6 @@ export default class BaseCommand extends Command {
             });
         });
         const frameworks = await this.project.detectFrameworks();
-        /** @type { string|undefined} */
         let packageConfig = flags.config ? resolve(flags.config) : undefined;
         // check if we have detected multiple projects inside which one we have to perform our operations.
         // only ask to select one if on the workspace root
@@ -457,11 +415,8 @@ export default class BaseCommand extends Command {
         };
         if (process.env.NETLIFY_API_URL) {
             const apiUrl = new URL(process.env.NETLIFY_API_URL);
-            // @ts-expect-error TS(2339) FIXME: Property 'scheme' does not exist on type '{ userAg... Remove this comment to see the full error message
             apiUrlOpts.scheme = apiUrl.protocol.slice(0, -1);
-            // @ts-expect-error TS(2339) FIXME: Property 'host' does not exist on type '{ userAgen... Remove this comment to see the full error message
             apiUrlOpts.host = apiUrl.host;
-            // @ts-expect-error TS(2339) FIXME: Property 'pathPrefix' does not exist on type '{ us... Remove this comment to see the full error message
             apiUrlOpts.pathPrefix =
                 process.env.NETLIFY_API_URL === `${apiUrl.protocol}//${apiUrl.host}` ? '/api/v1' : apiUrl.pathname;
         }
@@ -486,6 +441,7 @@ export default class BaseCommand extends Command {
             certificateFile: flags.httpProxyCertificateFilename,
         });
         const apiOpts = { ...apiUrlOpts, agent };
+        // TODO: remove typecast once we have proper types for the API
         const api = new NetlifyAPI(token || '', apiOpts);
         // If a user passes a site name as an option instead of a site ID to options.site, the siteInfo object
         // will only have the property siteInfo.id. Checking for one of the other properties ensures that we can do
@@ -501,7 +457,6 @@ export default class BaseCommand extends Command {
         // ==================================================
         // Perform analytics reporting
         // ==================================================
-        // @ts-expect-error TS(7006) FIXME: Parameter 'framework' implicitly has an 'any' type... Remove this comment to see the full error message
         const frameworkIDs = frameworks?.map((framework) => framework.id);
         if (frameworkIDs?.length !== 0) {
             this.setAnalyticsPayload({ frameworks: frameworkIDs });
@@ -509,7 +464,6 @@ export default class BaseCommand extends Command {
         this.setAnalyticsPayload({
             monorepo: Boolean(this.project.workspace),
             packageManager: this.project.packageManager?.name,
-            // @ts-expect-error TS(7031) FIXME: Binding element 'id' implicitly has an 'any' type.
             buildSystem: this.project.buildSystems.map(({ id }) => id),
         });
         // set the project and the netlify api object on the command,
@@ -553,22 +507,7 @@ export default class BaseCommand extends Command {
         };
         debug(`${this.name()}:init`)('end');
     }
-    /**
-     * Find and resolve the Netlify configuration
-     * @param {object} config
-     * @param {string} config.cwd
-     * @param {string|null=} config.token
-     * @param {*} config.state
-     * @param {boolean=} config.offline
-     * @param {string=} config.configFilePath An optional path to the netlify configuration file e.g. netlify.toml
-     * @param {string=} config.packagePath
-     * @param {string=} config.repositoryRoot
-     * @param {string=} config.host
-     * @param {string=} config.pathPrefix
-     * @param {string=} config.scheme
-     * @returns {ReturnType<typeof resolveConfig>}
-     */
-    // @ts-expect-error TS(7023) FIXME: 'getConfig' implicitly has return type 'any' becau... Remove this comment to see the full error message
+    /** Find and resolve the Netlify configuration */
     async getConfig(config) {
         // the flags that are passed to the command like `--debug` or `--offline`
         const flags = this.opts();
@@ -617,10 +556,16 @@ export default class BaseCommand extends Command {
      * 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
      * wish to override that.
-     *
-     * @returns {'production' | 'dev'}
      */
     getDefaultContext() {
         return this.name() === 'serve' ? 'production' : 'dev';
     }
+    /**
+     * Retrieve feature flags for this site
+     */
+    getFeatureFlag(flagName) {
+        return this.netlify.siteInfo.feature_flags?.[flagName] || null;
+    }
 }
+_BaseCommand_noBaseOptions = new WeakMap();
+export default BaseCommand;

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/dev/dev.js

@@ -65,7 +65,6 @@ export const dev = async (options, command) => {
     const { api, cachedConfig, config, repositoryRoot, site, siteInfo, state } = command.netlify;
     config.dev = { ...config.dev };
     config.build = { ...config.build };
-    /** @type {import('./types.js').DevConfig} */
     const devConfig = {
         framework: '#auto',
         autoLaunch: Boolean(options.open),

package/src/commands/functions/functions-create.js

@@ -18,7 +18,6 @@ import { fileExistsAsync } from '../../lib/fs.js';
 import { getAddons, getCurrentAddon, getSiteData } from '../../utils/addons/prepare.js';
 import { NETLIFYDEVERR, NETLIFYDEVLOG, NETLIFYDEVWARN, chalk, error, log } from '../../utils/command-helpers.js';
 import { getDotEnvVariables, injectEnvVariables } from '../../utils/dev.js';
-// @ts-expect-error TS(7034) FIXME: Variable 'execa' implicitly has type 'any' in some... Remove this comment to see the full error message
 import execa from '../../utils/execa.js';
 import { readRepoURL, validateRepoURL } from '../../utils/read-repo-url.js';
 const copyTemplateDir = promisify(copyTemplateDirOriginal);
@@ -364,7 +363,6 @@ const installDeps = async ({ functionPackageJson, functionPath, functionsDir })
     // of keeping that file in the function directory and running `npm install`
     // from there.
     if (!sitePackageJson) {
-        // @ts-expect-error TS(7005) FIXME: Variable 'execa' implicitly has an 'any' type.
         await execa('npm', ['i', ...npmInstallFlags], { cwd: functionPath });
         return;
     }
@@ -373,11 +371,9 @@ const installDeps = async ({ functionPackageJson, functionPath, functionsDir })
     const devDependencies = getNpmInstallPackages(siteDevDependencies, functionDevDependencies);
     const npmInstallPath = path.dirname(sitePackageJson);
     if (dependencies.length !== 0) {
-        // @ts-expect-error TS(7005) FIXME: Variable 'execa' implicitly has an 'any' type.
         await execa('npm', ['i', ...dependencies, '--save', ...npmInstallFlags], { cwd: npmInstallPath });
     }
     if (devDependencies.length !== 0) {
-        // @ts-expect-error TS(7005) FIXME: Variable 'execa' implicitly has an 'any' type.
         await execa('npm', ['i', ...devDependencies, '--save-dev', ...npmInstallFlags], { cwd: npmInstallPath });
     }
     // We installed the function's dependencies in the site-level `package.json`,

package/src/commands/link/link.js

@@ -193,7 +193,6 @@ or run ${chalk.cyanBright('netlify sites:create')} to create a site.`);
             catch (error_) {
                 // @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
                 if (error_.status === 404) {
-                    // @ts-expect-error TS(2345) FIXME: Argument of type 'Error' is not assignable to para... Remove this comment to see the full error message
                     error(new Error(`Site ID '${siteId}' not found`));
                 }
                 else {
@@ -207,7 +206,6 @@ or run ${chalk.cyanBright('netlify sites:create')} to create a site.`);
             return;
     }
     if (!site) {
-        // @ts-expect-error TS(2345) FIXME: Argument of type 'Error' is not assignable to para... Remove this comment to see the full error message
         error(new Error(`No site found`));
     }
     // Save site ID to config
@@ -253,7 +251,6 @@ export const link = async (options, command) => {
         catch (error_) {
             // @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
             if (error_.status === 404) {
-                // @ts-expect-error TS(2345) FIXME: Argument of type 'Error' is not assignable to para... Remove this comment to see the full error message
                 error(new Error(`Site id ${options.id} not found`));
             }
             else {
@@ -284,7 +281,6 @@ export const link = async (options, command) => {
         catch (error_) {
             // @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
             if (error_.status === 404) {
-                // @ts-expect-error TS(2345) FIXME: Argument of type 'Error' is not assignable to para... Remove this comment to see the full error message
                 error(new Error(`${options.name} not found`));
             }
             else {
@@ -293,7 +289,6 @@ export const link = async (options, command) => {
             }
         }
         if (results.length === 0) {
-            // @ts-expect-error TS(2345) FIXME: Argument of type 'Error' is not assignable to para... Remove this comment to see the full error message
             error(new Error(`No sites found named ${options.name}`));
         }
         const [firstSiteData] = results;

package/src/commands/lm/lm-setup.js

@@ -1,6 +1,5 @@
 import { Listr } from 'listr2';
 import { error } from '../../utils/command-helpers.js';
-// @ts-expect-error TS(7034) FIXME: Variable 'execa' implicitly has type 'any' in some... Remove this comment to see the full error message
 import execa from '../../utils/execa.js';
 import { installPlatform } from '../../utils/lm/install.js';
 import { checkHelperVersion } from '../../utils/lm/requirements.js';
@@ -45,7 +44,6 @@ const provisionService = async function (siteId, api) {
 const configureLFSURL = async function (siteId, api) {
     const siteInfo = await api.getSite({ siteId });
     const url = `https://${siteInfo.id_domain}/.netlify/large-media`;
-    // @ts-expect-error TS(7005) FIXME: Variable 'execa' implicitly has an 'any' type.
     return execa('git', ['config', '-f', '.lfsconfig', 'lfs.url', url]);
 };
 export const lmSetup = async (options, command) => {

package/src/commands/main.js

@@ -5,7 +5,6 @@ import envinfo from 'envinfo';
 import { closest } from 'fastest-levenshtein';
 import inquirer from 'inquirer';
 import { BANG, chalk, error, exit, log, NETLIFY_CYAN, USER_AGENT, warn } from '../utils/command-helpers.js';
-// @ts-expect-error TS(7034) FIXME: Variable 'execa' implicitly has type 'any' in some... Remove this comment to see the full error message
 import execa from '../utils/execa.js';
 import getGlobalConfig from '../utils/get-global-config.js';
 import getPackageJson from '../utils/get-package-json.js';
@@ -138,7 +137,6 @@ const mainCommand = async function (options, command) {
     if (!applySuggestion) {
         error(`Run ${NETLIFY_CYAN(`${command.name()} help`)} for a list of available commands.`);
     }
-    // @ts-expect-error TS(7005) FIXME: Variable 'execa' implicitly has an 'any' type.
     await execa(process.argv[0], [process.argv[1], suggestion], { stdio: 'inherit' });
 };
 /**

package/src/commands/serve/serve.js

@@ -16,7 +16,6 @@ export const serve = async (options, command) => {
     const { api, cachedConfig, config, repositoryRoot, site, siteInfo, state } = command.netlify;
     config.dev = { ...config.dev };
     config.build = { ...config.build };
-    /** @type {import('../dev/types').DevConfig} */
     const devConfig = {
         ...(config.functionsDirectory && { functions: config.functionsDirectory }),
         ...(config.build.publish && { publish: config.build.publish }),
@@ -41,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/commands/sites/sites-create-template.js

@@ -4,7 +4,6 @@ import pick from 'lodash/pick.js';
 import parseGitHubUrl from 'parse-github-url';
 import { render } from 'prettyjson';
 import { chalk, error, getTerminalLink, log, logJson, warn } from '../../utils/command-helpers.js';
-// @ts-expect-error TS(7034) FIXME: Variable 'execa' implicitly has type 'any' in some... Remove this comment to see the full error message
 import execa from '../../utils/execa.js';
 import getRepoData from '../../utils/get-repo-data.js';
 import { getGitHubToken } from '../../utils/init/config-github.js';
@@ -166,9 +165,7 @@ export const sitesCreateTemplate = async (repository, options, command) => {
     });
     if (cloneConfirm) {
         log();
-        // @ts-expect-error TS(7005) FIXME: Variable 'execa' implicitly has an 'any' type.
         await execa('git', ['clone', repoResp.clone_url, `${repoResp.name}`]);
-        // @ts-expect-error TS(2532) FIXME: Object is possibly 'undefined'.
         log(`🚀 Repository cloned successfully. You can find it under the ${chalk.magenta(repoResp.name)} folder`);
     }
     if (options.withCi) {

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,