netlify-cli 17.19.1 → 17.19.3

package/dist/utils/deploy/deploy-site.d.ts

@@ -1,4 +1,6 @@
-export declare const deploySite: (api: any, siteId: any, dir: any, { assetType, branch, concurrentHash, concurrentUpload, config, deployId, deployTimeout, draft, filter, fnDir, functionsConfig, hashAlgorithm, manifestPath, maxRetry, siteEnv, siteRoot, skipFunctionsCache, statusCb, syncFileLimit, tmpDir, workingDir, }?: {
+import BaseCommand from '../../commands/base-command.js';
+import { type $TSFixMe } from '../../commands/types.js';
+export declare const deploySite: (command: BaseCommand, api: $TSFixMe, siteId: any, dir: any, { assetType, branch, concurrentHash, concurrentUpload, config, deployId, deployTimeout, draft, filter, fnDir, functionsConfig, hashAlgorithm, manifestPath, maxRetry, siteRoot, skipFunctionsCache, statusCb, syncFileLimit, tmpDir, workingDir, }: {
     concurrentHash?: number | undefined;
     concurrentUpload?: number | undefined;
     deployTimeout?: number | undefined;
@@ -12,6 +14,7 @@ export declare const deploySite: (api: any, siteId: any, dir: any, { assetType,
     syncFileLimit?: number | undefined;
     tmpDir?: string | undefined;
     fnDir?: string[] | undefined;
+    workingDir: string;
 }) => Promise<{
     deployId: any;
     deploy: any;

package/dist/utils/deploy/deploy-site.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy-site.d.ts","sourceRoot":"","sources":["../../../src/utils/deploy/deploy-site.ts"],"names":[],"mappings":"AAqBA,eAAO,MAAM,UAAU;;;;;;yBAiDC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI;;;;;;;;EA8I5E,CAAA"}
+{"version":3,"file":"deploy-site.d.ts","sourceRoot":"","sources":["../../../src/utils/deploy/deploy-site.ts"],"names":[],"mappings":"AAKA,OAAO,WAAW,MAAM,gCAAgC,CAAA;AACxD,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAwBvD,eAAO,MAAM,UAAU,YACZ,WAAW,OACf,QAAQ;;;;;;yBA4CS;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI;;;;gBAI7D,MAAM;;;;;EAwIrB,CAAA"}

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

@@ -9,9 +9,12 @@ 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, 
+const buildStatsString = (possibleParts) => {
+    const parts = possibleParts.filter(Boolean);
+    const message = parts.slice(0, -1).join(', ');
+    return parts.length > 1 ? `${message} and ${parts[parts.length - 1]}` : message;
+};
+export const deploySite = async (command, api, 
 // @ts-expect-error TS(7006) FIXME: Parameter 'siteId' implicitly has an 'any' type.
 siteId, 
 // @ts-expect-error TS(7006) FIXME: Parameter 'dir' implicitly has an 'any' type.
@@ -33,15 +36,11 @@ hashAlgorithm,
 // @ts-expect-error TS(2525) FIXME: Initializer provides no value for this binding ele... Remove this comment to see the full error message
 manifestPath, maxRetry = DEFAULT_MAX_RETRY, 
 // @ts-expect-error TS(2525) FIXME: Initializer provides no value for this binding ele... Remove this comment to see the full error message
-siteEnv, 
-// @ts-expect-error TS(2525) FIXME: Initializer provides no value for this binding ele... Remove this comment to see the full error message
 siteRoot, 
 // @ts-expect-error TS(2525) FIXME: Initializer provides no value for this binding ele... Remove this comment to see the full error message
 skipFunctionsCache, statusCb = () => {
     /* default to noop */
-}, 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, } = {}) => {
+}, syncFileLimit = DEFAULT_SYNC_LIMIT, tmpDir = temporaryDirectory(), workingDir, }) => {
     statusCb({
         type: 'hashing',
         msg: `Hashing files...`,
@@ -58,18 +57,15 @@ workingDir, } = {}) => {
             normalizer: deployFileNormalizer.bind(null, workingDir),
             statusCb,
         }),
-        hashFns(fnDir, {
+        hashFns(command, fnDir, {
             functionsConfig,
             tmpDir,
             concurrentHash,
             hashAlgorithm,
             statusCb,
             assetType,
-            // @ts-expect-error TS(2345) FIXME: Argument of type '{ functionsConfig: any; tmpDir: ... Remove this comment to see the full error message
-            workingDir,
             manifestPath,
             skipFunctionsCache,
-            siteEnv,
             rootDir: siteRoot,
         }),
         hashConfig({ config }),
@@ -157,9 +153,3 @@ For more information, visit https://ntl.fyi/cli-native-modules.`);
     };
     return deployManifest;
 };
-// @ts-expect-error TS(7006) FIXME: Parameter 'possibleParts' implicitly has an 'any' ... Remove this comment to see the full error message
-const buildStatsString = (possibleParts) => {
-    const parts = possibleParts.filter(Boolean);
-    const message = parts.slice(0, -1).join(', ');
-    return parts.length > 1 ? `${message} and ${parts[parts.length - 1]}` : message;
-};

package/dist/utils/deploy/hash-fns.d.ts

@@ -1,13 +1,17 @@
-declare const hashFns: (directories: any, { assetType, concurrentHash, functionsConfig, hashAlgorithm, manifestPath, rootDir, skipFunctionsCache, statusCb, tmpDir, }: {
-    assetType?: string | undefined;
-    concurrentHash: any;
-    functionsConfig: any;
-    hashAlgorithm?: string | undefined;
-    manifestPath: any;
-    rootDir: any;
-    skipFunctionsCache: any;
-    statusCb: any;
-    tmpDir: any;
+import BaseCommand from '../../commands/base-command.js';
+import { $TSFixMe } from '../../commands/types.js';
+declare const hashFns: (command: BaseCommand, directories: string[], config: {
+    /** @default 'function' */
+    assetType?: string;
+    concurrentHash?: number;
+    functionsConfig: $TSFixMe;
+    /** @default 'sha256' */
+    hashAlgorithm?: string;
+    manifestPath: $TSFixMe;
+    rootDir: $TSFixMe;
+    skipFunctionsCache: $TSFixMe;
+    statusCb: $TSFixMe;
+    tmpDir: $TSFixMe;
 }) => Promise<{
     functions: {};
     functionsWithNativeModules: never[];

package/dist/utils/deploy/hash-fns.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hash-fns.d.ts","sourceRoot":"","sources":["../../../src/utils/deploy/hash-fns.ts"],"names":[],"mappings":"AAsFA,QAAA,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;;;EAkGZ,CAAA;AAED,eAAe,OAAO,CAAA"}
+{"version":3,"file":"hash-fns.d.ts","sourceRoot":"","sources":["../../../src/utils/deploy/hash-fns.ts"],"names":[],"mappings":"AAUA,OAAO,WAAW,MAAM,gCAAgC,CAAA;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AA+ElD,QAAA,MAAM,OAAO,YACF,WAAW,eACP,MAAM,EAAE,UACb;IACN,0BAA0B;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,eAAe,EAAE,QAAQ,CAAA;IACzB,wBAAwB;IACxB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,YAAY,EAAE,QAAQ,CAAA;IACtB,OAAO,EAAE,QAAQ,CAAA;IACjB,kBAAkB,EAAE,QAAQ,CAAA;IAC5B,QAAQ,EAAE,QAAQ,CAAA;IAClB,MAAM,EAAE,QAAQ,CAAA;CACjB;;;;;;;;;;;;;;EA0FF,CAAA;AAED,eAAe,OAAO,CAAA"}

package/dist/utils/deploy/hash-fns.js

@@ -6,27 +6,12 @@ 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.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;
-const getFunctionZips = async ({ 
-// @ts-expect-error TS(7031) FIXME: Binding element 'directories' implicitly has an 'a... Remove this comment to see the full error message
-directories, 
-// @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 'manifestPath' implicitly has an '... Remove this comment to see the full error message
-manifestPath, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'rootDir' implicitly has an 'any' ... Remove this comment to see the full error message
-rootDir, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'skipFunctionsCache' implicitly ha... Remove this comment to see the full error message
-skipFunctionsCache, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'statusCb' implicitly has an 'any'... Remove this comment to see the full error message
-statusCb, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'tmpDir' implicitly has an 'any' t... Remove this comment to see the full error message
-tmpDir, }) => {
+const getFunctionZips = async ({ command, directories, functionsConfig, manifestPath, rootDir, skipFunctionsCache, statusCb, tmpDir, }) => {
     statusCb({
         type: 'functions-manifest',
         msg: 'Looking for a functions cache...',
@@ -68,27 +53,12 @@ tmpDir, }) => {
     }
     return await zipFunctions(directories, tmpDir, {
         basePath: rootDir,
-        configFileDirectories: [getPathInProject([INTERNAL_FUNCTIONS_FOLDER])],
+        configFileDirectories: [command.getPathInProject(INTERNAL_FUNCTIONS_FOLDER)],
         config: functionsConfig,
     });
 };
-const hashFns = async (
-// @ts-expect-error TS(7006) FIXME: Parameter 'directories' implicitly has an 'any' ty... Remove this comment to see the full error message
-directories, { assetType = 'function', 
-// @ts-expect-error TS(7031) FIXME: Binding element 'concurrentHash' implicitly has an... Remove this comment to see the full error message
-concurrentHash, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'functionsConfig' implicitly has a... Remove this comment to see the full error message
-functionsConfig, hashAlgorithm = 'sha256', 
-// @ts-expect-error TS(7031) FIXME: Binding element 'manifestPath' implicitly has an '... Remove this comment to see the full error message
-manifestPath, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'rootDir' implicitly has an 'any' ... Remove this comment to see the full error message
-rootDir, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'skipFunctionsCache' implicitly ha... Remove this comment to see the full error message
-skipFunctionsCache, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'statusCb' implicitly has an 'any'... Remove this comment to see the full error message
-statusCb, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'tmpDir' implicitly has an 'any' t... Remove this comment to see the full error message
-tmpDir, }) => {
+const hashFns = async (command, directories, config) => {
+    const { assetType = 'function', concurrentHash, functionsConfig, hashAlgorithm = 'sha256', manifestPath, rootDir, skipFunctionsCache, statusCb, tmpDir, } = config || {};
     // Early out if no functions directories are configured.
     if (directories.length === 0) {
         return { functions: {}, functionsWithNativeModules: [], shaMap: {} };
@@ -97,6 +67,7 @@ tmpDir, }) => {
         throw new Error('Missing tmpDir directory for zipping files');
     }
     const functionZips = await getFunctionZips({
+        command,
         directories,
         functionsConfig,
         manifestPath,

package/dist/utils/proxy-server.d.ts

@@ -38,10 +38,11 @@ export declare const generateInspectSettings: (edgeInspect: any, edgeInspectBrk:
  * @param {import('../lib/functions/registry.js').FunctionsRegistry=} params.functionsRegistry
  * @returns
  */
-export declare const startProxyServer: ({ accountId, addonsUrls, blobsContext, config, configPath, debug, env, functionsRegistry, geoCountry, geolocationMode, getUpdatedConfig, inspectSettings, offline, projectDir, repositoryRoot, settings, site, siteInfo, state, }: {
+export declare const startProxyServer: ({ accountId, addonsUrls, blobsContext, command, config, configPath, debug, env, functionsRegistry, geoCountry, geolocationMode, getUpdatedConfig, inspectSettings, offline, projectDir, repositoryRoot, settings, site, siteInfo, state, }: {
     accountId: any;
     addonsUrls: any;
     blobsContext: any;
+    command: any;
     config: any;
     configPath: any;
     debug: any;

package/dist/utils/proxy-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proxy-server.d.ts","sourceRoot":"","sources":["../../src/utils/proxy-server.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AAEH;;;;GAIG;AAEH,eAAO,MAAM,uBAAuB;;;;CAiBnC,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;qBAkE5B,CAAA"}
+{"version":3,"file":"proxy-server.d.ts","sourceRoot":"","sources":["../../src/utils/proxy-server.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AAEH;;;;GAIG;AAEH,eAAO,MAAM,uBAAuB;;;;CAiBnC,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;qBAqE5B,CAAA"}

package/dist/utils/proxy-server.js

@@ -60,6 +60,8 @@ accountId,
 addonsUrls, 
 // @ts-expect-error TS(7031) FIXME: Binding element 'blobsContext' implicitly has an '... Remove this comment to see the full error message
 blobsContext, 
+// @ts-expect-error TS(7031) FIXME: Binding element 'accountId' implicitly has an 'any... Remove this comment to see the full error message
+command, 
 // @ts-expect-error TS(7031) FIXME: Binding element 'config' implicitly has an 'any' t... Remove this comment to see the full error message
 config, 
 // @ts-expect-error TS(7031) FIXME: Binding element 'configPath' implicitly has an 'an... Remove this comment to see the full error message
@@ -95,6 +97,7 @@ state, }) => {
     const url = await startProxy({
         addonsUrls,
         blobsContext,
+        command,
         config,
         configPath: configPath || site.configPath,
         debug,

package/dist/utils/proxy.d.ts

@@ -3,10 +3,11 @@
  * @returns
  */
 export declare const getProxyUrl: (settings: any) => string;
-export declare const startProxy: ({ accountId, addonsUrls, blobsContext, config, configPath, debug, env, functionsRegistry, geoCountry, geolocationMode, getUpdatedConfig, inspectSettings, offline, projectDir, repositoryRoot, settings, siteInfo, state, }: {
+export declare const startProxy: ({ accountId, addonsUrls, blobsContext, command, config, configPath, debug, env, functionsRegistry, geoCountry, geolocationMode, getUpdatedConfig, inspectSettings, offline, projectDir, repositoryRoot, settings, siteInfo, state, }: {
     accountId: any;
     addonsUrls: any;
     blobsContext: any;
+    command: any;
     config: any;
     configPath: any;
     debug: any;

package/dist/utils/proxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../src/utils/proxy.ts"],"names":[],"mappings":"AA0xBA;;;GAGG;AAEH,eAAO,MAAM,WAAW,2BAGvB,CAAA;AAED,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;qBAgItB,CAAA"}
+{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../src/utils/proxy.ts"],"names":[],"mappings":"AA0xBA;;;GAGG;AAEH,eAAO,MAAM,WAAW,2BAGvB,CAAA;AAED,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;qBAmItB,CAAA"}

package/dist/utils/proxy.js

@@ -354,23 +354,23 @@ const reqToURL = function (req, pathname) {
 const MILLISEC_TO_SEC = 1e3;
 const initializeProxy = async function ({ 
 // @ts-expect-error TS(7031) FIXME: Binding element 'configPath' implicitly has an 'any... Remove this comment to see the full error message
-configPath, 
+config, 
 // @ts-expect-error TS(7031) FIXME: Binding element 'distDir' implicitly has an 'any... Remove this comment to see the full error message
-distDir, 
+configPath, 
 // @ts-expect-error TS(7031) FIXME: Binding element 'env' implicitly has an 'any... Remove this comment to see the full error message
-env, 
+distDir, 
 // @ts-expect-error TS(7031) FIXME: Binding element 'host' implicitly has an 'any... Remove this comment to see the full error message
-host, 
+env, 
 // @ts-expect-error TS(7031) FIXME: Binding element 'imageProxy' implicitly has an 'any... Remove this comment to see the full error message
-imageProxy, 
+host, 
 // @ts-expect-error TS(7031) FIXME: Binding element 'port' implicitly has an 'any... Remove this comment to see the full error message
-port, 
+imageProxy, 
 // @ts-expect-error TS(7031) FIXME: Binding element 'projectDir' implicitly has an 'any... Remove this comment to see the full error message
-projectDir, 
+port, 
 // @ts-expect-error TS(7031) FIXME: Binding element 'siteInfo' implicitly has an 'any... Remove this comment to see the full error message
-siteInfo, 
+projectDir, 
 // @ts-expect-error TS(7031) FIXME: Binding element 'config' implicitly has an 'any... Remove this comment to see the full error message
-config, }) {
+siteInfo, }) {
     const proxy = httpProxy.createProxyServer({
         selfHandleResponse: true,
         target: {
@@ -669,6 +669,8 @@ accountId,
 addonsUrls, 
 // @ts-expect-error TS(7031) FIXME: Binding element 'blobsContext' implicitly has an '... Remove this comment to see the full error message
 blobsContext, 
+// @ts-expect-error TS(7031) FIXME: Binding element 'accountId' implicitly has an 'any... Remove this comment to see the full error message
+command, 
 // @ts-expect-error TS(7031) FIXME: Binding element 'config' implicitly has an 'any' t... Remove this comment to see the full error message
 config, 
 // @ts-expect-error TS(7031) FIXME: Binding element 'configPath' implicitly has an 'an... Remove this comment to see the full error message
@@ -702,6 +704,7 @@ state, }) {
     const secondaryServerPort = settings.https ? await getAvailablePort() : null;
     const functionsServer = settings.functionsPort ? `http://127.0.0.1:${settings.functionsPort}` : null;
     const edgeFunctionsProxy = await initializeEdgeFunctionsProxy({
+        command,
         blobsContext,
         config,
         configPath,