Commit ca1b7e8

authored

fix: handle case of env not being defined for edge functions (#2936)

* chore: adjust pattern for sites->projects rename * fix: handle case of env not being defined for edge functions

1 parent 8b0cf3d commit ca1b7e8Copy full SHA for ca1b7e8

File tree

-5

lines changed

-5

lines changed

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -132,9 +132,11 @@ const copyHandlerDependencies = async (`
`132`	`132`
`133`	`133`	const outputFile = join(destDir, `server/${name}.js`)
`134`	`134`
`135`		`- // Prepare environment variables for draft-mode (i.e. __NEXT_PREVIEW_MODE_ID, __NEXT_PREVIEW_MODE_SIGNING_KEY, __NEXT_PREVIEW_MODE_ENCRYPTION_KEY)`
`136`		`- for (const [key, value] of Object.entries(env)) {`
`137`		- parts.push(`process.env.${key} = '${value}';`)
	`135`	`+ if (env) {`
	`136`	`+ // Prepare environment variables for draft-mode (i.e. __NEXT_PREVIEW_MODE_ID, __NEXT_PREVIEW_MODE_SIGNING_KEY, __NEXT_PREVIEW_MODE_ENCRYPTION_KEY)`
	`137`	`+ for (const [key, value] of Object.entries(env)) {`
	`138`	+ parts.push(`process.env.${key} = '${value}';`)
	`139`	`+ }`
`138`	`140`	`}`
`139`	`141`
`140`	`142`	`if (wasm?.length) {`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ export class NextDeployInstance extends NextInstance {`
`148`	`148`
`149`	`149`	`try {`
`150`	`150`	`const deployUrlRegex = new RegExp(`
`151`		`- /https:\/\/app\.netlify\.com\/sites\/(?<siteName>[^\/]+)\/deploys\/(?<deployID>[0-9a-f]+)/gm,`
	`151`	`+ /https:\/\/app\.netlify\.com\/(sites\|projects)\/(?<siteName>[^\/]+)\/deploys\/(?<deployID>[0-9a-f]+)/gm,`
`152`	`152`	`).exec(deployRes.stdout)`
`153`	`153`	`const [buildLogsUrl] = deployUrlRegex \|\| []`
`154`	`154`	`const { deployID, siteName } = deployUrlRegex?.groups \|\| {}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,7 @@ async function deploySite(`
`281`	`281`
`282`	`282`	`const { siteName, deployID } =`
`283`	`283`	`new RegExp(`
`284`		`- /app\.netlify\.com\/sites\/(?<siteName>[^\/]+)\/deploys\/(?<deployID>[0-9a-f]+)/gm,`
	`284`	`+ /app\.netlify\.com\/(sites\|projects)\/(?<siteName>[^\/]+)\/deploys\/(?<deployID>[0-9a-f]+)/gm,`
`285`	`285`	`).exec(output)?.groups \|\| {}`
`286`	`286`
`287`	`287`	`if (!deployID) {`

Comments

(0)