vercel · ztanner · Apr 20, 2024 · Apr 19, 2024
diff --git a/packages/next/src/lib/generate-interception-routes-rewrites.ts b/packages/next/src/lib/generate-interception-routes-rewrites.ts
@@ -10,11 +10,14 @@ import type { Rewrite } from './load-custom-routes'
 // a function that converts normalised paths (e.g. /foo/[bar]/[baz]) to the format expected by pathToRegexp (e.g. /foo/:bar/:baz)
 function toPathToRegexpPath(path: string): string {
   return path.replace(/\[\[?([^\]]+)\]\]?/g, (_, capture) => {
+    // path-to-regexp only supports word characters, so we replace any non-word characters with underscores
+    const paramName = capture.replace(/\W+/g, '_')
+
     // handle catch-all segments (e.g. /foo/bar/[...baz] or /foo/bar/[[...baz]])
-    if (capture.startsWith('...')) {
-      return `:${capture.slice(3)}*`
+    if (paramName.startsWith('...')) {
+      return `:${paramName.slice(3)}*`
     }
-    return ':' + capture
+    return ':' + paramName
   })
 }
 

diff --git a/...app/interception-route-special-params/[this-is-my-route]/@intercept/(.)some-page/page.tsx b/...app/interception-route-special-params/[this-is-my-route]/@intercept/(.)some-page/page.tsx
@@ -0,0 +1,8 @@
+export default function Page({ params }) {
+  return (
+    <div>
+      Hello from [this-is-my-route]/@intercept/some-page. Param:{' '}
+      {params['this-is-my-route']}
+    </div>
+  )
+}
diff --git a/...erception/app/interception-route-special-params/[this-is-my-route]/@intercept/default.tsx b/...erception/app/interception-route-special-params/[this-is-my-route]/@intercept/default.tsx
@@ -0,0 +1,3 @@
+export default function Page() {
+  return null
+}
diff --git a/...utes-and-interception/app/interception-route-special-params/[this-is-my-route]/layout.tsx b/...utes-and-interception/app/interception-route-special-params/[this-is-my-route]/layout.tsx
@@ -0,0 +1,14 @@
+export default function Layout({
+  children,
+  intercept,
+}: {
+  children: React.ReactNode
+  intercept: React.ReactNode
+}) {
+  return (
+    <div>
+      <div>{children}</div>
+      <div>{intercept}</div>
+    </div>
+  )
+}
diff --git a/...routes-and-interception/app/interception-route-special-params/[this-is-my-route]/page.tsx b/...routes-and-interception/app/interception-route-special-params/[this-is-my-route]/page.tsx
@@ -0,0 +1,9 @@
+import Link from 'next/link'
+
+export default function Page() {
+  return (
+    <Link href="/interception-route-special-params/some-random-param/some-page">
+      Trigger Interception
+    </Link>
+  )
+}
diff --git a/...-interception/app/interception-route-special-params/[this-is-my-route]/some-page/page.tsx b/...-interception/app/interception-route-special-params/[this-is-my-route]/some-page/page.tsx
@@ -0,0 +1,8 @@
+export default function Page({ params }) {
+  return (
+    <div>
+      Hello from [this-is-my-route]/some-page. Param:{' '}
+      {params['this-is-my-route']}
+    </div>
+  )
+}
diff --git a/test/e2e/app-dir/parallel-routes-and-interception/parallel-routes-and-interception.test.ts b/test/e2e/app-dir/parallel-routes-and-interception/parallel-routes-and-interception.test.ts
@@ -873,6 +873,43 @@ createNextDescribe(
         await check(() => browser.waitForElementByCss('#main-slot').text(), '1')
       })
 
+      it('should intercept on routes that contain hyphenated/special dynamic params', async () => {
+        const browser = await next.browser(
+          '/interception-route-special-params/some-random-param'
+        )
+
+        await browser
+          .elementByCss(
+            "[href='/interception-route-special-params/some-random-param/some-page']"
+          )
+          .click()
+
+        const interceptionText =
+          'Hello from [this-is-my-route]/@intercept/some-page. Param: some-random-param'
+        const pageText =
+          'Hello from [this-is-my-route]/some-page. Param: some-random-param'
+
+        await retry(async () => {
+          expect(await browser.elementByCss('body').text()).toContain(
+            interceptionText
+          )
+
+          expect(await browser.elementByCss('body').text()).not.toContain(
+            pageText
+          )
+        })
+
+        await browser.refresh()
+
+        await retry(async () => {
+          expect(await browser.elementByCss('body').text()).toContain(pageText)
+
+          expect(await browser.elementByCss('body').text()).not.toContain(
+            interceptionText
+          )
+        })
+      })
+
       if (isNextStart) {
         it('should not have /default paths in the prerender manifest', async () => {
           const prerenderManifest = JSON.parse(