netlify-cli 27.6.0 → 27.8.0

package/dist/utils/login-url.js

@@ -2,7 +2,12 @@ import { getDrivingAgent } from './agent-detection.js';
 // By contract these two hold only a non-sensitive agent name[@version]. Every other marker's value is a flag,
 // a session or run id, or a path, none of which may reach a URL.
 const SOURCES_WITH_ANNOUNCED_VALUE = new Set(['NETLIFY_AGENT', 'AI_AGENT']);
+const LOGIN_SOURCES = new Set(['mcp']);
 const sanitizeUtmTerm = (raw) => raw.replace(/[^A-Za-z0-9_.:@-]/g, '').slice(0, 64);
+const getUtmSource = (env) => {
+    const source = env.NETLIFY_LOGIN_SOURCE;
+    return source !== undefined && LOGIN_SOURCES.has(source) ? source : 'cli';
+};
 const getUtmTerm = (source, env) => {
     const value = SOURCES_WITH_ANNOUNCED_VALUE.has(source) ? env[source] : undefined;
     return sanitizeUtmTerm(value ? `${source}:${value}` : source);
@@ -12,7 +17,7 @@ export const buildAuthorizeUrl = (ticketId, env = process.env) => {
     const params = new URLSearchParams({
         response_type: 'ticket',
         ticket: ticketId,
-        utm_source: 'cli',
+        utm_source: getUtmSource(env),
         utm_campaign: 'integrations',
     });
     const agent = getDrivingAgent(env);

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

@@ -4,7 +4,7 @@ import type { $TSFixMe, NetlifyOptions } from '../commands/types.js';
 import type { BlobsContextWithEdgeAccess } from '../lib/blobs/blobs.js';
 import type { FunctionsRegistry } from '../lib/functions/registry.js';
 import { type NormalizedCachedConfigConfig } from './command-helpers.js';
-import type { LocalState } from './types.js';
+import type { LocalState, SiteInfo } from './types.js';
 import type { ServerSettings } from './types.js';
 interface InspectSettings {
     enabled: boolean;
@@ -31,7 +31,7 @@ export declare const startProxyServer: ({ accountId, addonsUrls, aiGatewayContex
     settings: ServerSettings;
     offline: boolean;
     site: $TSFixMe;
-    siteInfo: $TSFixMe;
+    siteInfo: SiteInfo;
     projectDir: string;
     repositoryRoot?: string;
     state: LocalState;

package/dist/utils/proxy.d.ts

@@ -2,7 +2,7 @@ import type { AIGatewayContext } from '@netlify/ai/bootstrap';
 import type { BaseCommand } from '../commands/index.js';
 import type { $TSFixMe } from '../commands/types.js';
 import { type NormalizedCachedConfigConfig } from './command-helpers.js';
-import type { ServerSettings } from './types.js';
+import type { ServerSettings, SiteInfo } from './types.js';
 export declare const getProxyUrl: (settings: Pick<ServerSettings, 'https' | 'port'>) => string;
 export declare const startProxy: ({ accountId, addonsUrls, aiGatewayContext, api, blobsContext, command, config, configPath, debug, disableEdgeFunctions, env, functionsRegistry, geoCountry, geolocationMode, getUpdatedConfig, inspectSettings, offline, projectDir, repositoryRoot, settings, siteInfo, state, watchIgnore, deployEnvironment, }: {
     command: BaseCommand;
@@ -11,6 +11,7 @@ export declare const startProxy: ({ accountId, addonsUrls, aiGatewayContext, api
     disableEdgeFunctions: boolean;
     getUpdatedConfig: () => Promise<NormalizedCachedConfigConfig>;
     aiGatewayContext?: AIGatewayContext | null;
+    siteInfo?: SiteInfo;
     watchIgnore: string[];
     deployEnvironment: {
         key: string;

package/dist/utils/proxy.js

@@ -11,8 +11,10 @@ import process from 'process';
 import url from 'url';
 import util from 'util';
 import zlib from 'zlib';
-import { renderFunctionErrorPage } from '@netlify/dev-utils';
+import { FileWatcher, fromWebResponse, mockLocation, renderFunctionErrorPage } from '@netlify/dev-utils';
 import { ImageHandler } from '@netlify/images';
+import { ServerHandler } from '@netlify/server-dev';
+import { runBeforeProcessExit } from './shell.js';
 import contentType from 'content-type';
 import { parseCookie } from 'cookie';
 import { getProperty } from 'dot-prop';
@@ -607,7 +609,7 @@ const initializeProxy = async function ({ config, configPath, distDir, env, host
     };
     return handlers;
 };
-const onRequest = async ({ addonsUrls, api, edgeFunctionsProxy, env, functionsRegistry, functionsServer, imageProxy, proxy, rewriter, settings, siteInfo, }, req, res) => {
+const onRequest = async ({ addonsUrls, api, edgeFunctionsProxy, env, functionsRegistry, functionsServer, imageProxy, proxy, rewriter, serverHandler, settings, siteInfo, }, req, res) => {
     req.originalBody =
         req.method && ['GET', 'OPTIONS', 'HEAD'].includes(req.method) ? null : await createStreamPromise(req, BYTES_LIMIT);
     if (isImageRequest(req)) {
@@ -636,6 +638,40 @@ const onRequest = async ({ addonsUrls, api, edgeFunctionsProxy, env, functionsRe
         handleAddonUrl({ req, res, addonUrl });
         return;
     }
+    if (serverHandler) {
+        try {
+            const requestURL = reqToURL(req, req.url);
+            const serverMatch = await serverHandler.match(new Request(requestURL));
+            if (serverMatch) {
+                const staticFile = await getStatic(decodeURIComponent(requestURL.pathname), settings.dist ?? '');
+                if (!staticFile) {
+                    const headers = new Headers();
+                    for (let index = 0; index < req.rawHeaders.length; index += 2) {
+                        headers.append(req.rawHeaders[index], req.rawHeaders[index + 1]);
+                    }
+                    const response = await serverMatch.handle(new Request(requestURL, {
+                        body: req.originalBody,
+                        headers,
+                        method: req.method,
+                    }));
+                    await fromWebResponse(response, res);
+                    return;
+                }
+            }
+        }
+        catch (error) {
+            // The response may have failed mid-stream, in which case the head is
+            // out and the only remaining option is dropping the connection.
+            if (res.headersSent) {
+                res.destroy();
+            }
+            else {
+                res.writeHead(500);
+                res.end(error instanceof Error ? error.message : 'Failed to serve request from Netlify Server');
+            }
+            return;
+        }
+    }
     const match = await rewriter(req);
     const options = {
         match,
@@ -725,6 +761,24 @@ export const startProxy = async function ({ accountId, addonsUrls, aiGatewayCont
         logger: { log, warn, error: logError },
         imagesConfig: config.images,
     });
+    const serverEntryEnabled = process.env.EXPERIMENTAL_NETLIFY_SERVER === 'true' || Boolean(siteInfo?.feature_flags?.netlify_build_server_entry);
+    let serverHandler;
+    if (serverEntryEnabled) {
+        const serverFileWatcher = new FileWatcher();
+        serverHandler = new ServerHandler({
+            accountID: siteInfo?.account_id,
+            fileWatcher: serverFileWatcher,
+            geolocation: mockLocation,
+            logger: { log, warn, error: logError },
+            projectRoot: projectDir,
+            siteID: siteInfo?.id,
+        });
+        const handlerToStop = serverHandler;
+        runBeforeProcessExit(async () => {
+            await handlerToStop.stop();
+            await serverFileWatcher.close();
+        });
+    }
     const imageProxy = initializeImageProxy({
         settings,
         imageHandler,
@@ -752,6 +806,7 @@ export const startProxy = async function ({ accountId, addonsUrls, aiGatewayCont
     const onRequestWithOptions = onRequest.bind(undefined, {
         proxy,
         rewriter,
+        serverHandler,
         settings,
         addonsUrls,
         functionsRegistry,
@@ -766,6 +821,20 @@ export const startProxy = async function ({ accountId, addonsUrls, aiGatewayCont
         ? https.createServer({ cert: settings.https.cert, key: settings.https.key }, onRequestWithOptions)
         : http.createServer(onRequestWithOptions);
     const onUpgrade = async function onUpgrade(req, socket, head) {
+        if (serverHandler) {
+            let handled = false;
+            try {
+                handled = await serverHandler.handleUpgrade(req, socket, head);
+            }
+            catch (error) {
+                logError(`Failed to hand over upgrade request to server: ${error instanceof Error ? error.message : String(error)}`);
+                socket.destroy();
+                return;
+            }
+            if (handled) {
+                return;
+            }
+        }
         const match = await rewriter(req);
         if (match && !match.force404 && isExternal(match)) {
             const reqUrl = reqToURL(req, req.url);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "netlify-cli",
-  "version": "27.6.0",
+  "version": "27.8.0",
   "description": "Netlify command line tool",
   "keywords": [
     "api",
@@ -55,11 +55,11 @@
     "@fastify/static": "^10.0.0",
     "@netlify/ai": "^1.0.1",
     "@netlify/api": "^15.1.2",
-    "@netlify/blobs": "^11.0.3",
-    "@netlify/build": "^36.4.8",
+    "@netlify/blobs": "^11.1.0",
+    "@netlify/build": "^37.0.0",
     "@netlify/build-info": "^11.3.0",
     "@netlify/config": "^25.2.5",
-    "@netlify/dev": "^5.0.5",
+    "@netlify/dev": "^5.1.2",
     "@netlify/dev-utils": "^6.0.1",
     "@netlify/edge-bundler": "^16.0.4",
     "@netlify/edge-functions": "^4.0.0",
@@ -68,9 +68,10 @@
     "@netlify/images": "^2.0.1",
     "@netlify/local-functions-proxy": "^2.0.3",
     "@netlify/redirect-parser": "^16.1.1",
-    "@netlify/zip-it-and-ship-it": "^15.5.1",
+    "@netlify/server-dev": "^0.1.1",
+    "@netlify/zip-it-and-ship-it": "^16.0.0",
     "@octokit/rest": "^22.0.0",
-    "@opentelemetry/api": "^1.8.0",
+    "@opentelemetry/api": "~1.9.0",
     "@pnpm/tabtab": "^0.5.4",
     "ansi-escapes": "^7.3.0",
     "ansi-to-html": "^0.7.2",