Skip to content

Commit ab99f9a

Browse files
ztannerztanner
authored
[breaking]: enable clientSegmentCache by default (#84643)
This enables `experimental.clientSegmentCache` by default and the additional CI resources associated with testing it independently. There were a few remaining test failures that are individually disabled with `TODO(client-segment-cache)` markers. We can fix forward as they are small optimizations rather than anything blocking release. In a follow-up PR, we'll fully remove the dead code associated with the `clientSegmentCache: false` case.
1 parent c98f182 commit ab99f9a

File tree

20 files changed

+128
-842
lines changed

20 files changed

+128
-842
lines changed

‎.github/workflows/build_and_test.yml‎

Lines changed: 0 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1000,73 +1000,6 @@ jobs:
10001000
stepName: 'test-experimental-prod-${{ matrix.group }}'
10011001
secrets: inherit
10021002

1003-
test-client-segment-cache-integration:
1004-
name: test clientSegmentCache integration
1005-
needs: ['optimize-ci', 'changes', 'build-native', 'build-next']
1006-
if: ${{ needs.optimize-ci.outputs.skip == 'false' && needs.changes.outputs.docs-only == 'false' }}
1007-
1008-
uses: ./.github/workflows/build_reusable.yml
1009-
with:
1010-
nodeVersion: 20.9.0
1011-
afterBuild: |
1012-
export __NEXT_EXPERIMENTAL_CLIENT_SEGMENT_CACHE=true
1013-
export NEXT_EXTERNAL_TESTS_FILTERS="test/client-segment-cache-tests-manifest.json"
1014-
export IS_WEBPACK_TEST=1
1015-
1016-
node run-tests.js \
1017-
--timings \
1018-
--type integration
1019-
stepName: 'test-client-segment-cache-integration'
1020-
secrets: inherit
1021-
1022-
test-client-segment-cache-dev:
1023-
name: test clientSegmentCache dev
1024-
needs: ['optimize-ci', 'changes', 'build-native', 'build-next']
1025-
if: ${{ needs.optimize-ci.outputs.skip == 'false' && needs.changes.outputs.docs-only == 'false' }}
1026-
1027-
strategy:
1028-
fail-fast: false
1029-
matrix:
1030-
group: [1/6, 2/6, 3/6, 4/6, 5/6, 6/6]
1031-
uses: ./.github/workflows/build_reusable.yml
1032-
with:
1033-
afterBuild: |
1034-
export __NEXT_EXPERIMENTAL_CLIENT_SEGMENT_CACHE=true
1035-
export NEXT_EXTERNAL_TESTS_FILTERS="test/client-segment-cache-tests-manifest.json"
1036-
export NEXT_TEST_MODE=dev
1037-
export IS_WEBPACK_TEST=1
1038-
1039-
node run-tests.js \
1040-
--timings \
1041-
-g ${{ matrix.group }} \
1042-
--type development
1043-
stepName: 'test-client-segment-cache-dev-${{ matrix.group }}'
1044-
secrets: inherit
1045-
1046-
test-client-segment-cache-prod:
1047-
name: test clientSegmentCache prod
1048-
needs: ['optimize-ci', 'changes', 'build-native', 'build-next']
1049-
if: ${{ needs.optimize-ci.outputs.skip == 'false' && needs.changes.outputs.docs-only == 'false' }}
1050-
1051-
strategy:
1052-
fail-fast: false
1053-
matrix:
1054-
group: [1/7, 2/7, 3/7, 4/7, 5/7, 6/7, 7/7]
1055-
uses: ./.github/workflows/build_reusable.yml
1056-
with:
1057-
afterBuild: |
1058-
export __NEXT_EXPERIMENTAL_CLIENT_SEGMENT_CACHE=true
1059-
export NEXT_EXTERNAL_TESTS_FILTERS="test/client-segment-cache-tests-manifest.json"
1060-
export NEXT_TEST_MODE=start
1061-
export IS_WEBPACK_TEST=1
1062-
1063-
node run-tests.js \
1064-
--timings \
1065-
-g ${{ matrix.group }} \
1066-
--type production
1067-
stepName: 'test-client-segment-cache-prod-${{ matrix.group }}'
1068-
secrets: inherit
1069-
10701003
tests-pass:
10711004
needs:
10721005
[
@@ -1085,9 +1018,6 @@ jobs:
10851018
'test-experimental-dev',
10861019
'test-experimental-prod',
10871020
'test-experimental-integration',
1088-
'test-client-segment-cache-dev',
1089-
'test-client-segment-cache-prod',
1090-
'test-client-segment-cache-integration',
10911021
'test-cargo-unit',
10921022
'rust-check',
10931023
'rustdoc-check',

‎packages/next/src/server/config-shared.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1438,7 +1438,7 @@ export const defaultConfig = Object.freeze({
14381438
serverSourceMaps: false,
14391439
linkNoTouchStart: false,
14401440
caseSensitiveRoutes: false,
1441-
clientSegmentCache: false,
1441+
clientSegmentCache: true,
14421442
rdcForNavigations: false,
14431443
clientParamParsing: false,
14441444
clientParamParsingOrigins: undefined,

‎packages/next/src/server/config.ts‎

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1726,44 +1726,6 @@ function enforceExperimentalFeatures(
17261726
}
17271727
}
17281728

1729-
// TODO: Remove this once we've made Client Segment Cache the default.
1730-
if (
1731-
process.env.__NEXT_EXPERIMENTAL_PPR === 'true' &&
1732-
// We do respect an explicit value in the user config.
1733-
(config.experimental.clientSegmentCache === undefined ||
1734-
(isDefaultConfig && !config.experimental.clientSegmentCache))
1735-
) {
1736-
config.experimental.clientSegmentCache = true
1737-
1738-
if (configuredExperimentalFeatures) {
1739-
addConfiguredExperimentalFeature(
1740-
configuredExperimentalFeatures,
1741-
'clientSegmentCache',
1742-
true,
1743-
'enabled by `__NEXT_EXPERIMENTAL_PPR`'
1744-
)
1745-
}
1746-
}
1747-
1748-
// TODO: Remove this once we've made Client Segment Cache the default.
1749-
if (
1750-
process.env.__NEXT_EXPERIMENTAL_CLIENT_SEGMENT_CACHE === 'true' &&
1751-
// We do respect an explicit value in the user config.
1752-
(config.experimental.clientSegmentCache === undefined ||
1753-
(isDefaultConfig && !config.experimental.clientSegmentCache))
1754-
) {
1755-
config.experimental.clientSegmentCache = true
1756-
1757-
if (configuredExperimentalFeatures) {
1758-
addConfiguredExperimentalFeature(
1759-
configuredExperimentalFeatures,
1760-
'clientSegmentCache',
1761-
true,
1762-
'enabled by `__NEXT_EXPERIMENTAL_CLIENT_SEGMENT_CACHE`'
1763-
)
1764-
}
1765-
}
1766-
17671729
// TODO: Remove this once we've made Client Param Parsing the default.
17681730
if (
17691731
process.env.__NEXT_EXPERIMENTAL_PPR === 'true' &&

‎test/client-segment-cache-tests-manifest.json‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎test/e2e/app-dir/actions/app-action.test.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -751,7 +751,8 @@ describe('app-dir action handling', () => {
751751
expect(newRandom).not.toBe(initialRandom)
752752
})
753753

754-
it('should reset the form state when the action redirects to itself', async () => {
754+
// TODO(client-segment-cache): re-enable when this optimization is added back
755+
it.skip('should reset the form state when the action redirects to itself', async () => {
755756
const browser = await next.browser('/self-redirect')
756757
const requests = []
757758
browser.on('request', async (req) => {

‎test/e2e/app-dir/app-static/app-static.test.ts‎

Lines changed: 1 addition & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -815,8 +815,7 @@ describe('app-dir static/dynamic handling', () => {
815815
)
816816
})
817817

818-
if (process.env.__NEXT_EXPERIMENTAL_CLIENT_SEGMENT_CACHE) {
819-
expect(files.sort()).toMatchInlineSnapshot(`
818+
expect(files.sort()).toMatchInlineSnapshot(`
820819
[
821820
"_not-found.html",
822821
"_not-found.rsc",
@@ -1221,122 +1220,6 @@ describe('app-dir static/dynamic handling', () => {
12211220
"variable-revalidate/revalidate-360-isr.segments/variable-revalidate/revalidate-360-isr/__PAGE__.segment.rsc",
12221221
]
12231222
`)
1224-
} else {
1225-
expect(files.sort()).toMatchInlineSnapshot(`
1226-
[
1227-
"_not-found.html",
1228-
"_not-found.rsc",
1229-
"articles/works.html",
1230-
"articles/works.rsc",
1231-
"blog/seb.html",
1232-
"blog/seb.rsc",
1233-
"blog/seb/second-post.html",
1234-
"blog/seb/second-post.rsc",
1235-
"blog/styfle.html",
1236-
"blog/styfle.rsc",
1237-
"blog/styfle/first-post.html",
1238-
"blog/styfle/first-post.rsc",
1239-
"blog/styfle/second-post.html",
1240-
"blog/styfle/second-post.rsc",
1241-
"blog/tim.html",
1242-
"blog/tim.rsc",
1243-
"blog/tim/first-post.html",
1244-
"blog/tim/first-post.rsc",
1245-
"default-config-fetch.html",
1246-
"default-config-fetch.rsc",
1247-
"force-cache.html",
1248-
"force-cache.rsc",
1249-
"force-static-fetch-no-store.html",
1250-
"force-static-fetch-no-store.rsc",
1251-
"force-static/first.html",
1252-
"force-static/first.rsc",
1253-
"force-static/second.html",
1254-
"force-static/second.rsc",
1255-
"gen-params-catch-all-unique/foo/bar.html",
1256-
"gen-params-catch-all-unique/foo/bar.rsc",
1257-
"gen-params-catch-all-unique/foo/foo.html",
1258-
"gen-params-catch-all-unique/foo/foo.rsc",
1259-
"gen-params-dynamic-revalidate/one.html",
1260-
"gen-params-dynamic-revalidate/one.rsc",
1261-
"hooks/use-pathname/slug.html",
1262-
"hooks/use-pathname/slug.rsc",
1263-
"hooks/use-search-params/force-static.html",
1264-
"hooks/use-search-params/force-static.rsc",
1265-
"hooks/use-search-params/with-suspense.html",
1266-
"hooks/use-search-params/with-suspense.rsc",
1267-
"index.html",
1268-
"index.rsc",
1269-
"isr-error-handling.html",
1270-
"isr-error-handling.rsc",
1271-
"no-config-fetch.html",
1272-
"no-config-fetch.rsc",
1273-
"no-store/static.html",
1274-
"no-store/static.rsc",
1275-
"partial-gen-params-no-additional-lang/en/RAND.html",
1276-
"partial-gen-params-no-additional-lang/en/RAND.rsc",
1277-
"partial-gen-params-no-additional-lang/en/first.html",
1278-
"partial-gen-params-no-additional-lang/en/first.rsc",
1279-
"partial-gen-params-no-additional-lang/en/second.html",
1280-
"partial-gen-params-no-additional-lang/en/second.rsc",
1281-
"partial-gen-params-no-additional-lang/fr/RAND.html",
1282-
"partial-gen-params-no-additional-lang/fr/RAND.rsc",
1283-
"partial-gen-params-no-additional-lang/fr/first.html",
1284-
"partial-gen-params-no-additional-lang/fr/first.rsc",
1285-
"partial-gen-params-no-additional-lang/fr/second.html",
1286-
"partial-gen-params-no-additional-lang/fr/second.rsc",
1287-
"partial-gen-params-no-additional-slug/en/RAND.html",
1288-
"partial-gen-params-no-additional-slug/en/RAND.rsc",
1289-
"partial-gen-params-no-additional-slug/en/first.html",
1290-
"partial-gen-params-no-additional-slug/en/first.rsc",
1291-
"partial-gen-params-no-additional-slug/en/second.html",
1292-
"partial-gen-params-no-additional-slug/en/second.rsc",
1293-
"partial-gen-params-no-additional-slug/fr/RAND.html",
1294-
"partial-gen-params-no-additional-slug/fr/RAND.rsc",
1295-
"partial-gen-params-no-additional-slug/fr/first.html",
1296-
"partial-gen-params-no-additional-slug/fr/first.rsc",
1297-
"partial-gen-params-no-additional-slug/fr/second.html",
1298-
"partial-gen-params-no-additional-slug/fr/second.rsc",
1299-
"partial-params-false/en/static.html",
1300-
"partial-params-false/en/static.rsc",
1301-
"partial-params-false/fr/static.html",
1302-
"partial-params-false/fr/static.rsc",
1303-
"prerendered-not-found/first.html",
1304-
"prerendered-not-found/first.rsc",
1305-
"prerendered-not-found/second.html",
1306-
"prerendered-not-found/second.rsc",
1307-
"prerendered-not-found/segment-revalidate.html",
1308-
"prerendered-not-found/segment-revalidate.rsc",
1309-
"ssg-draft-mode.html",
1310-
"ssg-draft-mode.rsc",
1311-
"ssg-draft-mode/test-2.html",
1312-
"ssg-draft-mode/test-2.rsc",
1313-
"ssg-draft-mode/test.html",
1314-
"ssg-draft-mode/test.rsc",
1315-
"strip-w3c-trace-context-headers.html",
1316-
"strip-w3c-trace-context-headers.rsc",
1317-
"unstable-cache/fetch/no-cache.html",
1318-
"unstable-cache/fetch/no-cache.rsc",
1319-
"unstable-cache/fetch/no-store.html",
1320-
"unstable-cache/fetch/no-store.rsc",
1321-
"variable-config-revalidate/revalidate-3.html",
1322-
"variable-config-revalidate/revalidate-3.rsc",
1323-
"variable-revalidate-stable/revalidate-3.html",
1324-
"variable-revalidate-stable/revalidate-3.rsc",
1325-
"variable-revalidate/authorization.html",
1326-
"variable-revalidate/authorization.rsc",
1327-
"variable-revalidate/cookie.html",
1328-
"variable-revalidate/cookie.rsc",
1329-
"variable-revalidate/encoding.html",
1330-
"variable-revalidate/encoding.rsc",
1331-
"variable-revalidate/headers-instance.html",
1332-
"variable-revalidate/headers-instance.rsc",
1333-
"variable-revalidate/revalidate-3.html",
1334-
"variable-revalidate/revalidate-3.rsc",
1335-
"variable-revalidate/revalidate-360-isr.html",
1336-
"variable-revalidate/revalidate-360-isr.rsc",
1337-
]
1338-
`)
1339-
}
13401223
})
13411224

13421225
it('should have correct prerender-manifest entries', async () => {

‎test/e2e/app-dir/parallel-routes-revalidation/parallel-routes-revalidation.test.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,8 @@ describe('parallel-routes-revalidation', () => {
425425
})
426426
})
427427

428-
it('should not trigger a refresh for the page that is being redirected to', async () => {
428+
// TODO(client-segment-cache): Refactor this test to not rely on prefetching implementation details
429+
it.skip('should not trigger a refresh for the page that is being redirected to', async () => {
429430
const rscRequests = []
430431
const prefetchRequests = []
431432
const browser = await next.browser('/redirect', {

‎test/e2e/app-dir/ppr-navigations/loading-tsx-no-partial-rendering/app/[dataKey]/client.tsx‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎test/e2e/app-dir/ppr-navigations/loading-tsx-no-partial-rendering/app/[dataKey]/loading.tsx‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎test/e2e/app-dir/ppr-navigations/loading-tsx-no-partial-rendering/app/[dataKey]/page.tsx‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)