Skip to content

Commit 875287e

Browse files
mrstorkmrstork
authored
Merge branch 'main' into release-please--branches--main--components--plugin-nextjs
2 parents c37524f + 03f7a51 commit 875287e

File tree

7 files changed

+97
-109
lines changed

7 files changed

+97
-109
lines changed

‎package-lock.json‎

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

‎src/run/handlers/cache.cts‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -232,9 +232,8 @@ export class NetlifyCacheHandler implements CacheHandlerForMultipleVersions {
232232
// if we don't get cacheControls, but we still get revalidate, it should mean we are before
233233
// https://github.com/vercel/next.js/pull/76207
234234
try {
235-
const { normalizePagePath } = await import(
236-
'next/dist/shared/lib/page-path/normalize-page-path.js'
237-
)
235+
const { normalizePagePath } =
236+
await import('next/dist/shared/lib/page-path/normalize-page-path.js')
238237

239238
prerenderManifest.routes[key] = {
240239
experimentalPPR: undefined,
@@ -248,9 +247,8 @@ export class NetlifyCacheHandler implements CacheHandlerForMultipleVersions {
248247
// depending on Next.js version - prerender manifest might not be mutable
249248
// https://github.com/vercel/next.js/pull/64313
250249
// if it's not mutable we will try to use SharedRevalidateTimings ( https://github.com/vercel/next.js/pull/64370) instead
251-
const { SharedRevalidateTimings } = await import(
252-
'next/dist/server/lib/incremental-cache/shared-revalidate-timings.js'
253-
)
250+
const { SharedRevalidateTimings } =
251+
await import('next/dist/server/lib/incremental-cache/shared-revalidate-timings.js')
254252
const sharedRevalidateTimings = new SharedRevalidateTimings(prerenderManifest)
255253
sharedRevalidateTimings.set(key, revalidate)
256254
}

‎tests/fixtures/middleware-og/app/og.js‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,18 @@ import { ImageResponse } from 'next/og'
22

33
export default function og() {
44
return new ImageResponse(
5-
(
6-
<div
7-
style={{
8-
width: '100%',
9-
height: '100%',
10-
display: 'flex',
11-
alignItems: 'center',
12-
justifyContent: 'center',
13-
fontSize: 128,
14-
background: 'lavender',
15-
}}
16-
>
17-
Open Graph
18-
</div>
19-
),
5+
<div
6+
style={{
7+
width: '100%',
8+
height: '100%',
9+
display: 'flex',
10+
alignItems: 'center',
11+
justifyContent: 'center',
12+
fontSize: 128,
13+
background: 'lavender',
14+
}}
15+
>
16+
Open Graph
17+
</div>,
2018
)
2119
}

‎tests/fixtures/wasm-src/src/pages/api/og-wrong-runtime.js‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,18 @@ import { ImageResponse } from 'next-og-alias'
33

44
export default function () {
55
return new ImageResponse(
6-
(
7-
<div
8-
style={{
9-
width: '100%',
10-
height: '100%',
11-
display: 'flex',
12-
alignItems: 'center',
13-
justifyContent: 'center',
14-
fontSize: 128,
15-
background: 'lavender',
16-
}}
17-
>
18-
Hello!
19-
</div>
20-
),
6+
<div
7+
style={{
8+
width: '100%',
9+
height: '100%',
10+
display: 'flex',
11+
alignItems: 'center',
12+
justifyContent: 'center',
13+
fontSize: 128,
14+
background: 'lavender',
15+
}}
16+
>
17+
Hello!
18+
</div>,
2119
)
2220
}

‎tests/fixtures/wasm-src/src/pages/api/og.js‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,18 @@ export const config = {
77

88
export default function () {
99
return new ImageResponse(
10-
(
11-
<div
12-
style={{
13-
width: '100%',
14-
height: '100%',
15-
display: 'flex',
16-
alignItems: 'center',
17-
justifyContent: 'center',
18-
fontSize: 128,
19-
background: 'lavender',
20-
}}
21-
>
22-
Hello!
23-
</div>
24-
),
10+
<div
11+
style={{
12+
width: '100%',
13+
height: '100%',
14+
display: 'flex',
15+
alignItems: 'center',
16+
justifyContent: 'center',
17+
fontSize: 128,
18+
background: 'lavender',
19+
}}
20+
>
21+
Hello!
22+
</div>,
2523
)
2624
}

‎tests/fixtures/wasm/pages/api/og-wrong-runtime.js‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,18 @@ import { ImageResponse } from 'next-og-alias'
33

44
export default function () {
55
return new ImageResponse(
6-
(
7-
<div
8-
style={{
9-
width: '100%',
10-
height: '100%',
11-
display: 'flex',
12-
alignItems: 'center',
13-
justifyContent: 'center',
14-
fontSize: 128,
15-
background: 'lavender',
16-
}}
17-
>
18-
Hello!
19-
</div>
20-
),
6+
<div
7+
style={{
8+
width: '100%',
9+
height: '100%',
10+
display: 'flex',
11+
alignItems: 'center',
12+
justifyContent: 'center',
13+
fontSize: 128,
14+
background: 'lavender',
15+
}}
16+
>
17+
Hello!
18+
</div>,
2119
)
2220
}

‎tests/fixtures/wasm/pages/api/og.js‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,18 @@ export const config = {
77

88
export default function () {
99
return new ImageResponse(
10-
(
11-
<div
12-
style={{
13-
width: '100%',
14-
height: '100%',
15-
display: 'flex',
16-
alignItems: 'center',
17-
justifyContent: 'center',
18-
fontSize: 128,
19-
background: 'lavender',
20-
}}
21-
>
22-
Hello!
23-
</div>
24-
),
10+
<div
11+
style={{
12+
width: '100%',
13+
height: '100%',
14+
display: 'flex',
15+
alignItems: 'center',
16+
justifyContent: 'center',
17+
fontSize: 128,
18+
background: 'lavender',
19+
}}
20+
>
21+
Hello!
22+
</div>,
2523
)
2624
}

0 commit comments

Comments
 (0)