make getStaticPaths work with optional catch-all routes #13559

Janpot · 2020-05-29T16:39:40Z

Fixes #13524

To do:

fix dev mode
there's a ~~route ordering or~~ trailing slash issue with top level catch-all (current tests reflect that)
in this test /get-static-paths/whatever should fall back to /[[...optionalName]].js since fallback is false in its getStaticPaths method. ~~Currently seems to 500~~ must have been a glitch
add tests for null, undefined ~~and false~~ behavior as well (if decided these are valid)
~~add tests for string params as well~~ this is not allowed for catch-all routes
test behavior when fallback is enabled and a top level catch-all exists

packages/next/build/utils.ts

…t.js into optional-static-paths

test/integration/dynamic-optional-routing/pages/get-static-paths-undefined/[[...slug]].js

packages/next/build/utils.ts

packages/next/next-server/server/next-server.ts

ijjk · 2020-06-01T16:44:57Z

Stats from current PR

Default Server Mode (Increase detected ⚠️)

General Overall increase ⚠️

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
buildDuration	12.2s	12.1s	-69ms
nodeModulesSize	65.2 MB	65.2 MB	⚠️ +1.42 kB

Page Load Tests Overall decrease ⚠️

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
/ failed reqs	0	0	✓
/ total time (seconds)	1.972	2.11	⚠️ +0.14
/ avg req/sec	1267.99	1184.66	-83.33
/error-in-render failed reqs	0	0	✓
/error-in-render total time (seconds)	1.258	1.213	-0.04
/error-in-render avg req/sec	1987.72	2060.33	⚠️ +72.61

Client Bundles (main, webpack, commons) Overall increase ⚠️

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
main-HASH.js gzip	6.59 kB	6.59 kB	✓
webpack-HASH.js gzip	746 B	746 B	✓
de003c3a9d30..8679.js gzip	10.5 kB	10.5 kB	⚠️ +10 B
framework.HASH.js gzip	39.1 kB	39.1 kB	✓
Overall change	57 kB	57 kB	⚠️ +10 B

Client Bundles (main, webpack, commons) Modern Overall increase ⚠️

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
main-HASH.module.js gzip	5.67 kB	5.67 kB	✓
webpack-HASH..dule.js gzip	746 B	746 B	✓
de003c3a9d30..dule.js gzip	6.92 kB	6.93 kB	⚠️ +7 B
framework.HA..dule.js gzip	39.1 kB	39.1 kB	✓
Overall change	52.5 kB	52.5 kB	⚠️ +7 B

Legacy Client Bundles (polyfills)

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
polyfills-HASH.js gzip	26.3 kB	26.3 kB	✓
Overall change	26.3 kB	26.3 kB	✓

Client Pages

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
_app.js gzip	1.26 kB	1.26 kB	✓
_error.js gzip	3.25 kB	3.25 kB	✓
hooks.js gzip	881 B	881 B	✓
index.js gzip	222 B	222 B	✓
link.js gzip	2.06 kB	2.06 kB	✓
routerDirect.js gzip	279 B	279 B	✓
withRouter.js gzip	278 B	278 B	✓
Overall change	8.22 kB	8.22 kB	✓

Client Pages Modern

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
_app.module.js gzip	604 B	604 B	✓
_error.module.js gzip	2.04 kB	2.04 kB	✓
hooks.module.js gzip	383 B	383 B	✓
index.module.js gzip	223 B	223 B	✓
link.module.js gzip	1.52 kB	1.52 kB	✓
routerDirect..dule.js gzip	281 B	281 B	✓
withRouter.m..dule.js gzip	278 B	278 B	✓
Overall change	5.33 kB	5.33 kB	✓

Client Build Manifests

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
_buildManifest.js gzip	61 B	61 B	✓
_buildManife..dule.js gzip	61 B	61 B	✓
Overall change	122 B	122 B	✓

Rendered Page Sizes Overall decrease ✓

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
index.html gzip	927 B	926 B	-1 B
link.html gzip	937 B	935 B	-2 B
withRouter.html gzip	923 B	923 B	✓
Overall change	2.79 kB	2.78 kB	-3 B

