netlify 27.10.1 → 27.11.0

package/dist/utils/init/utils.js

@@ -1,7 +1,7 @@
 import { writeFile } from 'fs/promises';
 import path from 'path';
 import cleanDeep from 'clean-deep';
-import inquirer from 'inquirer';
+import { confirm, input } from '@inquirer/prompts';
 import { fileExistsAsync } from '../../lib/fs.js';
 import { normalizeBackslash } from '../../lib/path.js';
 import { detectBuildSettings } from '../build-info.js';
@@ -41,30 +41,6 @@ const normalizeSettings = (settings, config, command) => {
         recommendedPlugins,
     };
 };
-const getPromptInputs = ({ defaultBaseDir, defaultBuildCmd, defaultBuildDir, }) => {
-    const inputs = [
-        defaultBaseDir !== '' && {
-            type: 'input',
-            name: 'baseDir',
-            message: 'Base directory `(blank for current dir):',
-            default: defaultBaseDir,
-        },
-        {
-            type: 'input',
-            name: 'buildCmd',
-            message: 'Your build command (hugo build/yarn run build/etc):',
-            filter: (val) => (val === '' ? '# no build command' : val),
-            default: defaultBuildCmd,
-        },
-        {
-            type: 'input',
-            name: 'buildDir',
-            message: 'Directory to deploy (blank for current dir):',
-            default: defaultBuildDir,
-        },
-    ].filter(Boolean);
-    return inputs.filter(Boolean);
-};
 export const getBuildSettings = async ({ command, config, }) => {
     const settings = await detectBuildSettings(command);
     const setting = settings.length > 0 ? settings[0] : {};
@@ -79,11 +55,15 @@ export const getBuildSettings = async ({ command, config, }) => {
         log('For each setting, press Enter to accept the default or provide your own value.');
         log();
     }
-    const { baseDir, buildCmd, buildDir } = await inquirer.prompt(getPromptInputs({
-        defaultBaseDir,
-        defaultBuildCmd,
-        defaultBuildDir,
-    }));
+    const baseDir = defaultBaseDir === ''
+        ? undefined
+        : await input({ message: 'Base directory `(blank for current dir):', default: defaultBaseDir });
+    const buildCmdInput = await input({
+        message: 'Your build command (hugo build/yarn run build/etc):',
+        default: defaultBuildCmd,
+    });
+    const buildCmd = buildCmdInput === '' ? '# no build command' : buildCmdInput;
+    const buildDir = await input({ message: 'Directory to deploy (blank for current dir):', default: defaultBuildDir });
     const pluginsToInstall = recommendedPlugins.map((plugin) => ({ package: plugin }));
     const normalizedBaseDir = baseDir ? normalizeBackslash(baseDir) : undefined;
     return { baseDir: normalizedBaseDir, buildCmd, buildDir, functionsDir: defaultFunctionsDir, pluginsToInstall };
@@ -123,14 +103,10 @@ export const saveNetlifyToml = async ({ baseDir, buildCmd, buildDir, config, con
     if (configPath === undefined && Object.keys(cleanDeep(config)).length !== 0) {
         return;
     }
-    const { makeNetlifyTOML } = await inquirer.prompt([
-        {
-            type: 'confirm',
-            name: 'makeNetlifyTOML',
-            message: 'No netlify.toml detected. Would you like to create one with these build settings?',
-            default: true,
-        },
-    ]);
+    const makeNetlifyTOML = await confirm({
+        message: 'No netlify.toml detected. Would you like to create one with these build settings?',
+        default: true,
+    });
     if (makeNetlifyTOML) {
         try {
             await writeFile(tomlPath, getNetlifyToml({ command: buildCmd, publish: buildDir, functions: functionsDir }), 'utf-8');

package/dist/utils/prompts/confirm-prompt.js

@@ -1,20 +1,9 @@
-import inquirer from 'inquirer';
+import { confirm } from '@inquirer/prompts';
 import { log, exit } from '../command-helpers.js';
 export const confirmPrompt = async (message) => {
-    try {
-        const { confirm } = await inquirer.prompt({
-            type: 'confirm',
-            name: 'confirm',
-            message,
-            default: false,
-        });
-        log();
-        if (!confirm) {
-            exit();
-        }
-    }
-    catch (error) {
-        console.error(error);
+    const confirmed = await confirm({ message, default: false });
+    log();
+    if (!confirmed) {
         exit();
     }
 };

package/dist/utils/proxy.js

@@ -16,13 +16,10 @@ 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';
 import generateETag from 'etag';
 import getAvailablePort from 'get-port';
 import httpProxy from 'http-proxy';
 import { createProxyMiddleware } from 'http-proxy-middleware';
-import { jwtDecode } from 'jwt-decode';
 import { locatePath } from 'locate-path';
 import { throttle } from './object-utilities.js';
 import pFilter from 'p-filter';
@@ -126,7 +123,7 @@ const isEndpointExists = async function (endpoint, origin) {
     }
 };
 const isExternal = function (match) {
-    return 'to' in match && /^https?:\/\//.exec(match.to) != null;
+    return match.type === 'match' && /^https?:\/\//.exec(match.to) != null;
 };
 const stripOrigin = function ({ hash, pathname, search }) {
     return `${pathname}${search}${hash}`;
@@ -193,7 +190,7 @@ const serveRedirect = async function ({ env, functionsRegistry, imageProxy, matc
         return proxy.web(req, res, options);
     options = options || req.proxyOptions || {};
     options.match = null;
-    if (match.force404) {
+    if (match.type === 'forcedNotFound') {
         res.writeHead(404);
         res.end(await render404(options.publicFolder));
         return;
@@ -203,8 +200,9 @@ const serveRedirect = async function ({ env, functionsRegistry, imageProxy, matc
             req.headers[key] = value;
         });
     }
-    if (match.signingSecret) {
-        const signingSecretVar = env[match.signingSecret];
+    const signingSecretName = match.signer?.jwtSecret;
+    if (signingSecretName) {
+        const signingSecretVar = env[signingSecretName];
         if (signingSecretVar) {
             req.headers['x-nf-sign'] = signRedirect({
                 deployContext: 'dev',
@@ -214,7 +212,7 @@ const serveRedirect = async function ({ env, functionsRegistry, imageProxy, matc
             });
         }
         else {
-            log(NETLIFYDEVWARN, `Could not sign redirect because environment variable ${chalk.yellow(match.signingSecret)} is not set`);
+            log(NETLIFYDEVWARN, `Could not sign redirect because environment variable ${chalk.yellow(signingSecretName)} is not set`);
         }
     }
     if (isFunction(options.functionsPort, req.url)) {
@@ -226,44 +224,6 @@ const serveRedirect = async function ({ env, functionsRegistry, imageProxy, matc
         return;
     }
     const originalURL = req.url;
-    if (match.exceptions && match.exceptions.JWT) {
-        // Some values of JWT can start with :, so, make sure to normalize them
-        const expectedRoles = new Set(match.exceptions.JWT.split(',').map((value) => (value.startsWith(':') ? value.slice(1) : value)));
-        const cookieValues = parseCookie(req.headers.cookie || '');
-        const token = cookieValues.nf_jwt;
-        // Serve not found by default
-        req.url = '/.netlify/non-existent-path';
-        if (token) {
-            let jwtValue = {};
-            try {
-                jwtValue = jwtDecode(token) || {};
-            }
-            catch (error) {
-                // @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
-                console.warn(NETLIFYDEVWARN, 'Error while decoding JWT provided in request', error.message);
-                res.writeHead(400);
-                res.end('Invalid JWT provided. Please see logs for more info.');
-                return;
-            }
-            // @ts-expect-error TS(2339) FIXME: Property 'exp' does not exist on type '{}'.
-            if ((jwtValue.exp || 0) < Math.round(Date.now() / MILLISEC_TO_SEC)) {
-                console.warn(NETLIFYDEVWARN, 'Expired JWT provided in request', req.url);
-            }
-            else {
-                const presentedRoles = getProperty(jwtValue, options.jwtRolePath) || [];
-                if (!Array.isArray(presentedRoles)) {
-                    console.warn(NETLIFYDEVWARN, `Invalid roles value provided in JWT ${options.jwtRolePath}`, presentedRoles);
-                    res.writeHead(400);
-                    res.end('Invalid JWT provided. Please see logs for more info.');
-                    return;
-                }
-                // Restore the URL if everything is correct
-                if (presentedRoles.some((pr) => expectedRoles.has(pr))) {
-                    req.url = originalURL;
-                }
-            }
-        }
-    }
     const reqUrl = reqToURL(req, req.url);
     const isHiddenProxy = match.proxyHeaders &&
         Object.entries(match.proxyHeaders).some(([key, val]) => key.toLowerCase() === 'x-nf-hidden-proxy' && val === 'true');
@@ -363,7 +323,6 @@ const serveRedirect = async function ({ env, functionsRegistry, imageProxy, matc
 const reqToURL = function (req, pathname) {
     return new URL(pathname, `${req.protocol || (req.headers.scheme && `${req.headers.scheme}:`) || 'http:'}//${req.headers.host || req.hostname}`);
 };
-const MILLISEC_TO_SEC = 1e3;
 const initializeProxy = async function ({ config, configPath, distDir, env, host, imageProxy, port, projectDir, siteInfo, }) {
     const proxy = httpProxy.createProxyServer({
         selfHandleResponse: true,
@@ -836,7 +795,7 @@ export const startProxy = async function ({ accountId, addonsUrls, aiGatewayCont
             }
         }
         const match = await rewriter(req);
-        if (match && !match.force404 && isExternal(match)) {
+        if (match && isExternal(match)) {
             const reqUrl = reqToURL(req, req.url);
             const dest = new URL(match.to, `${reqUrl.protocol}//${reqUrl.host}`);
             const destURL = stripOrigin(dest);

package/dist/utils/redirects.js

@@ -26,10 +26,11 @@ const handleRedirectParsingErrors = function (errors) {
 const getErrorMessage = function ({ message }) {
     return message;
 };
-// `netlify-redirector` does not handle the same shape as the backend:
-//  - `from` is called `origin`
+// `@netlify/redirect-matcher` reads a different rule shape from the backend's:
 //  - `query` is called `params`
 //  - `conditions.role|country|language` are capitalized
+//  - `signed` becomes `sign.jwt_secret`
+// The matcher reads the source path from `path`; `origin` is ignored.
 const normalizeRedirect = function ({ 
 // @ts-expect-error TS(7031) FIXME: Binding element 'country' implicitly has an 'any' ... Remove this comment to see the full error message
 conditions: { country, language, role, ...conditions }, 

package/dist/utils/rules-proxy.js

@@ -1,10 +1,10 @@
 import path from 'path';
+import { createMatcher } from '@netlify/redirect-matcher';
 import chokidar from 'chokidar';
 import { parseCookie } from 'cookie';
-import redirector from 'netlify-redirector';
 import pFilter from 'p-filter';
 import { fileExistsAsync } from '../lib/fs.js';
-import { NETLIFYDEVLOG } from './command-helpers.js';
+import { NETLIFYDEVERR, NETLIFYDEVLOG, log } from './command-helpers.js';
 import { parseRedirects } from './redirects.js';
 const watchers = [];
 export const onChanges = function (files, listener) {
@@ -37,22 +37,35 @@ export const createRewriter = async function ({ config, configPath, distDir, geo
         const existingRedirectsFiles = await pFilter(watchedRedirectFiles, fileExistsAsync);
         console.log(`${NETLIFYDEVLOG} Reloading redirect rules from`, existingRedirectsFiles.map((redirectFile) => path.relative(projectDir, redirectFile)));
         redirects = await parseRedirects({ config, redirectsFiles, configPath });
+        // Not closed: a request may still hold the previous matcher. The package
+        // frees it once it is garbage-collected.
         matcher = null;
     });
-    const getMatcher = async () => {
-        if (matcher)
-            return matcher;
-        if (redirects.length !== 0) {
-            return (matcher = await redirector.parseJSON(JSON.stringify(redirects), {
-                jwtSecret,
-                jwtRoleClaim,
-            }));
+    const buildMatcher = async () => {
+        // Without rules, skip compiling the matcher's WebAssembly module.
+        if (redirects.length === 0) {
+            return { match: () => null };
         }
-        return {
-            match() {
-                return null;
-            },
-        };
+        const built = await createMatcher(redirects, { jwtSecret, jwtRoleClaim });
+        if (built.parseErrors.length !== 0) {
+            log(NETLIFYDEVERR, `Redirects matcher errors:\n${built.parseErrors.map(({ message }) => message).join('\n\n')}`);
+        }
+        return built;
+    };
+    // The promise is cached, not the matcher, so concurrent requests share one
+    // build and a reload mid-build cannot cache a matcher of the old rules.
+    const getMatcher = () => {
+        if (!matcher) {
+            const build = buildMatcher();
+            matcher = build;
+            // A failed build is retried by the next request, unless a reload has
+            // already replaced it with a newer one.
+            build.catch(() => {
+                if (matcher === build)
+                    matcher = null;
+            });
+        }
+        return matcher;
     };
     return async function rewriter(req) {
         const matcherFunc = await getMatcher();
@@ -63,25 +76,14 @@ export const createRewriter = async function ({ config, configPath, distDir, geo
             'x-country': cookieValues.nf_country || geoCountry || 'us',
             ...req.headers,
         };
-        // Definition: https://github.com/netlify/libredirect/blob/e81bbeeff9f7c260a5fb74cad296ccc67a92325b/node/src/redirects.cpp#L28-L60
-        const matchReq = {
+        return matcherFunc.match({
             scheme: reqUrl.protocol.replace(/:.*$/, ''),
             host: reqUrl.hostname,
             path: decodeURIComponent(reqUrl.pathname),
             query: reqUrl.search.slice(1),
             headers,
-            cookieValues,
-            getHeader: (name) => {
-                const val = headers[name.toLowerCase()];
-                if (Array.isArray(val)) {
-                    return val[0];
-                }
-                return val || '';
-            },
-            getCookie: (key) => cookieValues[key] || '',
-        };
-        const match = matcherFunc.match(matchReq);
-        return match;
+            cookies: cookieValues,
+        });
     };
 };
 //# sourceMappingURL=rules-proxy.js.map

package/dist/utils/types.d.ts

@@ -1,7 +1,7 @@
 import type { Buffer } from 'buffer';
 import type { IncomingMessage } from 'http';
 import type { PollingStrategy } from '@netlify/build-info';
-import type { Match } from 'netlify-redirector';
+import type { MatchResult } from '@netlify/redirect-matcher';
 export type { GlobalConfigStore } from '@netlify/dev-utils';
 export type { LocalState } from '@netlify/dev-utils';
 export type FrameworkNames = '#static' | '#auto' | '#custom' | string;
@@ -63,7 +63,7 @@ export interface Request extends IncomingMessage {
     protocol?: string;
     hostname?: string;
 }
-export type Rewriter = (req: Request) => Promise<Match | null>;
+export type Rewriter = (req: Request) => Promise<MatchResult | null>;
 export interface SiteInfo {
     account_id?: string | undefined;
     account_name: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "netlify",
-  "version": "27.10.1",
+  "version": "27.11.0",
   "description": "Netlify command line tool",
   "keywords": [
     "api",
@@ -52,24 +52,25 @@
   },
   "dependencies": {
     "@fastify/static": "^10.0.0",
+    "@inquirer/prompts": "^8.7.2",
     "@netlify/ai": "^1.0.1",
     "@netlify/api": "^15.1.2",
-    "@netlify/blobs": "^11.1.0",
-    "@netlify/build": "^37.3.1",
+    "@netlify/blobs": "^11.1.3",
+    "@netlify/build": "^37.3.3",
     "@netlify/build-info": "^11.3.0",
-    "@netlify/config": "^25.2.5",
-    "@netlify/dev": "^5.1.2",
-    "@netlify/dev-utils": "^6.0.1",
+    "@netlify/config": "^25.2.6",
+    "@netlify/dev": "^5.1.6",
+    "@netlify/dev-utils": "^6.0.3",
     "@netlify/edge-bundler": "^16.1.1",
     "@netlify/edge-functions": "^4.0.0",
     "@netlify/edge-functions-bootstrap": "^3.2.0",
     "@netlify/headers-parser": "^10.1.1",
     "@netlify/images": "^2.0.1",
     "@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/zip-it-and-ship-it": "^16.2.1",
-    "@octokit/rest": "^22.0.0",
+    "@netlify/zip-it-and-ship-it": "^16.2.3",
     "@opentelemetry/api": "~1.9.0",
     "@pnpm/tabtab": "^0.5.4",
     "ansi-escapes": "^7.3.0",
@@ -88,7 +89,6 @@
     "cron-parser": "^5.0.0",
     "debug": "^4.4.3",
     "decache": "^4.6.2",
-    "dot-prop": "^10.1.0",
     "dotenv": "^17.3.1",
     "env-paths": "^4.0.0",
     "envinfo": "^7.21.0",
@@ -107,8 +107,6 @@
     "http-proxy": "^1.18.1",
     "http-proxy-middleware": "^3.0.5",
     "https-proxy-agent": "^8.0.0",
-    "inquirer": "^8.2.7",
-    "inquirer-autocomplete-prompt": "^1.4.0",
     "is-docker": "^4.0.0",
     "is-stream": "^4.0.1",
     "is-wsl": "^3.1.0",
@@ -123,7 +121,6 @@
     "modern-tar": "^0.8.0",
     "multiparty": "^4.2.3",
     "nanospinner": "^1.2.2",
-    "netlify-redirector": "^0.5.0",
     "node-fetch": "^3.3.2",
     "normalize-package-data": "^7.0.1",
     "open": "^11.0.0",
@@ -168,8 +165,6 @@
     "@types/express": "^5.0.6",
     "@types/folder-walker": "^3.2.5",
     "@types/gitconfiglocal": "^2.0.3",
-    "@types/inquirer": "^9.0.9",
-    "@types/inquirer-autocomplete-prompt": "^3.0.3",
     "@types/jsonwebtoken": "^9.0.10",
     "@types/lodash.shuffle": "^4.2.9",
     "@types/multiparty": "^4.2.1",
@@ -192,6 +187,7 @@
     "c8": "^10.1.3",
     "cheerio": "^1.1.2",
     "dedent": "^1.7.2",
+    "dot-prop": "^10.1.0",
     "eslint": "^9.36.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-n": "^17.23.1",