fix: should not create Route for excluded directory

KAROTT7 · Nov 22, 2022 · 72debdd · 72debdd
1 parent f8a4b1e
commit 72debdd
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git a/__tests__/routes.spec.ts b/__tests__/routes.spec.ts
@@ -13,6 +13,13 @@ test('Test synchronous route', async () => {
 })
 
 test('Nested layout should not be imported synchronously', async () => {
+  await page.click('.excluded-components')
+  expect(await page.textContent('.no-match-content')).toBe('404')
+
+  await page.goBack()
+})
+
+test('Should not create Route for excluded directory', async () => {
   expect((await page.content()).includes('id="foo_layout"')).toBeFalsy()
 })
 

diff --git a/example/src/pages/components/button.jsx b/example/src/pages/components/button.jsx
@@ -0,0 +1,3 @@
+export default function Button() {
+  return 'button'
+}
diff --git a/example/src/pages/layout.jsx b/example/src/pages/layout.jsx
@@ -10,7 +10,8 @@ export default function Layout() {
         <Link className="utils" to="/utils">/utils</Link>{' '}
         <Link className="foo" to="/foo">/foo</Link>{' '}
         <Link className="foo-bar" to="/foo/bar">/foo/bar</Link>{' '}
-        <Link className="foo-type" to="/foo/a">/foo/:type</Link>
+        <Link className="foo-type" to="/foo/a">/foo/:type</Link>{' '}
+        <Link className="excluded-components" to="/components">/excluded/components</Link>
       </div>
       <div className="layout">layout</div>
       <Outlet />

diff --git a/example/vite.config.js b/example/vite.config.js
@@ -8,7 +8,7 @@ export default defineConfig({
     react(),
     router({
       exclude(path) {
-        return path.includes('utils')
+        return path.includes('utils') || path.includes('components')
       },
       sync(path) {
         return path.includes('sync')

diff --git a/index.ts b/index.ts
@@ -78,9 +78,7 @@ function VitePluginReactRouter(opts: Options = {}): PluginOption {
     }
 
     function readFiles(id: string, route: RouteObject, isDirectory = false, root = false) {
-      if (exclude?.(id)) {
-        return
-      }
+      if (exclude?.(id)) return
 
       const basename = id.endsWith(dir) ? '/' : path.basename(id)
 
@@ -89,8 +87,9 @@ function VitePluginReactRouter(opts: Options = {}): PluginOption {
 
         files.forEach(file => {
           const nextFile = path.join(id, file)
-          const stat = fs.statSync(nextFile)
+          if (exclude?.(nextFile)) return
 
+          const stat = fs.statSync(nextFile)
           if (stat.isDirectory()) {
             const newRoute = { path: path.basename(nextFile) } as RouteObject
             ;(route.children || (route.children = [])).push(newRoute)