Diffs

Diff for de003c3a9d30..a18624191.js

@@ -548,7 +548,8 @@
                 .replace(/\\([|\\{}()[\]^$+*?.-])/g, "$1") // eslint-disable-next-line no-sequences
             ] = {
               pos: groupIndex++,
-              repeat: isCatchAll
+              repeat: isCatchAll,
+              optional: isOptional
             };
             return isCatchAll
               ? isOptional

Diff for de003c3a9d30..08.module.js

@@ -470,7 +470,8 @@
                 .replace(/\\([|\\{}()[\]^$+*?.-])/g, "$1") // eslint-disable-next-line no-sequences
             ] = {
               pos: groupIndex++,
-              repeat: isCatchAll
+              repeat: isCatchAll,
+              optional: isOptional
             };
             return isCatchAll
               ? isOptional

Diff for index.html

@@ -30,7 +30,7 @@
     />
     <link
       rel="preload"
-      href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.98d04be1fd209669b708.module.js"
+      href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.41641d95dc96d5d4377a.module.js"
       as="script"
       crossorigin="anonymous"
     />
@@ -133,13 +133,13 @@
       type="module"
     ></script>
     <script
-      src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3db71069b12a18624191.js"
+      src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.af1e06cc201c9a513ccb.js"
       async=""
       crossorigin="anonymous"
       nomodule=""
     ></script>
     <script
-      src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.98d04be1fd209669b708.module.js"
+      src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.41641d95dc96d5d4377a.module.js"
       async=""
       crossorigin="anonymous"
       type="module"

Diff for link.html

@@ -30,7 +30,7 @@
     />
     <link
       rel="preload"
-      href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.98d04be1fd209669b708.module.js"
+      href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.41641d95dc96d5d4377a.module.js"
       as="script"
       crossorigin="anonymous"
     />
@@ -138,13 +138,13 @@
       type="module"
     ></script>
     <script
-      src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3db71069b12a18624191.js"
+      src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.af1e06cc201c9a513ccb.js"
       async=""
       crossorigin="anonymous"
       nomodule=""
     ></script>
     <script
-      src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.98d04be1fd209669b708.module.js"
+      src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.41641d95dc96d5d4377a.module.js"
       async=""
       crossorigin="anonymous"
       type="module"

Diff for withRouter.html

@@ -30,7 +30,7 @@
     />
     <link
       rel="preload"
-      href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.98d04be1fd209669b708.module.js"
+      href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.41641d95dc96d5d4377a.module.js"
       as="script"
       crossorigin="anonymous"
     />
@@ -133,13 +133,13 @@
       type="module"
     ></script>
     <script
-      src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3db71069b12a18624191.js"
+      src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.af1e06cc201c9a513ccb.js"
       async=""
       crossorigin="anonymous"
       nomodule=""
     ></script>
     <script
-      src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.98d04be1fd209669b708.module.js"
+      src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.41641d95dc96d5d4377a.module.js"
       async=""
       crossorigin="anonymous"
       type="module"

Serverless Mode (Increase detected ⚠️)

General Overall increase ⚠️

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
buildDuration	13.3s	13.4s	⚠️ +85ms
nodeModulesSize	65.2 MB	65.2 MB	⚠️ +1.42 kB

Client Bundles (main, webpack, commons) Overall increase ⚠️

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
main-HASH.js gzip	6.59 kB	6.59 kB	✓
webpack-HASH.js gzip	746 B	746 B	✓
de003c3a9d30..8679.js gzip	10.5 kB	N/A	N/A
framework.HASH.js gzip	39.1 kB	39.1 kB	✓
de003c3a9d30..21ef.js gzip	N/A	10.5 kB	N/A
Overall change	57 kB	57 kB	⚠️ +10 B

Client Bundles (main, webpack, commons) Modern Overall increase ⚠️

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
main-HASH.module.js gzip	5.67 kB	5.67 kB	✓
webpack-HASH..dule.js gzip	746 B	746 B	✓
de003c3a9d30..dule.js gzip	6.92 kB	N/A	N/A
framework.HA..dule.js gzip	39.1 kB	39.1 kB	✓
de003c3a9d30..dule.js gzip	N/A	6.93 kB	N/A
Overall change	52.5 kB	52.5 kB	⚠️ +7 B

