rari 0.2.6 → 0.2.7

package/src/router/router.tsx

@@ -47,9 +47,10 @@ export function RouterProvider({
     }),
     [config],
   )
+  const [currentRoute, setCurrentRoute] = useState<RouteMatch | null>(null)
 
-  const resolveRoute = useCallback(
-    (url: string): RouteMatch | null => {
+  const updateCurrentRoute = useCallback(
+    (url: string) => {
       const { pathname, search, hash, searchParams } = parseUrl(url)
       const normalizedPathname = normalizePathname(pathname)
 
@@ -63,56 +64,17 @@ export function RouterProvider({
           hash,
         }
 
-        enhancedMatch.childMatch = findDeepestChildMatch(
-          enhancedMatch,
-          normalizedPathname,
-        )
-        return enhancedMatch
-      }
+        enhancedMatch.childMatch = findDeepestChildMatch(enhancedMatch, normalizedPathname)
 
-      return null
+        setCurrentRoute(enhancedMatch)
+      }
+      else {
+        setCurrentRoute(null)
+      }
     },
     [routes],
   )
 
-  const [routerState, setRouterState] = useState<{
-    currentRoute: RouteMatch | null
-    isReady: boolean
-  }>(() => {
-    if (typeof window === 'undefined') {
-      return { currentRoute: null, isReady: false }
-    }
-
-    const url = mergedConfig.useHash
-      ? window.location.hash.slice(1) || '/'
-      : window.location.pathname
-        + window.location.search
-        + window.location.hash
-
-    let initialRoute
-    try {
-      initialRoute = resolveRoute(url)
-    }
-    catch (error) {
-      console.error('Error resolving initial route:', error)
-      initialRoute = null
-    }
-
-    const isReady = true
-    return { currentRoute: initialRoute, isReady }
-  })
-
-  const currentRoute = routerState.currentRoute
-  const isReady = routerState.isReady
-
-  const updateCurrentRoute = useCallback(
-    (url: string) => {
-      const route = resolveRoute(url)
-      setRouterState({ currentRoute: route, isReady: true })
-    },
-    [resolveRoute],
-  )
-
   useEffect(() => {
     const handleLocationChange = () => {
       const url = mergedConfig.useHash
@@ -124,6 +86,8 @@ export function RouterProvider({
       updateCurrentRoute(url)
     }
 
+    handleLocationChange()
+
     const handlePopState = () => {
       handleLocationChange()
     }
@@ -211,8 +175,8 @@ export function RouterProvider({
     [currentRoute],
   )
 
-  const contextValue: IRouterContext = useMemo(() => {
-    return {
+  const contextValue: IRouterContext = useMemo(
+    () => ({
       currentRoute,
       routes,
       navigate,
@@ -221,19 +185,18 @@ export function RouterProvider({
       replace,
       isActive,
       config: mergedConfig,
-      isReady,
-    }
-  }, [
-    currentRoute,
-    routes,
-    navigate,
-    back,
-    forward,
-    replace,
-    isActive,
-    mergedConfig,
-    isReady,
-  ])
+    }),
+    [
+      currentRoute,
+      routes,
+      navigate,
+      back,
+      forward,
+      replace,
+      isActive,
+      mergedConfig,
+    ],
+  )
 
   return <RouterContext value={contextValue}>{children}</RouterContext>
 }
@@ -281,7 +244,8 @@ export function useParams() {
 }
 
 export function useSearchParams() {
-  const { currentRoute, navigate } = useRouter()
+  const { currentRoute } = useRouter()
+  const { navigate } = useRouter()
 
   const searchParams = currentRoute?.searchParams || {}
 
@@ -290,7 +254,7 @@ export function useSearchParams() {
       params:
         | Record<string, string | string[]>
         | ((
-          prev: Record<string, string | string[]>,
+          prev: Record<string, string | string[]>
         ) => Record<string, string | string[]>),
       options: NavigationOptions = DEFAULT_CONFIG,
     ) => {
@@ -393,25 +357,16 @@ export function Outlet() {
     return null
   }
 
-  return (
-    <ChildComponent
-      {...childRoute.params}
-      searchParams={childRoute.searchParams}
-    />
-  )
+  return <ChildComponent {...childRoute.params} searchParams={childRoute.searchParams} />
 }
 
-function findChildRouteForCurrentLevel(
-  currentRoute: RouteMatch,
-): RouteMatch | null {
+function findChildRouteForCurrentLevel(currentRoute: RouteMatch): RouteMatch | null {
   if (currentRoute.childMatch) {
     return currentRoute.childMatch
   }
 
   if (currentRoute.route.children) {
-    const indexRoute = currentRoute.route.children.find(
-      child => child.isIndex,
-    )
+    const indexRoute = currentRoute.route.children.find(child => child.isIndex)
     if (indexRoute) {
       return {
         route: indexRoute,
@@ -430,26 +385,14 @@ function findChildRouteForCurrentLevel(
 export function RouteRenderer({ routeMatch }: { routeMatch: RouteMatch }) {
   if (!routeMatch.layouts || routeMatch.layouts.length === 0) {
     const Component = routeMatch.route.component
-    return Component
-      ? (
-          <Component
-            {...routeMatch.params}
-            searchParams={routeMatch.searchParams}
-          />
-        )
-      : null
+    return Component ? <Component {...routeMatch.params} searchParams={routeMatch.searchParams} /> : null
   }
 
   let rendered: ReactNode = null
   const Component = routeMatch.route.component
 
   if (Component) {
-    rendered = (
-      <Component
-        {...routeMatch.params}
-        searchParams={routeMatch.searchParams}
-      />
-    )
+    rendered = <Component {...routeMatch.params} searchParams={routeMatch.searchParams} />
   }
 
   for (let i = routeMatch.layouts.length - 1; i >= 0; i--) {
@@ -457,9 +400,7 @@ export function RouteRenderer({ routeMatch }: { routeMatch: RouteMatch }) {
     const LayoutComponent = layout.component
 
     if (LayoutComponent) {
-      rendered = (
-        <LayoutComponent route={routeMatch}>{rendered}</LayoutComponent>
-      )
+      rendered = <LayoutComponent route={routeMatch}>{rendered}</LayoutComponent>
     }
   }
 
@@ -487,10 +428,7 @@ export function Navigate({
 export default RouterProvider
 export { RouterContext }
 
-function findDeepestChildMatch(
-  routeMatch: RouteMatch,
-  pathname: string,
-): RouteMatch | null {
+function findDeepestChildMatch(routeMatch: RouteMatch, pathname: string): RouteMatch | null {
   if (!routeMatch.route.children || routeMatch.route.children.length === 0) {
     return null
   }
@@ -548,12 +486,18 @@ export function Link({
   )
 
   const isLinkActive = isActive(to, exact)
-  const finalClassName = [className, isLinkActive && activeClassName]
-    .filter(Boolean)
-    .join(' ')
+  const finalClassName = [
+    className,
+    isLinkActive && activeClassName,
+  ].filter(Boolean).join(' ')
 
   return (
-    <a href={to} className={finalClassName} onClick={handleClick} {...props}>
+    <a
+      href={to}
+      className={finalClassName}
+      onClick={handleClick}
+      {...props}
+    >
       {children}
     </a>
   )

package/src/router/types.ts

@@ -75,7 +75,6 @@ export interface RouterContext {
   replace: (path: string, options?: Omit<NavigationOptions, 'replace'>) => void
   isActive: (path: string, exact?: boolean) => boolean
   config: RouterConfig
-  isReady: boolean
 }
 
 export interface NavigationState {
@@ -123,7 +122,7 @@ export type RouteGenerator = (
   options: RouteGenerationOptions,
 ) => Promise<Route[]>
 
-export interface UseRouterReturn extends RouterContext {}
+export interface UseRouterReturn extends RouterContext { }
 
 export interface UseNavigationReturn extends NavigationState {
   navigate: RouterContext['navigate']

package/src/server.ts

@@ -1,4 +1,6 @@
-export { Link } from './router'
+export {
+  Link,
+} from './router'
 
 export {
   buildSearchString,
@@ -59,12 +61,19 @@ export {
   watchFileRoutes,
 } from './router/file-routes'
 
-export { getRoutePriority } from './router/utils'
+export {
+  getRoutePriority,
+} from './router/utils'
 
 export { rariRouter } from './router/vite-plugin'
 
-export { createHttpRuntimeClient, HttpRuntimeClient } from './runtime-client'
+export {
+  createHttpRuntimeClient,
+  HttpRuntimeClient,
+} from './runtime-client'
 
-export type { RuntimeClient } from './runtime-client'
+export type {
+  RuntimeClient,
+} from './runtime-client'
 
-export { createReactDOMOptimization, defineRariConfig, rari } from './vite'
+export { defineRariConfig, rari } from './vite'

package/src/vite/index.ts

@@ -151,10 +151,7 @@ export function rari(options: RariOptions = {}): Plugin[] {
     }
   }
 
-  function hasTopLevelDirective(
-    code: string,
-    directive: 'use client' | 'use server',
-  ): boolean {
+  function hasTopLevelDirective(code: string, directive: 'use client' | 'use server'): boolean {
     try {
       const ast = acorn.parse(code, {
         ecmaVersion: 2024,
@@ -373,47 +370,30 @@ if (import.meta.hot) {
     config(config: UserConfig, { command }) {
       config.resolve = config.resolve || {}
       const existingDedupe = Array.isArray((config.resolve as any).dedupe)
-        ? ((config.resolve as any).dedupe as string[])
+        ? (config.resolve as any).dedupe as string[]
         : []
-      const toAdd = ['react', 'react-dom'];
-      (config.resolve as any).dedupe = Array.from(
+      const toAdd = ['react', 'react-dom']
+        ; (config.resolve as any).dedupe = Array.from(
         new Set([...(existingDedupe || []), ...toAdd]),
       )
 
-      const existingResolveAlias = (config.resolve as any).alias || {};
-      (config.resolve as any).alias = {
-        ...existingResolveAlias,
-        'react-dom/server': 'react-dom/server.browser',
-      }
-
-      const existingAlias: Array<{
-        find: string | RegExp
-        replacement: string
-      }> = Array.isArray((config.resolve as any).alias)
-        ? (config.resolve as any).alias
-        : []
+      const existingAlias: Array<{ find: string | RegExp, replacement: string }>
+        = Array.isArray((config.resolve as any).alias)
+          ? (config.resolve as any).alias
+          : []
       const aliasFinds = new Set(existingAlias.map(a => String(a.find)))
       try {
         const reactPath = require.resolve('react')
         const reactDomClientPath = require.resolve('react-dom/client')
         const reactJsxRuntimePath = require.resolve('react/jsx-runtime')
-        const aliasesToAppend: Array<{ find: string, replacement: string }>
-          = []
+        const aliasesToAppend: Array<{ find: string, replacement: string }> = []
         if (!aliasFinds.has('react/jsx-runtime')) {
-          aliasesToAppend.push({
-            find: 'react/jsx-runtime',
-            replacement: reactJsxRuntimePath,
-          })
+          aliasesToAppend.push({ find: 'react/jsx-runtime', replacement: reactJsxRuntimePath })
         }
         try {
-          const reactJsxDevRuntimePath = require.resolve(
-            'react/jsx-dev-runtime',
-          )
+          const reactJsxDevRuntimePath = require.resolve('react/jsx-dev-runtime')
           if (!aliasFinds.has('react/jsx-dev-runtime')) {
-            aliasesToAppend.push({
-              find: 'react/jsx-dev-runtime',
-              replacement: reactJsxDevRuntimePath,
-            })
+            aliasesToAppend.push({ find: 'react/jsx-dev-runtime', replacement: reactJsxDevRuntimePath })
           }
         }
         catch { }
@@ -421,16 +401,10 @@ if (import.meta.hot) {
           aliasesToAppend.push({ find: 'react', replacement: reactPath })
         }
         if (!aliasFinds.has('react-dom/client')) {
-          aliasesToAppend.push({
-            find: 'react-dom/client',
-            replacement: reactDomClientPath,
-          })
+          aliasesToAppend.push({ find: 'react-dom/client', replacement: reactDomClientPath })
         }
         if (aliasesToAppend.length > 0) {
-          (config.resolve as any).alias = [
-            ...existingAlias,
-            ...aliasesToAppend,
-          ]
+          (config.resolve as any).alias = [...existingAlias, ...aliasesToAppend]
         }
       }
       catch { }
@@ -463,22 +437,12 @@ if (import.meta.hot) {
       if (!config.optimizeDeps.include.includes('react-dom/server')) {
         config.optimizeDeps.include.push('react-dom/server')
       }
-      if (!config.optimizeDeps.include.includes('react')) {
-        config.optimizeDeps.include.push('react')
-      }
-      if (!config.optimizeDeps.include.includes('react-dom/client')) {
-        config.optimizeDeps.include.push('react-dom/client')
-      }
-      config.optimizeDeps.exclude = config.optimizeDeps.exclude || []
-      if (!config.optimizeDeps.exclude.includes('virtual:rsc-integration')) {
-        config.optimizeDeps.exclude.push('virtual:rsc-integration')
-      }
 
       if (command === 'build') {
         for (const envName of ['rsc', 'ssr', 'client']) {
           const env = config.environments[envName]
           if (env && env.build) {
-            env.build.rolldownOptions = env.build.rolldownOptions || {}
+            env.build.rollupOptions = env.build.rollupOptions || {}
           }
         }
       }
@@ -514,219 +478,38 @@ if (import.meta.hot) {
 
       if (command === 'build') {
         config.build = config.build || {}
-        config.build.rolldownOptions = config.build.rolldownOptions || {}
+        config.build.rollupOptions = config.build.rollupOptions || {}
 
-        if (!config.build.rolldownOptions.input) {
-          config.build.rolldownOptions.input = {
+        if (!config.build.rollupOptions.input) {
+          config.build.rollupOptions.input = {
             main: './index.html',
           }
         }
-
-        config.build.rolldownOptions.output
-          = config.build.rolldownOptions.output || {}
-        const outputConfig = Array.isArray(config.build.rolldownOptions.output)
-          ? config.build.rolldownOptions.output[0] || {}
-          : config.build.rolldownOptions.output
-
-        outputConfig.manualChunks
-          = outputConfig.manualChunks
-            || ((id) => {
-              if (id.includes('react-dom')) {
-                return 'react-dom'
-              }
-              if (id.includes('react') && !id.includes('react-dom')) {
-                return 'react'
-              }
-              if (id.includes('markdown-it') || id.includes('shiki')) {
-                return 'vendor'
-              }
-              if (id.includes('node_modules')) {
-                return 'vendor'
-              }
-            })
-
-        config.build.rolldownOptions.treeshake = config.build.rolldownOptions
-          .treeshake || {
-          moduleSideEffects: (id) => {
-            if (id.includes('.css') || id.includes('polyfill')) {
-              return true
-            }
-            if (
-              id.includes('react-dom')
-              || id.includes('react')
-              || id.includes('scheduler')
-            ) {
-              return false
-            }
-            return false
-          },
-          unknownGlobalSideEffects: false,
-        }
-
-        const existingExternal = config.build.rolldownOptions.external || []
-        const reactDomExternals = [
-          'react-dom/profiling',
-          'react-dom/test-utils',
-          'react-dom/server',
-          'react-dom/server.browser',
-          'react-dom/server.node',
-          'react/jsx-dev-runtime',
-          'scheduler/tracing',
-          'scheduler/unstable_mock',
-          'react/cjs/react.development.js',
-          'react/cjs/react.production.min.js',
-          'react-dom/cjs/react-dom.development.js',
-          'react-dom/cjs/react-dom.production.min.js',
-        ]
-
-        if (Array.isArray(existingExternal)) {
-          const external = [...existingExternal]
-          external.push(
-            ...reactDomExternals.filter(dep => !external.includes(dep)),
-          )
-          config.build.rolldownOptions.external = external
-        }
-        else if (typeof existingExternal === 'function') {
-          const originalExternal = existingExternal
-          config.build.rolldownOptions.external = (id, parentId, isResolved) => {
-            if (reactDomExternals.includes(id))
-              return true
-            return originalExternal(id, parentId, isResolved)
-          }
-        }
-        else {
-          config.build.rolldownOptions.external = [
-            ...(Array.isArray(existingExternal)
-              ? existingExternal
-              : [existingExternal]),
-            ...reactDomExternals,
-          ].filter(Boolean)
-        }
-
-        config.build.minify = config.build.minify !== false ? 'terser' : false
-        config.build.target = config.build.target || [
-          'es2020',
-          'edge88',
-          'firefox78',
-          'chrome87',
-          'safari14',
-        ]
-        config.build.cssMinify
-          = config.build.cssMinify !== false ? 'esbuild' : false
-        config.build.sourcemap
-          = config.build.sourcemap !== undefined ? config.build.sourcemap : false
-
-        config.build.terserOptions = config.build.terserOptions || {
-          compress: {
-            drop_console: true,
-            drop_debugger: true,
-            pure_funcs: ['console.log', 'console.info', 'console.debug'],
-            passes: 2,
-          },
-          mangle: {
-            safari10: true,
-          },
-          format: {
-            comments: false,
-          },
-        }
-
-        outputConfig.format = outputConfig.format || 'es'
-        outputConfig.minify = true
-
-        if (Array.isArray(config.build.rolldownOptions.output)) {
-          config.build.rolldownOptions.output[0] = outputConfig
-        }
-        else {
-          config.build.rolldownOptions.output = outputConfig
-        }
       }
 
       if (config.environments && config.environments.client) {
         if (!config.environments.client.build) {
           config.environments.client.build = {}
         }
-        if (!config.environments.client.build.rolldownOptions) {
-          config.environments.client.build.rolldownOptions = {}
+        if (!config.environments.client.build.rollupOptions) {
+          config.environments.client.build.rollupOptions = {}
         }
-        if (!config.environments.client.build.rolldownOptions.input) {
-          config.environments.client.build.rolldownOptions.input = {}
+        if (!config.environments.client.build.rollupOptions.input) {
+          config.environments.client.build.rollupOptions.input = {}
         }
 
         if (
-          typeof config.environments.client.build.rolldownOptions.input
+          typeof config.environments.client.build.rollupOptions.input
           === 'object'
-          && !Array.isArray(config.environments.client.build.rolldownOptions.input)
+          && !Array.isArray(config.environments.client.build.rollupOptions.input)
         ) {
           (
-            config.environments.client.build.rolldownOptions.input as Record<
+            config.environments.client.build.rollupOptions.input as Record<
               string,
               string
             >
           )['client-components'] = 'virtual:rsc-client-components'
         }
-
-        config.environments.client.build.minify
-          = config.environments.client.build.minify !== false ? 'esbuild' : false
-        config.environments.client.build.target = config.environments.client
-          .build
-          .target || [
-          'es2020',
-          'edge88',
-          'firefox78',
-          'chrome87',
-          'safari14',
-        ]
-        config.environments.client.build.cssMinify = 'esbuild'
-        config.environments.client.build.rolldownOptions.treeshake = {
-          moduleSideEffects: false,
-          unknownGlobalSideEffects: false,
-        }
-
-        config.environments.client.build.rolldownOptions.output
-          = config.environments.client.build.rolldownOptions.output || {}
-        const clientOutputConfig = Array.isArray(
-          config.environments.client.build.rolldownOptions.output,
-        )
-          ? config.environments.client.build.rolldownOptions.output[0] || {}
-          : config.environments.client.build.rolldownOptions.output
-
-        clientOutputConfig.manualChunks
-          = clientOutputConfig.manualChunks
-            || ((id) => {
-              if (id.includes('react-dom')) {
-                return 'react-dom'
-              }
-              if (id.includes('react') && !id.includes('react-dom')) {
-                return 'react'
-              }
-              if (
-                id.includes('rari')
-                && (id.includes('router') || id.includes('navigation'))
-              ) {
-                return 'router'
-              }
-              if (id.includes('markdown-it') || id.includes('shiki')) {
-                return 'vendor'
-              }
-              if (id.includes('node_modules')) {
-                return 'vendor'
-              }
-            })
-
-        clientOutputConfig.format = clientOutputConfig.format || 'es'
-        clientOutputConfig.minify = true
-
-        if (
-          Array.isArray(config.environments.client.build.rolldownOptions.output)
-        ) {
-          config.environments.client.build.rolldownOptions.output[0]
-            = clientOutputConfig
-        }
-        else {
-          config.environments.client.build.rolldownOptions.output
-            = clientOutputConfig
-        }
       }
 
       return config

package/dist/client-dev.d.ts

@@ -1,2 +0,0 @@
-import { ErrorBoundaryProps, FileRouteInfo, HttpRuntimeClient, LayoutProps, Link, LinkProps, LoadingProps, Navigate, NavigationOptions, NavigationState, Outlet, PageComponent, PageProps, Route, RouteComponent, RouteGenerationOptions, RouteMatch, RouteMeta, RouteParams, RouterConfig, RouterContext, RouterProvider, RouterProviderProps, Routes, RuntimeClient, SearchParams, buildSearchString, buildUrl, createHttpRuntimeClient, extractParamNames, findMatchingRoute, isDynamicRoute, isPathActive, joinPaths, normalizePathname, parseSearchParams, parseUrl, useNavigation, useParams, usePathname, useRoute, useRouter, useSearchParams, withRouter } from "./runtime-client-P4vvSVPV.js";
-export { type ErrorBoundaryProps, type FileRouteInfo, HttpRuntimeClient, type LayoutProps, Link, type LinkProps, type LoadingProps, Navigate, type NavigationOptions, type NavigationState, Outlet, type PageComponent, type PageProps, RouteComponent as Route, type RouteGenerationOptions, type RouteMatch, type RouteMeta, type RouteParams, type Route as RouteType, type RouterConfig, type RouterContext, RouterProvider, type RouterProviderProps, Routes, type RuntimeClient, type SearchParams, buildSearchString, buildUrl, createHttpRuntimeClient, extractParamNames, findMatchingRoute, isDynamicRoute, isPathActive, joinPaths, normalizePathname, parseSearchParams, parseUrl, useNavigation, useParams, usePathname, useRoute, useRouter, useSearchParams, withRouter };

package/dist/client-dev.js

@@ -1,3 +0,0 @@
-import { HttpRuntimeClient, Link, Navigate, Outlet, RouteComponent, Routes, buildSearchString, buildUrl, createHttpRuntimeClient, extractParamNames, findMatchingRoute, isDynamicRoute, isPathActive, joinPaths, normalizePathname, parseSearchParams, parseUrl, router_default, useNavigation, useParams, usePathname, useRoute, useRouter, useSearchParams, withRouter } from "./runtime-client-CcEhh-F7.js";
-
-export { HttpRuntimeClient, Link, Navigate, Outlet, RouteComponent as Route, router_default as RouterProvider, Routes, buildSearchString, buildUrl, createHttpRuntimeClient, extractParamNames, findMatchingRoute, isDynamicRoute, isPathActive, joinPaths, normalizePathname, parseSearchParams, parseUrl, useNavigation, useParams, usePathname, useRoute, useRouter, useSearchParams, withRouter };

package/dist/server-build-Cp6_RdeA.js

@@ -1,3 +0,0 @@
-import { ServerComponentBuilder, createServerBuildPlugin, scanDirectory } from "./server-build-DaBgiV55.js";
-
-export { ServerComponentBuilder, scanDirectory };