netlify-cli 27.11.2 → 27.12.0

package/dist/utils/proxy.d.ts

@@ -4,7 +4,7 @@ import type { $TSFixMe } from '../commands/types.js';
 import { type NormalizedCachedConfigConfig } from './command-helpers.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, }: {
+export declare const startProxy: ({ accountId, aiGatewayContext, api, blobsContext, command, config, configPath, debug, disableEdgeFunctions, env, functionsRegistry, geoCountry, geolocationMode, getUpdatedConfig, inspectSettings, offline, projectDir, repositoryRoot, settings, siteInfo, state, watchIgnore, deployEnvironment, }: {
     command: BaseCommand;
     config: NormalizedCachedConfigConfig;
     settings: ServerSettings;

package/dist/utils/proxy.js

@@ -15,7 +15,7 @@ import { FileWatcher, fromWebResponse, mockLocation, renderFunctionErrorPage } f
 import { ImageHandler } from '@netlify/images';
 import { ServerHandler } from '@netlify/server-dev';
 import { runBeforeProcessExit } from './shell.js';
-import contentType from 'content-type';
+import { parse as parseContentType } from 'content-type';
 import generateETag from 'etag';
 import getAvailablePort from 'get-port';
 import httpProxy from 'http-proxy';
@@ -99,18 +99,13 @@ function isInternal(url) {
 function isFunction(functionsPort, url) {
     return functionsPort && url.match(DEFAULT_FUNCTION_URL_EXPRESSION);
 }
-function getAddonUrl(addonsUrls, req) {
-    const matches = req.url?.match(/^\/.netlify\/([^/]+)(\/.*)/);
-    const addonUrl = matches && addonsUrls[matches[1]];
-    return addonUrl ? `${addonUrl}${matches[2]}` : null;
-}
 const getStatic = async function (pathname, publicFolder) {
     const alternatives = [pathname, ...alternativePathsFor(pathname)].map((filePath) => path.resolve(publicFolder, filePath.slice(1)));
     const file = await locatePath(alternatives);
     if (file === undefined) {
         return false;
     }
-    return `/${path.relative(publicFolder, file)}`;
+    return `/${path.relative(publicFolder, file).split(path.sep).join('/')}`;
 };
 const isEndpointExists = async function (endpoint, origin) {
     const url = new URL(endpoint, origin);
@@ -137,12 +132,6 @@ const proxyToExternalUrl = function ({ dest, destURL, req, res, }) {
     });
     void handler(req, res, () => { });
 };
-// @ts-expect-error TS(7031) FIXME: Binding element 'addonUrl' implicitly has an 'any'... Remove this comment to see the full error message
-const handleAddonUrl = function ({ addonUrl, req, res }) {
-    const dest = new URL(addonUrl);
-    const destURL = stripOrigin(dest);
-    proxyToExternalUrl({ req, res, dest, destURL });
-};
 const isRedirect = function (match) {
     return 'status' in match && match.status != null && match.status >= 300 && match.status <= 400;
 };
@@ -218,11 +207,6 @@ const serveRedirect = async function ({ env, functionsRegistry, imageProxy, matc
     if (isFunction(options.functionsPort, req.url)) {
         return proxy.web(req, res, { target: options.functionsServer });
     }
-    const urlForAddons = getAddonUrl(options.addonsUrls, req);
-    if (urlForAddons) {
-        handleAddonUrl({ req, res, addonUrl: urlForAddons });
-        return;
-    }
     const originalURL = req.url;
     const reqUrl = reqToURL(req, req.url);
     const isHiddenProxy = match.proxyHeaders &&
@@ -277,7 +261,7 @@ const serveRedirect = async function ({ env, functionsRegistry, imageProxy, matc
             res.end(`Redirecting to ${destURL}`);
             return;
         }
-        const ct = req.headers['content-type'] ? contentType.parse(req).type : '';
+        const ct = parseContentType(req.headers['content-type'] ?? '').type;
         if (req.method === 'POST' &&
             !isInternal(req.url) &&
             !isInternal(destURL) &&
@@ -310,11 +294,6 @@ const serveRedirect = async function ({ env, functionsRegistry, imageProxy, matc
         if (isImageRequest(req)) {
             return imageProxy(req, res);
         }
-        const addonUrl = getAddonUrl(options.addonsUrls, req);
-        if (addonUrl) {
-            handleAddonUrl({ req, res, addonUrl });
-            return;
-        }
         return proxy.web(req, res, { ...options, status: statusValue });
     }
     return proxy.web(req, res, options);
@@ -436,7 +415,7 @@ const initializeProxy = async function ({ config, configPath, distDir, env, host
             // The request has failed but we might still have a matching redirect
             // rule (without `force`) that should kick in. This is how we mimic the
             // file shadowing behavior from the CDN.
-            if (options && options.match) {
+            if (options?.match) {
                 return serveRedirect({
                     // We don't want to match functions at this point because any redirects
                     // to functions will have already been processed, so we don't supply a
@@ -568,7 +547,7 @@ const initializeProxy = async function ({ config, configPath, distDir, env, host
     };
     return handlers;
 };
-const onRequest = async ({ addonsUrls, api, edgeFunctionsProxy, env, functionsRegistry, functionsServer, imageProxy, proxy, rewriter, serverHandler, settings, siteInfo, }, req, res) => {
+const onRequest = async ({ 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)) {
@@ -592,11 +571,6 @@ const onRequest = async ({ addonsUrls, api, edgeFunctionsProxy, env, functionsRe
         }
         return proxy.web(req, res, { headers, target: functionsServer });
     }
-    const addonUrl = getAddonUrl(addonsUrls, req);
-    if (addonUrl) {
-        handleAddonUrl({ req, res, addonUrl });
-        return;
-    }
     if (serverHandler) {
         try {
             const requestURL = reqToURL(req, req.url);
@@ -634,7 +608,6 @@ const onRequest = async ({ addonsUrls, api, edgeFunctionsProxy, env, functionsRe
     const match = await rewriter(req);
     const options = {
         match,
-        addonsUrls,
         target: `http://${settings.frameworkHost && isIPv6(settings.frameworkHost) ? `[${settings.frameworkHost}]` : settings.frameworkHost}:${settings.frameworkPort}`,
         detectTarget: settings.detectFrameworkHost,
         targetHostname: settings.frameworkHost,
@@ -668,7 +641,7 @@ const onRequest = async ({ addonsUrls, api, edgeFunctionsProxy, env, functionsRe
     // @ts-expect-error TS(7031) FIXME: Binding element 'statusCode' implicitly has an 'an... Remove this comment to see the full error message
     req[shouldGenerateETag] = ({ statusCode }) => statusCode >= 200 && statusCode < 300;
     const hasFormSubmissionHandler = functionsRegistry && getFormHandler({ functionsRegistry, logWarning: false });
-    const ct = req.headers['content-type'] ? contentType.parse(req).type : '';
+    const ct = parseContentType(req.headers['content-type'] ?? '').type;
     if (hasFormSubmissionHandler &&
         functionsServer &&
         req.method === 'POST' &&
@@ -683,7 +656,7 @@ export const getProxyUrl = function (settings) {
     const scheme = settings.https ? 'https' : 'http';
     return `${scheme}://localhost:${settings.port}`;
 };
-export const startProxy = async function ({ accountId, addonsUrls, aiGatewayContext, api, blobsContext, command, config, configPath, debug, disableEdgeFunctions, env, functionsRegistry, geoCountry, geolocationMode, getUpdatedConfig, inspectSettings, offline, projectDir, repositoryRoot, settings, siteInfo, state, watchIgnore, deployEnvironment, }) {
+export const startProxy = async function ({ accountId, aiGatewayContext, api, blobsContext, command, config, configPath, debug, disableEdgeFunctions, env, functionsRegistry, geoCountry, geolocationMode, getUpdatedConfig, inspectSettings, offline, projectDir, repositoryRoot, settings, siteInfo, state, watchIgnore, deployEnvironment, }) {
     const secondaryServerPort = settings.https ? await getAvailablePort() : null;
     const functionsServer = settings.functionsPort ? `http://127.0.0.1:${settings.functionsPort}` : null;
     let edgeFunctionsProxy;
@@ -767,7 +740,6 @@ export const startProxy = async function ({ accountId, addonsUrls, aiGatewayCont
         rewriter,
         serverHandler,
         settings,
-        addonsUrls,
         functionsRegistry,
         functionsServer,
         edgeFunctionsProxy,

package/dist/utils/types.d.ts

@@ -196,7 +196,7 @@ export type MinimalAccount = {
     members_count: number;
 };
 type EnvironmentVariableScope = 'builds' | 'functions' | 'runtime' | 'post_processing';
-export type EnvironmentVariableSource = 'account' | 'addons' | 'configFile' | 'general' | 'internal' | 'ui';
+export type EnvironmentVariableSource = 'account' | 'configFile' | 'general' | 'internal' | 'ui';
 export type EnvironmentVariables = Record<string, {
     sources: EnvironmentVariableSource[];
     value: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "netlify-cli",
-  "version": "27.11.2",
+  "version": "27.12.0",
   "description": "Netlify command line tool",
   "keywords": [
     "api",
@@ -63,14 +63,14 @@
     "@netlify/dev": "^5.1.6",
     "@netlify/dev-utils": "^6.0.3",
     "@netlify/edge-bundler": "^16.1.2",
-    "@netlify/edge-functions": "^4.0.0",
+    "@netlify/edge-functions": "^4.0.2",
     "@netlify/edge-functions-bootstrap": "^3.2.0",
     "@netlify/headers-parser": "^10.1.1",
-    "@netlify/images": "^2.0.1",
+    "@netlify/images": "^2.0.3",
     "@netlify/local-functions-proxy": "^2.0.3",
     "@netlify/redirect-matcher": "^0.4.2",
     "@netlify/redirect-parser": "^16.1.1",
-    "@netlify/server-dev": "^0.1.1",
+    "@netlify/server-dev": "^0.1.3",
     "@netlify/zip-it-and-ship-it": "^16.3.0",
     "@opentelemetry/api": "~1.9.0",
     "@pnpm/tabtab": "^0.5.4",
@@ -85,7 +85,7 @@
     "clean-deep": "^3.4.0",
     "commander": "^12.1.0",
     "comment-json": "^5.0.0",
-    "content-type": "^1.0.5",
+    "content-type": "^3.1.1",
     "cookie": "^2.0.0",
     "cron-parser": "^5.0.0",
     "debug": "^4.4.3",
@@ -153,12 +153,11 @@
     "@eslint/compat": "^1.4.1",
     "@eslint/js": "^9.36.0",
     "@netlify/functions": "^6.0.0",
-    "@netlify/types": "^3.0.0",
+    "@netlify/types": "^3.2.0",
     "@sindresorhus/slugify": "^3.0.0",
     "@tsconfig/node22": "22.0.5",
     "@tsconfig/recommended": "^1.0.13",
     "@types/backoff": "^2.5.5",
-    "@types/content-type": "^1.1.9",
     "@types/debug": "^4.1.12",
     "@types/envinfo": "^7.8.4",
     "@types/eslint-config-prettier": "^6.11.3",
@@ -183,7 +182,7 @@
     "@types/write-file-atomic": "^4.0.3",
     "@types/ws": "^8.18.1",
     "@types/yauzl": "^2.10.3",
-    "@vitest/coverage-v8": "^3.2.4",
+    "@vitest/coverage-v8": "^4.1.11",
     "@vitest/eslint-plugin": "1.3.13",
     "c8": "^10.1.3",
     "cheerio": "^1.1.2",
@@ -197,7 +196,7 @@
     "memfs": "^4.56.10",
     "nock": "^14.0.10",
     "npm-run-all2": "^8.0.4",
-    "oxfmt": "0.61.0",
+    "oxfmt": "0.72.0",
     "p-timeout": "^7.0.0",
     "picomatch": "^4.0.4",
     "pkg-pr-new": "^0.0.86",
@@ -211,7 +210,7 @@
     "typescript-eslint": "~8.65.0",
     "typescript-native": "npm:typescript@~7.0.2",
     "verdaccio": "^6.3.2",
-    "vitest": "^3.2.4"
+    "vitest": "^4.1.11"
   },
   "engines": {
     "node": ">=22.13.0"

package/dist/utils/addons/prepare.d.ts

@@ -1,13 +0,0 @@
-export declare const getCurrentAddon: ({ addonName, addons }: {
-    addonName: any;
-    addons: any;
-}) => any;
-export declare const getSiteData: ({ api, siteId }: {
-    api: any;
-    siteId: any;
-}) => Promise<any>;
-export declare const getAddons: ({ api, siteId }: {
-    api: any;
-    siteId: any;
-}) => Promise<any>;
-//# sourceMappingURL=prepare.d.ts.map

package/dist/utils/addons/prepare.js

@@ -1,26 +0,0 @@
-import { logAndThrowError } from '../command-helpers.js';
-// @ts-expect-error TS(7031) FIXME: Binding element 'addonName' implicitly has an 'any... Remove this comment to see the full error message
-export const getCurrentAddon = ({ addonName, addons }) => addons.find((addon) => addon.service_slug === addonName);
-// @ts-expect-error TS(7031) FIXME: Binding element 'api' implicitly has an 'any' type... Remove this comment to see the full error message
-export const getSiteData = async ({ api, siteId }) => {
-    let siteData;
-    try {
-        siteData = await api.getSite({ siteId });
-    }
-    catch (error_) {
-        return logAndThrowError(`Failed getting list of project data: ${error_.message}`);
-    }
-    return siteData;
-};
-// @ts-expect-error TS(7031) FIXME: Binding element 'api' implicitly has an 'any' type... Remove this comment to see the full error message
-export const getAddons = async ({ api, siteId }) => {
-    let addons;
-    try {
-        addons = await api.listServiceInstancesForSite({ siteId });
-    }
-    catch (error_) {
-        return logAndThrowError(`Failed getting list of addons: ${error_.message}`);
-    }
-    return addons;
-};
-//# sourceMappingURL=prepare.js.map