Legacy Client Bundles (polyfills)

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
polyfills-HASH.js gzip	26.3 kB	26.3 kB	✓
Overall change	26.3 kB	26.3 kB	✓

Client Pages

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
_app.js gzip	1.26 kB	1.26 kB	✓
_error.js gzip	3.25 kB	3.25 kB	✓
hooks.js gzip	881 B	881 B	✓
index.js gzip	222 B	222 B	✓
link.js gzip	2.06 kB	2.06 kB	✓
routerDirect.js gzip	279 B	279 B	✓
withRouter.js gzip	278 B	278 B	✓
Overall change	8.22 kB	8.22 kB	✓

Client Pages Modern

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
_app.module.js gzip	604 B	604 B	✓
_error.module.js gzip	2.04 kB	2.04 kB	✓
hooks.module.js gzip	383 B	383 B	✓
index.module.js gzip	223 B	223 B	✓
link.module.js gzip	1.52 kB	1.52 kB	✓
routerDirect..dule.js gzip	281 B	281 B	✓
withRouter.m..dule.js gzip	278 B	278 B	✓
Overall change	5.33 kB	5.33 kB	✓

Client Build Manifests

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
_buildManifest.js gzip	61 B	61 B	✓
_buildManife..dule.js gzip	61 B	61 B	✓
Overall change	122 B	122 B	✓

Serverless bundles Overall increase ⚠️

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
_error.js	877 kB	877 kB	✓
404.html	4.18 kB	4.18 kB	✓
hooks.html	3.81 kB	3.81 kB	✓
index.js	877 kB	877 kB	✓
link.js	915 kB	915 kB	⚠️ +28 B
routerDirect.js	907 kB	907 kB	⚠️ +28 B
withRouter.js	907 kB	907 kB	⚠️ +28 B
Overall change	4.49 MB	4.49 MB	⚠️ +84 B

ijjk · 2020-06-01T16:48:11Z

Stats from current PR

Default Server Mode (Increase detected ⚠️)

General Overall increase ⚠️

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
buildDuration	12s	11.9s	-87ms
nodeModulesSize	65.2 MB	65.2 MB	⚠️ +1.42 kB

Page Load Tests Overall decrease ⚠️

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
/ failed reqs	0	0	✓
/ total time (seconds)	2.096	2.075	-0.02
/ avg req/sec	1192.62	1204.8	⚠️ +12.18
/error-in-render failed reqs	0	0	✓
/error-in-render total time (seconds)	1.197	1.266	⚠️ +0.07
/error-in-render avg req/sec	2088.57	1975.21	-113.36

Client Bundles (main, webpack, commons) Overall increase ⚠️

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
main-HASH.js gzip	6.59 kB	6.59 kB	✓
webpack-HASH.js gzip	746 B	746 B	✓
de003c3a9d30..8679.js gzip	10.5 kB	10.5 kB	⚠️ +10 B
framework.HASH.js gzip	39.1 kB	39.1 kB	✓
Overall change	57 kB	57 kB	⚠️ +10 B

Client Bundles (main, webpack, commons) Modern Overall increase ⚠️

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
main-HASH.module.js gzip	5.67 kB	5.67 kB	✓
webpack-HASH..dule.js gzip	746 B	746 B	✓
de003c3a9d30..dule.js gzip	6.92 kB	6.93 kB	⚠️ +7 B
framework.HA..dule.js gzip	39.1 kB	39.1 kB	✓
Overall change	52.5 kB	52.5 kB	⚠️ +7 B

Legacy Client Bundles (polyfills)

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
polyfills-HASH.js gzip	26.3 kB	26.3 kB	✓
Overall change	26.3 kB	26.3 kB	✓

Client Pages

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
_app.js gzip	1.26 kB	1.26 kB	✓
_error.js gzip	3.25 kB	3.25 kB	✓
hooks.js gzip	881 B	881 B	✓
index.js gzip	222 B	222 B	✓
link.js gzip	2.06 kB	2.06 kB	✓
routerDirect.js gzip	279 B	279 B	✓
withRouter.js gzip	278 B	278 B	✓
Overall change	8.22 kB	8.22 kB	✓

