fix: exclude ignored files from glob for bundling

oedotme · Apr 13, 2024 · 8dfbc63 · 8dfbc63
1 parent 56d6402
commit 8dfbc63
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 10 deletions.
diff --git a/examples/react-router-custom-path/client/src/routes.tsx b/examples/react-router-custom-path/client/src/routes.tsx
@@ -9,9 +9,10 @@ type Module = { default: Element; Loader?: LoaderFunction; Action?: ActionFuncti
 
 const PRESERVED = import.meta.glob<Module>('/client/src/pages/(_app|404).{jsx,tsx}', { eager: true })
 const MODALS = import.meta.glob<Pick<Module, 'default'>>('/client/src/pages/**/[+]*.{jsx,tsx}', { eager: true })
-const ROUTES = import.meta.glob<Module>(['/client/src/pages/**/[\\w[-]*.{jsx,tsx,mdx}', '!**/(_app|404).*'], {
-  eager: true,
-})
+const ROUTES = import.meta.glob<Module>(
+  ['/client/src/pages/**/[\\w[-]*.{jsx,tsx,mdx}', '!**/(_!(layout)*(/*)?|_app|404)*'],
+  { eager: true },
+)
 
 const preservedRoutes = generatePreservedRoutes<Omit<Module, 'Action'>>(PRESERVED)
 const modalRoutes = generateModalRoutes<Element>(MODALS)

diff --git a/examples/react-router-custom/src/routes.tsx b/examples/react-router-custom/src/routes.tsx
@@ -9,7 +9,9 @@ type Module = { default: Element; Loader?: LoaderFunction; Action?: ActionFuncti
 
 const PRESERVED = import.meta.glob<Module>('/src/pages/(_app|404).{jsx,tsx}', { eager: true })
 const MODALS = import.meta.glob<Pick<Module, 'default'>>('/src/pages/**/[+]*.{jsx,tsx}', { eager: true })
-const ROUTES = import.meta.glob<Module>(['/src/pages/**/[\\w[-]*.{jsx,tsx,mdx}', '!**/(_app|404).*'], { eager: true })
+const ROUTES = import.meta.glob<Module>(['/src/pages/**/[\\w[-]*.{jsx,tsx,mdx}', '!**/(_!(layout)*(/*)?|_app|404)*'], {
+  eager: true,
+})
 
 const preservedRoutes = generatePreservedRoutes<Omit<Module, 'Action'>>(PRESERVED)
 const modalRoutes = generateModalRoutes<Element>(MODALS)

diff --git a/explorer/src/components/routes.tsx b/explorer/src/components/routes.tsx
@@ -6,7 +6,9 @@ import { classNames } from '@/utils'
 
 const PRESERVED = import.meta.glob('/src/pages/(_app|404).{jsx,tsx}', { eager: true })
 const MODALS = import.meta.glob('/src/pages/**/[+]*.{jsx,tsx}', { eager: true })
-const ROUTES = import.meta.glob(['/src/pages/**/[\\w[-]*.{jsx,tsx}', '!**/(_app|404).*'], { eager: true })
+const ROUTES = import.meta.glob(['/src/pages/**/[\\w[-]*.{jsx,tsx}', '!**/(_!(layout)*(/*)?|_app|404)*'], {
+  eager: true,
+})
 
 type Route = RouteObject & Partial<{ key: string; modal: boolean; pathname: string }>
 

diff --git a/packages/generouted/src/react-location.tsx b/packages/generouted/src/react-location.tsx
@@ -7,7 +7,7 @@ type Element = () => JSX.Element
 type Module = { default: Element; Loader: LoaderFn; Pending: Element; Catch: Element }
 
 const PRESERVED = import.meta.glob<Module>('/src/pages/(_app|404).{jsx,tsx}', { eager: true })
-const ROUTES = import.meta.glob<Module>(['/src/pages/**/[\\w[-]*.{jsx,tsx}', '!**/(_app|404).*'])
+const ROUTES = import.meta.glob<Module>(['/src/pages/**/[\\w[-]*.{jsx,tsx}', '!**/(_!(layout)*(/*)?|_app|404)*'])
 
 const preservedRoutes = generatePreservedRoutes<Module>(PRESERVED)
 

diff --git a/packages/generouted/src/react-router-lazy.tsx b/packages/generouted/src/react-router-lazy.tsx
@@ -9,7 +9,7 @@ type Module = { default: Element; Loader?: LoaderFunction; Action?: ActionFuncti
 
 const PRESERVED = import.meta.glob<Module>('/src/pages/(_app|404).{jsx,tsx}', { eager: true })
 const MODALS = import.meta.glob<Pick<Module, 'default'>>('/src/pages/**/[+]*.{jsx,tsx}', { eager: true })
-const ROUTES = import.meta.glob<Module>(['/src/pages/**/[\\w[-]*.{jsx,tsx,mdx}', '!**/(_app|404).*'])
+const ROUTES = import.meta.glob<Module>(['/src/pages/**/[\\w[-]*.{jsx,tsx,mdx}', '!**/(_!(layout)*(/*)?|_app|404)*'])
 
 const preservedRoutes = generatePreservedRoutes<Omit<Module, 'Action'>>(PRESERVED)
 const modalRoutes = generateModalRoutes<Element>(MODALS)

diff --git a/packages/generouted/src/react-router.tsx b/packages/generouted/src/react-router.tsx
@@ -9,7 +9,9 @@ type Module = { default: Element; Loader?: LoaderFunction; Action?: ActionFuncti
 
 const PRESERVED = import.meta.glob<Module>('/src/pages/(_app|404).{jsx,tsx}', { eager: true })
 const MODALS = import.meta.glob<Pick<Module, 'default'>>('/src/pages/**/[+]*.{jsx,tsx}', { eager: true })
-const ROUTES = import.meta.glob<Module>(['/src/pages/**/[\\w[-]*.{jsx,tsx,mdx}', '!**/(_app|404).*'], { eager: true })
+const ROUTES = import.meta.glob<Module>(['/src/pages/**/[\\w[-]*.{jsx,tsx,mdx}', '!**/(_!(layout)*(/*)?|_app|404)*'], {
+  eager: true,
+})
 
 const preservedRoutes = generatePreservedRoutes<Omit<Module, 'Action'>>(PRESERVED)
 const modalRoutes = generateModalRoutes<Element>(MODALS)

diff --git a/packages/generouted/src/solid-router-lazy.tsx b/packages/generouted/src/solid-router-lazy.tsx
@@ -10,7 +10,7 @@ type Route = { path?: string; component?: Component; children?: Route[] }
 
 const PRESERVED = import.meta.glob<Module>('/src/pages/(_app|404).{jsx,tsx}', { eager: true })
 const MODALS = import.meta.glob<Pick<Module, 'default'>>('/src/pages/**/[+]*.{jsx,tsx}', { eager: true })
-const ROUTES = import.meta.glob<Module>(['/src/pages/**/[\\w[-]*.{jsx,tsx,mdx}', '!**/(_app|404).*'])
+const ROUTES = import.meta.glob<Module>(['/src/pages/**/[\\w[-]*.{jsx,tsx,mdx}', '!**/(_!(layout)*(/*)?|_app|404)*'])
 
 const preservedRoutes = generatePreservedRoutes<Module>(PRESERVED)
 const modalRoutes = generateModalRoutes<Element>(MODALS)

diff --git a/packages/generouted/src/solid-router.tsx b/packages/generouted/src/solid-router.tsx
@@ -10,7 +10,9 @@ type RouteDef = { path?: string; component?: Component; children?: RouteDef[] }
 
 const PRESERVED = import.meta.glob<Module>('/src/pages/(_app|404).{jsx,tsx}', { eager: true })
 const MODALS = import.meta.glob<Pick<Module, 'default'>>('/src/pages/**/[+]*.{jsx,tsx}', { eager: true })
-const ROUTES = import.meta.glob<Module>(['/src/pages/**/[\\w[-]*.{jsx,tsx,mdx}', '!**/(_app|404).*'], { eager: true })
+const ROUTES = import.meta.glob<Module>(['/src/pages/**/[\\w[-]*.{jsx,tsx,mdx}', '!**/(_!(layout)*(/*)?|_app|404)*'], {
+  eager: true,
+})
 
 const preservedRoutes = generatePreservedRoutes<Module>(PRESERVED)
 const modalRoutes = generateModalRoutes<Element>(MODALS)