diff --git a/packages/remix-router/eslint.config.ts b/packages/remix-router/eslint.config.ts new file mode 100644 index 00000000..6d0339c9 --- /dev/null +++ b/packages/remix-router/eslint.config.ts @@ -0,0 +1,15 @@ +import rootConfig from '../../eslint.config.js' +import type { Linter } from 'eslint' + +export default [ + ...rootConfig, + { + ignores: ['example/**'], + }, + { + files: ['src/**/*.{ts,tsx}', 'tests/**/*.{ts,tsx}'], + rules: { + '@typescript-eslint/no-unnecessary-condition': 'off', + }, + }, +] as Array diff --git a/packages/remix-router/src/Link.tsx b/packages/remix-router/src/Link.tsx index 6de4a53b..a777e036 100644 --- a/packages/remix-router/src/Link.tsx +++ b/packages/remix-router/src/Link.tsx @@ -156,20 +156,20 @@ function resolveSimpleStyle( : EMPTY_OBJECT const className = [ - options.class as string | undefined, - options.className as string | undefined, - (activeProps as any).class, - (activeProps as any).className, - (inactiveProps as any).class, - (inactiveProps as any).className, + options.class, + options.className, + (activeProps).class, + (activeProps).className, + (inactiveProps).class, + (inactiveProps).className, ] .filter(Boolean) .join(' ') const style: Record = { ...(typeof options.style === 'object' ? (options.style as any) : null), - ...((activeProps as any).style ?? null), - ...((inactiveProps as any).style ?? null), + ...((activeProps).style ?? null), + ...((inactiveProps).style ?? null), } return { @@ -380,7 +380,7 @@ export function Link(handle: Handle>) { doPreload() return } - const eventTarget = (e.currentTarget ?? e.target) as EventTarget | null + const eventTarget = (e.currentTarget ?? e.target) if (!eventTarget || timeoutMap.has(eventTarget)) return timeoutMap.set( eventTarget, @@ -395,9 +395,9 @@ export function Link(handle: Handle>) { if (disabled) return const eventTarget = e.currentTarget ?? e.target if (eventTarget) { - const id = timeoutMap.get(eventTarget as EventTarget) + const id = timeoutMap.get(eventTarget) clearTimeout(id) - timeoutMap.delete(eventTarget as EventTarget) + timeoutMap.delete(eventTarget) } } @@ -410,7 +410,7 @@ export function Link(handle: Handle>) { // ===== Resolve children ===== let resolvedChildren: RemixNode = null if (typeof children === 'function') { - resolvedChildren = (children as any)({ isActive, isTransitioning }) + resolvedChildren = (children)({ isActive, isTransitioning }) } else if (children !== undefined) { resolvedChildren = children as RemixNode } @@ -438,7 +438,7 @@ export function Link(handle: Handle>) { href={resolvedHref} target={target} mix={eventMixins} - {...(propsSafeToSpread as any)} + {...(propsSafeToSpread)} {...(disabled ? STATIC_DISABLED_PROPS : null)} {...(isTransitioning ? STATIC_TRANSITIONING_ATTRIBUTES : null)} {...(stateProps as any)} diff --git a/packages/remix-router/src/MatchRoute.tsx b/packages/remix-router/src/MatchRoute.tsx index 24136d29..9b440575 100644 --- a/packages/remix-router/src/MatchRoute.tsx +++ b/packages/remix-router/src/MatchRoute.tsx @@ -51,7 +51,7 @@ export function MatchRoute< const { children, ...rest } = props as any const matchResult = matchRoute(rest) if (typeof children === 'function') { - return (children as any)(matchResult) + return (children)(matchResult) } return matchResult ? (children as RemixNode) : null } diff --git a/packages/remix-router/src/Matches.tsx b/packages/remix-router/src/Matches.tsx index 0b16f54e..d2ed3f0e 100644 --- a/packages/remix-router/src/Matches.tsx +++ b/packages/remix-router/src/Matches.tsx @@ -40,7 +40,7 @@ export function Matches(handle: Handle) { if (InnerWrap) { // InnerWrap follows the same React-shape contract as Wrap — // call it as a function rather than using JSX. - inner = InnerWrap({ children: inner }) as RemixNode + inner = InnerWrap({ children: inner }) } if (router.options.disableGlobalCatchBoundary) { diff --git a/packages/remix-router/src/RouterProvider.tsx b/packages/remix-router/src/RouterProvider.tsx index 084b714e..996192bf 100644 --- a/packages/remix-router/src/RouterProvider.tsx +++ b/packages/remix-router/src/RouterProvider.tsx @@ -49,7 +49,7 @@ export function RouterContextProvider( // factory-shaped (handle -> renderFn) components in JSX // position, but a router-options-supplied Wrap follows the // cross-binding contract. - return Wrap({ children }) as RemixNode + return Wrap({ children }) } return <>{children} } diff --git a/packages/remix-router/src/accessors.ts b/packages/remix-router/src/accessors.ts index 2f7f31d6..41195c79 100644 --- a/packages/remix-router/src/accessors.ts +++ b/packages/remix-router/src/accessors.ts @@ -1,9 +1,9 @@ -import { isRedirect, isNotFound } from '@tanstack/router-core' +import { isNotFound, isRedirect } from '@tanstack/router-core' import { RouterProvider } from './RouterProvider' import { MatchContext } from './MatchContext' import { subscribeStore } from './subscribe' import type { Handle } from '@remix-run/ui' -import type { AnyRoute, AnyRouter, AnyRouteMatch } from '@tanstack/router-core' +import type { AnyRoute, AnyRouteMatch, AnyRouter } from '@tanstack/router-core' /** * Read the router instance from the nearest enclosing ``. diff --git a/packages/remix-router/src/fileRoute.ts b/packages/remix-router/src/fileRoute.ts index 0add5752..90c004ba 100644 --- a/packages/remix-router/src/fileRoute.ts +++ b/packages/remix-router/src/fileRoute.ts @@ -173,7 +173,7 @@ export class LazyRoute { ): UseNavigateResult => { const router = useRouter(handle) return useNavigate(handle, { - from: router.routesById[this.options.id]?.fullPath as any, + from: router.routesById[this.options.id]?.fullPath, }) } } diff --git a/packages/remix-router/src/index.ts b/packages/remix-router/src/index.ts index bc845fd1..4af43927 100644 --- a/packages/remix-router/src/index.ts +++ b/packages/remix-router/src/index.ts @@ -1,6 +1,8 @@ // Module augmentations for route/router options must load before any // downstream code reads them. Keep this import first. import './extensions' +// Augments `@tanstack/history` with state-bookkeeping field types. +import './history' // Re-export the framework-agnostic core surface verbatim. The Remix binding // is purely additive — it provides reactivity glue and view components, @@ -32,9 +34,6 @@ export { export type { AnyRootRoute } from './route' export { RouteApi, getRouteApi } from './routeApi' -// Augments `@tanstack/history` with state-bookkeeping field types. -import './history' - // Async data. export { Await, useAwaited } from './awaited' export type { AwaitOptions, AwaitProps } from './awaited' @@ -61,7 +60,11 @@ export { ScrollRestoration, useElementScrollRestoration, } from './ScrollRestoration' -export { buildHeadTags, buildHeadTags as useTags, uniqBy } from './headContentUtils' +export { + buildHeadTags, + buildHeadTags as useTags, + uniqBy, +} from './headContentUtils' // `Transitioner` is intentionally NOT exported. It's the // router-state lifecycle component rendered automatically inside @@ -143,7 +146,10 @@ export type { // returns a getter `() => T` to be called inside the render function. export { useRouter } from './useRouter' export { useRouterState } from './useRouterState' -export type { UseRouterStateOptions, UseRouterStateResult } from './useRouterState' +export type { + UseRouterStateOptions, + UseRouterStateResult, +} from './useRouterState' export { useLocation } from './useLocation' export type { UseLocationBaseOptions, UseLocationResult } from './useLocation' export { useNavigate } from './useNavigate' @@ -217,3 +223,34 @@ export type { RequiredStructuralSharing, DefaultStructuralSharingEnabled, } from './structuralSharing' + +// Server component primitives (also used by tests). +export { + serverComponent, + isServerComponent, + getServerComponent, + createServerComponentCollector, + activateServerComponentCollector, + deactivateServerComponentCollector, + getActiveServerComponentCollector, + _resetServerComponentRegistry, +} from './serverComponent' +export type { + ServerComponentEntry, + ServerComponentMarker, + ServerComponent, + ServerComponentPayloadEntry, + ServerComponentCollector, +} from './serverComponent' +export { + initServerComponentClient, + reRenderServerComponent, + getPrerenderedHtml, + getServerComponentInstance, + listServerComponentInstances, + _resetServerComponentClient, +} from './serverComponentClient' +export { + handleServerComponentRequest, + DEFAULT_SERVER_COMPONENT_BASE, +} from './serverComponentEndpoint' diff --git a/packages/remix-router/src/route.ts b/packages/remix-router/src/route.ts index 0df1bc66..169f7a49 100644 --- a/packages/remix-router/src/route.ts +++ b/packages/remix-router/src/route.ts @@ -11,12 +11,12 @@ import type { AnyContext, AnyRoute, Register, + ResolveFullPath, + ResolveId, ResolveParams, + RootRouteOptions, RouteConstraints, RouteOptions, - RootRouteOptions, - ResolveFullPath, - ResolveId, UpdatableRouteOptions, UseNavigateResult, } from '@tanstack/router-core' @@ -423,6 +423,6 @@ export class NotFoundRoute< TBeforeLoadFn >, ) { - super({ id: '404' as any, ...(options as any) } as any) + super({ id: '404' as any, ...(options as any) }) } } diff --git a/packages/remix-router/src/routeApi.ts b/packages/remix-router/src/routeApi.ts index c5a952bb..3fe8cf84 100644 --- a/packages/remix-router/src/routeApi.ts +++ b/packages/remix-router/src/routeApi.ts @@ -54,21 +54,21 @@ export class RouteApi< ...(opts as any), from: this.id as any, strict: false, - } as any) + }) useLoaderData = (handle: Handle, opts?: { select?: any }) => useLoaderData(handle, { ...(opts as any), from: this.id as any, strict: false, - } as any) + }) useNavigate = ( handle: Handle, ): UseNavigateResult['fullPath']> => { const router = useRouter(handle) return useNavigate(handle, { - from: router.routesById[this.id as any]?.fullPath as any, + from: router.routesById[this.id as any]?.fullPath, }) } diff --git a/packages/remix-router/src/server.tsx b/packages/remix-router/src/server.tsx index 08a61999..af8743ab 100644 --- a/packages/remix-router/src/server.tsx +++ b/packages/remix-router/src/server.tsx @@ -4,15 +4,10 @@ import { createMemoryHistory } from '@tanstack/history' import { attachRouterServerSsrUtils } from '@tanstack/router-core/ssr/server' import { renderToStream } from '@remix-run/ui/server' import { RouterProvider } from './RouterProvider' -import { - activateServerComponentCollector, - createServerComponentCollector, - deactivateServerComponentCollector, -} from './serverComponent' -import { - DEFAULT_SERVER_COMPONENT_BASE, - handleServerComponentRequest, -} from './serverComponentEndpoint' + + + + import type { Handle, RemixNode } from '@remix-run/ui' import type { AnyRouter, Manifest } from '@tanstack/router-core' diff --git a/packages/remix-router/src/serverComponent.tsx b/packages/remix-router/src/serverComponent.tsx index 7a5cd183..45e27b78 100644 --- a/packages/remix-router/src/serverComponent.tsx +++ b/packages/remix-router/src/serverComponent.tsx @@ -153,14 +153,14 @@ export function serverComponent( activeCollector.record(instanceId, { id, props: props as unknown }) } const entry = registry.get(id)! - const inner = entry.factory(handle as Handle) + const inner = entry.factory(handle) return ( - {inner(props) as RemixNode} + {inner(props)} ) } diff --git a/packages/remix-router/src/subscribe.ts b/packages/remix-router/src/subscribe.ts index 72eab0e1..65c5dac5 100644 --- a/packages/remix-router/src/subscribe.ts +++ b/packages/remix-router/src/subscribe.ts @@ -102,7 +102,7 @@ export function subscribeSelected( ? options.select(read()) : (read() as unknown as TSelected) if (options.structuralSharing) { - const shared = replaceEqualDeep(cached, next) as TSelected + const shared = replaceEqualDeep(cached, next) cached = shared return shared } diff --git a/packages/remix-router/src/useBlocker.ts b/packages/remix-router/src/useBlocker.ts index de808311..be5bef66 100644 --- a/packages/remix-router/src/useBlocker.ts +++ b/packages/remix-router/src/useBlocker.ts @@ -140,7 +140,7 @@ function _resolveBlockerOpts< } } - const legacy = opts as LegacyBlockerOpts + const legacy = opts const shouldBlock = Boolean(legacy.condition ?? true) const fn = async () => { if (shouldBlock && legacy.blockerFn !== undefined) { diff --git a/packages/remix-router/src/useLinkProps.ts b/packages/remix-router/src/useLinkProps.ts index 4bb46d22..98279441 100644 --- a/packages/remix-router/src/useLinkProps.ts +++ b/packages/remix-router/src/useLinkProps.ts @@ -211,7 +211,7 @@ export function useLinkProps< function enqueueIntent(e: MouseEvent | FocusEvent) { if (disabled || preload !== 'intent') return if (!preloadDelay) return doPreload() - const t = (e.currentTarget ?? e.target) as EventTarget | null + const t = (e.currentTarget ?? e.target) if (!t || timeoutMap.has(t)) return timeoutMap.set( t, @@ -223,7 +223,7 @@ export function useLinkProps< } function handleLeave(e: MouseEvent | FocusEvent) { if (disabled) return - const t = (e.currentTarget ?? e.target) as EventTarget | null + const t = (e.currentTarget ?? e.target) if (t) { const id = timeoutMap.get(t) clearTimeout(id) @@ -248,28 +248,28 @@ export function useLinkProps< const computedActive = isActive && activeProps - ? functionalUpdate(activeProps as any, {}) + ? functionalUpdate(activeProps, {}) : EMPTY_OBJECT const computedInactive = !isActive && inactiveProps - ? functionalUpdate(inactiveProps as any, {}) + ? functionalUpdate(inactiveProps, {}) : EMPTY_OBJECT const mergedClass = [ linkClass, className, - (computedActive as any).class, - (computedActive as any).className, - (computedInactive as any).class, - (computedInactive as any).className, + (computedActive).class, + (computedActive).className, + (computedInactive).class, + (computedInactive).className, ] .filter(Boolean) .join(' ') const mergedStyle = { - ...(typeof style === 'object' ? (style as any) : null), - ...((computedActive as any).style ?? null), - ...((computedInactive as any).style ?? null), + ...(typeof style === 'object' ? (style) : null), + ...((computedActive).style ?? null), + ...((computedInactive).style ?? null), } return { diff --git a/packages/remix-router/src/useLoaderDeps.ts b/packages/remix-router/src/useLoaderDeps.ts index 3ded7e01..5edce4bd 100644 --- a/packages/remix-router/src/useLoaderDeps.ts +++ b/packages/remix-router/src/useLoaderDeps.ts @@ -50,5 +50,5 @@ export function useLoaderDeps< ...(opts as any), select: (match: any) => opts.select ? opts.select(match.loaderDeps) : match.loaderDeps, - } as any) as any + }) as any } diff --git a/packages/remix-router/src/useMatches.ts b/packages/remix-router/src/useMatches.ts index d47f06ac..2632d89b 100644 --- a/packages/remix-router/src/useMatches.ts +++ b/packages/remix-router/src/useMatches.ts @@ -155,6 +155,6 @@ export function useMatchRoute( caseSensitive, fuzzy, includeSearch, - }) as any + }) } } diff --git a/packages/remix-router/src/useRouteContext.ts b/packages/remix-router/src/useRouteContext.ts index e8dbb01f..fce637c2 100644 --- a/packages/remix-router/src/useRouteContext.ts +++ b/packages/remix-router/src/useRouteContext.ts @@ -26,5 +26,5 @@ export function useRouteContext< ...(opts as any), select: (match: any) => opts.select ? opts.select(match.context) : match.context, - } as any) as any + }) as any } diff --git a/packages/remix-router/src/vite/index.ts b/packages/remix-router/src/vite/index.ts index 4e6f45c7..c5400237 100644 --- a/packages/remix-router/src/vite/index.ts +++ b/packages/remix-router/src/vite/index.ts @@ -1,4 +1,6 @@ import { remixClientEntries } from './clientEntries' +import type { ClientEntriesPluginOptions } from './clientEntries' + export type { ClientEntriesPluginOptions, ClientEntryManifest, @@ -20,9 +22,7 @@ export type { * handler. No router-specific plugin is required for that path. */ export interface RemixRouterPluginOptions { - clientEntries?: - | import('./clientEntries').ClientEntriesPluginOptions - | false + clientEntries?: ClientEntriesPluginOptions | false } export function remixRouter(options: RemixRouterPluginOptions = {}) { diff --git a/packages/remix-router/src/vite/serverComponents.ts b/packages/remix-router/src/vite/serverComponents.ts index 3aac5950..b2dde798 100644 --- a/packages/remix-router/src/vite/serverComponents.ts +++ b/packages/remix-router/src/vite/serverComponents.ts @@ -174,12 +174,12 @@ function buildSkipMask(code: string): Uint8Array { } /** - * Find each `/* SC */ import.meta.env.SSR ? (` marker emitted by the + * Find each `/* SC * / import.meta.env.SSR ? (` marker emitted by the * `transform` step and insert ` : null)` at the matching closing * paren that ends the surrounding `serverComponent(...)` call. * * Walks character-by-character respecting paren depth, single-/double- - * /backtick string boundaries, and `//` / `/* */` comments. Not a full + * /backtick string boundaries, and `//` / `/* * /` comments. Not a full * JS parser — but enough for the well-formed call shapes the runtime * accepts. */ diff --git a/packages/remix-router/tests/clientEntry.test.tsx b/packages/remix-router/tests/clientEntry.test.tsx index 9b55bc7c..95c90827 100644 --- a/packages/remix-router/tests/clientEntry.test.tsx +++ b/packages/remix-router/tests/clientEntry.test.tsx @@ -2,7 +2,7 @@ /** @jsxImportSource @remix-run/ui */ import { describe, expect, test } from 'vitest' import { renderToString } from '@remix-run/ui/server' -import { ClientLink, setActiveRouter, clearActiveRouter } from '../src' +import { ClientLink, clearActiveRouter } from '../src' describe('', () => { test('SSR emits a hydration marker for the entry', async () => { diff --git a/packages/remix-router/tests/dom/link.test.tsx b/packages/remix-router/tests/dom/link.test.tsx index e850da66..5e4b1037 100644 --- a/packages/remix-router/tests/dom/link.test.tsx +++ b/packages/remix-router/tests/dom/link.test.tsx @@ -5,12 +5,12 @@ import { afterEach, describe, expect, test } from 'vitest' import { render } from '@remix-run/ui/test' import { createMemoryHistory } from '@tanstack/history' import { - createRootRoute, - createRoute, - createRouter, Link, Outlet, RouterProvider, + createRootRoute, + createRoute, + createRouter, } from '../../src' import type { Handle } from '@remix-run/ui' diff --git a/packages/remix-router/tests/dom/router.test.tsx b/packages/remix-router/tests/dom/router.test.tsx index f8b51165..1a17cc4c 100644 --- a/packages/remix-router/tests/dom/router.test.tsx +++ b/packages/remix-router/tests/dom/router.test.tsx @@ -5,14 +5,13 @@ import { afterEach, describe, expect, test } from 'vitest' import { render } from '@remix-run/ui/test' import { createMemoryHistory } from '@tanstack/history' import { - createRootRoute, - createRoute, - createRouter, Link, Outlet, RouterProvider, + createRootRoute, + createRoute, + createRouter, useLoaderData, - useNavigate, useParams, } from '../../src' import type { Handle } from '@remix-run/ui' diff --git a/packages/remix-router/tests/dom/serverFnRedirect.test.tsx b/packages/remix-router/tests/dom/serverFnRedirect.test.tsx index 1a983071..d504e14e 100644 --- a/packages/remix-router/tests/dom/serverFnRedirect.test.tsx +++ b/packages/remix-router/tests/dom/serverFnRedirect.test.tsx @@ -18,7 +18,6 @@ import { isRedirect, redirect, } from '../../src' -import type { Handle } from '@remix-run/ui' function makeRouter() { const root = createRootRoute() diff --git a/packages/remix-router/tests/dom/wrap.test.tsx b/packages/remix-router/tests/dom/wrap.test.tsx index 63c93523..ff43ec83 100644 --- a/packages/remix-router/tests/dom/wrap.test.tsx +++ b/packages/remix-router/tests/dom/wrap.test.tsx @@ -76,11 +76,11 @@ describe('router options Wrap / InnerWrap', () => { activeCleanup = result.cleanup expect(result.$('#wrap-marker')?.textContent).toBe('wrap-active') - expect(result.$('#wrap')?.contains(result.$('#page')!)).toBe(true) + expect(result.$('#wrap')?.contains(result.$('#page'))).toBe(true) }) test('InnerWrap envelopes only the match tree (inside router context)', async () => { - let routerInsideInnerWrap: unknown = null + const routerInsideInnerWrap: unknown = null const router = setup({ InnerWrap: ({ children }) => (

@@ -95,7 +95,7 @@ describe('router options Wrap / InnerWrap', () => { activeCleanup = result.cleanup expect(result.$('#inner-wrap-marker')?.textContent).toBe('inner-active') - expect(result.$('#inner-wrap')?.contains(result.$('#page')!)).toBe(true) + expect(result.$('#inner-wrap')?.contains(result.$('#page'))).toBe(true) }) test('InnerWrap can use useRouter — the router context is in scope', async () => { diff --git a/packages/remix-router/tests/router.test.ts b/packages/remix-router/tests/router.test.ts index feede318..7967cc59 100644 --- a/packages/remix-router/tests/router.test.ts +++ b/packages/remix-router/tests/router.test.ts @@ -98,7 +98,9 @@ describe('loaders', () => { }) await router.load() - const match = router.stores.matches.get().find((m) => m.routeId === '/items') + const match = router.stores.matches + .get() + .find((m) => m.routeId === '/items') expect(match?.status).toBe('success') expect(match?.loaderData).toEqual(['a', 'b', 'c']) }) @@ -173,7 +175,7 @@ describe('not-found', () => { loader: ({ params }: { params: { id: string } }) => { if (params.id === 'missing') { // notFound() lives on router-core; throw via the standard helper. - // eslint-disable-next-line @typescript-eslint/no-throw-literal + // eslint-disable-next-line @typescript-eslint/only-throw-error throw { isNotFound: true, data: undefined } } return { id: params.id } diff --git a/packages/remix-router/tests/ssr.test.tsx b/packages/remix-router/tests/ssr.test.tsx index ca6c31b3..fadf69cf 100644 --- a/packages/remix-router/tests/ssr.test.tsx +++ b/packages/remix-router/tests/ssr.test.tsx @@ -4,12 +4,12 @@ import { describe, expect, test } from 'vitest' import { renderToString } from '@remix-run/ui/server' import { createMemoryHistory } from '@tanstack/history' import { - createRootRoute, - createRoute, - createRouter, Link, Outlet, RouterProvider, + createRootRoute, + createRoute, + createRouter, useLoaderData, } from '../src' import type { Handle } from '@remix-run/ui' diff --git a/packages/remix-router/tsconfig.json b/packages/remix-router/tsconfig.json index db87bd84..5638bef3 100644 --- a/packages/remix-router/tsconfig.json +++ b/packages/remix-router/tsconfig.json @@ -10,5 +10,5 @@ "target": "es2022", "lib": ["es2022", "dom", "dom.iterable"] }, - "include": ["src"] + "include": ["src", "tests", "vitest.config.ts", "eslint.config.ts"] }