Client Pages Modern

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
_app.module.js gzip	604 B	604 B	✓
_error.module.js gzip	2.04 kB	2.04 kB	✓
hooks.module.js gzip	383 B	383 B	✓
index.module.js gzip	223 B	223 B	✓
link.module.js gzip	1.52 kB	1.52 kB	✓
routerDirect..dule.js gzip	281 B	281 B	✓
withRouter.m..dule.js gzip	278 B	278 B	✓
Overall change	5.33 kB	5.33 kB	✓

Client Build Manifests

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
_buildManifest.js gzip	61 B	61 B	✓
_buildManife..dule.js gzip	61 B	61 B	✓
Overall change	122 B	122 B	✓

Rendered Page Sizes Overall decrease ✓

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
index.html gzip	927 B	926 B	-1 B
link.html gzip	937 B	935 B	-2 B
withRouter.html gzip	923 B	923 B	✓
Overall change	2.79 kB	2.78 kB	-3 B

Diffs

Diff for de003c3a9d30..a18624191.js

@@ -548,7 +548,8 @@
                 .replace(/\\([|\\{}()[\]^$+*?.-])/g, "$1") // eslint-disable-next-line no-sequences
             ] = {
               pos: groupIndex++,
-              repeat: isCatchAll
+              repeat: isCatchAll,
+              optional: isOptional
             };
             return isCatchAll
               ? isOptional

Diff for de003c3a9d30..08.module.js

@@ -470,7 +470,8 @@
                 .replace(/\\([|\\{}()[\]^$+*?.-])/g, "$1") // eslint-disable-next-line no-sequences
             ] = {
               pos: groupIndex++,
-              repeat: isCatchAll
+              repeat: isCatchAll,
+              optional: isOptional
             };
             return isCatchAll
               ? isOptional

Diff for index.html

@@ -30,7 +30,7 @@
     />
     <link
       rel="preload"
-      href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.98d04be1fd209669b708.module.js"
+      href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.41641d95dc96d5d4377a.module.js"
       as="script"
       crossorigin="anonymous"
     />
@@ -133,13 +133,13 @@
       type="module"
     ></script>
     <script
-      src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3db71069b12a18624191.js"
+      src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.af1e06cc201c9a513ccb.js"
       async=""
       crossorigin="anonymous"
       nomodule=""
     ></script>
     <script
-      src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.98d04be1fd209669b708.module.js"
+      src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.41641d95dc96d5d4377a.module.js"
       async=""
       crossorigin="anonymous"
       type="module"

Diff for link.html

@@ -30,7 +30,7 @@
     />
     <link
       rel="preload"
-      href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.98d04be1fd209669b708.module.js"
+      href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.41641d95dc96d5d4377a.module.js"
       as="script"
       crossorigin="anonymous"
     />
@@ -138,13 +138,13 @@
       type="module"
     ></script>
     <script
-      src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3db71069b12a18624191.js"
+      src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.af1e06cc201c9a513ccb.js"
       async=""
       crossorigin="anonymous"
       nomodule=""
     ></script>
     <script
-      src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.98d04be1fd209669b708.module.js"
+      src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.41641d95dc96d5d4377a.module.js"
       async=""
       crossorigin="anonymous"
       type="module"

Diff for withRouter.html

@@ -30,7 +30,7 @@
     />
     <link
       rel="preload"
-      href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.98d04be1fd209669b708.module.js"
+      href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.41641d95dc96d5d4377a.module.js"
       as="script"
       crossorigin="anonymous"
     />
@@ -133,13 +133,13 @@
       type="module"
     ></script>
     <script
-      src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3db71069b12a18624191.js"
+      src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.af1e06cc201c9a513ccb.js"
       async=""
       crossorigin="anonymous"
       nomodule=""
     ></script>
     <script
-      src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.98d04be1fd209669b708.module.js"
+      src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.41641d95dc96d5d4377a.module.js"
       async=""
       crossorigin="anonymous"
       type="module"

