apply suggestions

packages/next-on-pages/src/buildApplication/processVercelFunctions/edgeFunctions.ts

@@ -93,7 +93,7 @@ async function checkEntrypoint(
 	entrypoint: string,
 ): Promise<
 	| { value: 'invalid' }
-	| { value: 'ignore', reason: string }
+	| { value: 'ignore'; reason: string }
 	| { value: 'valid'; finalEntrypoint: string }
 > {
 	let finalEntrypoint = entrypoint;

packages/next-on-pages/src/buildApplication/processVercelFunctions/invalidFunctions.ts

@@ -1,7 +1,7 @@
 import { gtr as versionGreaterThan, coerce } from 'semver';
 import { cliError, cliWarn } from '../../cli';
 import { getPackageVersion } from '../packageManagerUtils';
-import { stripFuncExtension } from '../../utils';
+import { formatRoutePath, stripFuncExtension } from '../../utils';
 import type { CollectedFunctions, FunctionInfo } from './configs';
 import { join, resolve } from 'path';
 import type { ProcessVercelFunctionsOpts } from '.';
@@ -102,7 +102,7 @@ async function tryToFixI18nFunctions(
 
 		// Matches the format used in certain source route entries in the build output config.
 		// e.g. "src": "/(?<nextLocale>default|en|ja)(/.*|$)"
-		/\(\??<nextLocale>([^)]+)\)/
+		/\(\?<nextLocale>([^)]+)\)/
 			.exec(route.src)?.[1]
 			?.split('|')
 			?.forEach(locale => acc.add(locale));
@@ -127,12 +127,14 @@ async function tryToFixI18nFunctions(
 					.replace(new RegExp(`^/${i18nKey}/`), '/');
 				const fullPathWithoutI18nKey = join(functionsDir, pathWithoutI18nKey);
 
-				if (edgeFunctions.has(fullPathWithoutI18nKey)) {
+				const edgeFn = edgeFunctions.get(fullPathWithoutI18nKey);
+				if (edgeFn) {
 					invalidFunctions.delete(fullPath);
 					ignoredFunctions.set(fullPath, {
 						reason: 'unnecessary invalid i18n function',
 						...fnInfo,
 					});
+					edgeFn.route?.overrides?.push(formatRoutePath(fnInfo.relativePath));
 				}
 			}
 		}

packages/next-on-pages/tests/_helpers/index.ts

@@ -403,9 +403,8 @@ export async function collectFunctionsFrom(
 	});
 
 	await processOutputDir(outputDir, await getVercelStaticAssets());
-	const collectedFunctions = await collectFunctionConfigsRecursively(
-		functionsDir,
-	);
+	const collectedFunctions =
+		await collectFunctionConfigsRecursively(functionsDir);
 
 	return { collectedFunctions, restoreFsMock: () => mockFs.restore() };
 }

packages/next-on-pages/tests/src/buildApplication/processVercelFunctions/invalidFunctions.test.ts

@@ -34,15 +34,21 @@ describe('checkInvalidFunctions', () => {
 		});
 		restoreFsMock();
 
-		const { edgeFunctions, invalidFunctions } = collectedFunctions;
+		const { edgeFunctions, invalidFunctions, ignoredFunctions } =
+			collectedFunctions;
 
 		expect(edgeFunctions.size).toEqual(1);
 		expect(getRouteInfo(edgeFunctions, 'index.func')).toEqual({
 			path: '/index',
-			overrides: ['/'],
+			overrides: ['/', '/en'],
 		});
 
 		expect(invalidFunctions.size).toEqual(0);
+
+		expect(ignoredFunctions.size).toEqual(1);
+		expect(ignoredFunctions.has(resolve(functionsDir, 'en.func'))).toEqual(
+			true,
+		);
 	});
 
 	test('should ignore i18n nested route with valid alternative', async () => {
@@ -63,15 +69,21 @@ describe('checkInvalidFunctions', () => {
 		});
 		restoreFsMock();
 
-		const { edgeFunctions, invalidFunctions } = collectedFunctions;
+		const { edgeFunctions, invalidFunctions, ignoredFunctions } =
+			collectedFunctions;
 
 		expect(edgeFunctions.size).toEqual(1);
 		expect(getRouteInfo(edgeFunctions, 'test/route.func')).toEqual({
 			path: '/test/route',
-			overrides: [],
+			overrides: ['/en/test/route'],
 		});
 
 		expect(invalidFunctions.size).toEqual(0);
+
+		expect(ignoredFunctions.size).toEqual(1);
+		expect(
+			ignoredFunctions.has(resolve(functionsDir, 'en/test/route.func')),
+		).toEqual(true);
 	});
 
 	test('should not ignore i18n with no valid alternative', async () => {
@@ -96,7 +108,8 @@ describe('checkInvalidFunctions', () => {
 		});
 		restoreFsMock();
 
-		const { edgeFunctions, invalidFunctions } = collectedFunctions;
+		const { edgeFunctions, invalidFunctions, ignoredFunctions } =
+			collectedFunctions;
 
 		expect(edgeFunctions.size).toEqual(0);
 
@@ -105,6 +118,8 @@ describe('checkInvalidFunctions', () => {
 			true,
 		);
 
+		expect(ignoredFunctions.size).toEqual(0);
+
 		expect(processExitMock).toHaveBeenCalledWith(1);
 		mockedConsole.expectCalls([
 			/The following routes were not configured to run with the Edge Runtime(?:.|\n)+- \/en/,