Bump ESLint and fix issues

Author: gregory-j-baker

.eslintrc.cjs

@@ -1,4 +1,4 @@
-import { Namespace } from 'i18next';
+import type { Namespace } from 'i18next';
 
 declare global {
   /**
@@ -20,6 +20,6 @@ declare global {
    * Client-side environment variables accessible through `window.env`.
    */
   interface Window {
-    env: Record<string, string | undefined>;
+    env: Record<string, string | undefined> | undefined;
   }
 }

app/@types/global.d.ts

@@ -1,5 +1,7 @@
 import 'i18next';
 
+/* eslint-disable @typescript-eslint/consistent-type-imports */
+
 declare module 'i18next' {
   /**
    * Enables IntelliSense for i18n keys by defining the

app/@types/i18next.d.ts

@@ -1,13 +1,14 @@
 import * as React from 'react';
 
-import { generatePath, Link, Params, Path } from '@remix-run/react';
+import type { Params, Path } from '@remix-run/react';
+import { generatePath, Link } from '@remix-run/react';
 import invariant from 'tiny-invariant';
 
 import { useCurrentLanguage } from '~/hooks/use-current-language';
 import { useI18nPath } from '~/hooks/use-i18n-path';
-import { Language } from '~/modules/i18n';
+import type { Language } from '~/modules/i18n';
 import { cn } from '~/modules/utils';
-import { PageRouteId } from '~/routes';
+import type { PageRouteId } from '~/routes';
 
 /**
  * The Remix <Link> props.

app/components/app-link.tsx

@@ -1,7 +1,8 @@
 import * as React from 'react';
 
 import { Slot } from '@radix-ui/react-slot';
-import { cva, type VariantProps } from 'class-variance-authority';
+import type { VariantProps } from 'class-variance-authority';
+import { cva } from 'class-variance-authority';
 
 import { cn } from '~/modules/utils';
 

app/components/ui/button.tsx

@@ -26,6 +26,7 @@ async function hydrate() {
   });
 }
 
+// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
 if (window.requestIdleCallback) {
   window.requestIdleCallback(hydrate);
 } else {

app/entry.client.tsx

@@ -61,6 +61,7 @@ export default async function handleRequest(
           reject(error);
         },
         onError(error: unknown) {
+          // eslint-disable-next-line no-param-reassign
           responseStatusCode = 500;
           // Log streaming rendering errors from inside the shell. Don't log
           // errors encountered during initial shell rendering since they'll

app/entry.server.tsx

@@ -1,7 +1,7 @@
 import { useLocation } from '@remix-run/react';
 
 import { getLanguage } from '~/modules/i18n';
-import { Language } from '~/routes';
+import type { Language } from '~/routes';
 
 /**
  * Returns the current language based on the pathname.

app/hooks/use-current-language.ts

@@ -1,7 +1,8 @@
 import { useMatches } from '@remix-run/react';
 import invariant from 'tiny-invariant';
 
-import { isRouteId, RouteId } from '~/routes';
+import type { RouteId } from '~/routes';
+import { isRouteId } from '~/routes';
 
 /**
  * Returns the id of the current route.

app/hooks/use-current-route-id.ts

@@ -1,6 +1,6 @@
 import invariant from 'tiny-invariant';
 
-import { Language } from '~/modules/i18n';
+import type { Language } from '~/modules/i18n';
 import { findRouteById } from '~/routes';
 
 /**

app/hooks/use-i18n-path.ts

@@ -5,10 +5,9 @@
  * relevant in a client-side context.
  */
 
-/* eslint-disable import/no-named-as-default-member */
-
-import { UNSAFE_RouteModules as RouteModules } from '@remix-run/react';
-import i18next, { LanguageDetectorModule } from 'i18next';
+import type { UNSAFE_RouteModules as RouteModules } from '@remix-run/react';
+import type { LanguageDetectorModule } from 'i18next';
+import i18next from 'i18next';
 import I18NextHttpBackend from 'i18next-http-backend';
 import { initReactI18next } from 'react-i18next';
 

app/modules/i18n.client.ts

@@ -8,13 +8,15 @@
  * - Providing a consistent i18n context for server-side rendering
  */
 
-import { UNSAFE_RouteModules as RouteModules } from '@remix-run/react';
-import { createInstance as createI18NextInstance, Namespace } from 'i18next';
+import type { UNSAFE_RouteModules as RouteModules } from '@remix-run/react';
+import type { Namespace } from 'i18next';
+import { createInstance as createI18NextInstance } from 'i18next';
 import I18NexFsBackend from 'i18next-fs-backend';
 import { resolve } from 'node:path';
 import { initReactI18next } from 'react-i18next';
 
-import { getI18nNamespaces, getLanguage, Language } from '~/modules/i18n';
+import type { Language } from '~/modules/i18n';
+import { getI18nNamespaces, getLanguage } from '~/modules/i18n';
 
 // set to true to enable server-side i18next debug logging
 // ex: DEBUG_I18N_SERVER=true npm run dev

app/modules/i18n.server.ts

@@ -9,11 +9,12 @@
  * all contexts.
  */
 
-import { UNSAFE_RouteModules as RouteModules } from '@remix-run/react';
-import { Namespace } from 'i18next';
+import type { UNSAFE_RouteModules as RouteModules } from '@remix-run/react';
+import type { Namespace } from 'i18next';
 
 import { isRouteHandle } from '~/modules/utils';
-import { Language, languages } from '~/routes';
+import type { Language } from '~/routes';
+import { languages } from '~/routes';
 
 // re-export the languages from the routes modules
 export { languages, type Language };

app/modules/i18n.ts

@@ -1,4 +1,5 @@
-import { clsx, type ClassValue } from 'clsx';
+import type { ClassValue } from 'clsx';
+import { clsx } from 'clsx';
 import { twMerge } from 'tailwind-merge';
 
 /**

app/modules/utils.ts

@@ -1,4 +1,4 @@
-import { LoaderFunctionArgs, SerializeFrom } from '@remix-run/node';
+import type { LoaderFunctionArgs, SerializeFrom } from '@remix-run/node';
 import {
   isRouteErrorResponse,
   Links,
@@ -23,7 +23,7 @@ export const handle = {
   i18nNamespaces: ['common'],
 } satisfies RouteHandle;
 
-export async function loader({ request }: LoaderFunctionArgs) {
+export function loader({ request }: LoaderFunctionArgs) {
   const language = getLanguage(new URL(request.url).pathname);
 
   return {

app/root.tsx

@@ -7,7 +7,7 @@
  * build errors.
  */
 
-import { DefineRoutesFunction } from '@remix-run/dev/dist/config/routes';
+import type { DefineRoutesFunction } from '@remix-run/dev/dist/config/routes';
 
 /**
  * All languages supported by the i18n routing.

app/routes.ts

@@ -1,4 +1,4 @@
-import { LoaderFunctionArgs } from '@remix-run/node';
+import type { LoaderFunctionArgs } from '@remix-run/node';
 import { json, useLoaderData } from '@remix-run/react';
 import { useTranslation } from 'react-i18next';