Serverless Mode (Increase detected ⚠️)

General Overall increase ⚠️

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
buildDuration	13s	13.3s	⚠️ +262ms
nodeModulesSize	65.2 MB	65.2 MB	⚠️ +1.42 kB

Client Bundles (main, webpack, commons) Overall increase ⚠️

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
main-HASH.js gzip	6.59 kB	6.59 kB	✓
webpack-HASH.js gzip	746 B	746 B	✓
de003c3a9d30..8679.js gzip	10.5 kB	N/A	N/A
framework.HASH.js gzip	39.1 kB	39.1 kB	✓
de003c3a9d30..21ef.js gzip	N/A	10.5 kB	N/A
Overall change	57 kB	57 kB	⚠️ +10 B

Client Bundles (main, webpack, commons) Modern Overall increase ⚠️

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
main-HASH.module.js gzip	5.67 kB	5.67 kB	✓
webpack-HASH..dule.js gzip	746 B	746 B	✓
de003c3a9d30..dule.js gzip	6.92 kB	N/A	N/A
framework.HA..dule.js gzip	39.1 kB	39.1 kB	✓
de003c3a9d30..dule.js gzip	N/A	6.93 kB	N/A
Overall change	52.5 kB	52.5 kB	⚠️ +7 B

Legacy Client Bundles (polyfills)

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
polyfills-HASH.js gzip	26.3 kB	26.3 kB	✓
Overall change	26.3 kB	26.3 kB	✓

Client Pages

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
_app.js gzip	1.26 kB	1.26 kB	✓
_error.js gzip	3.25 kB	3.25 kB	✓
hooks.js gzip	881 B	881 B	✓
index.js gzip	222 B	222 B	✓
link.js gzip	2.06 kB	2.06 kB	✓
routerDirect.js gzip	279 B	279 B	✓
withRouter.js gzip	278 B	278 B	✓
Overall change	8.22 kB	8.22 kB	✓

Client Pages Modern

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
_app.module.js gzip	604 B	604 B	✓
_error.module.js gzip	2.04 kB	2.04 kB	✓
hooks.module.js gzip	383 B	383 B	✓
index.module.js gzip	223 B	223 B	✓
link.module.js gzip	1.52 kB	1.52 kB	✓
routerDirect..dule.js gzip	281 B	281 B	✓
withRouter.m..dule.js gzip	278 B	278 B	✓
Overall change	5.33 kB	5.33 kB	✓

Client Build Manifests

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
_buildManifest.js gzip	61 B	61 B	✓
_buildManife..dule.js gzip	61 B	61 B	✓
Overall change	122 B	122 B	✓

Serverless bundles Overall increase ⚠️

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
_error.js	877 kB	877 kB	✓
404.html	4.18 kB	4.18 kB	✓
hooks.html	3.81 kB	3.81 kB	✓
index.js	877 kB	877 kB	✓
link.js	915 kB	915 kB	⚠️ +28 B
routerDirect.js	907 kB	907 kB	⚠️ +28 B
withRouter.js	907 kB	907 kB	⚠️ +28 B
Overall change	4.49 MB	4.49 MB	⚠️ +84 B

Timer

Excellent work, thank you!

ijjk · 2020-06-01T16:58:01Z

Stats from current PR

Default Server Mode (Increase detected ⚠️)

General Overall increase ⚠️

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
buildDuration	12s	12.3s	⚠️ +362ms
nodeModulesSize	65.2 MB	65.2 MB	⚠️ +1.42 kB

Page Load Tests Overall increase ✓

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
/ failed reqs	0	0	✓
/ total time (seconds)	2.1	2.108	⚠️ +0.01
/ avg req/sec	1190.45	1185.89	-4.56
/error-in-render failed reqs	0	0	✓
/error-in-render total time (seconds)	1.219	1.2	-0.02
/error-in-render avg req/sec	2050.28	2083.76	⚠️ +33.48

