netlify-cli 22.2.3-rc.0 → 22.3.0

package/bin/run.js

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
 import { argv } from 'process'
 import EventEmitter from 'events'
-import nf, { Request, Response, Headers } from 'node-fetch'
 
 import { maybeEnableCompileCache } from '../dist/utils/nodejs-compile-cache.js'
 
@@ -13,7 +12,7 @@ const UPDATE_BOXEN_OPTIONS = {
   padding: 1,
   margin: 1,
   textAlignment: 'center',
-  borderStyle: 'round',
+  borderStyle: 'round', 
   borderColor: NETLIFY_CYAN_HEX,
   float: 'center',
   // This is an intentional half-width space to work around a unicode padding math bug in boxen
@@ -21,15 +20,6 @@ const UPDATE_BOXEN_OPTIONS = {
   titleAlignment: 'center',
 }
 
-// patch fetch for node < 18
-if (!globalThis.fetch) {
-  globalThis.fetch = nf;
-  globalThis.Request = Request;
-  globalThis.Response = Response;
-  // eslint-disable-next-line n/no-unsupported-features/node-builtins
-  globalThis.Headers = Headers;
-}
-
 const main = async () => {
   // TODO(serhalp) Investigate and fix this at the root instead.
   // This avoids `MaxListenersExceededWarning` warnings during Edge Functions bundling,

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

@@ -1 +1 @@
-{"version":3,"file":"functions-serve.d.ts","sourceRoot":"","sources":["../../../src/commands/functions/functions-serve.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAcxC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAK5C,eAAO,MAAM,cAAc,GAAU,SAAS,YAAY,EAAE,SAAS,WAAW,kBAkD/E,CAAA"}
+{"version":3,"file":"functions-serve.d.ts","sourceRoot":"","sources":["../../../src/commands/functions/functions-serve.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAcxC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAK5C,eAAO,MAAM,cAAc,GAAU,SAAS,YAAY,EAAE,SAAS,WAAW,kBAmD/E,CAAA"}

package/dist/commands/functions/functions-serve.js

@@ -31,6 +31,7 @@ export const functionsServe = async (options, command) => {
         siteID: site.id ?? UNLINKED_SITE_MOCK_ID,
     });
     await startFunctionsServer({
+        loadDistFunctions: process.env.NETLIFY_FUNCTIONS_SERVE_LOAD_DIST_FUNCTIONS === 'true',
         blobsContext,
         config,
         debug: options.debug,

package/dist/commands/functions/functions-serve.js.map

@@ -1 +1 @@
-{"version":3,"file":"functions-serve.js","sourceRoot":"","sources":["../../../src/commands/functions/functions-serve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAI3B,OAAO,EAAE,6BAA6B,EAAE,MAAM,0BAA0B,CAAA;AACxE,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAA;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAA;AAC9D,OAAO,EACL,qBAAqB,EACrB,WAAW,EACX,kBAAkB,EAClB,kBAAkB,EAClB,kBAAkB,GACnB,MAAM,oBAAoB,CAAA;AAC3B,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAA;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAGlD,MAAM,YAAY,GAAG,IAAI,CAAA;AAEzB,mGAAmG;AACnG,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EAAE,OAAqB,EAAE,OAAoB,EAAE,EAAE;IAClF,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,OAAO,CAAA;IAE9D,MAAM,YAAY,GAAG,eAAe,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC,CAAA;IACvF,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,YAAY,CAAA;IAE1C,GAAG,CAAC,WAAW,GAAG,EAAE,OAAO,EAAE,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAA;IAE1D,GAAG,GAAG,MAAM,kBAAkB,CAAC,EAAE,SAAS,EAAE,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAA;IAC3E,kBAAkB,CAAC,GAAG,CAAC,CAAA;IAEvB,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,MAAM,kBAAkB,CAAC;QAC9E,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,GAAG;QACH,IAAI;QACJ,QAAQ;KACT,CAAC,CAAA;IAEF,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC;QACtC,cAAc,EAAE,OAAO,CAAC,IAAI,IAAI,MAAM,CAAC,GAAG,EAAE,aAAa;QACzD,WAAW,EAAE,YAAY;QACzB,YAAY,EAAE,6CAA6C;KAC5D,CAAC,CAAA;IAEF,MAAM,YAAY,GAAG,MAAM,6BAA6B,CAAC;QACvD,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,WAAW,EAAE,OAAO,CAAC,UAAU;QAC/B,MAAM,EAAE,IAAI,CAAC,EAAE,IAAI,qBAAqB;KACzC,CAAC,CAAA;IAEF,MAAM,oBAAoB,CAAC;QACzB,YAAY;QACZ,MAAM;QACN,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,OAAO;QACP,QAAQ,EAAE,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE;QACpD,IAAI;QACJ,QAAQ;QACR,OAAO;QACP,YAAY;QACZ,QAAQ;QACR,eAAe,EAAE,OAAO,CAAC,GAAG;QAC5B,UAAU,EAAE,OAAO,CAAC,OAAO;QAC3B,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,KAAK;QACL,SAAS;KACV,CAAC,CAAA;IAEF,MAAM,GAAG,GAAG,WAAW,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,CAAA;IAChD,WAAW,CAAC,EAAE,GAAG,EAAE,CAAC,CAAA;AACtB,CAAC,CAAA"}
+{"version":3,"file":"functions-serve.js","sourceRoot":"","sources":["../../../src/commands/functions/functions-serve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAI3B,OAAO,EAAE,6BAA6B,EAAE,MAAM,0BAA0B,CAAA;AACxE,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAA;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAA;AAC9D,OAAO,EACL,qBAAqB,EACrB,WAAW,EACX,kBAAkB,EAClB,kBAAkB,EAClB,kBAAkB,GACnB,MAAM,oBAAoB,CAAA;AAC3B,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAA;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAGlD,MAAM,YAAY,GAAG,IAAI,CAAA;AAEzB,mGAAmG;AACnG,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EAAE,OAAqB,EAAE,OAAoB,EAAE,EAAE;IAClF,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,OAAO,CAAA;IAE9D,MAAM,YAAY,GAAG,eAAe,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC,CAAA;IACvF,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,YAAY,CAAA;IAE1C,GAAG,CAAC,WAAW,GAAG,EAAE,OAAO,EAAE,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAA;IAE1D,GAAG,GAAG,MAAM,kBAAkB,CAAC,EAAE,SAAS,EAAE,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAA;IAC3E,kBAAkB,CAAC,GAAG,CAAC,CAAA;IAEvB,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,MAAM,kBAAkB,CAAC;QAC9E,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,GAAG;QACH,IAAI;QACJ,QAAQ;KACT,CAAC,CAAA;IAEF,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC;QACtC,cAAc,EAAE,OAAO,CAAC,IAAI,IAAI,MAAM,CAAC,GAAG,EAAE,aAAa;QACzD,WAAW,EAAE,YAAY;QACzB,YAAY,EAAE,6CAA6C;KAC5D,CAAC,CAAA;IAEF,MAAM,YAAY,GAAG,MAAM,6BAA6B,CAAC;QACvD,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,WAAW,EAAE,OAAO,CAAC,UAAU;QAC/B,MAAM,EAAE,IAAI,CAAC,EAAE,IAAI,qBAAqB;KACzC,CAAC,CAAA;IAEF,MAAM,oBAAoB,CAAC;QACzB,iBAAiB,EAAE,OAAO,CAAC,GAAG,CAAC,2CAA2C,KAAK,MAAM;QACrF,YAAY;QACZ,MAAM;QACN,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,OAAO;QACP,QAAQ,EAAE,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE;QACpD,IAAI;QACJ,QAAQ;QACR,OAAO;QACP,YAAY;QACZ,QAAQ;QACR,eAAe,EAAE,OAAO,CAAC,GAAG;QAC5B,UAAU,EAAE,OAAO,CAAC,OAAO;QAC3B,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,KAAK;QACL,SAAS;KACV,CAAC,CAAA;IAEF,MAAM,GAAG,GAAG,WAAW,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,CAAA;IAChD,WAAW,CAAC,EAAE,GAAG,EAAE,CAAC,CAAA;AACtB,CAAC,CAAA"}

package/dist/lib/geo-location.d.ts

@@ -1,22 +1,9 @@
-export type Geolocation = {
-    city: string;
-    country: {
-        code: string;
-        name: string;
-    };
-    subdivision: {
-        code: string;
-        name: string;
-    };
-    longitude: number;
-    latitude: number;
-    timezone: string;
-};
+import { type Geolocation } from '@netlify/dev-utils';
+export { Geolocation };
 interface State {
     get(key: string): unknown;
     set(key: string, value: unknown): void;
 }
-export declare const mockLocation: Geolocation;
 /**
  * Returns geolocation data from a remote API, the local cache, or a mock location, depending on the
  * specified mode.
@@ -27,5 +14,4 @@ export declare const getGeoLocation: ({ geoCountry, mode, offline, state, }: {
     offline?: boolean | undefined;
     state: State;
 }) => Promise<Geolocation>;
-export {};
 //# sourceMappingURL=geo-location.d.ts.map

package/dist/lib/geo-location.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geo-location.d.ts","sourceRoot":"","sources":["../../src/lib/geo-location.ts"],"names":[],"mappings":"AAUA,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE;QACP,IAAI,EAAE,MAAM,CAAA;QACZ,IAAI,EAAE,MAAM,CAAA;KACb,CAAA;IACD,WAAW,EAAE;QACX,IAAI,EAAE,MAAM,CAAA;QACZ,IAAI,EAAE,MAAM,CAAA;KACb,CAAA;IACD,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,UAAU,KAAK;IACb,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;IACzB,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI,CAAA;CACvC;AAED,eAAO,MAAM,YAAY,EAAE,WAO1B,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,cAAc,GAAU,uCAKlC;IACD,IAAI,EAAE,OAAO,GAAG,QAAQ,GAAG,MAAM,CAAA;IACjC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC/B,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IAC7B,KAAK,EAAE,KAAK,CAAA;CACb,KAAG,OAAO,CAAC,WAAW,CAyDtB,CAAA"}
+{"version":3,"file":"geo-location.d.ts","sourceRoot":"","sources":["../../src/lib/geo-location.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,WAAW,EAAgB,MAAM,oBAAoB,CAAA;AAUnE,OAAO,EAAE,WAAW,EAAE,CAAA;AAEtB,UAAU,KAAK;IACb,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;IACzB,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI,CAAA;CACvC;AAED;;;GAGG;AACH,eAAO,MAAM,cAAc,GAAU,uCAKlC;IACD,IAAI,EAAE,OAAO,GAAG,QAAQ,GAAG,MAAM,CAAA;IACjC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC/B,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IAC7B,KAAK,EAAE,KAAK,CAAA;CACb,KAAG,OAAO,CAAC,WAAW,CAyDtB,CAAA"}

package/dist/lib/geo-location.js

@@ -1,18 +1,11 @@
 import fetch from 'node-fetch';
+import { mockLocation } from '@netlify/dev-utils';
 const API_URL = 'https://netlifind.netlify.app';
 const STATE_GEO_PROPERTY = 'geolocation';
 // 24 hours
 const CACHE_TTL = 8.64e7;
 // 10 seconds
 const REQUEST_TIMEOUT = 1e4;
-export const mockLocation = {
-    city: 'San Francisco',
-    country: { code: 'US', name: 'United States' },
-    subdivision: { code: 'CA', name: 'California' },
-    longitude: 0,
-    latitude: 0,
-    timezone: 'UTC',
-};
 /**
  * Returns geolocation data from a remote API, the local cache, or a mock location, depending on the
  * specified mode.
@@ -27,7 +20,7 @@ export const getGeoLocation = async ({ geoCountry, mode, offline = false, state,
     // `cache`, let's try to use it.
     // Or, if the country we're trying to mock is the same one as we have in the
     // cache, let's use the cache instead of the mock.
-    if (cacheObject !== undefined && (mode === 'cache' || cacheObject.data.country.code === geoCountry)) {
+    if (cacheObject !== undefined && (mode === 'cache' || cacheObject.data.country?.code === geoCountry)) {
         const age = Date.now() - cacheObject.timestamp;
         // Let's use the cached data if it's not older than the TTL. Also, if the
         // `--offline` option was used, it's best to use the cached location than

package/dist/lib/geo-location.js.map

@@ -1 +1 @@
-{"version":3,"file":"geo-location.js","sourceRoot":"","sources":["../../src/lib/geo-location.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"geo-location.js","sourceRoot":"","sources":["../../src/lib/geo-location.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,YAAY,CAAA;AAC9B,OAAO,EAAoB,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAEnE,MAAM,OAAO,GAAG,+BAA+B,CAAA;AAC/C,MAAM,kBAAkB,GAAG,aAAa,CAAA;AACxC,WAAW;AACX,MAAM,SAAS,GAAG,MAAM,CAAA;AAExB,aAAa;AACb,MAAM,eAAe,GAAG,GAAG,CAAA;AAS3B;;;GAGG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EAAE,EACnC,UAAU,EACV,IAAI,EACJ,OAAO,GAAG,KAAK,EACf,KAAK,GAMN,EAAwB,EAAE;IACzB,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,kBAAkB,CAAyD,CAAA;IAEzG,sDAAsD;IACtD,IAAI,UAAU,EAAE,CAAC;QACf,IAAI,GAAG,MAAM,CAAA;IACf,CAAC;IAED,sEAAsE;IACtE,gCAAgC;IAChC,4EAA4E;IAC5E,kDAAkD;IAClD,IAAI,WAAW,KAAK,SAAS,IAAI,CAAC,IAAI,KAAK,OAAO,IAAI,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,KAAK,UAAU,CAAC,EAAE,CAAC;QACrG,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,WAAW,CAAC,SAAS,CAAA;QAE9C,yEAAyE;QACzE,yEAAyE;QACzE,gBAAgB;QAChB,IAAI,GAAG,GAAG,SAAS,IAAI,OAAO,EAAE,CAAC;YAC/B,OAAO,WAAW,CAAC,IAAI,CAAA;QACzB,CAAC;IACH,CAAC;IAED,4EAA4E;IAC5E,yEAAyE;IACzE,4EAA4E;IAC5E,YAAY;IACZ,IAAI,IAAI,KAAK,MAAM,IAAI,OAAO,IAAI,UAAU,EAAE,CAAC;QAC7C,IAAI,UAAU,EAAE,CAAC;YACf,OAAO;gBACL,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,cAAc,EAAE;gBACnD,WAAW,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,kBAAkB,EAAE;gBACrD,SAAS,EAAE,CAAC;gBACZ,QAAQ,EAAE,CAAC;gBACX,QAAQ,EAAE,KAAK;aAChB,CAAA;QACH,CAAC;QACD,OAAO,YAAY,CAAA;IACrB,CAAC;IAED,2EAA2E;IAC3E,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,qBAAqB,EAAE,CAAA;QAC1C,MAAM,cAAc,GAAG;YACrB,IAAI;YACJ,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;SACtB,CAAA;QAED,KAAK,CAAC,GAAG,CAAC,kBAAkB,EAAE,cAAc,CAAC,CAAA;QAE7C,OAAO,IAAI,CAAA;IACb,CAAC;IAAC,MAAM,CAAC;QACP,qEAAqE;QACrE,iBAAiB;QACjB,OAAO,YAAY,CAAA;IACrB,CAAC;AACH,CAAC,CAAA;AAED;;GAEG;AACH,MAAM,qBAAqB,GAAG,KAAK,IAA0B,EAAE;IAC7D,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,OAAO,EAAE;QAC/B,MAAM,EAAE,KAAK;QACb,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,eAAe,CAAC;KAC7C,CAAC,CAAA;IACF,8EAA8E;IAC9E,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAA;IAEhC,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA"}