Merge branch 'canary' into fix/skip-trailing-slash-pages

vercel · Sep 6, 2023 · 18b8cff · 18b8cff
2 parents b296ed2 + 16cbc82
commit 18b8cff
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 40 deletions.
diff --git a/test/e2e/app-dir/app-basepath/app/use-pathname-another/page.js b/test/e2e/app-dir/app-basepath/app/use-pathname-another/page.js
@@ -0,0 +1,3 @@
+'use client'
+
+export { ReadPathName as default } from '../../components/read-path-name'
diff --git a/test/e2e/app-dir/app-basepath/app/use-pathname/page.js b/test/e2e/app-dir/app-basepath/app/use-pathname/page.js
@@ -0,0 +1,3 @@
+'use client'
+
+export { ReadPathName as default } from '../../components/read-path-name'
diff --git a/...e2e/app-dir/base-path/components/page.jsx → ...app-basepath/components/read-path-name.js b/...e2e/app-dir/base-path/components/page.jsx → ...app-basepath/components/read-path-name.js
@@ -1,6 +1,6 @@
 import { usePathname } from 'next/navigation'
 
-export function Page() {
+export function ReadPathName() {
   const pathname = usePathname()
   return (
     <div id="pathname" data-pathname={pathname}>

diff --git a/test/e2e/app-dir/app-basepath/index.test.ts b/test/e2e/app-dir/app-basepath/index.test.ts
@@ -2,13 +2,11 @@ import { createNextDescribe } from 'e2e-utils'
 import { check } from 'next-test-utils'
 
 createNextDescribe(
-  'app dir basepath',
+  'app dir - basepath',
   {
     files: __dirname,
     skipDeployment: true,
     dependencies: {
-      react: 'latest',
-      'react-dom': 'latest',
       sass: 'latest',
     },
   },
@@ -43,5 +41,14 @@ createNextDescribe(
         return 'success'
       }, 'success')
     })
+
+    it('should render usePathname without the basePath', async () => {
+      const pathnames = ['/use-pathname', '/use-pathname-another']
+      const validatorPromises = pathnames.map(async (pathname) => {
+        const $ = await next.render$('/base' + pathname)
+        expect($('#pathname').data('pathname')).toBe(pathname)
+      })
+      await Promise.all(validatorPromises)
+    })
   }
 )
diff --git a/test/e2e/app-dir/base-path/app/dashboard/page.jsx b/test/e2e/app-dir/base-path/app/dashboard/page.jsx
diff --git a/test/e2e/app-dir/base-path/app/layout.jsx b/test/e2e/app-dir/base-path/app/layout.jsx
diff --git a/test/e2e/app-dir/base-path/app/page.jsx b/test/e2e/app-dir/base-path/app/page.jsx
diff --git a/test/e2e/app-dir/base-path/index.test.ts b/test/e2e/app-dir/base-path/index.test.ts
diff --git a/test/e2e/app-dir/base-path/next.config.js b/test/e2e/app-dir/base-path/next.config.js
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		'use client'

		export { ReadPathName as default } from '../../components/read-path-name'