Client Bundles (main, webpack, commons) Overall increase ⚠️

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
main-HASH.js gzip	6.59 kB	6.59 kB	✓
webpack-HASH.js gzip	746 B	746 B	✓
de003c3a9d30..8679.js gzip	10.5 kB	10.5 kB	⚠️ +10 B
framework.HASH.js gzip	39.1 kB	39.1 kB	✓
Overall change	57 kB	57 kB	⚠️ +10 B

Client Bundles (main, webpack, commons) Modern Overall increase ⚠️

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
main-HASH.module.js gzip	5.67 kB	5.67 kB	✓
webpack-HASH..dule.js gzip	746 B	746 B	✓
de003c3a9d30..dule.js gzip	6.92 kB	6.93 kB	⚠️ +7 B
framework.HA..dule.js gzip	39.1 kB	39.1 kB	✓
Overall change	52.5 kB	52.5 kB	⚠️ +7 B

Legacy Client Bundles (polyfills)

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
polyfills-HASH.js gzip	26.3 kB	26.3 kB	✓
Overall change	26.3 kB	26.3 kB	✓

Client Pages

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
_app.js gzip	1.26 kB	1.26 kB	✓
_error.js gzip	3.25 kB	3.25 kB	✓
hooks.js gzip	881 B	881 B	✓
index.js gzip	222 B	222 B	✓
link.js gzip	2.06 kB	2.06 kB	✓
routerDirect.js gzip	279 B	279 B	✓
withRouter.js gzip	278 B	278 B	✓
Overall change	8.22 kB	8.22 kB	✓

Client Pages Modern

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
_app.module.js gzip	604 B	604 B	✓
_error.module.js gzip	2.04 kB	2.04 kB	✓
hooks.module.js gzip	383 B	383 B	✓
index.module.js gzip	223 B	223 B	✓
link.module.js gzip	1.52 kB	1.52 kB	✓
routerDirect..dule.js gzip	281 B	281 B	✓
withRouter.m..dule.js gzip	278 B	278 B	✓
Overall change	5.33 kB	5.33 kB	✓

Client Build Manifests

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
_buildManifest.js gzip	61 B	61 B	✓
_buildManife..dule.js gzip	61 B	61 B	✓
Overall change	122 B	122 B	✓

Rendered Page Sizes Overall decrease ✓

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
index.html gzip	927 B	926 B	-1 B
link.html gzip	937 B	935 B	-2 B
withRouter.html gzip	923 B	923 B	✓
Overall change	2.79 kB	2.78 kB	-3 B

Diffs

Diff for de003c3a9d30..a18624191.js

@@ -548,7 +548,8 @@
                 .replace(/\\([|\\{}()[\]^$+*?.-])/g, "$1") // eslint-disable-next-line no-sequences
             ] = {
               pos: groupIndex++,
-              repeat: isCatchAll
+              repeat: isCatchAll,
+              optional: isOptional
             };
             return isCatchAll
               ? isOptional

Diff for de003c3a9d30..08.module.js

@@ -470,7 +470,8 @@
                 .replace(/\\([|\\{}()[\]^$+*?.-])/g, "$1") // eslint-disable-next-line no-sequences
             ] = {
               pos: groupIndex++,
-              repeat: isCatchAll
+              repeat: isCatchAll,
+              optional: isOptional
             };
             return isCatchAll
               ? isOptional

Diff for index.html

@@ -30,7 +30,7 @@
     />
     <link
       rel="preload"
-      href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.98d04be1fd209669b708.module.js"
+      href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.41641d95dc96d5d4377a.module.js"
       as="script"
       crossorigin="anonymous"
     />
@@ -133,13 +133,13 @@
       type="module"
     ></script>
     <script
-      src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3db71069b12a18624191.js"
+      src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.af1e06cc201c9a513ccb.js"
       async=""
       crossorigin="anonymous"
       nomodule=""
     ></script>
     <script
-      src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.98d04be1fd209669b708.module.js"
+      src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.41641d95dc96d5d4377a.module.js"
       async=""
       crossorigin="anonymous"
       type="module"

Diff for link.html

@@ -30,7 +30,7 @@
     />
     <link
       rel="preload"
-      href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.98d04be1fd209669b708.module.js"
+      href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.41641d95dc96d5d4377a.module.js"
       as="script"
       crossorigin="anonymous"
     />
