Skip to content

Commit a6bcd5a

Browse files
authored
Release packages (#935)
2 parents fb52441 + 31c9e69 commit a6bcd5a

14 files changed

Lines changed: 49 additions & 43 deletions

File tree

.changeset/slow-beds-grab.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@headstartwp/next": patch
3+
---
4+
5+
Fix bug with preview mode not being handled properly. Fixes #932

package-lock.json

Lines changed: 26 additions & 26 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
@@ -84,4 +84,4 @@
8484
"turbo-windows-arm64": "^2.0.3"
8585
},
8686
"packageManager": "npm@10.5.0"
87-
}
87+
}

packages/next/src/rsc/actions/preview.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import { COOKIE_NAME } from '../handlers/previewRouteHandler';
77
export async function disableDraftMode() {
88
const headersObject = await headers();
99
const currentUrl = headersObject.get('x-headstartwp-current-url') ?? '/';
10-
const { disable } = await draftMode();
11-
await disable();
10+
const draft = await draftMode();
11+
await draft.disable();
1212
const cookiesObject = await cookies();
1313
cookiesObject.delete(COOKIE_NAME);
1414
redirect(currentUrl);

packages/next/src/rsc/data/queries/__tests__/queryPost.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { queryPost } from '../queryPost';
55
import { COOKIE_NAME } from '../../../handlers/previewRouteHandler';
66

77
jest.mock('next/headers', () => ({
8-
draftMode: jest.fn(() => ({ isEnabled: false })),
8+
draftMode: jest.fn(() => ({ isEnabled: false, disable: jest.fn() })),
99
cookies: jest.fn(() => ({
1010
get: jest.fn(),
1111
has: jest.fn(),
@@ -67,7 +67,7 @@ describe('queryPosts', () => {
6767
// set cookies
6868

6969
// @ts-expect-error
70-
nextHeaders.draftMode.mockReturnValueOnce({ isEnabled: true });
70+
nextHeaders.draftMode.mockReturnValueOnce({ isEnabled: true, disable: jest.fn() });
7171

7272
const previewDataPayload = JSON.stringify({
7373
id: DRAFT_POST_ID,
@@ -93,7 +93,8 @@ describe('queryPosts', () => {
9393
});
9494

9595
expect(nextHeaders.draftMode).toHaveBeenCalled();
96-
expect(nextHeaders.draftMode).toHaveReturnedWith({ isEnabled: true });
96+
const draftModeResult = nextHeaders.draftMode.mock.results.at(-1)?.value;
97+
expect(draftModeResult?.isEnabled).toBe(true);
9798
expect(nextHeaders.cookies).toHaveBeenCalled();
9899
expect(nextHeaders.cookies().has).toHaveBeenCalledWith(COOKIE_NAME);
99100
expect(nextHeaders.cookies().get).toHaveReturnedWith({

packages/next/src/rsc/data/queries/queryPost.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ export async function queryPost<
2828
const { config, handleError, ...query } = prepareQuery<P>(nextQuery, _config);
2929

3030
try {
31-
const { isEnabled, disable } = await draftMode();
31+
const draft = await draftMode();
3232
const cookiesObject = await cookies();
3333

34-
if (isEnabled) {
34+
if (draft.isEnabled) {
3535
// the cookie will only exist for the previewed path
3636
if (cookiesObject.has(COOKIE_NAME)) {
3737
const previewData: PreviewData = JSON.parse(
@@ -50,7 +50,7 @@ export async function queryPost<
5050
}
5151
} else {
5252
// if draft mode was enabled but no preview cookie was found, disable draft mode
53-
await disable();
53+
await draft.disable();
5454
}
5555
}
5656

projects/wp-multisite-i18n-nextjs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"@linaria/core": "^6.2.0",
2020
"@linaria/react": "^6.2.1",
2121
"clsx": "^1.1.1",
22-
"next": "^15.5.7",
22+
"next": "^15.5.9",
2323
"nprogress": "^0.2.0",
2424
"prop-types": "^15.7.2",
2525
"react": "^18.2.0",

projects/wp-multisite-nextjs-app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"dependencies": {
1212
"react": "^18",
1313
"react-dom": "^18",
14-
"next": "^15.5.7",
14+
"next": "^15.5.9",
1515
"@headstartwp/core": "^1.6.0",
1616
"@headstartwp/next": "^1.5.1"
1717
},

projects/wp-multisite-nextjs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"@linaria/core": "^6.2.0",
2020
"@linaria/react": "^6.2.1",
2121
"clsx": "^1.1.1",
22-
"next": "^15.5.7",
22+
"next": "^15.5.9",
2323
"nprogress": "^0.2.0",
2424
"prop-types": "^15.7.2",
2525
"react": "^18.2.0",

projects/wp-nextjs-app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"dependencies": {
1717
"react": "^18",
1818
"react-dom": "^18",
19-
"next": "^15.5.7",
19+
"next": "^15.5.9",
2020
"@headstartwp/core": "^1.6.0",
2121
"@headstartwp/next": "^1.5.1",
2222
"@10up/next-redis-cache-provider": "^2.0.0"

0 commit comments

Comments
 (0)