Skip to content

Commit df7ba10

Browse files
Merge branch 'main' into mk/cache-bust-import
2 parents c4d7f02 + 279db6e commit df7ba10

File tree

4 files changed

+76
-21
lines changed

4 files changed

+76
-21
lines changed

package-lock.json

Lines changed: 72 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"@babel/preset-env": "^7.15.8",
4747
"@babel/preset-typescript": "^7.16.0",
4848
"@delucis/if-env": "^1.1.2",
49-
"@netlify/build": "^27.15.0",
49+
"@netlify/build": "^27.15.1",
5050
"@netlify/eslint-config-node": "^7.0.0",
5151
"@testing-library/cypress": "^8.0.1",
5252
"@types/fs-extra": "^9.0.13",

packages/runtime/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
},
3131
"devDependencies": {
3232
"@delucis/if-env": "^1.1.2",
33-
"@netlify/build": "^27.15.0",
33+
"@netlify/build": "^27.15.1",
3434
"@types/fs-extra": "^9.0.13",
3535
"@types/jest": "^27.4.1",
3636
"@types/node": "^17.0.25",

packages/runtime/src/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ const plugin: NetlifyPlugin = {
8585

8686
let usingEdge = false
8787

88-
if (Object.keys(middlewareManifest?.functions).length !== 0) {
88+
if (middlewareManifest?.functions && Object.keys(middlewareManifest.functions).length !== 0) {
8989
usingEdge = true
9090
if (process.env.NEXT_DISABLE_NETLIFY_EDGE) {
9191
failBuild(outdent`
@@ -95,7 +95,7 @@ const plugin: NetlifyPlugin = {
9595
}
9696
}
9797

98-
if (Object.keys(middlewareManifest?.middleware).length !== 0) {
98+
if (middlewareManifest?.middleware && Object.keys(middlewareManifest.middleware).length !== 0) {
9999
usingEdge = true
100100
if (process.env.NEXT_DISABLE_NETLIFY_EDGE) {
101101
console.log(

0 commit comments

Comments
 (0)