@@ -138,13 +138,13 @@
       type="module"
     ></script>
     <script
-      src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3db71069b12a18624191.js"
+      src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.af1e06cc201c9a513ccb.js"
       async=""
       crossorigin="anonymous"
       nomodule=""
     ></script>
     <script
-      src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.98d04be1fd209669b708.module.js"
+      src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.41641d95dc96d5d4377a.module.js"
       async=""
       crossorigin="anonymous"
       type="module"

Diff for withRouter.html

@@ -30,7 +30,7 @@
     />
     <link
       rel="preload"
-      href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.98d04be1fd209669b708.module.js"
+      href="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.41641d95dc96d5d4377a.module.js"
       as="script"
       crossorigin="anonymous"
     />
@@ -133,13 +133,13 @@
       type="module"
     ></script>
     <script
-      src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.3db71069b12a18624191.js"
+      src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.af1e06cc201c9a513ccb.js"
       async=""
       crossorigin="anonymous"
       nomodule=""
     ></script>
     <script
-      src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.98d04be1fd209669b708.module.js"
+      src="/_next/static/chunks/de003c3a9d308750aa009870a5926f9b18ab31f4.41641d95dc96d5d4377a.module.js"
       async=""
       crossorigin="anonymous"
       type="module"

Serverless Mode (Increase detected ⚠️)

General Overall increase ⚠️

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
buildDuration	13.6s	13.3s	-337ms
nodeModulesSize	65.2 MB	65.2 MB	⚠️ +1.42 kB

Client Bundles (main, webpack, commons) Overall increase ⚠️

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
main-HASH.js gzip	6.59 kB	6.59 kB	✓
webpack-HASH.js gzip	746 B	746 B	✓
de003c3a9d30..8679.js gzip	10.5 kB	N/A	N/A
framework.HASH.js gzip	39.1 kB	39.1 kB	✓
de003c3a9d30..21ef.js gzip	N/A	10.5 kB	N/A
Overall change	57 kB	57 kB	⚠️ +10 B

Client Bundles (main, webpack, commons) Modern Overall increase ⚠️

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
main-HASH.module.js gzip	5.67 kB	5.67 kB	✓
webpack-HASH..dule.js gzip	746 B	746 B	✓
de003c3a9d30..dule.js gzip	6.92 kB	N/A	N/A
framework.HA..dule.js gzip	39.1 kB	39.1 kB	✓
de003c3a9d30..dule.js gzip	N/A	6.93 kB	N/A
Overall change	52.5 kB	52.5 kB	⚠️ +7 B

Legacy Client Bundles (polyfills)

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
polyfills-HASH.js gzip	26.3 kB	26.3 kB	✓
Overall change	26.3 kB	26.3 kB	✓

Client Pages

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
_app.js gzip	1.26 kB	1.26 kB	✓
_error.js gzip	3.25 kB	3.25 kB	✓
hooks.js gzip	881 B	881 B	✓
index.js gzip	222 B	222 B	✓
link.js gzip	2.06 kB	2.06 kB	✓
routerDirect.js gzip	279 B	279 B	✓
withRouter.js gzip	278 B	278 B	✓
Overall change	8.22 kB	8.22 kB	✓

Client Pages Modern

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
_app.module.js gzip	604 B	604 B	✓
_error.module.js gzip	2.04 kB	2.04 kB	✓
hooks.module.js gzip	383 B	383 B	✓
index.module.js gzip	223 B	223 B	✓
link.module.js gzip	1.52 kB	1.52 kB	✓
routerDirect..dule.js gzip	281 B	281 B	✓
withRouter.m..dule.js gzip	278 B	278 B	✓
Overall change	5.33 kB	5.33 kB	✓

Client Build Manifests

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
_buildManifest.js gzip	61 B	61 B	✓
_buildManife..dule.js gzip	61 B	61 B	✓
Overall change	122 B	122 B	✓

Serverless bundles Overall increase ⚠️

	vercel/next.js canary	Janpot/next.js optional-static-paths	Change
