netlify-cli 17.5.3 → 17.7.0

package/src/lib/functions/runtimes/go/{index.mjs → index.js}

@@ -2,8 +2,8 @@ import { dirname, extname } from 'path';
 import { platform } from 'process';
 import { temporaryFile } from 'tempy';
 // @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.mjs';
-import { runFunctionsProxy } from '../../local-proxy.mjs';
+import execa from '../../../../utils/execa.js';
+import { runFunctionsProxy } from '../../local-proxy.js';
 const isWindows = platform === 'win32';
 export const name = 'go';
 // @ts-expect-error TS(7031) FIXME: Binding element 'binaryPath' implicitly has an 'an... Remove this comment to see the full error message

package/src/lib/functions/runtimes/{index.mjs → index.js}

@@ -1,7 +1,6 @@
-/* eslint-disable import/no-namespace */
-import * as go from './go/index.mjs';
-import * as js from './js/index.mjs';
-import * as rust from './rust/index.mjs';
+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

package/src/lib/functions/runtimes/js/builders/{netlify-lambda.mjs → netlify-lambda.js}

@@ -2,9 +2,9 @@ import { readFile } from 'fs/promises';
 import { resolve } from 'path';
 import minimist from 'minimist';
 // @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.mjs';
-import { fileExistsAsync } from '../../../../fs.mjs';
-import { memoizedBuild } from '../../../memoized-build.mjs';
+import execa from '../../../../../utils/execa.js';
+import { fileExistsAsync } from '../../../../fs.js';
+import { memoizedBuild } from '../../../memoized-build.js';
 // @ts-expect-error TS(2525) FIXME: Initializer provides no value for this binding ele... Remove this comment to see the full error message
 export const detectNetlifyLambda = async function ({ packageJson } = {}) {
     const { dependencies, devDependencies, scripts } = packageJson || {};

package/src/lib/functions/runtimes/js/builders/{zisi.mjs → zisi.js}

@@ -6,11 +6,11 @@ import decache from 'decache';
 import { readPackageUp } from 'read-pkg-up';
 // @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'sour... Remove this comment to see the full error message
 import sourceMapSupport from 'source-map-support';
-import { NETLIFYDEVERR } from '../../../../../utils/command-helpers.mjs';
-import { SERVE_FUNCTIONS_FOLDER } from '../../../../../utils/functions/functions.mjs';
-import { getPathInProject } from '../../../../settings.mjs';
-import { normalizeFunctionsConfig } from '../../../config.mjs';
-import { memoizedBuild } from '../../../memoized-build.mjs';
+import { NETLIFYDEVERR } from '../../../../../utils/command-helpers.js';
+import { SERVE_FUNCTIONS_FOLDER } from '../../../../../utils/functions/functions.js';
+import { getPathInProject } from '../../../../settings.js';
+import { normalizeFunctionsConfig } from '../../../config.js';
+import { memoizedBuild } from '../../../memoized-build.js';
 const require = createRequire(import.meta.url);
 // @ts-expect-error TS(7006) FIXME: Parameter 'config' implicitly has an 'any' type.
 const addFunctionsConfigDefaults = (config) => ({
@@ -142,7 +142,7 @@ export default async function handler({ config, directory, errorExit, func, meta
     }
     else {
         // We must use esbuild for certain file extensions.
-        const mustTranspile = ['.mjs', '.ts', '.mts', '.cts'].includes(path.extname(func.mainFile));
+        const mustTranspile = ['.js', '.ts', '.mts', '.cts'].includes(path.extname(func.mainFile));
         const mustUseEsbuild = hasTypeModule || mustTranspile;
         if (mustUseEsbuild && !functionsConfig['*'].nodeBundler) {
             functionsConfig['*'].nodeBundler = 'esbuild';

package/src/lib/functions/runtimes/js/{index.mjs → index.js}

@@ -3,9 +3,9 @@ import { dirname } from 'path';
 import { pathToFileURL } from 'url';
 import { Worker } from 'worker_threads';
 import lambdaLocal from 'lambda-local';
-import detectNetlifyLambdaBuilder from './builders/netlify-lambda.mjs';
-import detectZisiBuilder, { parseFunctionForMetadata } from './builders/zisi.mjs';
-import { SECONDS_TO_MILLISECONDS } from './constants.mjs';
+import detectNetlifyLambdaBuilder from './builders/netlify-lambda.js';
+import detectZisiBuilder, { parseFunctionForMetadata } from './builders/zisi.js';
+import { SECONDS_TO_MILLISECONDS } from './constants.js';
 export const name = 'js';
 // @ts-expect-error TS(7034) FIXME: Variable 'netlifyLambdaDetectorCache' implicitly h... Remove this comment to see the full error message
 let netlifyLambdaDetectorCache;
@@ -40,7 +40,7 @@ export const getBuildFunction = async ({ config, directory, errorExit, func, pro
     // @ts-expect-error TS(2532) FIXME: Object is possibly 'undefined'.
     return () => ({ schedule: metadata.schedule, srcFiles });
 };
-const workerURL = new URL('worker.mjs', import.meta.url);
+const workerURL = new URL('worker.js', import.meta.url);
 // @ts-expect-error TS(7031) FIXME: Binding element 'context' implicitly has an 'any' ... Remove this comment to see the full error message
 export const invokeFunction = async ({ context, environment, event, func, timeout }) => {
     if (func.buildData.runtimeAPIVersion !== 2) {

package/src/lib/functions/runtimes/rust/{index.mjs → index.js}

@@ -4,10 +4,10 @@ import { platform } from 'process';
 import { findUp } from 'find-up';
 import toml from 'toml';
 // @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.mjs';
-import { SERVE_FUNCTIONS_FOLDER } from '../../../../utils/functions/functions.mjs';
-import { getPathInProject } from '../../../settings.mjs';
-import { runFunctionsProxy } from '../../local-proxy.mjs';
+import execa from '../../../../utils/execa.js';
+import { SERVE_FUNCTIONS_FOLDER } from '../../../../utils/functions/functions.js';
+import { getPathInProject } from '../../../settings.js';
+import { runFunctionsProxy } from '../../local-proxy.js';
 const isWindows = platform === 'win32';
 export const name = 'rs';
 // @ts-expect-error TS(7031) FIXME: Binding element 'func' implicitly has an 'any' typ... Remove this comment to see the full error message

package/src/lib/functions/{scheduled.mjs → scheduled.js}

@@ -1,6 +1,6 @@
 import AnsiToHtml from 'ansi-to-html';
-import { CLOCKWORK_USERAGENT } from '../../utils/functions/index.mjs';
-import { formatLambdaError } from './utils.mjs';
+import { CLOCKWORK_USERAGENT } from '../../utils/functions/index.js';
+import { formatLambdaError } from './utils.js';
 const ansiToHtml = new AnsiToHtml();
 // @ts-expect-error TS(7031) FIXME: Binding element 'error' implicitly has an 'any' ty... Remove this comment to see the full error message
 export const buildHelpResponse = ({ error, headers, path, result }) => {

package/src/lib/functions/{server.mjs → server.js}

@@ -5,18 +5,18 @@ import express from 'express';
 // @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'expr... Remove this comment to see the full error message
 import expressLogging from 'express-logging';
 import jwtDecode from 'jwt-decode';
-import { NETLIFYDEVERR, NETLIFYDEVLOG, error as errorExit, log } from '../../utils/command-helpers.mjs';
-import { isFeatureFlagEnabled } from '../../utils/feature-flags.mjs';
-import { CLOCKWORK_USERAGENT, getFunctionsDistPath, getFunctionsServePath, getInternalFunctionsDir, } from '../../utils/functions/index.mjs';
-import { NFFunctionName, NFFunctionRoute } from '../../utils/headers.mjs';
-import { headers as efHeaders } from '../edge-functions/headers.mjs';
-import { getGeoLocation } from '../geo-location.mjs';
-import { handleBackgroundFunction, handleBackgroundFunctionResult } from './background.mjs';
-import { createFormSubmissionHandler } from './form-submissions-handler.mjs';
-import { FunctionsRegistry } from './registry.mjs';
-import { handleScheduledFunction } from './scheduled.mjs';
-import { handleSynchronousFunction } from './synchronous.mjs';
-import { shouldBase64Encode } from './utils.mjs';
+import { NETLIFYDEVERR, NETLIFYDEVLOG, error as errorExit, log } from '../../utils/command-helpers.js';
+import { isFeatureFlagEnabled } from '../../utils/feature-flags.js';
+import { CLOCKWORK_USERAGENT, getFunctionsDistPath, getFunctionsServePath, getInternalFunctionsDir, } from '../../utils/functions/index.js';
+import { NFFunctionName, NFFunctionRoute } from '../../utils/headers.js';
+import { headers as efHeaders } from '../edge-functions/headers.js';
+import { getGeoLocation } from '../geo-location.js';
+import { handleBackgroundFunction, handleBackgroundFunctionResult } from './background.js';
+import { createFormSubmissionHandler } from './form-submissions-handler.js';
+import { FunctionsRegistry } from './registry.js';
+import { handleScheduledFunction } from './scheduled.js';
+import { handleSynchronousFunction } from './synchronous.js';
+import { shouldBase64Encode } from './utils.js';
 // @ts-expect-error TS(7006) FIXME: Parameter 'headers' implicitly has an 'any' type.
 const buildClientContext = function (headers) {
     // inject a client context based on auth header, ported over from netlify-lambda (https://github.com/netlify/netlify-lambda/pull/57)
@@ -201,8 +201,8 @@ const getFunctionsServer = (options) => {
 /**
  *
  * @param {object} options
- * @param {import("../blobs/blobs.mjs").BlobsContext} options.blobsContext
- * @param {import('../../commands/base-command.mjs').default} options.command
+ * @param {import("../blobs/blobs.js").BlobsContext} options.blobsContext
+ * @param {import('../../commands/base-command.js').default} options.command
  * @param {*} options.capabilities
  * @param {*} options.config
  * @param {boolean} options.debug
@@ -212,7 +212,7 @@ const getFunctionsServer = (options) => {
  * @param {*} options.siteInfo
  * @param {string} options.siteUrl
  * @param {*} options.timeouts
- * @returns {Promise<import('./registry.mjs').FunctionsRegistry | undefined>}
+ * @returns {Promise<import('./registry.js').FunctionsRegistry | undefined>}
  */
 // @ts-expect-error TS(7006) FIXME: Parameter 'options' implicitly has an 'any' type.
 export const startFunctionsServer = async (options) => {

package/src/lib/functions/{synchronous.mjs → synchronous.js}

@@ -1,8 +1,8 @@
 import { Buffer } from 'buffer';
 import { isStream } from 'is-stream';
-import { chalk, logPadded, NETLIFYDEVERR } from '../../utils/command-helpers.mjs';
-import renderErrorTemplate from '../render-error-template.mjs';
-import { detectAwsSdkError } from './utils.mjs';
+import { chalk, logPadded, NETLIFYDEVERR } from '../../utils/command-helpers.js';
+import renderErrorTemplate from '../render-error-template.js';
+import { detectAwsSdkError } from './utils.js';
 /**
  * @typedef InvocationError
  * @property {string} errorType

package/src/lib/functions/{utils.mjs → utils.js}

@@ -1,5 +1,5 @@
-import { chalk, warn } from '../../utils/command-helpers.mjs';
-import { MISSING_AWS_SDK_WARNING } from '../log.mjs';
+import { chalk, warn } from '../../utils/command-helpers.js';
+import { MISSING_AWS_SDK_WARNING } from '../log.js';
 // @ts-expect-error TS(7031) FIXME: Binding element 'error' implicitly has an 'any' ty... Remove this comment to see the full error message
 export const detectAwsSdkError = ({ error }) => {
     const isAwsSdkError = error && error.errorMessage && error.errorMessage.includes("Cannot find module 'aws-sdk'");

package/src/lib/{geo-location.mjs → geo-location.js}

@@ -36,7 +36,7 @@ export const mockLocation = {
  * @param {"cache"|"update"|"mock"} params.mode
  * @param {string} params.geoCountry
  * @param {boolean} params.offline
- * @param {import('../utils/state-config.mjs').default} params.state
+ * @param {import('../utils/state-config.js').default} params.state
  * @returns {Promise<GeoLocation>}
  */
 // @ts-expect-error TS(7031) FIXME: Binding element 'geoCountry' implicitly has an 'an... Remove this comment to see the full error message

package/src/lib/{http-agent.mjs → http-agent.js}

@@ -1,7 +1,7 @@
 import { readFile } from 'fs/promises';
 import HttpsProxyAgent from 'https-proxy-agent';
 import waitPort from 'wait-port';
-import { NETLIFYDEVERR, NETLIFYDEVWARN, exit, log } from '../utils/command-helpers.mjs';
+import { NETLIFYDEVERR, NETLIFYDEVWARN, exit, log } from '../utils/command-helpers.js';
 // https://github.com/TooTallNate/node-https-proxy-agent/issues/89
 // Maybe replace with https://github.com/delvedor/hpagent
 // @ts-expect-error TS(2507) FIXME: Type 'typeof createHttpsProxyAgent' is not a const... Remove this comment to see the full error message

package/src/lib/images/{proxy.mjs → proxy.js}

@@ -1,7 +1,7 @@
 import express from 'express';
 import { createIPX, ipxFSStorage, ipxHttpStorage, createIPXNodeServer } from 'ipx';
-import { log, NETLIFYDEVERR } from '../../utils/command-helpers.mjs';
-import { getProxyUrl } from '../../utils/proxy.mjs';
+import { log, NETLIFYDEVERR } from '../../utils/command-helpers.js';
+import { getProxyUrl } from '../../utils/proxy.js';
 export const IMAGE_URL_PATTERN = '/.netlify/images';
 // @ts-expect-error TS(7006) FIXME: Parameter 'config' implicitly has an 'any' type.
 export const parseAllDomains = function (config) {

package/src/lib/{log.mjs → log.js}

@@ -1,4 +1,4 @@
-import { chalk } from '../utils/command-helpers.mjs';
+import { chalk } from '../utils/command-helpers.js';
 const RED_BACKGROUND = chalk.red('-background');
 const [PRO, BUSINESS, ENTERPRISE] = ['Pro', 'Business', 'Enterprise'].map((plan) => chalk.magenta(plan));
 export const BACKGROUND_FUNCTIONS_WARNING = `A serverless function ending in \`${RED_BACKGROUND}\` was detected.

package/src/recipes/vscode/{index.mjs → index.js}

@@ -2,8 +2,8 @@ import { join } from 'path';
 import { DenoBridge } from '@netlify/edge-bundler';
 import execa from 'execa';
 import inquirer from 'inquirer';
-import { NETLIFYDEVLOG, NETLIFYDEVWARN, chalk, error, log } from '../../utils/command-helpers.mjs';
-import { applySettings, getSettings, writeSettings } from './settings.mjs';
+import { NETLIFYDEVLOG, NETLIFYDEVWARN, chalk, error, log } from '../../utils/command-helpers.js';
+import { applySettings, getSettings, writeSettings } from './settings.js';
 export const description = 'Create VS Code settings for an optimal experience with Netlify projects';
 // @ts-expect-error TS(7031) FIXME: Binding element 'fileExists' implicitly has an 'an... Remove this comment to see the full error message
 const getPrompt = ({ fileExists, path }) => {

package/src/recipes/vscode/{settings.mjs → settings.js}

@@ -1,6 +1,5 @@
 import { mkdir, readFile, stat, writeFile } from 'fs/promises';
 import { dirname, relative } from 'path';
-// eslint-disable-next-line import/no-namespace
 import * as JSONC from 'comment-json';
 // @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'unix... Remove this comment to see the full error message
 import unixify from 'unixify';

package/src/utils/addons/diffs/{index.mjs → index.js}

@@ -1,6 +1,6 @@
 // @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'conc... Remove this comment to see the full error message
 import concordance from 'concordance';
-import { concordanceDiffOptions, concordanceOptions } from './options.mjs';
+import { concordanceDiffOptions, concordanceOptions } from './options.js';
 // @ts-expect-error TS(7006) FIXME: Parameter 'actualDescriptor' implicitly has an 'an... Remove this comment to see the full error message
 const formatDescriptorDiff = function (actualDescriptor, expectedDescriptor, options) {
     const diffOptions = { ...options, ...concordanceDiffOptions };

package/src/utils/addons/diffs/{options.mjs → options.js}

@@ -1,5 +1,4 @@
 import ansiStyles from 'ansi-styles';
-// eslint-disable-next-line no-restricted-imports
 import { Chalk } from 'chalk';
 const forceColor = new Chalk({ level: 1 });
 const colorTheme = {

package/src/utils/addons/{prepare.mjs → prepare.js}

@@ -1,4 +1,4 @@
-import { chalk, error, exit, log, warn } from '../command-helpers.mjs';
+import { chalk, error, exit, log, warn } from '../command-helpers.js';
 export const ADDON_VALIDATION = {
     EXISTS: 'EXISTS',
     NOT_EXISTS: 'NOT_EXISTS',
@@ -88,7 +88,7 @@ export const getAddons = async ({ api, siteId }) => {
 /**
  *
  * @param {object} config
- * @param {import('../../commands/base-command.mjs').default} config.command
+ * @param {import('../../commands/base-command.js').default} config.command
  * @param {string} [config.addonName]
  * @param {keyof ADDON_VALIDATION} [config.validation]
  */

package/src/utils/addons/{prompts.mjs → prompts.js}

@@ -1,4 +1,4 @@
-import { chalk } from '../command-helpers.mjs';
+import { chalk } from '../command-helpers.js';
 /* programmatically generate CLI prompts */
 // @ts-expect-error TS(7006) FIXME: Parameter 'settings' implicitly has an 'any' type.
 export default function generatePrompts(settings) {

package/src/utils/addons/{render.mjs → render.js}

@@ -1,5 +1,5 @@
 import AsciiTable from 'ascii-table';
-import { chalk } from '../command-helpers.mjs';
+import { chalk } from '../command-helpers.js';
 // @ts-expect-error TS(7006) FIXME: Parameter 'values' implicitly has an 'any' type.
 export const renderMissingValues = function (values, manifest) {
     const display = values

package/src/utils/{banner.mjs → banner.js}

@@ -1,5 +1,5 @@
 import boxen from 'boxen';
-import { chalk, log, NETLIFYDEVLOG } from './command-helpers.mjs';
+import { chalk, log, NETLIFYDEVLOG } from './command-helpers.js';
 // @ts-expect-error TS(7031) FIXME: Binding element 'url' implicitly has an 'any' type... Remove this comment to see the full error message
 export const printBanner = ({ url }) => {
     const banner = chalk.bold(`${NETLIFYDEVLOG} Server now ready on ${url}`);

package/src/utils/{build-info.mjs → build-info.js}

@@ -1,6 +1,6 @@
 import fuzzy from 'fuzzy';
 import inquirer from 'inquirer';
-import { chalk, log } from './command-helpers.mjs';
+import { chalk, log } from './command-helpers.js';
 /**
  * Filters the inquirer settings based on the input
  * @param {ReturnType<typeof formatSettingsArrForInquirer>} scriptInquirerOptions
@@ -37,7 +37,7 @@ const formatSettingsArrForInquirer = function (settings, type = 'dev') {
 /**
  * Uses @netlify/build-info to detect the dev settings and port based on the framework
  * and the build system that is used.
- * @param {import('../commands/base-command.mjs').default} command
+ * @param {import('../commands/base-command.js').default} command
  * @param {'dev' | 'build'} type The type of command (dev or build)
  * @returns {Promise<Settings | undefined>}
  */
@@ -80,7 +80,7 @@ command = "${chosenSettings.devCommand}"
 };
 /**
  * Detects and filters the build setting for a project and a command
- * @param {import('../commands/base-command.mjs').default} command
+ * @param {import('../commands/base-command.js').default} command
  */
 // @ts-expect-error TS(7006) FIXME: Parameter 'command' implicitly has an 'any' type.
 export const detectBuildSettings = async (command) => {

package/src/utils/{command-helpers.mjs → command-helpers.js}

@@ -2,17 +2,16 @@ import { once } from 'events';
 import os from 'os';
 import process from 'process';
 import { format, inspect } from 'util';
-// eslint-disable-next-line no-restricted-imports
 import { Chalk } from 'chalk';
 import chokidar from 'chokidar';
 import decache from 'decache';
 import WSL from 'is-wsl';
 import debounce from 'lodash/debounce.js';
 import terminalLink from 'terminal-link';
-import { clearSpinner, startSpinner } from '../lib/spinner.mjs';
-import getGlobalConfig from './get-global-config.mjs';
-import getPackageJson from './get-package-json.mjs';
-import { reportError } from './telemetry/report-error.mjs';
+import { clearSpinner, startSpinner } from '../lib/spinner.js';
+import getGlobalConfig from './get-global-config.js';
+import getPackageJson from './get-package-json.js';
+import { reportError } from './telemetry/report-error.js';
 /** The parsed process argv without the binary only arguments and flags */
 const argv = process.argv.slice(2);
 /**
@@ -202,7 +201,6 @@ export const exit = (code = 0) => {
 // @ts-expect-error TS(7006) FIXME: Parameter 'config' implicitly has an 'any' type.
 export const normalizeConfig = (config) => {
     // Unused var here is in order to omit 'publish' from build config
-    // eslint-disable-next-line no-unused-vars
     const { publish, publishOrigin, ...build } = config.build;
     return publishOrigin === 'default' ? { ...config, build } : config;
 };
@@ -253,9 +251,6 @@ export const watchDebounced = async (target, { depth, ignored = [], onAdd = noOp
 // @ts-expect-error TS(7006) FIXME: Parameter 'text' implicitly has an 'any' type.
 export const getTerminalLink = (text, url) => terminalLink(text, url, { fallback: () => `${text} (${url})` });
 export const isNodeError = (err) => error instanceof Error;
-// FIXME: tsc is throwing the following error:
-// @ts-expect-error TS7060: This syntax is reserved in files with the .mts or .cts extension. Add a trailing comma or explicit constraint.
-// Adding a trailing comma to the generic type fixes the problem, but annoyingly Prettier is undoing that.
 export const nonNullable = (value) => value !== null && value !== undefined;
 export const noOp = () => {
     // no-op

package/src/utils/deploy/{deploy-site.mjs → deploy-site.js}

@@ -1,14 +1,14 @@
 import { rm } from 'fs/promises';
 import cleanDeep from 'clean-deep';
 import { temporaryDirectory } from 'tempy';
-import { deployFileNormalizer, getDistPathIfExists, isEdgeFunctionFile } from '../../lib/edge-functions/deploy.mjs';
-import { warn } from '../command-helpers.mjs';
-import { DEFAULT_CONCURRENT_HASH, DEFAULT_CONCURRENT_UPLOAD, DEFAULT_DEPLOY_TIMEOUT, DEFAULT_MAX_RETRY, DEFAULT_SYNC_LIMIT, } from './constants.mjs';
-import { hashConfig } from './hash-config.mjs';
-import hashFiles from './hash-files.mjs';
-import hashFns from './hash-fns.mjs';
-import uploadFiles from './upload-files.mjs';
-import { getUploadList, waitForDeploy, waitForDiff } from './util.mjs';
+import { deployFileNormalizer, getDistPathIfExists, isEdgeFunctionFile } from '../../lib/edge-functions/deploy.js';
+import { warn } from '../command-helpers.js';
+import { DEFAULT_CONCURRENT_HASH, DEFAULT_CONCURRENT_UPLOAD, DEFAULT_DEPLOY_TIMEOUT, DEFAULT_MAX_RETRY, DEFAULT_SYNC_LIMIT, } from './constants.js';
+import { hashConfig } from './hash-config.js';
+import hashFiles from './hash-files.js';
+import hashFns from './hash-fns.js';
+import uploadFiles from './upload-files.js';
+import { getUploadList, waitForDeploy, waitForDiff } from './util.js';
 export const deploySite = async (
 // @ts-expect-error TS(7006) FIXME: Parameter 'api' implicitly has an 'any' type.
 api, 

package/src/utils/deploy/{hash-files.mjs → hash-files.js}

@@ -3,7 +3,7 @@ import { promisify } from 'util';
 import walker from 'folder-walker';
 // @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'pump... Remove this comment to see the full error message
 import pumpModule from 'pump';
-import { fileFilterCtor, fileNormalizerCtor, hasherCtor, manifestCollectorCtor } from './hasher-segments.mjs';
+import { fileFilterCtor, fileNormalizerCtor, hasherCtor, manifestCollectorCtor } from './hasher-segments.js';
 const pump = promisify(pumpModule);
 const hashFiles = async ({ assetType = 'file', 
 // @ts-expect-error TS(7031) FIXME: Binding element 'concurrentHash' implicitly has an... Remove this comment to see the full error message

package/src/utils/deploy/{hash-fns.mjs → hash-fns.js}

@@ -6,9 +6,9 @@ import { zipFunctions } from '@netlify/zip-it-and-ship-it';
 import fromArray from 'from2-array';
 // @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'pump... Remove this comment to see the full error message
 import pumpModule from 'pump';
-import { getPathInProject } from '../../lib/settings.mjs';
-import { INTERNAL_FUNCTIONS_FOLDER } from '../functions/functions.mjs';
-import { hasherCtor, manifestCollectorCtor } from './hasher-segments.mjs';
+import { getPathInProject } from '../../lib/settings.js';
+import { INTERNAL_FUNCTIONS_FOLDER } from '../functions/functions.js';
+import { hasherCtor, manifestCollectorCtor } from './hasher-segments.js';
 const pump = promisify(pumpModule);
 // Maximum age of functions manifest (2 minutes).
 const MANIFEST_FILE_TTL = 12e4;

package/src/utils/deploy/{hasher-segments.mjs → hasher-segments.js}

@@ -7,7 +7,7 @@ import transform from 'parallel-transform';
 import { objCtor as objFilterCtor } from 'through2-filter';
 // @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'thro... Remove this comment to see the full error message
 import { obj as map } from 'through2-map';
-import { normalizePath } from './util.mjs';
+import { normalizePath } from './util.js';
 // a parallel transform stream segment ctor that hashes fileObj's created by folder-walker
 // TODO: use promises instead of callbacks
 /* eslint-disable promise/prefer-await-to-callbacks */

package/src/utils/deploy/{upload-files.mjs → upload-files.js}

@@ -2,7 +2,7 @@ import fs from 'fs';
 // @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'back... Remove this comment to see the full error message
 import backoff from 'backoff';
 import pMap from 'p-map';
-import { UPLOAD_INITIAL_DELAY, UPLOAD_MAX_DELAY, UPLOAD_RANDOM_FACTOR } from './constants.mjs';
+import { UPLOAD_INITIAL_DELAY, UPLOAD_MAX_DELAY, UPLOAD_RANDOM_FACTOR } from './constants.js';
 // @ts-expect-error TS(7006) FIXME: Parameter 'api' implicitly has an 'any' type.
 const uploadFiles = async (api, deployId, uploadList, { concurrentUpload, maxRetry, statusCb }) => {
     if (!concurrentUpload || !statusCb || !maxRetry)

package/src/utils/deploy/{util.mjs → util.js}

@@ -1,6 +1,6 @@
 import { sep } from 'path';
 import pWaitFor from 'p-wait-for';
-import { DEPLOY_POLL } from './constants.mjs';
+import { DEPLOY_POLL } from './constants.js';
 // normalize windows paths to unix paths
 // @ts-expect-error TS(7006) FIXME: Parameter 'relname' implicitly has an 'any' type.
 export const normalizePath = (relname) => {

package/src/utils/{detect-server-settings.mjs → detect-server-settings.js}

@@ -3,11 +3,11 @@ import { EOL } from 'os';
 import { dirname, relative, resolve } from 'path';
 import { getFramework, getSettings } from '@netlify/build-info';
 import getPort from 'get-port';
-import { detectFrameworkSettings } from './build-info.mjs';
-import { NETLIFYDEVWARN, chalk, log } from './command-helpers.mjs';
-import { acquirePort } from './dev.mjs';
-import { getInternalFunctionsDir } from './functions/functions.mjs';
-import { getPluginsToAutoInstall } from './init/utils.mjs';
+import { detectFrameworkSettings } from './build-info.js';
+import { NETLIFYDEVWARN, chalk, log } from './command-helpers.js';
+import { acquirePort } from './dev.js';
+import { getInternalFunctionsDir } from './functions/functions.js';
+import { getPluginsToAutoInstall } from './init/utils.js';
 /** @param {string} str */
 // @ts-expect-error TS(7006) FIXME: Parameter 'str' implicitly has an 'any' type.
 const formatProperty = (str) => chalk.magenta(`'${str}'`);
@@ -49,7 +49,6 @@ const readHttpsSettings = async (options) => {
  */
 // @ts-expect-error TS(7006) FIXME: Parameter 'devConfig' implicitly has an 'any' type... Remove this comment to see the full error message
 function validateProperty(devConfig, property, type) {
-    // eslint-disable-next-line valid-typeof
     if (devConfig[property] && typeof devConfig[property] !== type) {
         const formattedProperty = formatProperty(property);
         throw new TypeError(`Invalid ${formattedProperty} option provided in config. The value of ${formattedProperty} option must be of type ${type}`);
@@ -236,7 +235,7 @@ const handleForcedFramework = async ({ devConfig, project, workingDir, workspace
  * Get the server settings based on the flags and the devConfig
  * @param {import('../commands/dev/types.js').DevConfig} devConfig
  * @param {import('commander').OptionValues} flags
- * @param {import('../commands/base-command.mjs').default} command
+ * @param {import('../commands/base-command.js').default} command
  * @returns {Promise<import('./types.js').ServerSettings>}
  */
 // @ts-expect-error TS(7006) FIXME: Parameter 'devConfig' implicitly has an 'any' type... Remove this comment to see the full error message

package/src/utils/{dev.mjs → dev.js}

@@ -1,9 +1,9 @@
 import process from 'process';
 import getPort from 'get-port';
 import isEmpty from 'lodash/isEmpty.js';
-import { supportsBackgroundFunctions } from '../lib/account.mjs';
-import { NETLIFYDEVLOG, chalk, error, log, warn } from './command-helpers.mjs';
-import { loadDotEnvFiles } from './dot-env.mjs';
+import { supportsBackgroundFunctions } from '../lib/account.js';
+import { NETLIFYDEVLOG, chalk, error, log, warn } from './command-helpers.js';
+import { loadDotEnvFiles } from './dot-env.js';
 // Possible sources of environment variables. For the purpose of printing log messages only. Order does not matter.
 const ENV_VAR_SOURCES = {
     account: {

package/src/utils/{dot-env.mjs → dot-env.js}

@@ -1,8 +1,8 @@
 import { readFile } from 'fs/promises';
 import path from 'path';
 import dotenv from 'dotenv';
-import { isFileAsync } from '../lib/fs.mjs';
-import { warn } from './command-helpers.mjs';
+import { isFileAsync } from '../lib/fs.js';
+import { warn } from './command-helpers.js';
 // @ts-expect-error TS(7031) FIXME: Binding element 'envFiles' implicitly has an 'any'... Remove this comment to see the full error message
 export const loadDotEnvFiles = async function ({ envFiles, projectDir }) {
     const response = await tryLoadDotEnvFiles({ projectDir, dotenvFiles: envFiles });

package/src/utils/env/{index.mjs → index.js}

@@ -1,4 +1,4 @@
-import { error } from '../command-helpers.mjs';
+import { error } from '../command-helpers.js';
 export const AVAILABLE_CONTEXTS = ['all', 'production', 'deploy-preview', 'branch-deploy', 'dev'];
 export const AVAILABLE_SCOPES = ['builds', 'functions', 'runtime', 'post_processing'];
 /**

package/src/utils/{framework-server.mjs → framework-server.js}

@@ -1,8 +1,8 @@
 import waitPort from 'wait-port';
-import { startSpinner, stopSpinner } from '../lib/spinner.mjs';
-import { error, exit, log, NETLIFYDEVERR, NETLIFYDEVLOG } from './command-helpers.mjs';
-import { runCommand } from './shell.mjs';
-import { startStaticServer } from './static-server.mjs';
+import { startSpinner, stopSpinner } from '../lib/spinner.js';
+import { error, exit, log, NETLIFYDEVERR, NETLIFYDEVLOG } from './command-helpers.js';
+import { runCommand } from './shell.js';
+import { startStaticServer } from './static-server.js';
 // 10 minutes
 const FRAMEWORK_PORT_TIMEOUT = 6e5;
 /**

package/src/utils/functions/{functions.mjs → functions.js}

@@ -1,7 +1,7 @@
 import { promises as fs } from 'fs';
 import { resolve } from 'path';
-import { isDirectoryAsync, isFileAsync } from '../../lib/fs.mjs';
-import { getPathInProject } from '../../lib/settings.mjs';
+import { isDirectoryAsync, isFileAsync } from '../../lib/fs.js';
+import { getPathInProject } from '../../lib/settings.js';
 export const INTERNAL_FUNCTIONS_FOLDER = 'functions-internal';
 export const SERVE_FUNCTIONS_FOLDER = 'functions-serve';
 /**

package/src/utils/functions/{get-functions.mjs → get-functions.js}

@@ -1,5 +1,5 @@
 import { listFunctions } from '@netlify/zip-it-and-ship-it';
-import { fileExistsAsync } from '../../lib/fs.mjs';
+import { fileExistsAsync } from '../../lib/fs.js';
 // @ts-expect-error TS(7006) FIXME: Parameter 'functionName' implicitly has an 'any' t... Remove this comment to see the full error message
 const getUrlPath = (functionName) => `/.netlify/functions/${functionName}`;
 export const BACKGROUND = '-background';

package/src/utils/functions/index.js

@@ -0,0 +1,3 @@
+export * from './constants.js';
+export * from './functions.js';
+export * from './get-functions.js';

package/src/utils/{get-global-config.mjs → get-global-config.js}

@@ -2,7 +2,7 @@ import { readFile } from 'fs/promises';
 // @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'conf... Remove this comment to see the full error message
 import Configstore from 'configstore';
 import { v4 as uuidv4 } from 'uuid';
-import { getLegacyPathInHome, getPathInHome } from '../lib/settings.mjs';
+import { getLegacyPathInHome, getPathInHome } from '../lib/settings.js';
 const globalConfigDefaults = {
     /* disable stats from being sent to Netlify */
     telemetryDisabled: false,

package/src/utils/{get-repo-data.mjs → get-repo-data.js}

@@ -6,7 +6,7 @@ import gitRepoInfo from 'git-repo-info';
 import gitconfiglocal from 'gitconfiglocal';
 // @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'pars... Remove this comment to see the full error message
 import parseGitRemote from 'parse-github-url';
-import { log } from './command-helpers.mjs';
+import { log } from './command-helpers.js';
 /**
  *
  * @param {object} config

package/src/utils/{get-site.mjs → get-site.js}

@@ -1,4 +1,4 @@
-import { error } from './command-helpers.mjs';
+import { error } from './command-helpers.js';
 // @ts-expect-error TS(7006) FIXME: Parameter 'api' implicitly has an 'any' type.
 export const getSiteByName = async (api, siteName) => {
     try {

package/src/utils/{gh-auth.mjs → gh-auth.js}

@@ -4,9 +4,9 @@ import process from 'process';
 import { Octokit } from '@octokit/rest';
 import getPort from 'get-port';
 import inquirer from 'inquirer';
-import { log } from './command-helpers.mjs';
-import createDeferred from './create-deferred.mjs';
-import openBrowser from './open-browser.mjs';
+import { log } from './command-helpers.js';
+import createDeferred from './create-deferred.js';
+import openBrowser from './open-browser.js';
 const SERVER_PORT = 3000;
 /**
  * @typedef Token