🐛 fix(support next ^13.3): improved handling of next config lookup (fix #88)

Next 13.3/13.4 changed internal code how nextConfig is written. New regex added for finding this
configuration in new syntax. Fixes #88

fix #88

Author: sladg

lib/cli/pack.ts

@@ -2,8 +2,8 @@ import { mkdirSync, rmSync, writeFileSync } from 'fs'
 import { tmpdir } from 'os'
 import path from 'path'
 
-import { nextServerConfigRegex } from '../consts'
-import { findInFile, findPathToNestedFile, validateFolderExists, validatePublicFolderStructure, zipMultipleFoldersOrFiles } from '../utils'
+import { nextServerConfigRegex, nextServerConfigRegex13_3 } from '../consts'
+import { findObjectInFile, findPathToNestedFile, validateFolderExists, validatePublicFolderStructure, zipMultipleFoldersOrFiles } from '../utils'
 
 interface Props {
 	standaloneFolder: string
@@ -90,7 +90,7 @@ export const packHandler = async ({ handlerPath, outputFolder, publicFolder, sta
 
 	const tmpFolder = tmpdir()
 
-	const nextConfig = findInFile(generatedNextServerPath, nextServerConfigRegex)
+	const nextConfig = findObjectInFile(generatedNextServerPath, [nextServerConfigRegex13_3, nextServerConfigRegex])
 	const configPath = path.resolve(tmpFolder, `./config.json_${Math.random()}`)
 	writeFileSync(configPath, nextConfig, 'utf-8')
 

lib/consts.ts

@@ -1,3 +1,4 @@
 export const nextServerConfigRegex = /(?<=conf: )(.*)(?=,)/
+export const nextServerConfigRegex13_3 = /(?<=nextConfig = )(.*)/
 
 export const DEFAULT_REGION = 'eu-central-1'

lib/utils.ts

@@ -3,15 +3,29 @@ import { exec } from 'child_process'
 import { createWriteStream, existsSync, readdirSync, readFileSync } from 'fs'
 import glob, { IOptions as GlobOptions } from 'glob'
 
-export const findInFile = (filePath: string, regex: RegExp): string => {
+export const findObjectInFile = (filePath: string, regexes: RegExp[]): string => {
 	const content = readFileSync(filePath, 'utf-8')
-	const data = content.match(regex)
 
-	if (!data?.[0]) {
-		throw new Error('Unable to match Next server configuration.')
+	const data = regexes.reduce<string | null>((acc, regex) => {
+		if (acc) {
+			return acc
+		}
+
+		return content.match(regex)?.[0] ?? null
+	}, null)
+
+	if (!data) {
+		throw new Error('Unable to match Next server configuration. Report this issue in Github.')
+	}
+
+	try {
+		JSON.parse(data)
+	} catch (err) {
+		console.warn(err)
+		throw new Error('Unable to parse Next server configuration. Report this issue in Github.')
 	}
 
-	return data[0]
+	return data
 }
 
 interface ZipFolderProps {