_error.js	877 kB	877 kB	✓
404.html	4.18 kB	4.18 kB	✓
hooks.html	3.81 kB	3.81 kB	✓
index.js	877 kB	877 kB	✓
link.js	915 kB	915 kB	⚠️ +28 B
routerDirect.js	907 kB	907 kB	⚠️ +28 B
withRouter.js	907 kB	907 kB	⚠️ +28 B
Overall change	4.49 MB	4.49 MB	⚠️ +84 B

Fixes vercel#13524 To do: - [x] fix dev mode - [x] there's a ~route ordering or~ trailing slash issue with top level catch-all (current tests reflect that) - [x] in this test `/get-static-paths/whatever` should fall back to `/[[...optionalName]].js` since `fallback` is `false` in its `getStaticPaths` method. ~Currently seems to 500~ must have been a glitch - [x] add tests for `null`, `undefined` ~and `false`~ behavior as well (if decided these are valid) - [x] ~add tests for string params as well~ this is not allowed for catch-all routes - [x] test behavior when fallback is enabled and a top level catch-all exists

make getStaticPaths work

7715f21

Janpot commented May 29, 2020

View reviewed changes

packages/next/build/utils.ts Show resolved Hide resolved

Janpot changed the title ~~make getStaticPaths work~~ make getStaticPaths work with optional catch-all routes May 29, 2020

Timer self-assigned this May 29, 2020

Janpot added 9 commits May 31, 2020 13:45

Fix trailing slashes

a31a6a4

Merge branch 'canary' into optional-static-paths

f531af9

add test for top level fallback

7f41966

add null/undefined handling

899707f

typo

feb7b1c

Merge branch 'canary' into optional-static-paths

85ba8ac

Merge branch 'optional-static-paths' of https://github.com/Janpot/nex…

2e50c86

…t.js into optional-static-paths

Merge branch 'canary' into optional-static-paths

7f3c48c

add fallback: true tests

48d91f3

Janpot marked this pull request as ready for review June 1, 2020 10:45

Janpot requested review from ijjk, lfades, Timer and timneutkens as code owners June 1, 2020 10:45

Timer requested changes Jun 1, 2020

View reviewed changes

test/integration/dynamic-optional-routing/pages/get-static-paths-undefined/[[...slug]].js Outdated Show resolved Hide resolved

packages/next/build/utils.ts Show resolved Hide resolved

packages/next/next-server/server/next-server.ts Show resolved Hide resolved

Janpot added 4 commits June 1, 2020 18:13

expand to false and explicit undefined

f99af4f

Fail when not explicitly defined param

4a305dd

Fix indentation

f3b327a

Merge branch 'canary' into optional-static-paths

002d297

Add tests for subpath and trailing slash

07c1f9d

Timer added this to the 9.4.5 milestone Jun 1, 2020

Timer added experimental labels Jun 1, 2020

Timer approved these changes Jun 1, 2020

View reviewed changes

kodiakhq bot merged commit 8bac412 into vercel:canary Jun 1, 2020

Janpot mentioned this pull request Jun 5, 2020

Optional catch all routes and getStaticPaths #13467

Closed

FinnWoelm mentioned this pull request Jun 13, 2020

[MERGED] support optional catch-all routes netlify/next-on-netlify#15

Closed

vercel locked as resolved and limited conversation to collaborators Jan 30, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

make getStaticPaths work with optional catch-all routes #13559

make getStaticPaths work with optional catch-all routes #13559

Janpot commented May 29, 2020 •

edited

Loading

ijjk commented Jun 1, 2020

Diffs

ijjk commented Jun 1, 2020

Diffs

Timer left a comment

ijjk commented Jun 1, 2020

Diffs

make getStaticPaths work with optional catch-all routes #13559

make getStaticPaths work with optional catch-all routes #13559

Conversation

Janpot commented May 29, 2020 • edited Loading

ijjk commented Jun 1, 2020

Stats from current PR

Diffs

ijjk commented Jun 1, 2020

Stats from current PR

Diffs

Timer left a comment

Choose a reason for hiding this comment

ijjk commented Jun 1, 2020

Stats from current PR

Diffs

Janpot commented May 29, 2020 •

edited

Loading