feat: support server, cache, root params types #82259
Draft
+1,168
−125
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Warning This pull request is not mergeable via GitHub because a downstack PR is open. Once all requirements are satisfied, merge this PR as a stack on Graphite.
This stack of pull requests is managed by Graphite. Learn more about stacking. |
|
@lubieowoce: right now, file paths and route types include root parameters. So you'd for example use Still need to add tests (and update old ones) but I've tested locally and core functionality is working! |
![vercel[bot]](https://avatars.githubusercontent.com/in/8329?s=60&v=4){kind=small}
Comment on lines
1427
to
1375
| // Find layouts that could be root layouts (have dynamic segments) | ||
| const layoutsWithParams = layoutRoutes | ||
| .map(({ route }) => { | ||
| const foundParams = Array.from( | ||
| route.matchAll(/\[(.*?)\]/g), | ||
| (match) => match[1] | ||
| ) | ||
| return { route, params: foundParams } | ||
| }) | ||
| .filter(({ params }) => params.length > 0) | ||
|
|
||
| // Sort by path depth (ascending) to find the shallowest layout with params | ||
| layoutsWithParams.sort((a, b) => { | ||
| const aDepth = a.route.split('/').length | ||
| const bDepth = b.route.split('/').length | ||
| return aDepth - bDepth | ||
| }) | ||
|
|
||
| // The root layout is the shallowest layout with dynamic segments | ||
| if (layoutsWithParams.length > 0) { | ||
| const rootLayout = layoutsWithParams[0] | ||
| collectedRootParams[rootLayout.route] = rootLayout.params | ||
| } |
There was a problem hiding this comment.
The root layout detection logic has been significantly simplified and may incorrectly identify root layouts, potentially breaking TypeScript definitions for unstable_rootParams().
View Details
Analysis
The refactored root layout detection logic differs substantially from the original implementation in the deleted webpack plugin. The key differences are:
Original logic (deleted plugin):
- Only considered layouts where ALL path segments (except first and last) were dynamic parameters
- Used complex logic with
allSegmentsAreDynamiccheck - Handled multiple root layouts and marked parameters as optional when appropriate
- Used
isSubpathfunction to understand layout relationships
New logic (current code):
- Considers ANY layout with dynamic segments
- Simply chooses the shallowest layout with any dynamic parameters
- Always marks all parameters as
optional: false - No validation of segment structure
This change could lead to incorrect root parameter detection in applications with mixed static and dynamic segments. For example:
- Layouts:
/[tenant]/dashboard/layout.tsx,/[tenant]/[project]/layout.tsx - Old logic: Would choose
/[tenant]/[project]/layout.tsx(all segments dynamic) - New logic: Would choose
/[tenant]/dashboard/layout.tsx(shallower path) - Result: Wrong root params, potentially breaking
unstable_rootParams()types
The original allSegmentsAreDynamic validation appeared to be intentional, ensuring only layouts with fully dynamic paths were considered root layouts.
Recommendation
Restore the allSegmentsAreDynamic validation from the original logic. Add a check to ensure all path segments (excluding first and last) are dynamic parameters before considering a layout as a potential root layout:
const layoutsWithParams = layoutRoutes
.map(({ route }) => {
const foundParams = Array.from(
route.matchAll(/\\[(.*?)\\]/g),
(match) => match[1]
)
// Check if all segments (excluding first and last) are dynamic
const segments = route.split('/').slice(1, -1)
const allSegmentsAreDynamic = segments.every((segment) =>
/^\\[[^[.\\]]+\\]$/.test(segment)
)
return { route, params: foundParams, allSegmentsAreDynamic }
})
.filter(({ params, allSegmentsAreDynamic }) =>
params.length > 0 && allSegmentsAreDynamic
)Additionally, consider restoring the multiple root layout detection logic to properly handle the optional parameter flag.
bgub
changed the title
bgub
force-pushed
the
feat/type-validation-new
branch
from
f584746 to
d12494d
Compare
bgub
force-pushed
the
feat/type-validation-new
branch
from
d12494d to
7ef0cb7
Compare
bgub
force-pushed
the
advanced-typegen
branch
3 times, most recently
from
b3b5d5a to
13fc670
Compare
Failing test suitesCommit: 9c35b1d
Expand output● app type checking - production mode › should type check invalid entry exports Read more about building and testing Next.js in contributing.md.
Expand output● catchall-parallel-routes-group › should work without throwing any errors about invalid pages Read more about building and testing Next.js in contributing.md.
Expand output● app-root-params - generateStaticParams › should correctly generate types Read more about building and testing Next.js in contributing.md.
Expand output● app-root-params - multiple roots › should correctly generate types Read more about building and testing Next.js in contributing.md.
Expand output● app-root-params - simple › should correctly generate types Read more about building and testing Next.js in contributing.md.
Expand output● next-types-plugin private-folder-convention › should have type for root page ● next-types-plugin private-folder-convention › should have type for root layout ● next-types-plugin private-folder-convention › should have type for nested page ● next-types-plugin private-folder-convention › should have type for nested layout Read more about building and testing Next.js in contributing.md.
Expand output● app-dir - sync-params-type-check › should fail build with sync params Read more about building and testing Next.js in contributing.md. |
Comment on lines
+233
to
+442
| export function unstable_rootParams(): Promise<{ ${rootParams | ||
| .map( | ||
| ({ param, optional }) => | ||
| // ensure params with dashes are valid keys | ||
| `${param.includes('-') ? `'${param}'` : param}${optional ? '?' : ''}: string` | ||
| ) | ||
| .join(', ')} }> |
There was a problem hiding this comment.
The generateServerTypesFile function generates invalid TypeScript syntax when called with an empty rootParams array, creating a malformed function signature.
View Details
Analysis
In the generateServerTypesFile function, the template literal directly embeds the result of rootParams.map(...).join(', ') without checking if the array is empty. If rootParams is an empty array, this will produce:
export function unstable_rootParams(): Promise<{ }>This creates an empty object type with extra whitespace, which while technically valid TypeScript, is inconsistent with the pattern used in other generation functions (like generateRouteTypesFile) that explicitly handle empty arrays by falling back to appropriate types like never.
While the current caller writeServerTypesFile protects against this by only calling the function when allRootParams.length > 0, the function itself is fragile and could cause issues if called from elsewhere with an empty array. The function should be defensive and handle the empty case gracefully.
Recommendation
Add a check for empty arrays in the generateServerTypesFile function, similar to the pattern used in generateRouteTypesFile. Modify the function to handle the empty case by either returning an appropriate default or by restructuring the template to handle empty parameter lists properly:
export function generateServerTypesFile(
rootParams: { param: string; optional: boolean }[]
): string {
const paramsString = rootParams.length > 0
? rootParams
.map(
({ param, optional }) =>
`${param.includes('-') ? `'${param}'` : param}${optional ? '?' : ''}: string`
)
.join(', ')
: '';
return `// Type definitions for Next.js server types
declare module 'next/server' {
// ... other exports
export function unstable_rootParams(): Promise<{ ${paramsString} }>
}
`;
}
Stats from current PRDefault Build (Increase detected
|
| vercel/next.js canary | vercel/next.js advanced-typegen | Change | |
|---|---|---|---|
| buildDuration | 22.2s | 19.3s | N/A |
| buildDurationCached | 18.4s | 16.2s | N/A |
| nodeModulesSize | 446 MB | 446 MB | |
| nextStartRea..uration (ms) | 457ms | 478ms | N/A |
Client Bundles (main, webpack)
| vercel/next.js canary | vercel/next.js advanced-typegen | Change | |
|---|---|---|---|
| 234bef07-HASH.js gzip | 54.2 kB | 54.2 kB | N/A |
| 5194.HASH.js gzip | 169 B | 169 B | ✓ |
| 8863-HASH.js gzip | 5.27 kB | 5.27 kB | N/A |
| 9304-HASH.js gzip | 46 kB | 45.3 kB | N/A |
| framework-HASH.js gzip | 57.7 kB | 57.7 kB | N/A |
| main-app-HASH.js gzip | 253 B | 254 B | N/A |
| main-HASH.js gzip | 36.7 kB | 36.5 kB | N/A |
| webpack-HASH.js gzip | 1.71 kB | 1.71 kB | N/A |
| Overall change | 169 B | 169 B | ✓ |
Legacy Client Bundles (polyfills)
| vercel/next.js canary | vercel/next.js advanced-typegen | Change | |
|---|---|---|---|
| polyfills-HASH.js gzip | 39.4 kB | 39.4 kB | ✓ |
| Overall change | 39.4 kB | 39.4 kB | ✓ |
Client Pages
| vercel/next.js canary | vercel/next.js advanced-typegen | Change | |
|---|---|---|---|
| _app-HASH.js gzip | 194 B | 193 B | N/A |
| _error-HASH.js gzip | 182 B | 182 B | ✓ |
| amp-HASH.js gzip | 502 B | 507 B | N/A |
| css-HASH.js gzip | 335 B | 333 B | N/A |
| dynamic-HASH.js gzip | 1.83 kB | 1.83 kB | N/A |
| edge-ssr-HASH.js gzip | 255 B | 255 B | ✓ |
| head-HASH.js gzip | 350 B | 352 B | N/A |
| hooks-HASH.js gzip | 385 B | 383 B | N/A |
| image-HASH.js gzip | 4.65 kB | 4.66 kB | N/A |
| index-HASH.js gzip | 257 B | 259 B | N/A |
| link-HASH.js gzip | 2.52 kB | 2.52 kB | N/A |
| routerDirect..HASH.js gzip | 320 B | 318 B | N/A |
| script-HASH.js gzip | 387 B | 386 B | N/A |
| withRouter-HASH.js gzip | 315 B | 313 B | N/A |
| 1afbb74e6ecf..834.css gzip | 106 B | 106 B | ✓ |
| Overall change | 543 B | 543 B | ✓ |
Client Build Manifests
| vercel/next.js canary | vercel/next.js advanced-typegen | Change | |
|---|---|---|---|
| _buildManifest.js gzip | 753 B | 751 B | N/A |
| Overall change | 0 B | 0 B | ✓ |
Rendered Page Sizes
| vercel/next.js canary | vercel/next.js advanced-typegen | Change | |
|---|---|---|---|
| index.html gzip | 524 B | 523 B | N/A |
| link.html gzip | 537 B | 537 B | ✓ |
| withRouter.html gzip | 519 B | 519 B | ✓ |
| Overall change | 1.06 kB | 1.06 kB | ✓ |
Edge SSR bundle Size
| vercel/next.js canary | vercel/next.js advanced-typegen | Change | |
|---|---|---|---|
| edge-ssr.js gzip | 120 kB | 120 kB | N/A |
| page.js gzip | 224 kB | 223 kB | N/A |
| Overall change | 0 B | 0 B | ✓ |
Middleware size
| vercel/next.js canary | vercel/next.js advanced-typegen | Change | |
|---|---|---|---|
| middleware-b..fest.js gzip | 674 B | 675 B | N/A |
| middleware-r..fest.js gzip | 156 B | 155 B | N/A |
| middleware.js gzip | 32.8 kB | 32.9 kB | N/A |
| edge-runtime..pack.js gzip | 853 B | 853 B | ✓ |
| Overall change | 853 B | 853 B | ✓ |
Next Runtimes
| vercel/next.js canary | vercel/next.js advanced-typegen | Change | |
|---|---|---|---|
| app-page-exp...dev.js gzip | 284 kB | 284 kB | N/A |
| app-page-exp..prod.js gzip | 156 kB | 156 kB | ✓ |
| app-page-tur...dev.js gzip | 284 kB | 284 kB | N/A |
| app-page-tur..prod.js gzip | 156 kB | 156 kB | ✓ |
| app-page-tur...dev.js gzip | 272 kB | 272 kB | ✓ |
| app-page-tur..prod.js gzip | 150 kB | 150 kB | ✓ |
| app-page.run...dev.js gzip | 272 kB | 272 kB | ✓ |
| app-page.run..prod.js gzip | 150 kB | 150 kB | ✓ |
| app-route-ex...dev.js gzip | 69.6 kB | 69.6 kB | ✓ |
| app-route-ex..prod.js gzip | 48.8 kB | 48.8 kB | ✓ |
| app-route-tu...dev.js gzip | 69.6 kB | 69.6 kB | ✓ |
| app-route-tu..prod.js gzip | 48.8 kB | 48.8 kB | ✓ |
| app-route-tu...dev.js gzip | 69 kB | 69 kB | ✓ |
| app-route-tu..prod.js gzip | 48.4 kB | 48.4 kB | ✓ |
| app-route.ru...dev.js gzip | 68.9 kB | 68.9 kB | ✓ |
| app-route.ru..prod.js gzip | 48.4 kB | 48.4 kB | ✓ |
| dist_client_...dev.js gzip | 326 B | 326 B | ✓ |
| dist_client_...dev.js gzip | 328 B | 328 B | ✓ |
| dist_client_...dev.js gzip | 320 B | 320 B | ✓ |
| dist_client_...dev.js gzip | 318 B | 318 B | ✓ |
| pages-api-tu...dev.js gzip | 42.3 kB | 42.3 kB | ✓ |
| pages-api-tu..prod.js gzip | 32.5 kB | 32.5 kB | ✓ |
| pages-api.ru...dev.js gzip | 42.2 kB | 42.2 kB | ✓ |
| pages-api.ru..prod.js gzip | 32.5 kB | 32.5 kB | ✓ |
| pages-turbo....dev.js gzip | 52.3 kB | 52.3 kB | ✓ |
| pages-turbo...prod.js gzip | 39.9 kB | 39.9 kB | ✓ |
| pages.runtim...dev.js gzip | 52.4 kB | 52.4 kB | ✓ |
| pages.runtim..prod.js gzip | 40 kB | 40 kB | ✓ |
| server.runti..prod.js gzip | 59.8 kB | 59.8 kB | ✓ |
| Overall change | 2.02 MB | 2.02 MB | ✓ |
build cache Overall increase ⚠️
| vercel/next.js canary | vercel/next.js advanced-typegen | Change | |
|---|---|---|---|
| 0.pack gzip | 2.9 MB | 2.9 MB | N/A |
| index.pack gzip | 93 kB | 93.6 kB | |
| Overall change | 93 kB | 93.6 kB |
Diff details
Diff for page.js
Diff too large to display
Diff for middleware.js
Diff too large to display
Diff for edge-ssr.js
Diff too large to display
Diff for amp-HASH.js
@@ -1,17 +1,65 @@
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
[5034],
{
- /***/ 4105: /***/ (
+ /***/ 6212: /***/ (
+ __unused_webpack_module,
+ __webpack_exports__,
+ __webpack_require__
+ ) => {
+ "use strict";
+ __webpack_require__.r(__webpack_exports__);
+ /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+ /* harmony export */ config: () => /* binding */ config,
+ /* harmony export */ default: () => /* binding */ Amp,
+ /* harmony export */
+ });
+ /* harmony import */ var next_amp__WEBPACK_IMPORTED_MODULE_0__ =
+ __webpack_require__(7023);
+ /* harmony import */ var next_amp__WEBPACK_IMPORTED_MODULE_0___default =
+ /*#__PURE__*/ __webpack_require__.n(
+ next_amp__WEBPACK_IMPORTED_MODULE_0__
+ );
+
+ const config = {
+ amp: "hybrid",
+ };
+ function Amp(props) {
+ return (0, next_amp__WEBPACK_IMPORTED_MODULE_0__.useAmp)()
+ ? "AMP mode"
+ : "normal mode";
+ }
+
+ /***/
+ },
+
+ /***/ 7023: /***/ (
module,
__unused_webpack_exports,
__webpack_require__
) => {
- module.exports = __webpack_require__(4642);
+ module.exports = __webpack_require__(9926);
+
+ /***/
+ },
+
+ /***/ 8647: /***/ (
+ __unused_webpack_module,
+ __unused_webpack_exports,
+ __webpack_require__
+ ) => {
+ (window.__NEXT_P = window.__NEXT_P || []).push([
+ "/amp",
+ function () {
+ return __webpack_require__(6212);
+ },
+ ]);
+ if (false) {
+ }
/***/
},
- /***/ 4642: /***/ (module, exports, __webpack_require__) => {
+ /***/ 9926: /***/ (module, exports, __webpack_require__) => {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -27,8 +75,8 @@
const _react = /*#__PURE__*/ _interop_require_default._(
__webpack_require__(5977)
);
- const _ampcontextsharedruntime = __webpack_require__(8358);
- const _ampmode = __webpack_require__(242);
+ const _ampcontextsharedruntime = __webpack_require__(5418);
+ const _ampmode = __webpack_require__(3494);
function useAmp() {
// Don't assign the context value to a variable to save bytes
return (0, _ampmode.isInAmpMode)(
@@ -49,61 +97,13 @@
/***/
},
-
- /***/ 5261: /***/ (
- __unused_webpack_module,
- __unused_webpack_exports,
- __webpack_require__
- ) => {
- (window.__NEXT_P = window.__NEXT_P || []).push([
- "/amp",
- function () {
- return __webpack_require__(9550);
- },
- ]);
- if (false) {
- }
-
- /***/
- },
-
- /***/ 9550: /***/ (
- __unused_webpack_module,
- __webpack_exports__,
- __webpack_require__
- ) => {
- "use strict";
- __webpack_require__.r(__webpack_exports__);
- /* harmony export */ __webpack_require__.d(__webpack_exports__, {
- /* harmony export */ config: () => /* binding */ config,
- /* harmony export */ default: () => /* binding */ Amp,
- /* harmony export */
- });
- /* harmony import */ var next_amp__WEBPACK_IMPORTED_MODULE_0__ =
- __webpack_require__(4105);
- /* harmony import */ var next_amp__WEBPACK_IMPORTED_MODULE_0___default =
- /*#__PURE__*/ __webpack_require__.n(
- next_amp__WEBPACK_IMPORTED_MODULE_0__
- );
-
- const config = {
- amp: "hybrid",
- };
- function Amp(props) {
- return (0, next_amp__WEBPACK_IMPORTED_MODULE_0__.useAmp)()
- ? "AMP mode"
- : "normal mode";
- }
-
- /***/
- },
},
/******/ (__webpack_require__) => {
// webpackRuntimeModules
/******/ var __webpack_exec__ = (moduleId) =>
__webpack_require__((__webpack_require__.s = moduleId));
/******/ __webpack_require__.O(0, [636, 6593, 8792], () =>
- __webpack_exec__(5261)
+ __webpack_exec__(8647)
);
/******/ var __webpack_exports__ = __webpack_require__.O();
/******/ _N_E = __webpack_exports__;Diff for css-HASH.js
@@ -1,7 +1,14 @@
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
[9813],
{
- /***/ 5267: /***/ (
+ /***/ 1978: /***/ (module) => {
+ // extracted by mini-css-extract-plugin
+ module.exports = { helloWorld: "css_helloWorld__aUdUq" };
+
+ /***/
+ },
+
+ /***/ 6941: /***/ (
__unused_webpack_module,
__webpack_exports__,
__webpack_require__
@@ -15,7 +22,7 @@
/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ =
__webpack_require__(7765);
/* harmony import */ var _css_module_css__WEBPACK_IMPORTED_MODULE_1__ =
- __webpack_require__(6320);
+ __webpack_require__(1978);
/* harmony import */ var _css_module_css__WEBPACK_IMPORTED_MODULE_1___default =
/*#__PURE__*/ __webpack_require__.n(
_css_module_css__WEBPACK_IMPORTED_MODULE_1__
@@ -35,14 +42,7 @@
/***/
},
- /***/ 6320: /***/ (module) => {
- // extracted by mini-css-extract-plugin
- module.exports = { helloWorld: "css_helloWorld__aUdUq" };
-
- /***/
- },
-
- /***/ 9643: /***/ (
+ /***/ 8685: /***/ (
__unused_webpack_module,
__unused_webpack_exports,
__webpack_require__
@@ -50,7 +50,7 @@
(window.__NEXT_P = window.__NEXT_P || []).push([
"/css",
function () {
- return __webpack_require__(5267);
+ return __webpack_require__(6941);
},
]);
if (false) {
@@ -64,7 +64,7 @@
/******/ var __webpack_exec__ = (moduleId) =>
__webpack_require__((__webpack_require__.s = moduleId));
/******/ __webpack_require__.O(0, [636, 6593, 8792], () =>
- __webpack_exec__(9643)
+ __webpack_exec__(8685)
);
/******/ var __webpack_exports__ = __webpack_require__.O();
/******/ _N_E = __webpack_exports__;Diff for dynamic-HASH.js
@@ -1,17 +1,63 @@
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
[2291],
{
- /***/ 2406: /***/ (
- module,
- __unused_webpack_exports,
+ /***/ 2839: /***/ (
+ __unused_webpack_module,
+ __webpack_exports__,
__webpack_require__
) => {
- module.exports = __webpack_require__(8949);
+ "use strict";
+ __webpack_require__.r(__webpack_exports__);
+ /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+ /* harmony export */ __N_SSP: () => /* binding */ __N_SSP,
+ /* harmony export */ default: () => __WEBPACK_DEFAULT_EXPORT__,
+ /* harmony export */
+ });
+ /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ =
+ __webpack_require__(7765);
+ /* harmony import */ var next_dynamic__WEBPACK_IMPORTED_MODULE_1__ =
+ __webpack_require__(7444);
+ /* harmony import */ var next_dynamic__WEBPACK_IMPORTED_MODULE_1___default =
+ /*#__PURE__*/ __webpack_require__.n(
+ next_dynamic__WEBPACK_IMPORTED_MODULE_1__
+ );
+
+ const DynamicHello = next_dynamic__WEBPACK_IMPORTED_MODULE_1___default()(
+ () =>
+ __webpack_require__
+ .e(/* import() */ 1376)
+ .then(__webpack_require__.bind(__webpack_require__, 1376))
+ .then((mod) => mod.Hello),
+ {
+ loadableGenerated: {
+ webpack: () => [/*require.resolve*/ 1376],
+ },
+ }
+ );
+ const Page = () =>
+ /*#__PURE__*/ (0, react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsxs)(
+ react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.Fragment,
+ {
+ children: [
+ /*#__PURE__*/ (0,
+ react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)("p", {
+ children: "testing next/dynamic size",
+ }),
+ /*#__PURE__*/ (0,
+ react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)(
+ DynamicHello,
+ {}
+ ),
+ ],
+ }
+ );
+ var __N_SSP = true;
+ /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = Page;
/***/
},
- /***/ 4466: /***/ (
+ /***/ 4478: /***/ (
__unused_webpack_module,
exports,
__webpack_require__
@@ -53,7 +99,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
const _react = /*#__PURE__*/ _interop_require_default._(
__webpack_require__(5977)
);
- const _loadablecontextsharedruntime = __webpack_require__(8452);
+ const _loadablecontextsharedruntime = __webpack_require__(5792);
function resolve(obj) {
return obj && obj.default ? obj.default : obj;
}
@@ -288,63 +334,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
/***/
},
- /***/ 4545: /***/ (
- __unused_webpack_module,
- __webpack_exports__,
- __webpack_require__
- ) => {
- "use strict";
- __webpack_require__.r(__webpack_exports__);
- /* harmony export */ __webpack_require__.d(__webpack_exports__, {
- /* harmony export */ __N_SSP: () => /* binding */ __N_SSP,
- /* harmony export */ default: () => __WEBPACK_DEFAULT_EXPORT__,
- /* harmony export */
- });
- /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ =
- __webpack_require__(7765);
- /* harmony import */ var next_dynamic__WEBPACK_IMPORTED_MODULE_1__ =
- __webpack_require__(2406);
- /* harmony import */ var next_dynamic__WEBPACK_IMPORTED_MODULE_1___default =
- /*#__PURE__*/ __webpack_require__.n(
- next_dynamic__WEBPACK_IMPORTED_MODULE_1__
- );
-
- const DynamicHello = next_dynamic__WEBPACK_IMPORTED_MODULE_1___default()(
- () =>
- __webpack_require__
- .e(/* import() */ 5194)
- .then(__webpack_require__.bind(__webpack_require__, 5194))
- .then((mod) => mod.Hello),
- {
- loadableGenerated: {
- webpack: () => [/*require.resolve*/ 5194],
- },
- }
- );
- const Page = () =>
- /*#__PURE__*/ (0, react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsxs)(
- react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.Fragment,
- {
- children: [
- /*#__PURE__*/ (0,
- react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)("p", {
- children: "testing next/dynamic size",
- }),
- /*#__PURE__*/ (0,
- react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)(
- DynamicHello,
- {}
- ),
- ],
- }
- );
- var __N_SSP = true;
- /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = Page;
-
- /***/
- },
-
- /***/ 8452: /***/ (
+ /***/ 5792: /***/ (
__unused_webpack_module,
exports,
__webpack_require__
@@ -371,24 +361,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
/***/
},
- /***/ 8931: /***/ (
- __unused_webpack_module,
- __unused_webpack_exports,
- __webpack_require__
- ) => {
- (window.__NEXT_P = window.__NEXT_P || []).push([
- "/dynamic",
- function () {
- return __webpack_require__(4545);
- },
- ]);
- if (false) {
- }
-
- /***/
- },
-
- /***/ 8949: /***/ (module, exports, __webpack_require__) => {
+ /***/ 6153: /***/ (module, exports, __webpack_require__) => {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -421,7 +394,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
__webpack_require__(5977)
);
const _loadablesharedruntime = /*#__PURE__*/ _interop_require_default._(
- __webpack_require__(4466)
+ __webpack_require__(4478)
);
const isServerSide = "object" === "undefined";
// Normalize loader to return the module as form { default: Component } for `React.lazy`.
@@ -521,13 +494,40 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
/***/
},
+
+ /***/ 7444: /***/ (
+ module,
+ __unused_webpack_exports,
+ __webpack_require__
+ ) => {
+ module.exports = __webpack_require__(6153);
+
+ /***/
+ },
+
+ /***/ 9805: /***/ (
+ __unused_webpack_module,
+ __unused_webpack_exports,
+ __webpack_require__
+ ) => {
+ (window.__NEXT_P = window.__NEXT_P || []).push([
+ "/dynamic",
+ function () {
+ return __webpack_require__(2839);
+ },
+ ]);
+ if (false) {
+ }
+
+ /***/
+ },
},
/******/ (__webpack_require__) => {
// webpackRuntimeModules
/******/ var __webpack_exec__ = (moduleId) =>
__webpack_require__((__webpack_require__.s = moduleId));
/******/ __webpack_require__.O(0, [636, 6593, 8792], () =>
- __webpack_exec__(8931)
+ __webpack_exec__(9805)
);
/******/ var __webpack_exports__ = __webpack_require__.O();
/******/ _N_E = __webpack_exports__;Diff for edge-ssr-HASH.js
@@ -1,24 +1,7 @@
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
[676],
{
- /***/ 4717: /***/ (
- __unused_webpack_module,
- __unused_webpack_exports,
- __webpack_require__
- ) => {
- (window.__NEXT_P = window.__NEXT_P || []).push([
- "/edge-ssr",
- function () {
- return __webpack_require__(7776);
- },
- ]);
- if (false) {
- }
-
- /***/
- },
-
- /***/ 7776: /***/ (
+ /***/ 170: /***/ (
__unused_webpack_module,
__webpack_exports__,
__webpack_require__
@@ -37,13 +20,30 @@
/***/
},
+
+ /***/ 8079: /***/ (
+ __unused_webpack_module,
+ __unused_webpack_exports,
+ __webpack_require__
+ ) => {
+ (window.__NEXT_P = window.__NEXT_P || []).push([
+ "/edge-ssr",
+ function () {
+ return __webpack_require__(170);
+ },
+ ]);
+ if (false) {
+ }
+
+ /***/
+ },
},
/******/ (__webpack_require__) => {
// webpackRuntimeModules
/******/ var __webpack_exec__ = (moduleId) =>
__webpack_require__((__webpack_require__.s = moduleId));
/******/ __webpack_require__.O(0, [636, 6593, 8792], () =>
- __webpack_exec__(4717)
+ __webpack_exec__(8079)
);
/******/ var __webpack_exports__ = __webpack_require__.O();
/******/ _N_E = __webpack_exports__;Diff for head-HASH.js
@@ -1,34 +1,17 @@
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
[5350],
{
- /***/ 943: /***/ (
+ /***/ 1177: /***/ (
module,
__unused_webpack_exports,
__webpack_require__
) => {
- module.exports = __webpack_require__(2554);
+ module.exports = __webpack_require__(8366);
/***/
},
- /***/ 3829: /***/ (
- __unused_webpack_module,
- __unused_webpack_exports,
- __webpack_require__
- ) => {
- (window.__NEXT_P = window.__NEXT_P || []).push([
- "/head",
- function () {
- return __webpack_require__(4662);
- },
- ]);
- if (false) {
- }
-
- /***/
- },
-
- /***/ 4662: /***/ (
+ /***/ 1992: /***/ (
__unused_webpack_module,
__webpack_exports__,
__webpack_require__
@@ -43,7 +26,7 @@
/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ =
__webpack_require__(7765);
/* harmony import */ var next_head__WEBPACK_IMPORTED_MODULE_1__ =
- __webpack_require__(943);
+ __webpack_require__(1177);
/* harmony import */ var next_head__WEBPACK_IMPORTED_MODULE_1___default =
/*#__PURE__*/ __webpack_require__.n(
next_head__WEBPACK_IMPORTED_MODULE_1__
@@ -76,13 +59,30 @@
/***/
},
+
+ /***/ 8751: /***/ (
+ __unused_webpack_module,
+ __unused_webpack_exports,
+ __webpack_require__
+ ) => {
+ (window.__NEXT_P = window.__NEXT_P || []).push([
+ "/head",
+ function () {
+ return __webpack_require__(1992);
+ },
+ ]);
+ if (false) {
+ }
+
+ /***/
+ },
},
/******/ (__webpack_require__) => {
// webpackRuntimeModules
/******/ var __webpack_exec__ = (moduleId) =>
__webpack_require__((__webpack_require__.s = moduleId));
/******/ __webpack_require__.O(0, [636, 6593, 8792], () =>
- __webpack_exec__(3829)
+ __webpack_exec__(8751)
);
/******/ var __webpack_exports__ = __webpack_require__.O();
/******/ _N_E = __webpack_exports__;Diff for hooks-HASH.js
@@ -1,7 +1,24 @@
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
[9804],
{
- /***/ 2452: /***/ (
+ /***/ 2227: /***/ (
+ __unused_webpack_module,
+ __unused_webpack_exports,
+ __webpack_require__
+ ) => {
+ (window.__NEXT_P = window.__NEXT_P || []).push([
+ "/hooks",
+ function () {
+ return __webpack_require__(2770);
+ },
+ ]);
+ if (false) {
+ }
+
+ /***/
+ },
+
+ /***/ 2770: /***/ (
__unused_webpack_module,
__webpack_exports__,
__webpack_require__
@@ -59,30 +76,13 @@
/***/
},
-
- /***/ 6105: /***/ (
- __unused_webpack_module,
- __unused_webpack_exports,
- __webpack_require__
- ) => {
- (window.__NEXT_P = window.__NEXT_P || []).push([
- "/hooks",
- function () {
- return __webpack_require__(2452);
- },
- ]);
- if (false) {
- }
-
- /***/
- },
},
/******/ (__webpack_require__) => {
// webpackRuntimeModules
/******/ var __webpack_exec__ = (moduleId) =>
__webpack_require__((__webpack_require__.s = moduleId));
/******/ __webpack_require__.O(0, [636, 6593, 8792], () =>
- __webpack_exec__(6105)
+ __webpack_exec__(2227)
);
/******/ var __webpack_exports__ = __webpack_require__.O();
/******/ _N_E = __webpack_exports__;Diff for image-HASH.js
Diff too large to display
Diff for link-HASH.js
@@ -1,143 +1,82 @@
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
[4672],
{
- /***/ 1585: /***/ (module, exports, __webpack_require__) => {
+ /***/ 2346: /***/ (__unused_webpack_module, exports) => {
"use strict";
Object.defineProperty(exports, "__esModule", {
value: true,
});
- Object.defineProperty(exports, "useIntersection", {
+ Object.defineProperty(exports, "errorOnce", {
enumerable: true,
get: function () {
- return useIntersection;
+ return errorOnce;
},
});
- const _react = __webpack_require__(5977);
- const _requestidlecallback = __webpack_require__(356);
- const hasIntersectionObserver =
- typeof IntersectionObserver === "function";
- const observers = new Map();
- const idList = [];
- function createObserver(options) {
- const id = {
- root: options.root || null,
- margin: options.rootMargin || "",
- };
- const existing = idList.find(
- (obj) => obj.root === id.root && obj.margin === id.margin
- );
- let instance;
- if (existing) {
- instance = observers.get(existing);
- if (instance) {
- return instance;
- }
- }
- const elements = new Map();
- const observer = new IntersectionObserver((entries) => {
- entries.forEach((entry) => {
- const callback = elements.get(entry.target);
- const isVisible =
- entry.isIntersecting || entry.intersectionRatio > 0;
- if (callback && isVisible) {
- callback(isVisible);
- }
- });
- }, options);
- instance = {
- id,
- observer,
- elements,
- };
- idList.push(id);
- observers.set(id, instance);
- return instance;
- }
- function observe(element, callback, options) {
- const { id, observer, elements } = createObserver(options);
- elements.set(element, callback);
- observer.observe(element);
- return function unobserve() {
- elements.delete(element);
- observer.unobserve(element);
- // Destroy observer when there's nothing left to watch:
- if (elements.size === 0) {
- observer.disconnect();
- observers.delete(id);
- const index = idList.findIndex(
- (obj) => obj.root === id.root && obj.margin === id.margin
- );
- if (index > -1) {
- idList.splice(index, 1);
- }
- }
- };
- }
- function useIntersection(param) {
- let { rootRef, rootMargin, disabled } = param;
- const isDisabled = disabled || !hasIntersectionObserver;
- const [visible, setVisible] = (0, _react.useState)(false);
- const elementRef = (0, _react.useRef)(null);
- const setElement = (0, _react.useCallback)((element) => {
- elementRef.current = element;
- }, []);
- (0, _react.useEffect)(() => {
- if (hasIntersectionObserver) {
- if (isDisabled || visible) return;
- const element = elementRef.current;
- if (element && element.tagName) {
- const unobserve = observe(
- element,
- (isVisible) => isVisible && setVisible(isVisible),
- {
- root: rootRef == null ? void 0 : rootRef.current,
- rootMargin,
- }
- );
- return unobserve;
- }
- } else {
- if (!visible) {
- const idleCallback = (0,
- _requestidlecallback.requestIdleCallback)(() => setVisible(true));
- return () =>
- (0, _requestidlecallback.cancelIdleCallback)(idleCallback);
- }
- }
- // eslint-disable-next-line react-hooks/exhaustive-deps
- }, [isDisabled, rootMargin, rootRef, visible, elementRef.current]);
- const resetVisible = (0, _react.useCallback)(() => {
- setVisible(false);
- }, []);
- return [setElement, visible, resetVisible];
- }
- if (
- (typeof exports.default === "function" ||
- (typeof exports.default === "object" && exports.default !== null)) &&
- typeof exports.default.__esModule === "undefined"
- ) {
- Object.defineProperty(exports.default, "__esModule", {
- value: true,
- });
- Object.assign(exports.default, exports);
- module.exports = exports.default;
- } //# sourceMappingURL=use-intersection.js.map
+ let errorOnce = (_) => {};
+ if (false) {
+ } //# sourceMappingURL=error-once.js.map
/***/
},
- /***/ 2621: /***/ (
+ /***/ 2783: /***/ (
module,
__unused_webpack_exports,
__webpack_require__
) => {
- module.exports = __webpack_require__(5410);
+ module.exports = __webpack_require__(5926);
/***/
},
- /***/ 5410: /***/ (module, exports, __webpack_require__) => {
+ /***/ 4174: /***/ (
+ __unused_webpack_module,
+ __webpack_exports__,
+ __webpack_require__
+ ) => {
+ "use strict";
+ __webpack_require__.r(__webpack_exports__);
+ /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+ /* harmony export */ __N_SSP: () => /* binding */ __N_SSP,
+ /* harmony export */ default: () => __WEBPACK_DEFAULT_EXPORT__,
+ /* harmony export */
+ });
+ /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ =
+ __webpack_require__(7765);
+ /* harmony import */ var next_link__WEBPACK_IMPORTED_MODULE_1__ =
+ __webpack_require__(2783);
+ /* harmony import */ var next_link__WEBPACK_IMPORTED_MODULE_1___default =
+ /*#__PURE__*/ __webpack_require__.n(
+ next_link__WEBPACK_IMPORTED_MODULE_1__
+ );
+
+ function aLink(props) {
+ return /*#__PURE__*/ (0,
+ react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsxs)("div", {
+ children: [
+ /*#__PURE__*/ (0,
+ react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)("h3", {
+ children: "A Link page!",
+ }),
+ /*#__PURE__*/ (0,
+ react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)(
+ next_link__WEBPACK_IMPORTED_MODULE_1___default(),
+ {
+ href: "/",
+ children: "Go to /",
+ }
+ ),
+ ],
+ });
+ }
+ var __N_SSP = true;
+ /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = aLink;
+
+ /***/
+ },
+
+ /***/ 5926: /***/ (module, exports, __webpack_require__) => {
"use strict";
/* __next_internal_client_entry_do_not_use__ cjs */
Object.defineProperty(exports, "__esModule", {
@@ -164,17 +103,17 @@
const _react = /*#__PURE__*/ _interop_require_wildcard._(
__webpack_require__(5977)
);
- const _resolvehref = __webpack_require__(224);
- const _islocalurl = __webpack_require__(7746);
- const _formaturl = __webpack_require__(315);
- const _utils = __webpack_require__(8709);
- const _addlocale = __webpack_require__(6358);
- const _routercontextsharedruntime = __webpack_require__(4095);
- const _useintersection = __webpack_require__(1585);
- const _getdomainlocale = __webpack_require__(8802);
- const _addbasepath = __webpack_require__(6151);
- const _usemergedref = __webpack_require__(9100);
- const _erroronce = __webpack_require__(9574);
+ const _resolvehref = __webpack_require__(6708);
+ const _islocalurl = __webpack_require__(6526);
+ const _formaturl = __webpack_require__(5575);
+ const _utils = __webpack_require__(3497);
+ const _addlocale = __webpack_require__(722);
+ const _routercontextsharedruntime = __webpack_require__(1235);
+ const _useintersection = __webpack_require__(8069);
+ const _getdomainlocale = __webpack_require__(9734);
+ const _addbasepath = __webpack_require__(4419);
+ const _usemergedref = __webpack_require__(6136);
+ const _erroronce = __webpack_require__(2346);
const prefetched = new Set();
function prefetch(router, href, as, options) {
if (false) {
@@ -563,43 +502,7 @@
/***/
},
- /***/ 8802: /***/ (module, exports, __webpack_require__) => {
- "use strict";
-
- Object.defineProperty(exports, "__esModule", {
- value: true,
- });
- Object.defineProperty(exports, "getDomainLocale", {
- enumerable: true,
- get: function () {
- return getDomainLocale;
- },
- });
- const _normalizetrailingslash = __webpack_require__(1652);
- const basePath =
- /* unused pure expression or super */ null && (false || "");
- function getDomainLocale(path, locale, locales, domainLocales) {
- if (false) {
- } else {
- return false;
- }
- }
- if (
- (typeof exports.default === "function" ||
- (typeof exports.default === "object" && exports.default !== null)) &&
- typeof exports.default.__esModule === "undefined"
- ) {
- Object.defineProperty(exports.default, "__esModule", {
- value: true,
- });
- Object.assign(exports.default, exports);
- module.exports = exports.default;
- } //# sourceMappingURL=get-domain-locale.js.map
-
- /***/
- },
-
- /***/ 9100: /***/ (module, exports, __webpack_require__) => {
+ /***/ 6136: /***/ (module, exports, __webpack_require__) => {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -677,26 +580,7 @@
/***/
},
- /***/ 9574: /***/ (__unused_webpack_module, exports) => {
- "use strict";
-
- Object.defineProperty(exports, "__esModule", {
- value: true,
- });
- Object.defineProperty(exports, "errorOnce", {
- enumerable: true,
- get: function () {
- return errorOnce;
- },
- });
- let errorOnce = (_) => {};
- if (false) {
- } //# sourceMappingURL=error-once.js.map
-
- /***/
- },
-
- /***/ 9693: /***/ (
+ /***/ 7047: /***/ (
__unused_webpack_module,
__unused_webpack_exports,
__webpack_require__
@@ -704,7 +588,7 @@
(window.__NEXT_P = window.__NEXT_P || []).push([
"/link",
function () {
- return __webpack_require__(9948);
+ return __webpack_require__(4174);
},
]);
if (false) {
@@ -713,48 +597,164 @@
/***/
},
- /***/ 9948: /***/ (
- __unused_webpack_module,
- __webpack_exports__,
- __webpack_require__
- ) => {
+ /***/ 8069: /***/ (module, exports, __webpack_require__) => {
"use strict";
- __webpack_require__.r(__webpack_exports__);
- /* harmony export */ __webpack_require__.d(__webpack_exports__, {
- /* harmony export */ __N_SSP: () => /* binding */ __N_SSP,
- /* harmony export */ default: () => __WEBPACK_DEFAULT_EXPORT__,
- /* harmony export */
+
+ Object.defineProperty(exports, "__esModule", {
+ value: true,
});
- /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ =
- __webpack_require__(7765);
- /* harmony import */ var next_link__WEBPACK_IMPORTED_MODULE_1__ =
- __webpack_require__(2621);
- /* harmony import */ var next_link__WEBPACK_IMPORTED_MODULE_1___default =
- /*#__PURE__*/ __webpack_require__.n(
- next_link__WEBPACK_IMPORTED_MODULE_1__
+ Object.defineProperty(exports, "useIntersection", {
+ enumerable: true,
+ get: function () {
+ return useIntersection;
+ },
+ });
+ const _react = __webpack_require__(5977);
+ const _requestidlecallback = __webpack_require__(3432);
+ const hasIntersectionObserver =
+ typeof IntersectionObserver === "function";
+ const observers = new Map();
+ const idList = [];
+ function createObserver(options) {
+ const id = {
+ root: options.root || null,
+ margin: options.rootMargin || "",
+ };
+ const existing = idList.find(
+ (obj) => obj.root === id.root && obj.margin === id.margin
);
-
- function aLink(props) {
- return /*#__PURE__*/ (0,
- react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsxs)("div", {
- children: [
- /*#__PURE__*/ (0,
- react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)("h3", {
- children: "A Link page!",
- }),
- /*#__PURE__*/ (0,
- react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)(
- next_link__WEBPACK_IMPORTED_MODULE_1___default(),
- {
- href: "/",
- children: "Go to /",
- }
- ),
- ],
+ let instance;
+ if (existing) {
+ instance = observers.get(existing);
+ if (instance) {
+ return instance;
+ }
+ }
+ const elements = new Map();
+ const observer = new IntersectionObserver((entries) => {
+ entries.forEach((entry) => {
+ const callback = elements.get(entry.target);
+ const isVisible =
+ entry.isIntersecting || entry.intersectionRatio > 0;
+ if (callback && isVisible) {
+ callback(isVisible);
+ }
+ });
+ }, options);
+ instance = {
+ id,
+ observer,
+ elements,
+ };
+ idList.push(id);
+ observers.set(id, instance);
+ return instance;
+ }
+ function observe(element, callback, options) {
+ const { id, observer, elements } = createObserver(options);
+ elements.set(element, callback);
+ observer.observe(element);
+ return function unobserve() {
+ elements.delete(element);
+ observer.unobserve(element);
+ // Destroy observer when there's nothing left to watch:
+ if (elements.size === 0) {
+ observer.disconnect();
+ observers.delete(id);
+ const index = idList.findIndex(
+ (obj) => obj.root === id.root && obj.margin === id.margin
+ );
+ if (index > -1) {
+ idList.splice(index, 1);
+ }
+ }
+ };
+ }
+ function useIntersection(param) {
+ let { rootRef, rootMargin, disabled } = param;
+ const isDisabled = disabled || !hasIntersectionObserver;
+ const [visible, setVisible] = (0, _react.useState)(false);
+ const elementRef = (0, _react.useRef)(null);
+ const setElement = (0, _react.useCallback)((element) => {
+ elementRef.current = element;
+ }, []);
+ (0, _react.useEffect)(() => {
+ if (hasIntersectionObserver) {
+ if (isDisabled || visible) return;
+ const element = elementRef.current;
+ if (element && element.tagName) {
+ const unobserve = observe(
+ element,
+ (isVisible) => isVisible && setVisible(isVisible),
+ {
+ root: rootRef == null ? void 0 : rootRef.current,
+ rootMargin,
+ }
+ );
+ return unobserve;
+ }
+ } else {
+ if (!visible) {
+ const idleCallback = (0,
+ _requestidlecallback.requestIdleCallback)(() => setVisible(true));
+ return () =>
+ (0, _requestidlecallback.cancelIdleCallback)(idleCallback);
+ }
+ }
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [isDisabled, rootMargin, rootRef, visible, elementRef.current]);
+ const resetVisible = (0, _react.useCallback)(() => {
+ setVisible(false);
+ }, []);
+ return [setElement, visible, resetVisible];
+ }
+ if (
+ (typeof exports.default === "function" ||
+ (typeof exports.default === "object" && exports.default !== null)) &&
+ typeof exports.default.__esModule === "undefined"
+ ) {
+ Object.defineProperty(exports.default, "__esModule", {
+ value: true,
});
+ Object.assign(exports.default, exports);
+ module.exports = exports.default;
+ } //# sourceMappingURL=use-intersection.js.map
+
+ /***/
+ },
+
+ /***/ 9734: /***/ (module, exports, __webpack_require__) => {
+ "use strict";
+
+ Object.defineProperty(exports, "__esModule", {
+ value: true,
+ });
+ Object.defineProperty(exports, "getDomainLocale", {
+ enumerable: true,
+ get: function () {
+ return getDomainLocale;
+ },
+ });
+ const _normalizetrailingslash = __webpack_require__(504);
+ const basePath =
+ /* unused pure expression or super */ null && (false || "");
+ function getDomainLocale(path, locale, locales, domainLocales) {
+ if (false) {
+ } else {
+ return false;
+ }
}
- var __N_SSP = true;
- /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = aLink;
+ if (
+ (typeof exports.default === "function" ||
+ (typeof exports.default === "object" && exports.default !== null)) &&
+ typeof exports.default.__esModule === "undefined"
+ ) {
+ Object.defineProperty(exports.default, "__esModule", {
+ value: true,
+ });
+ Object.assign(exports.default, exports);
+ module.exports = exports.default;
+ } //# sourceMappingURL=get-domain-locale.js.map
/***/
},
@@ -764,7 +764,7 @@
/******/ var __webpack_exec__ = (moduleId) =>
__webpack_require__((__webpack_require__.s = moduleId));
/******/ __webpack_require__.O(0, [636, 6593, 8792], () =>
- __webpack_exec__(9693)
+ __webpack_exec__(7047)
);
/******/ var __webpack_exports__ = __webpack_require__.O();
/******/ _N_E = __webpack_exports__;Diff for script-HASH.js
@@ -1,7 +1,34 @@
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
[1209],
{
- /***/ 3699: /***/ (
+ /***/ 1008: /***/ (
+ module,
+ __unused_webpack_exports,
+ __webpack_require__
+ ) => {
+ module.exports = __webpack_require__(2817);
+
+ /***/
+ },
+
+ /***/ 6951: /***/ (
+ __unused_webpack_module,
+ __unused_webpack_exports,
+ __webpack_require__
+ ) => {
+ (window.__NEXT_P = window.__NEXT_P || []).push([
+ "/script",
+ function () {
+ return __webpack_require__(8889);
+ },
+ ]);
+ if (false) {
+ }
+
+ /***/
+ },
+
+ /***/ 8889: /***/ (
__unused_webpack_module,
__webpack_exports__,
__webpack_require__
@@ -16,7 +43,7 @@
/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ =
__webpack_require__(7765);
/* harmony import */ var next_script__WEBPACK_IMPORTED_MODULE_1__ =
- __webpack_require__(4802);
+ __webpack_require__(1008);
/* harmony import */ var next_script__WEBPACK_IMPORTED_MODULE_1___default =
/*#__PURE__*/ __webpack_require__.n(
next_script__WEBPACK_IMPORTED_MODULE_1__
@@ -48,40 +75,13 @@
/***/
},
-
- /***/ 4802: /***/ (
- module,
- __unused_webpack_exports,
- __webpack_require__
- ) => {
- module.exports = __webpack_require__(8661);
-
- /***/
- },
-
- /***/ 7861: /***/ (
- __unused_webpack_module,
- __unused_webpack_exports,
- __webpack_require__
- ) => {
- (window.__NEXT_P = window.__NEXT_P || []).push([
- "/script",
- function () {
- return __webpack_require__(3699);
- },
- ]);
- if (false) {
- }
-
- /***/
- },
},
/******/ (__webpack_require__) => {
// webpackRuntimeModules
/******/ var __webpack_exec__ = (moduleId) =>
__webpack_require__((__webpack_require__.s = moduleId));
/******/ __webpack_require__.O(0, [636, 6593, 8792], () =>
- __webpack_exec__(7861)
+ __webpack_exec__(6951)
);
/******/ var __webpack_exports__ = __webpack_require__.O();
/******/ _N_E = __webpack_exports__;Diff for 8863-HASH.js
@@ -1,8 +1,33 @@
"use strict";
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
- [8863],
+ [7009],
{
- /***/ 22: /***/ (module, exports, __webpack_require__) => {
+ /***/ 414: /***/ (
+ __unused_webpack_module,
+ exports,
+ __webpack_require__
+ ) => {
+ Object.defineProperty(exports, "__esModule", {
+ value: true,
+ });
+ Object.defineProperty(exports, "AmpStateContext", {
+ enumerable: true,
+ get: function () {
+ return AmpStateContext;
+ },
+ });
+ const _interop_require_default = __webpack_require__(2726);
+ const _react = /*#__PURE__*/ _interop_require_default._(
+ __webpack_require__(2224)
+ );
+ const AmpStateContext = _react.default.createContext({});
+ if (false) {
+ } //# sourceMappingURL=amp-context.shared-runtime.js.map
+
+ /***/
+ },
+
+ /***/ 1912: /***/ (module, exports, __webpack_require__) => {
Object.defineProperty(exports, "__esModule", {
value: true,
});
@@ -12,7 +37,7 @@
return useMergedRef;
},
});
- const _react = __webpack_require__(2786);
+ const _react = __webpack_require__(2224);
function useMergedRef(refA, refB) {
const cleanupA = (0, _react.useRef)(null);
const cleanupB = (0, _react.useRef)(null);
@@ -78,56 +103,99 @@
/***/
},
- /***/ 936: /***/ (__unused_webpack_module, exports) => {
+ /***/ 2843: /***/ (
+ __unused_webpack_module,
+ exports,
+ __webpack_require__
+ ) => {
Object.defineProperty(exports, "__esModule", {
value: true,
});
- 0 && 0;
- function _export(target, all) {
- for (var name in all)
- Object.defineProperty(target, name, {
- enumerable: true,
- get: all[name],
- });
- }
- _export(exports, {
- VALID_LOADERS: function () {
- return VALID_LOADERS;
+ Object.defineProperty(exports, "RouterContext", {
+ enumerable: true,
+ get: function () {
+ return RouterContext;
},
- imageConfigDefault: function () {
- return imageConfigDefault;
+ });
+ const _interop_require_default = __webpack_require__(2726);
+ const _react = /*#__PURE__*/ _interop_require_default._(
+ __webpack_require__(2224)
+ );
+ const RouterContext = _react.default.createContext(null);
+ if (false) {
+ } //# sourceMappingURL=router-context.shared-runtime.js.map
+
+ /***/
+ },
+
+ /***/ 3003: /***/ (__unused_webpack_module, exports) => {
+ Object.defineProperty(exports, "__esModule", {
+ value: true,
+ });
+ Object.defineProperty(exports, "default", {
+ enumerable: true,
+ get: function () {
+ return _default;
},
});
- const VALID_LOADERS = [
- "default",
- "imgix",
- "cloudinary",
- "akamai",
- "custom",
- ];
- const imageConfigDefault = {
- deviceSizes: [640, 750, 828, 1080, 1200, 1920, 2048, 3840],
- imageSizes: [16, 32, 48, 64, 96, 128, 256, 384],
- path: "/_next/image",
- loader: "default",
- loaderFile: "",
- domains: [],
- disableStaticImages: false,
- minimumCacheTTL: 60,
- formats: ["image/webp"],
- dangerouslyAllowSVG: false,
- contentSecurityPolicy: "script-src 'none'; frame-src 'none'; sandbox;",
- contentDispositionType: "attachment",
- localPatterns: undefined,
- remotePatterns: [],
- qualities: undefined,
- unoptimized: false,
- }; //# sourceMappingURL=image-config.js.map
+ const DEFAULT_Q = 75;
+ function defaultLoader(param) {
+ let { config, src, width, quality } = param;
+ var _config_qualities;
+ if (false) {
+ }
+ const q =
+ quality ||
+ ((_config_qualities = config.qualities) == null
+ ? void 0
+ : _config_qualities.reduce((prev, cur) =>
+ Math.abs(cur - DEFAULT_Q) < Math.abs(prev - DEFAULT_Q)
+ ? cur
+ : prev
+ )) ||
+ DEFAULT_Q;
+ return (
+ config.path +
+ "?url=" +
+ encodeURIComponent(src) +
+ "&w=" +
+ width +
+ "&q=" +
+ q +
+ (src.startsWith("/_next/static/media/") && false ? 0 : "")
+ );
+ }
+ // We use this to determine if the import is the default loader
+ // or a custom loader defined by the user in next.config.js
+ defaultLoader.__next_img_default = true;
+ const _default = defaultLoader; //# sourceMappingURL=image-loader.js.map
/***/
},
- /***/ 1268: /***/ (__unused_webpack_module, exports) => {
+ /***/ 3810: /***/ (__unused_webpack_module, exports) => {
+ Object.defineProperty(exports, "__esModule", {
+ value: true,
+ });
+ Object.defineProperty(exports, "isInAmpMode", {
+ enumerable: true,
+ get: function () {
+ return isInAmpMode;
+ },
+ });
+ function isInAmpMode(param) {
+ let {
+ ampFirst = false,
+ hybrid = false,
+ hasQuery = false,
+ } = param === void 0 ? {} : param;
+ return ampFirst || (hybrid && hasQuery);
+ } //# sourceMappingURL=amp-mode.js.map
+
+ /***/
+ },
+
+ /***/ 5218: /***/ (__unused_webpack_module, exports) => {
/**
* A shared function, used on both client and server, to generate a SVG blur placeholder.
*/
@@ -181,7 +249,7 @@
/***/
},
- /***/ 1796: /***/ (module, exports, __webpack_require__) => {
+ /***/ 5402: /***/ (module, exports, __webpack_require__) => {
/* __next_internal_client_entry_do_not_use__ cjs */
Object.defineProperty(exports, "__esModule", {
value: true,
@@ -202,19 +270,19 @@
return defaultHead;
},
});
- const _interop_require_default = __webpack_require__(8182);
- const _interop_require_wildcard = __webpack_require__(8319);
- const _jsxruntime = __webpack_require__(1050);
+ const _interop_require_default = __webpack_require__(2726);
+ const _interop_require_wildcard = __webpack_require__(2527);
+ const _jsxruntime = __webpack_require__(8204);
const _react = /*#__PURE__*/ _interop_require_wildcard._(
- __webpack_require__(2786)
+ __webpack_require__(2224)
);
const _sideeffect = /*#__PURE__*/ _interop_require_default._(
- __webpack_require__(5581)
+ __webpack_require__(9319)
);
- const _ampcontextsharedruntime = __webpack_require__(3800);
- const _headmanagercontextsharedruntime = __webpack_require__(4950);
- const _ampmode = __webpack_require__(7824);
- const _warnonce = __webpack_require__(2854);
+ const _ampcontextsharedruntime = __webpack_require__(414);
+ const _headmanagercontextsharedruntime = __webpack_require__(3100);
+ const _ampmode = __webpack_require__(3810);
+ const _warnonce = __webpack_require__(4504);
function defaultHead(inAmpMode) {
if (inAmpMode === void 0) inAmpMode = false;
const head = [
@@ -379,7 +447,7 @@
/***/
},
- /***/ 2843: /***/ (
+ /***/ 6745: /***/ (
__unused_webpack_module,
exports,
__webpack_require__
@@ -393,9 +461,9 @@
return getImgProps;
},
});
- const _warnonce = __webpack_require__(2854);
- const _imageblursvg = __webpack_require__(1268);
- const _imageconfig = __webpack_require__(936);
+ const _warnonce = __webpack_require__(4504);
+ const _imageblursvg = __webpack_require__(5218);
+ const _imageconfig = __webpack_require__(9278);
const VALID_LOADING_VALUES =
/* unused pure expression or super */ null && [
"lazy",
@@ -822,245 +890,7 @@
/***/
},
- /***/ 3800: /***/ (
- __unused_webpack_module,
- exports,
- __webpack_require__
- ) => {
- Object.defineProperty(exports, "__esModule", {
- value: true,
- });
- Object.defineProperty(exports, "AmpStateContext", {
- enumerable: true,
- get: function () {
- return AmpStateContext;
- },
- });
- const _interop_require_default = __webpack_require__(8182);
- const _react = /*#__PURE__*/ _interop_require_default._(
- __webpack_require__(2786)
- );
- const AmpStateContext = _react.default.createContext({});
- if (false) {
- } //# sourceMappingURL=amp-context.shared-runtime.js.map
-
- /***/
- },
-
- /***/ 5581: /***/ (
- __unused_webpack_module,
- exports,
- __webpack_require__
- ) => {
- Object.defineProperty(exports, "__esModule", {
- value: true,
- });
- Object.defineProperty(exports, "default", {
- enumerable: true,
- get: function () {
- return SideEffect;
- },
- });
- const _react = __webpack_require__(2786);
- const isServer = "object" === "undefined";
- const useClientOnlyLayoutEffect = isServer
- ? () => {}
- : _react.useLayoutEffect;
- const useClientOnlyEffect = isServer ? () => {} : _react.useEffect;
- function SideEffect(props) {
- const { headManager, reduceComponentsToState } = props;
- function emitChange() {
- if (headManager && headManager.mountedInstances) {
- const headElements = _react.Children.toArray(
- Array.from(headManager.mountedInstances).filter(Boolean)
- );
- headManager.updateHead(
- reduceComponentsToState(headElements, props)
- );
- }
- }
- if (isServer) {
- var _headManager_mountedInstances;
- headManager == null
- ? void 0
- : (_headManager_mountedInstances = headManager.mountedInstances) ==
- null
- ? void 0
- : _headManager_mountedInstances.add(props.children);
- emitChange();
- }
- useClientOnlyLayoutEffect(() => {
- var _headManager_mountedInstances;
- headManager == null
- ? void 0
- : (_headManager_mountedInstances = headManager.mountedInstances) ==
- null
- ? void 0
- : _headManager_mountedInstances.add(props.children);
- return () => {
- var _headManager_mountedInstances;
- headManager == null
- ? void 0
- : (_headManager_mountedInstances =
- headManager.mountedInstances) == null
- ? void 0
- : _headManager_mountedInstances.delete(props.children);
- };
- });
- // We need to call `updateHead` method whenever the `SideEffect` is trigger in all
- // life-cycles: mount, update, unmount. However, if there are multiple `SideEffect`s
- // being rendered, we only trigger the method from the last one.
- // This is ensured by keeping the last unflushed `updateHead` in the `_pendingUpdate`
- // singleton in the layout effect pass, and actually trigger it in the effect pass.
- useClientOnlyLayoutEffect(() => {
- if (headManager) {
- headManager._pendingUpdate = emitChange;
- }
- return () => {
- if (headManager) {
- headManager._pendingUpdate = emitChange;
- }
- };
- });
- useClientOnlyEffect(() => {
- if (headManager && headManager._pendingUpdate) {
- headManager._pendingUpdate();
- headManager._pendingUpdate = null;
- }
- return () => {
- if (headManager && headManager._pendingUpdate) {
- headManager._pendingUpdate();
- headManager._pendingUpdate = null;
- }
- };
- });
- return null;
- } //# sourceMappingURL=side-effect.js.map
-
- /***/
- },
-
- /***/ 7053: /***/ (
- __unused_webpack_module,
- exports,
- __webpack_require__
- ) => {
- Object.defineProperty(exports, "__esModule", {
- value: true,
- });
- Object.defineProperty(exports, "RouterContext", {
- enumerable: true,
- get: function () {
- return RouterContext;
- },
- });
- const _interop_require_default = __webpack_require__(8182);
- const _react = /*#__PURE__*/ _interop_require_default._(
- __webpack_require__(2786)
- );
- const RouterContext = _react.default.createContext(null);
- if (false) {
- } //# sourceMappingURL=router-context.shared-runtime.js.map
-
- /***/
- },
-
- /***/ 7281: /***/ (__unused_webpack_module, exports) => {
- Object.defineProperty(exports, "__esModule", {
- value: true,
- });
- Object.defineProperty(exports, "default", {
- enumerable: true,
- get: function () {
- return _default;
- },
- });
- const DEFAULT_Q = 75;
- function defaultLoader(param) {
- let { config, src, width, quality } = param;
- var _config_qualities;
- if (false) {
- }
- const q =
- quality ||
- ((_config_qualities = config.qualities) == null
- ? void 0
- : _config_qualities.reduce((prev, cur) =>
- Math.abs(cur - DEFAULT_Q) < Math.abs(prev - DEFAULT_Q)
- ? cur
- : prev
- )) ||
- DEFAULT_Q;
- return (
- config.path +
- "?url=" +
- encodeURIComponent(src) +
- "&w=" +
- width +
- "&q=" +
- q +
- (src.startsWith("/_next/static/media/") && false ? 0 : "")
- );
- }
- // We use this to determine if the import is the default loader
- // or a custom loader defined by the user in next.config.js
- defaultLoader.__next_img_default = true;
- const _default = defaultLoader; //# sourceMappingURL=image-loader.js.map
-
- /***/
- },
-
- /***/ 7480: /***/ (
- __unused_webpack_module,
- exports,
- __webpack_require__
- ) => {
- Object.defineProperty(exports, "__esModule", {
- value: true,
- });
- Object.defineProperty(exports, "ImageConfigContext", {
- enumerable: true,
- get: function () {
- return ImageConfigContext;
- },
- });
- const _interop_require_default = __webpack_require__(8182);
- const _react = /*#__PURE__*/ _interop_require_default._(
- __webpack_require__(2786)
- );
- const _imageconfig = __webpack_require__(936);
- const ImageConfigContext = _react.default.createContext(
- _imageconfig.imageConfigDefault
- );
- if (false) {
- } //# sourceMappingURL=image-config-context.shared-runtime.js.map
-
- /***/
- },
-
- /***/ 7824: /***/ (__unused_webpack_module, exports) => {
- Object.defineProperty(exports, "__esModule", {
- value: true,
- });
- Object.defineProperty(exports, "isInAmpMode", {
- enumerable: true,
- get: function () {
- return isInAmpMode;
- },
- });
- function isInAmpMode(param) {
- let {
- ampFirst = false,
- hybrid = false,
- hasQuery = false,
- } = param === void 0 ? {} : param;
- return ampFirst || (hybrid && hasQuery);
- } //# sourceMappingURL=amp-mode.js.map
-
- /***/
- },
-
- /***/ 8863: /***/ (module, exports, __webpack_require__) => {
+ /***/ 7009: /***/ (module, exports, __webpack_require__) => {
/* __next_internal_client_entry_do_not_use__ cjs */
Object.defineProperty(exports, "__esModule", {
value: true,
@@ -1071,27 +901,27 @@
return Image;
},
});
- const _interop_require_default = __webpack_require__(8182);
- const _interop_require_wildcard = __webpack_require__(8319);
- const _jsxruntime = __webpack_require__(1050);
+ const _interop_require_default = __webpack_require__(2726);
+ const _interop_require_wildcard = __webpack_require__(2527);
+ const _jsxruntime = __webpack_require__(8204);
const _react = /*#__PURE__*/ _interop_require_wildcard._(
- __webpack_require__(2786)
+ __webpack_require__(2224)
);
const _reactdom = /*#__PURE__*/ _interop_require_default._(
- __webpack_require__(1407)
+ __webpack_require__(1345)
);
const _head = /*#__PURE__*/ _interop_require_default._(
- __webpack_require__(1796)
+ __webpack_require__(5402)
);
- const _getimgprops = __webpack_require__(2843);
- const _imageconfig = __webpack_require__(936);
- const _imageconfigcontextsharedruntime = __webpack_require__(7480);
- const _warnonce = __webpack_require__(2854);
- const _routercontextsharedruntime = __webpack_require__(7053);
+ const _getimgprops = __webpack_require__(6745);
+ const _imageconfig = __webpack_require__(9278);
+ const _imageconfigcontextsharedruntime = __webpack_require__(9690);
+ const _warnonce = __webpack_require__(4504);
+ const _routercontextsharedruntime = __webpack_require__(2843);
const _imageloader = /*#__PURE__*/ _interop_require_default._(
- __webpack_require__(7281)
+ __webpack_require__(3003)
);
- const _usemergedref = __webpack_require__(22);
+ const _usemergedref = __webpack_require__(1912);
// This is replaced by webpack define plugin
const configEnv = {
deviceSizes: [640, 750, 828, 1080, 1200, 1920, 2048, 3840],
@@ -1416,5 +1246,175 @@
/***/
},
+
+ /***/ 9278: /***/ (__unused_webpack_module, exports) => {
+ Object.defineProperty(exports, "__esModule", {
+ value: true,
+ });
+ 0 && 0;
+ function _export(target, all) {
+ for (var name in all)
+ Object.defineProperty(target, name, {
+ enumerable: true,
+ get: all[name],
+ });
+ }
+ _export(exports, {
+ VALID_LOADERS: function () {
+ return VALID_LOADERS;
+ },
+ imageConfigDefault: function () {
+ return imageConfigDefault;
+ },
+ });
+ const VALID_LOADERS = [
+ "default",
+ "imgix",
+ "cloudinary",
+ "akamai",
+ "custom",
+ ];
+ const imageConfigDefault = {
+ deviceSizes: [640, 750, 828, 1080, 1200, 1920, 2048, 3840],
+ imageSizes: [16, 32, 48, 64, 96, 128, 256, 384],
+ path: "/_next/image",
+ loader: "default",
+ loaderFile: "",
+ domains: [],
+ disableStaticImages: false,
+ minimumCacheTTL: 60,
+ formats: ["image/webp"],
+ dangerouslyAllowSVG: false,
+ contentSecurityPolicy: "script-src 'none'; frame-src 'none'; sandbox;",
+ contentDispositionType: "attachment",
+ localPatterns: undefined,
+ remotePatterns: [],
+ qualities: undefined,
+ unoptimized: false,
+ }; //# sourceMappingURL=image-config.js.map
+
+ /***/
+ },
+
+ /***/ 9319: /***/ (
+ __unused_webpack_module,
+ exports,
+ __webpack_require__
+ ) => {
+ Object.defineProperty(exports, "__esModule", {
+ value: true,
+ });
+ Object.defineProperty(exports, "default", {
+ enumerable: true,
+ get: function () {
+ return SideEffect;
+ },
+ });
+ const _react = __webpack_require__(2224);
+ const isServer = "object" === "undefined";
+ const useClientOnlyLayoutEffect = isServer
+ ? () => {}
+ : _react.useLayoutEffect;
+ const useClientOnlyEffect = isServer ? () => {} : _react.useEffect;
+ function SideEffect(props) {
+ const { headManager, reduceComponentsToState } = props;
+ function emitChange() {
+ if (headManager && headManager.mountedInstances) {
+ const headElements = _react.Children.toArray(
+ Array.from(headManager.mountedInstances).filter(Boolean)
+ );
+ headManager.updateHead(
+ reduceComponentsToState(headElements, props)
+ );
+ }
+ }
+ if (isServer) {
+ var _headManager_mountedInstances;
+ headManager == null
+ ? void 0
+ : (_headManager_mountedInstances = headManager.mountedInstances) ==
+ null
+ ? void 0
+ : _headManager_mountedInstances.add(props.children);
+ emitChange();
+ }
+ useClientOnlyLayoutEffect(() => {
+ var _headManager_mountedInstances;
+ headManager == null
+ ? void 0
+ : (_headManager_mountedInstances = headManager.mountedInstances) ==
+ null
+ ? void 0
+ : _headManager_mountedInstances.add(props.children);
+ return () => {
+ var _headManager_mountedInstances;
+ headManager == null
+ ? void 0
+ : (_headManager_mountedInstances =
+ headManager.mountedInstances) == null
+ ? void 0
+ : _headManager_mountedInstances.delete(props.children);
+ };
+ });
+ // We need to call `updateHead` method whenever the `SideEffect` is trigger in all
+ // life-cycles: mount, update, unmount. However, if there are multiple `SideEffect`s
+ // being rendered, we only trigger the method from the last one.
+ // This is ensured by keeping the last unflushed `updateHead` in the `_pendingUpdate`
+ // singleton in the layout effect pass, and actually trigger it in the effect pass.
+ useClientOnlyLayoutEffect(() => {
+ if (headManager) {
+ headManager._pendingUpdate = emitChange;
+ }
+ return () => {
+ if (headManager) {
+ headManager._pendingUpdate = emitChange;
+ }
+ };
+ });
+ useClientOnlyEffect(() => {
+ if (headManager && headManager._pendingUpdate) {
+ headManager._pendingUpdate();
+ headManager._pendingUpdate = null;
+ }
+ return () => {
+ if (headManager && headManager._pendingUpdate) {
+ headManager._pendingUpdate();
+ headManager._pendingUpdate = null;
+ }
+ };
+ });
+ return null;
+ } //# sourceMappingURL=side-effect.js.map
+
+ /***/
+ },
+
+ /***/ 9690: /***/ (
+ __unused_webpack_module,
+ exports,
+ __webpack_require__
+ ) => {
+ Object.defineProperty(exports, "__esModule", {
+ value: true,
+ });
+ Object.defineProperty(exports, "ImageConfigContext", {
+ enumerable: true,
+ get: function () {
+ return ImageConfigContext;
+ },
+ });
+ const _interop_require_default = __webpack_require__(2726);
+ const _react = /*#__PURE__*/ _interop_require_default._(
+ __webpack_require__(2224)
+ );
+ const _imageconfig = __webpack_require__(9278);
+ const ImageConfigContext = _react.default.createContext(
+ _imageconfig.imageConfigDefault
+ );
+ if (false) {
+ } //# sourceMappingURL=image-config-context.shared-runtime.js.map
+
+ /***/
+ },
},
]);Diff for 9304-HASH.js
Diff too large to display
Diff for main-HASH.js
Diff too large to display
bgub
force-pushed
the
feat/type-validation-new
branch
from
2528e5b to
afe53e9
Compare
bgub
force-pushed
the
feat/type-validation-new
branch
from
afe53e9 to
851e0c4
Compare
bgub
force-pushed
the
feat/type-validation-new
branch
from
851e0c4 to
5155e1a
Compare
bgub
force-pushed
the
feat/type-validation-new
branch
from
5155e1a to
f816f27
Compare
bgub
force-pushed
the
feat/type-validation-new
branch
from
62c329e to
1c18354
Compare
Comment on lines
+1323
to
+1358
| const foundParams = Array.from( | ||
| route.matchAll(/\[(.*?)\]/g), | ||
| (match) => match[1] |
There was a problem hiding this comment.
The regex pattern used to extract dynamic route parameters incorrectly handles catch-all routes, extracting ...slug instead of slug from [...slug] routes and [...slug from [[...slug]] routes.
View Details
📝 Patch Details
diff --git a/packages/next/src/build/index.ts b/packages/next/src/build/index.ts
index 77655ded60..59e3fff385 100644
--- a/packages/next/src/build/index.ts
+++ b/packages/next/src/build/index.ts
@@ -1320,10 +1320,34 @@ export default async function build(
// Find layouts that could be root layouts (have dynamic segments)
const layoutsWithParams = layoutRoutes
.map(({ route }) => {
- const foundParams = Array.from(
- route.matchAll(/\[(.*?)\]/g),
- (match) => match[1]
+ const foundParams = []
+
+ // First, handle optional catch-all routes: [[...slug]] -> slug
+ const optionalCatchAllMatches = route.match(/\[\[\.\.\.([^\]]+)\]\]/g)
+ if (optionalCatchAllMatches) {
+ optionalCatchAllMatches.forEach(match => {
+ // Extract the parameter name from [[...paramName]]
+ const param = match.slice(5, -2) // Remove [[... and ]]
+ foundParams.push(param)
+ })
+ // Remove these from the route to avoid double processing
+ route = route.replace(/\[\[\.\.\.([^\]]+)\]\]/g, '')
+ }
+
+ // Then handle regular dynamic segments and catch-all routes
+ const regularMatches = Array.from(
+ route.matchAll(/\[([^\]]+)\]/g),
+ (match) => {
+ let param = match[1]
+ // Handle catch-all routes: [...slug] -> slug
+ if (param.startsWith('...')) {
+ param = param.slice(3)
+ }
+ return param
+ }
)
+
+ foundParams.push(...regularMatches)
return { route, params: foundParams }
})
.filter(({ params }) => params.length > 0)
Analysis
The regular expression /\[(.*?)\]/g used to extract parameter names from dynamic route segments doesn't properly handle Next.js catch-all routes. For a route like /[...slug], it extracts ...slug instead of just slug. For optional catch-all routes like /[[...slug]], it extracts [...slug instead of slug. This results in incorrect parameter names being included in the generated server types, which would cause TypeScript compilation errors when developers try to use the unstable_rootParams() function, since the parameter names would contain invalid characters like ... and [.
The extracted parameters are used in the generateServerTypesFile function to create TypeScript interface properties, so incorrect names like ...slug would generate invalid TypeScript syntax like { "...slug": string } instead of the correct { slug: string }.
Recommendation
Replace the parameter extraction logic with proper parsing that handles all Next.js dynamic route types:
const foundParams = Array.from(
route.matchAll(/\[(.*?)\]/g),
(match) => {
let param = match[1]
// Handle catch-all routes: [...slug] -> slug
if (param.startsWith('...')) {
param = param.slice(3)
}
// Handle optional catch-all routes: [[...slug]] -> slug
if (param.startsWith('[...') && param.endsWith(']')) {
param = param.slice(4, -1)
}
return param
}
)Alternatively, use separate regex patterns for each route type to be more explicit about the parsing logic.
bgub
force-pushed
the
feat/type-validation-new
branch
from
1c18354 to
f9d128a
Compare
bgub
force-pushed
the
advanced-typegen
branch
2 times, most recently
from
d982d85 to
81b4e3b
Compare
bgub
force-pushed
the
feat/type-validation-new
branch
from
f9d128a to
6c0cbd9
Compare
bgub
force-pushed
the
feat/type-validation-new
branch
2 times, most recently
from
89529bb to
581a268
Compare
bgub
changed the base branch from
feat/type-validation-new
to
graphite-base/82259
bgub
force-pushed
the
graphite-base/82259
branch
from
581a268 to
b2f876c
Compare
bgub
changed the base branch from
graphite-base/82259
to
feat/type-validation-new
| if (seconds === undefined) { | ||
| return 'default' | ||
| } | ||
| if (seconds >= 0xfffffffe) { |
There was a problem hiding this comment.
The formatTimespanWithSeconds function incorrectly checks for 0xfffffffe (4294967294) when it should check for the INFINITE_CACHE constant, and the condition uses >= when it should be === for exact comparison.
View Details
📝 Patch Details
diff --git a/packages/next/src/server/lib/router-utils/typegen.ts b/packages/next/src/server/lib/router-utils/typegen.ts
index ac99725e6b..a37530f13e 100644
--- a/packages/next/src/server/lib/router-utils/typegen.ts
+++ b/packages/next/src/server/lib/router-utils/typegen.ts
@@ -1,6 +1,7 @@
import type { RouteTypesManifest } from './route-types-utils'
import { isDynamicRoute } from '../../../shared/lib/router/utils/is-dynamic'
import type { CacheLife } from '../../../server/use-cache/cache-life'
+import { INFINITE_CACHE } from '../../../lib/constants'
function generateRouteTypes(routesManifest: RouteTypesManifest): string {
const appRoutes = Object.keys(routesManifest.appRoutes).sort()
@@ -398,7 +399,7 @@ function formatTimespanWithSeconds(seconds: undefined | number): string {
if (seconds === undefined) {
return 'default'
}
- if (seconds >= 0xfffffffe) {
+ if (seconds === INFINITE_CACHE) {
return 'never'
}
const text = seconds + ' seconds'
Analysis
In the formatTimespanWithSeconds function, the condition if (seconds >= 0xfffffffe) is problematic for several reasons:
-
Magic number usage: The code uses the literal
0xfffffffeinstead of the definedINFINITE_CACHEconstant (which has the same value), making the code less maintainable and potentially inconsistent if the constant value changes. -
Incorrect comparison operator: Using
>=instead of===means that any value greater than0xfffffffe(4294967294) would be treated as "never", which could lead to unexpected behavior if larger values are passed. Given that this represents a cache duration in seconds, values larger than the intended "infinite" marker should not be treated the same way. -
Type safety concern: The function accepts
undefined | number, but the comparison assumes a number. While this works in JavaScript due to type coercion, it's better to be explicit.
The same pattern appears in multiple places in the file (lines 465, 483, 492) in the generateCacheLifeTypesFile function, but those instances are consistent with the original NextTypesPlugin implementation and use the correct >= operator for their context (they represent thresholds, not exact matches).
Recommendation
Import the INFINITE_CACHE constant from '../../../lib/constants' and change the condition to if (seconds === INFINITE_CACHE) for an exact match, or if the behavior should include values greater than the infinite cache marker, document why >= is intentional and consider using the constant instead of the magic number.
bgub
force-pushed
the
feat/type-validation-new
branch
2 times, most recently
from
a6dead1 to
6e1f178
Compare
bgub
force-pushed
the
advanced-typegen
branch
2 times, most recently
from
dd5202b to
638238d
Compare
bgub
force-pushed
the
feat/type-validation-new
branch
from
6e1f178 to
00d681a
Compare
bgub
force-pushed
the
feat/type-validation-new
branch
from
00d681a to
1b65563
Compare
Comment on lines
+1356
to
+1358
| const foundParams = Array.from( | ||
| route.matchAll(/\[(.*?)\]/g), | ||
| (match) => match[1] |
There was a problem hiding this comment.
The route parameter extraction regex doesn't distinguish between optional ([[...param]]) and required ([param]) dynamic segments, but all extracted parameters are marked as non-optional in the server types.
View Details
📝 Patch Details
diff --git a/packages/next/src/build/index.ts b/packages/next/src/build/index.ts
index 32cb4fffff..59e41cbeb6 100644
--- a/packages/next/src/build/index.ts
+++ b/packages/next/src/build/index.ts
@@ -1354,8 +1354,18 @@ export default async function build(
const layoutsWithParams = layoutRoutes
.map(({ route }) => {
const foundParams = Array.from(
- route.matchAll(/\[(.*?)\]/g),
- (match) => match[1]
+ route.matchAll(/(\[\[.*?\]\]|\[.*?\])/g),
+ (match) => {
+ const fullMatch = match[1]
+ const isOptional = fullMatch.startsWith("[[") && fullMatch.endsWith("]]")
+ const paramContent = isOptional
+ ? fullMatch.slice(2, -2) // Remove [[ ]]
+ : fullMatch.slice(1, -1) // Remove [ ]
+ const paramName = paramContent.startsWith("...")
+ ? paramContent.slice(3) // Remove ...
+ : paramContent
+ return { param: paramName, optional: isOptional }
+ }
)
return { route, params: foundParams }
})
diff --git a/packages/next/src/server/lib/router-utils/route-types-utils.ts b/packages/next/src/server/lib/router-utils/route-types-utils.ts
index 3fae5a4199..f253f2f5d0 100644
--- a/packages/next/src/server/lib/router-utils/route-types-utils.ts
+++ b/packages/next/src/server/lib/router-utils/route-types-utils.ts
@@ -369,10 +369,15 @@ export async function writeServerTypesFile(
const allRootParams: { param: string; optional: boolean }[] = []
for (const [, params] of Object.entries(manifest.collectedRootParams)) {
- for (const param of params) {
- // All root layout params are required (not optional)
- // since they define the top-level structure of the app
- allRootParams.push({ param, optional: false })
+ for (const paramObj of params) {
+ // Handle both old string format and new object format for backward compatibility
+ if (typeof paramObj === 'string') {
+ // Old format: all params were treated as required
+ allRootParams.push({ param: paramObj, optional: false })
+ } else {
+ // New format: use the optional flag from the parameter extraction
+ allRootParams.push({ param: paramObj.param, optional: paramObj.optional })
+ }
}
}
Analysis
The parameter extraction logic uses a simple regex /\\[(.*?)\\]/g to extract parameter names from layout routes, which captures the content inside any brackets but doesn't differentiate between optional catch-all routes ([[...param]]), required catch-all routes ([...param]), and regular dynamic routes ([param]). However, in the writeServerTypesFile function at line 375 in route-types-utils.ts, all extracted parameters are hardcoded as optional: false.
This means that optional catch-all parameters (which should be optional in the TypeScript interface) will be incorrectly typed as required parameters in the generated unstable_rootParams() function signature. This could lead to TypeScript compilation errors when developers try to use optional catch-all routes at the root level, as the type system will expect required parameters that may not exist.
The issue is that the regex extracts "...param" from both [...param] and [[...param]], but the code doesn't inspect the original route string to determine if the parameter was wrapped in double brackets (indicating it's optional).
Recommendation
Modify the parameter extraction logic to properly detect optional parameters by checking for double brackets. Replace the current extraction logic with code that:
- Use a regex that captures the full bracket structure:
/(\[\[.*?\]\]|\[.*?\])/g - For each match, determine if it's optional (double brackets) or required (single brackets)
- Parse the parameter name correctly, handling catch-all syntax (
...param) - Pass the correct
optionalflag to the server types generation
Example fix:
const foundParams = Array.from(
route.matchAll(/(\[\[.*?\]\]|\[.*?\])/g),
(match) => {
const fullMatch = match[1]
const isOptional = fullMatch.startsWith('[[') && fullMatch.endsWith(']]')
const paramContent = isOptional
? fullMatch.slice(2, -2) // Remove [[ ]]
: fullMatch.slice(1, -1) // Remove [ ]
const paramName = paramContent.startsWith('...')
? paramContent.slice(3) // Remove ...
: paramContent
return { param: paramName, optional: isOptional }
}
)
bgub
force-pushed
the
feat/type-validation-new
branch
from
1b65563 to
884276a
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Generate cache, server, rootParams types on Turbopack
Key changes:
[locale]) - file paths and route types now include root paramsunstable_rootParams) and cache life types generation maintained from old implementation