netlify-cli 17.23.3 → 17.23.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,7 @@
1
1
  interface BaseBlobsContext {
2
2
  deployID: string;
3
3
  siteID: string;
4
+ primaryRegion?: string;
4
5
  token: string;
5
6
  }
6
7
  export interface BlobsContextWithAPIAccess extends BaseBlobsContext {
@@ -27,6 +28,16 @@ export declare const getBlobsContextWithAPIAccess: ({ debug, projectRoot, siteID
27
28
  * and edge functions connect to it.
28
29
  */
29
30
  export declare const getBlobsContextWithEdgeAccess: ({ debug, projectRoot, siteID }: GetBlobsContextOptions) => Promise<BlobsContextWithEdgeAccess>;
31
+ /**
32
+ * Returns the Blobs metadata that should be added to the Lambda event when
33
+ * invoking a serverless function.
34
+ */
35
+ export declare const getBlobsEventProperty: (context: BlobsContextWithEdgeAccess) => {
36
+ primary_region: string | undefined;
37
+ url: string;
38
+ url_uncached: string;
39
+ token: string;
40
+ };
30
41
  /**
31
42
  * Returns a Base-64, JSON-encoded representation of the Blobs context. This is
32
43
  * the format that the `@netlify/blobs` package expects to find the context in.
@@ -1 +1 @@
1
- {"version":3,"file":"blobs.d.ts","sourceRoot":"","sources":["../../../src/lib/blobs/blobs.ts"],"names":[],"mappings":"AASA,UAAU,gBAAgB;IACxB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;CACd;AAED,MAAM,WAAW,yBAA0B,SAAQ,gBAAgB;IACjE,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,0BAA2B,SAAQ,gBAAgB;IAClE,OAAO,EAAE,MAAM,CAAA;IACf,eAAe,EAAE,MAAM,CAAA;CACxB;AAED,MAAM,MAAM,YAAY,GAAG,yBAAyB,GAAG,0BAA0B,CAAA;AAIjF,eAAO,MAAM,sBAAsB,0BAA0B,CAAA;AAmC7D,UAAU,sBAAsB;IAC9B,KAAK,EAAE,OAAO,CAAA;IACd,WAAW,EAAE,MAAM,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;CACf;AAED;;;GAGG;AACH,eAAO,MAAM,4BAA4B,mCAA0C,sBAAsB,uCAUxG,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,6BAA6B,mCAA0C,sBAAsB,wCAWzG,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,kBAAkB,YAAa,YAAY,WAA4D,CAAA"}
1
+ {"version":3,"file":"blobs.d.ts","sourceRoot":"","sources":["../../../src/lib/blobs/blobs.ts"],"names":[],"mappings":"AASA,UAAU,gBAAgB;IACxB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,KAAK,EAAE,MAAM,CAAA;CACd;AAED,MAAM,WAAW,yBAA0B,SAAQ,gBAAgB;IACjE,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,0BAA2B,SAAQ,gBAAgB;IAClE,OAAO,EAAE,MAAM,CAAA;IACf,eAAe,EAAE,MAAM,CAAA;CACxB;AAED,MAAM,MAAM,YAAY,GAAG,yBAAyB,GAAG,0BAA0B,CAAA;AAIjF,eAAO,MAAM,sBAAsB,0BAA0B,CAAA;AAoC7D,UAAU,sBAAsB;IAC9B,KAAK,EAAE,OAAO,CAAA;IACd,WAAW,EAAE,MAAM,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;CACf;AAED;;;GAGG;AACH,eAAO,MAAM,4BAA4B,mCAA0C,sBAAsB,uCAWxG,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,6BAA6B,mCAA0C,sBAAsB,wCAYzG,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,qBAAqB,YAAa,0BAA0B;;;;;CAKvE,CAAA;AAEF;;;GAGG;AACH,eAAO,MAAM,kBAAkB,YAAa,YAAY,WAA4D,CAAA"}
@@ -6,6 +6,7 @@ import { log, NETLIFYDEVLOG } from '../../utils/command-helpers.js';
6
6
  import { getPathInProject } from '../settings.js';
7
7
  let hasPrintedLocalBlobsNotice = false;
8
8
  export const BLOBS_CONTEXT_VARIABLE = 'NETLIFY_BLOBS_CONTEXT';
9
+ const DEV_REGION = 'dev';
9
10
  const printLocalBlobsNotice = () => {
10
11
  if (hasPrintedLocalBlobsNotice) {
11
12
  return;
@@ -41,6 +42,7 @@ export const getBlobsContextWithAPIAccess = async ({ debug, projectRoot, siteID
41
42
  const context = {
42
43
  apiURL: url,
43
44
  deployID: '0',
45
+ primaryRegion: DEV_REGION,
44
46
  siteID,
45
47
  token,
46
48
  };
@@ -58,9 +60,20 @@ export const getBlobsContextWithEdgeAccess = async ({ debug, projectRoot, siteID
58
60
  siteID,
59
61
  token,
60
62
  uncachedEdgeURL: url,
63
+ primaryRegion: DEV_REGION,
61
64
  };
62
65
  return context;
63
66
  };
67
+ /**
68
+ * Returns the Blobs metadata that should be added to the Lambda event when
69
+ * invoking a serverless function.
70
+ */
71
+ export const getBlobsEventProperty = (context) => ({
72
+ primary_region: context.primaryRegion,
73
+ url: context.edgeURL,
74
+ url_uncached: context.edgeURL,
75
+ token: context.token,
76
+ });
64
77
  /**
65
78
  * Returns a Base-64, JSON-encoded representation of the Blobs context. This is
66
79
  * the format that the `@netlify/blobs` package expects to find the context in.
@@ -1 +1 @@
1
- {"version":3,"file":"netlify-function.d.ts","sourceRoot":"","sources":["../../../src/lib/functions/netlify-function.ts"],"names":[],"mappings":"AA2BA,MAAM,CAAC,OAAO,OAAO,eAAe;IAClC,SAAgB,IAAI,EAAE,MAAM,CAAA;IAC5B,SAAgB,QAAQ,EAAE,MAAM,CAAA;IAChC,SAAgB,WAAW,EAAE,MAAM,CAAA;IACnC,SAAgB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjC,SAAgB,OAAO,EAAE,MAAM,CAAA;IAE/B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAQ;IAClC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAQ;IACpC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAA4B;IACzD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAQ;IAC1C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAQ;IAI3C,SAAgB,YAAY,EAAE,OAAO,CAAA;IAErC,OAAO,CAAC,UAAU,CAAC,CAAiB;IACpC,OAAO,CAAC,SAAS,CAAC,CAAQ;IACnB,UAAU,EAAE,KAAK,GAAG,IAAI,CAAO;IAItC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAoB;gBAEjC,EAEV,YAAY,EAEZ,MAAM,EAEN,SAAS,EAET,WAAW,EAEX,QAAQ,EAER,IAAI,EAEJ,WAAW,EAEX,OAAO,EAEP,QAAQ,EAER,iBAAiB,EAEjB,kBAAkB,GACnB;;;;;;;;;;;;KAAA;IAuBD,IAAI,QAAQ,kBAMX;IAED,uBAAuB;IAqBvB,YAAY;IAMN,WAAW;IAMjB,WAAW;IAIX,YAAY;IAQN,UAAU;IAeV,KAAK,CAAC,EAAE,KAAK,EAAE;;KAAA;;;;;;;;;;;;IA2Cf,YAAY;IAQlB,eAAe,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC;;;;IAWlC,MAAM,CAAC,KAAK,KAAK,EAAE,OAAO,KAAK;;;;;;;IAoCrC;;;OAGG;IACG,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC;IAoCzF,IAAI,iBAAiB,QAEpB;IAED,IAAI,GAAG,WAWN;CACF"}
1
+ {"version":3,"file":"netlify-function.d.ts","sourceRoot":"","sources":["../../../src/lib/functions/netlify-function.ts"],"names":[],"mappings":"AA2BA,MAAM,CAAC,OAAO,OAAO,eAAe;IAClC,SAAgB,IAAI,EAAE,MAAM,CAAA;IAC5B,SAAgB,QAAQ,EAAE,MAAM,CAAA;IAChC,SAAgB,WAAW,EAAE,MAAM,CAAA;IACnC,SAAgB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjC,SAAgB,OAAO,EAAE,MAAM,CAAA;IAE/B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAQ;IAClC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAQ;IACpC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAA4B;IACzD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAQ;IAC1C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAQ;IAI3C,SAAgB,YAAY,EAAE,OAAO,CAAA;IAErC,OAAO,CAAC,UAAU,CAAC,CAAiB;IACpC,OAAO,CAAC,SAAS,CAAC,CAAQ;IACnB,UAAU,EAAE,KAAK,GAAG,IAAI,CAAO;IAItC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAoB;gBAEjC,EAEV,YAAY,EAEZ,MAAM,EAEN,SAAS,EAET,WAAW,EAEX,QAAQ,EAER,IAAI,EAEJ,WAAW,EAEX,OAAO,EAEP,QAAQ,EAER,iBAAiB,EAEjB,kBAAkB,GACnB;;;;;;;;;;;;KAAA;IAuBD,IAAI,QAAQ,kBAMX;IAED,uBAAuB;IAqBvB,YAAY;IAMN,WAAW;IAMjB,WAAW;IAIX,YAAY;IAQN,UAAU;IAeV,KAAK,CAAC,EAAE,KAAK,EAAE;;KAAA;;;;;;;;;;;;IA2Cf,YAAY;IAQlB,eAAe,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC;;;;IAWlC,MAAM,CAAC,KAAK,KAAK,EAAE,OAAO,KAAK;;;;;;;IAgCrC;;;OAGG;IACG,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC;IAoCzF,IAAI,iBAAiB,QAEpB;IAED,IAAI,GAAG,WAWN;CACF"}
@@ -5,6 +5,7 @@ import CronParser from 'cron-parser';
5
5
  import semver from 'semver';
6
6
  import { error as errorExit } from '../../utils/command-helpers.js';
7
7
  import { BACKGROUND } from '../../utils/functions/get-functions.js';
8
+ import { getBlobsEventProperty } from '../blobs/blobs.js';
8
9
  const TYPESCRIPT_EXTENSIONS = new Set(['.cts', '.mts', '.ts']);
9
10
  const V2_MIN_NODE_VERSION = '18.14.0';
10
11
  // Returns a new set with all elements of `setA` that don't exist in `setB`.
@@ -170,11 +171,7 @@ export default class NetlifyFunction {
170
171
  const timeout = this.isBackground ? this.timeoutBackground : this.timeoutSynchronous;
171
172
  const environment = {};
172
173
  if (this.blobsContext) {
173
- const payload = JSON.stringify({
174
- url: this.blobsContext.edgeURL,
175
- url_uncached: this.blobsContext.edgeURL,
176
- token: this.blobsContext.token,
177
- });
174
+ const payload = JSON.stringify(getBlobsEventProperty(this.blobsContext));
178
175
  // @ts-expect-error TS(2339) FIXME: Property 'blobs' does not exist on type '{}'.
179
176
  event.blobs = Buffer.from(payload).toString('base64');
180
177
  }