netlify-cli 17.22.0 → 17.22.1

package/dist/commands/dev/dev.js

@@ -2,7 +2,7 @@ import process from 'process';
 // @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module '@net... Remove this comment to see the full error message
 import { applyMutations } from '@netlify/config';
 import { Option } from 'commander';
-import { BLOBS_CONTEXT_VARIABLE, encodeBlobsContext, getBlobsContext } from '../../lib/blobs/blobs.js';
+import { BLOBS_CONTEXT_VARIABLE, encodeBlobsContext, getBlobsContextWithEdgeAccess } from '../../lib/blobs/blobs.js';
 import { promptEditorHelper } from '../../lib/edge-functions/editor-helper.js';
 import { startFunctionsServer } from '../../lib/functions/server.js';
 import { printBanner } from '../../utils/banner.js';
@@ -78,7 +78,7 @@ export const dev = async (options, command) => {
     };
     let { env } = cachedConfig;
     env.NETLIFY_DEV = { sources: ['internal'], value: 'true' };
-    const blobsContext = await getBlobsContext({
+    const blobsContext = await getBlobsContextWithEdgeAccess({
         debug: options.debug,
         projectRoot: command.workingDir,
         siteID: site.id ?? UNLINKED_SITE_MOCK_ID,

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

@@ -1,5 +1,5 @@
 import { join } from 'path';
-import { getBlobsContext } from '../../lib/blobs/blobs.js';
+import { getBlobsContextWithEdgeAccess } from '../../lib/blobs/blobs.js';
 import { startFunctionsServer } from '../../lib/functions/server.js';
 import { printBanner } from '../../utils/banner.js';
 import { UNLINKED_SITE_MOCK_ID, acquirePort, getDotEnvVariables, getSiteInformation, injectEnvVariables, } from '../../utils/dev.js';
@@ -24,7 +24,7 @@ export const functionsServe = async (options, command) => {
         defaultPort: DEFAULT_PORT,
         errorMessage: 'Could not acquire configured functions port',
     });
-    const blobsContext = await getBlobsContext({
+    const blobsContext = await getBlobsContextWithEdgeAccess({
         debug: options.debug,
         projectRoot: command.workingDir,
         siteID: site.id ?? UNLINKED_SITE_MOCK_ID,

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

@@ -1 +1 @@
-{"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["../../../src/commands/serve/serve.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAwBxC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAG5C,eAAO,MAAM,KAAK,YAAmB,YAAY,WAAW,WAAW,uBAgJtE,CAAA"}
+{"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["../../../src/commands/serve/serve.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AA6BxC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAG5C,eAAO,MAAM,KAAK,YAAmB,YAAY,WAAW,WAAW,uBA0JtE,CAAA"}

package/dist/commands/serve/serve.js

@@ -1,5 +1,5 @@
 import process from 'process';
-import { BLOBS_CONTEXT_VARIABLE, encodeBlobsContext, getBlobsContext } from '../../lib/blobs/blobs.js';
+import { BLOBS_CONTEXT_VARIABLE, encodeBlobsContext, getBlobsContextWithAPIAccess, getBlobsContextWithEdgeAccess, } from '../../lib/blobs/blobs.js';
 import { promptEditorHelper } from '../../lib/edge-functions/editor-helper.js';
 import { startFunctionsServer } from '../../lib/functions/server.js';
 import { printBanner } from '../../utils/banner.js';
@@ -64,19 +64,26 @@ export const serve = async (options, command) => {
     command.setAnalyticsPayload({ live: options.live });
     log(`${NETLIFYDEVLOG} Building site for production`);
     log(`${NETLIFYDEVWARN} Changes will not be hot-reloaded, so if you need to rebuild your site you must exit and run 'netlify serve' again`);
-    const blobsContext = await getBlobsContext({
+    const blobsOptions = {
         debug: options.debug,
         projectRoot: command.workingDir,
         siteID: site.id ?? UNLINKED_SITE_MOCK_ID,
-    });
-    process.env[BLOBS_CONTEXT_VARIABLE] = encodeBlobsContext(blobsContext);
+    };
+    // We start by running a build, so we want a Blobs context with API access,
+    // which is what build plugins use.
+    process.env[BLOBS_CONTEXT_VARIABLE] = encodeBlobsContext(await getBlobsContextWithAPIAccess(blobsOptions));
     const { configPath: configPathOverride } = await runBuildTimeline({
         command,
         settings,
         options,
+        env: {},
     });
+    // Now we generate a second Blobs context object, this time with edge access
+    // for runtime access (i.e. from functions and edge functions).
+    const runtimeBlobsContext = await getBlobsContextWithEdgeAccess(blobsOptions);
+    process.env[BLOBS_CONTEXT_VARIABLE] = encodeBlobsContext(runtimeBlobsContext);
     const functionsRegistry = await startFunctionsServer({
-        blobsContext,
+        blobsContext: runtimeBlobsContext,
         command,
         config,
         debug: options.debug,
@@ -109,6 +116,7 @@ export const serve = async (options, command) => {
     const inspectSettings = generateInspectSettings(options.edgeInspect, options.edgeInspectBrk);
     const url = await startProxyServer({
         addonsUrls,
+        blobsContext: runtimeBlobsContext,
         command,
         config,
         configPath: configPathOverride,

package/dist/lib/blobs/blobs.d.ts

@@ -1,21 +1,32 @@
-export declare const BLOBS_CONTEXT_VARIABLE = "NETLIFY_BLOBS_CONTEXT";
-export interface BlobsContext {
+interface BaseBlobsContext {
     deployID: string;
-    edgeURL: string;
     siteID: string;
     token: string;
+}
+export interface BlobsContextWithAPIAccess extends BaseBlobsContext {
+    apiURL: string;
+}
+export interface BlobsContextWithEdgeAccess extends BaseBlobsContext {
+    edgeURL: string;
     uncachedEdgeURL: string;
 }
+export type BlobsContext = BlobsContextWithAPIAccess | BlobsContextWithEdgeAccess;
+export declare const BLOBS_CONTEXT_VARIABLE = "NETLIFY_BLOBS_CONTEXT";
 interface GetBlobsContextOptions {
     debug: boolean;
     projectRoot: string;
     siteID: string;
 }
+/**
+ * Starts a local Blobs server and returns a context object that lets build
+ * plugins connect to it.
+ */
+export declare const getBlobsContextWithAPIAccess: ({ debug, projectRoot, siteID }: GetBlobsContextOptions) => Promise<BlobsContextWithAPIAccess>;
 /**
  * Starts a local Blobs server and returns a context object that lets functions
- * connect to it.
+ * and edge functions connect to it.
  */
-export declare const getBlobsContext: ({ debug, projectRoot, siteID }: GetBlobsContextOptions) => Promise<BlobsContext>;
+export declare const getBlobsContextWithEdgeAccess: ({ debug, projectRoot, siteID }: GetBlobsContextOptions) => Promise<BlobsContextWithEdgeAccess>;
 /**
  * Returns a Base-64, JSON-encoded representation of the Blobs context. This is
  * the format that the `@netlify/blobs` package expects to find the context in.

package/dist/lib/blobs/blobs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"blobs.d.ts","sourceRoot":"","sources":["../../../src/lib/blobs/blobs.ts"],"names":[],"mappings":"AAWA,eAAO,MAAM,sBAAsB,0BAA0B,CAAA;AAE7D,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;IACb,eAAe,EAAE,MAAM,CAAA;CACxB;AA6BD,UAAU,sBAAsB;IAC9B,KAAK,EAAE,OAAO,CAAA;IACd,WAAW,EAAE,MAAM,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;CACf;AAED;;;GAGG;AACH,eAAO,MAAM,eAAe,mCAA0C,sBAAsB,0BAa3F,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,kBAAkB,YAAa,YAAY,WAA4D,CAAA"}
+{"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"}

package/dist/lib/blobs/blobs.js

@@ -13,7 +13,12 @@ const printLocalBlobsNotice = () => {
     hasPrintedLocalBlobsNotice = true;
     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) => {
+/**
+ * Starts a local Blobs server on a random port and generates a random token
+ * for its authentication.
+ */
+const initializeBlobsServer = async (projectRoot, debug) => {
+    const token = uuidv4();
     const directory = path.resolve(projectRoot, getPathInProject(['blobs-serve']));
     const server = new BlobsServer({
         debug,
@@ -24,16 +29,29 @@ const startBlobsServer = async (debug, projectRoot, token) => {
         token,
     });
     const { port } = await server.start();
-    return { port };
+    const url = `http://localhost:${port}`;
+    return { url, token };
+};
+/**
+ * Starts a local Blobs server and returns a context object that lets build
+ * plugins connect to it.
+ */
+export const getBlobsContextWithAPIAccess = async ({ debug, projectRoot, siteID }) => {
+    const { token, url } = await initializeBlobsServer(projectRoot, debug);
+    const context = {
+        apiURL: url,
+        deployID: '0',
+        siteID,
+        token,
+    };
+    return context;
 };
 /**
  * Starts a local Blobs server and returns a context object that lets functions
- * connect to it.
+ * and edge functions connect to it.
  */
-export const getBlobsContext = async ({ debug, projectRoot, siteID }) => {
-    const token = uuidv4();
-    const { port } = await startBlobsServer(debug, projectRoot, token);
-    const url = `http://localhost:${port}`;
+export const getBlobsContextWithEdgeAccess = async ({ debug, projectRoot, siteID }) => {
+    const { token, url } = await initializeBlobsServer(projectRoot, debug);
     const context = {
         deployID: '0',
         edgeURL: url,

package/dist/lib/edge-functions/proxy.d.ts

@@ -1,7 +1,7 @@
 import type { IncomingMessage } from 'http';
 import BaseCommand from '../../commands/base-command.js';
 import { $TSFixMe } from '../../commands/types.js';
-import { BlobsContext } from '../blobs/blobs.js';
+import { BlobsContextWithEdgeAccess } from '../blobs/blobs.js';
 declare const headersSymbol: unique symbol;
 export declare const handleProxyRequest: (req: any, proxyReq: any) => void;
 interface SiteInfo {
@@ -13,7 +13,7 @@ export declare const createSiteInfoHeader: (siteInfo: SiteInfo, localURL: string
 export declare const createAccountInfoHeader: (accountInfo?: {}) => string;
 export declare const initializeProxy: ({ accountId, blobsContext, command, config, configPath, debug, env: configEnv, geoCountry, geolocationMode, getUpdatedConfig, inspectSettings, mainPort, offline, passthroughPort, projectDir, repositoryRoot, settings, siteInfo, state, }: {
     accountId: string;
-    blobsContext: BlobsContext;
+    blobsContext: BlobsContextWithEdgeAccess;
     command: BaseCommand;
     config: $TSFixMe;
     configPath: string;

package/dist/lib/edge-functions/proxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../../src/lib/edge-functions/proxy.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAA;AAM3C,OAAO,WAAW,MAAM,gCAAgC,CAAA;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAGlD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAUhD,QAAA,MAAM,aAAa,eAAmC,CAAA;AAsBtD,eAAO,MAAM,kBAAkB,mCAI9B,CAAA;AAKD,UAAU,QAAQ;IAChB,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,MAAM,CAAA;CACZ;AAED,eAAO,MAAM,oBAAoB,aAAc,QAAQ,YAAY,MAAM,WAKxE,CAAA;AAED,eAAO,MAAM,uBAAuB,8BAMnC,CAAA;AAED,eAAO,MAAM,eAAe;eAqBf,MAAM;kBACH,YAAY;aACjB,WAAW;YACZ,QAAQ;gBACJ,MAAM;WACX,OAAO;SACT,QAAQ;aACJ,QAAQ;gBACL,QAAQ;qBACH,QAAQ;sBACP,QAAQ;qBACT,QAAQ;cACf,QAAQ;qBACD,QAAQ;gBACb,MAAM;;cAER,QAAQ;cACR,QAAQ;WACX,QAAQ;oBAyBI,eAAe,GAAG;IAAE,eAAe,EAAE,OAAO,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,iCAkDjF,CAAA;AAGD,eAAO,MAAM,sBAAsB,uBAA4C,CAAA"}
+{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../../src/lib/edge-functions/proxy.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAA;AAM3C,OAAO,WAAW,MAAM,gCAAgC,CAAA;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAGlD,OAAO,EAAE,0BAA0B,EAAE,MAAM,mBAAmB,CAAA;AAU9D,QAAA,MAAM,aAAa,eAAmC,CAAA;AAsBtD,eAAO,MAAM,kBAAkB,mCAI9B,CAAA;AAKD,UAAU,QAAQ;IAChB,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,MAAM,CAAA;CACZ;AAED,eAAO,MAAM,oBAAoB,aAAc,QAAQ,YAAY,MAAM,WAKxE,CAAA;AAED,eAAO,MAAM,uBAAuB,8BAMnC,CAAA;AAED,eAAO,MAAM,eAAe;eAqBf,MAAM;kBACH,0BAA0B;aAC/B,WAAW;YACZ,QAAQ;gBACJ,MAAM;WACX,OAAO;SACT,QAAQ;aACJ,QAAQ;gBACL,QAAQ;qBACH,QAAQ;sBACP,QAAQ;qBACT,QAAQ;cACf,QAAQ;qBACD,QAAQ;gBACb,MAAM;;cAER,QAAQ;cACR,QAAQ;WACX,QAAQ;oBAyBI,eAAe,GAAG;IAAE,eAAe,EAAE,OAAO,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,iCAkDjF,CAAA;AAGD,eAAO,MAAM,sBAAsB,uBAA4C,CAAA"}

package/dist/lib/functions/netlify-function.d.ts.map

@@ -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,CAAc;IAC3C,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"}
+{"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"}