Merge pull request #33 from sambecker/clsx-lite

Switch to clsx/lite, change TS bundler strategy

src/admin/AdminGrid.tsx

@@ -1,4 +1,4 @@
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 import { ReactNode } from 'react';
 
 export default function AdminGrid ({

src/admin/AdminNav.tsx

@@ -6,7 +6,7 @@ import {
   checkPathPrefix,
   isPathAdminConfiguration,
 } from '@/site/paths';
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 import Link from 'next/link';
 import { usePathname } from 'next/navigation';
 import { BiCog } from 'react-icons/bi';

src/admin/BlobUrls.tsx

@@ -6,7 +6,7 @@ import { fileNameForBlobUrl } from '@/services/blob';
 import FormWithConfirm from '@/components/FormWithConfirm';
 import { deleteBlobPhotoAction } from '@/photo/actions';
 import DeleteButton from './DeleteButton';
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 import { pathForAdminUploadUrl } from '@/site/paths';
 import AddButton from './AddButton';
 

src/admin/DeleteButton.tsx

@@ -1,5 +1,5 @@
 import SubmitButtonWithStatus from '@/components/SubmitButtonWithStatus';
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 import { BiTrash } from 'react-icons/bi';
 
 export default function DeleteButton () {

src/app/(auth-state)/admin/photos/page.tsx

@@ -2,7 +2,7 @@ import { Fragment } from 'react';
 import PhotoUpload from '@/photo/PhotoUpload';
 import Link from 'next/link';
 import PhotoTiny from '@/photo/PhotoTiny';
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 import FormWithConfirm from '@/components/FormWithConfirm';
 import SiteGrid from '@/components/SiteGrid';
 import { deletePhotoAction, syncPhotoExifDataAction } from '@/photo/actions';

src/app/(auth-state)/admin/tags/page.tsx

@@ -10,7 +10,7 @@ import PhotoTag from '@/tag/PhotoTag';
 import { formatTag } from '@/tag';
 import EditButton from '@/admin/EditButton';
 import { pathForAdminTagEdit } from '@/site/paths';
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 
 export default async function AdminTagsPage() {
   const tags = await getUniqueTagsHiddenCached();

src/app/(static)/film-demo/animate/page.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import SiteGrid from '@/components/SiteGrid';
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 import { FILM_SIMULATION_FORM_INPUT_OPTIONS } from '@/vendors/fujifilm';
 import PhotoFilmSimulation from
   '@/simulation/PhotoFilmSimulation';

src/app/layout.tsx

@@ -1,6 +1,6 @@
 import { Analytics } from '@vercel/analytics/react';
 import { SpeedInsights } from '@vercel/speed-insights/react';
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 import { IBM_Plex_Mono } from 'next/font/google';
 import { Metadata } from 'next';
 import { BASE_URL, SITE_DESCRIPTION, SITE_TITLE } from '@/site/config';

src/app/sign-in/page.tsx

@@ -1,7 +1,7 @@
 import { auth } from '@/auth';
 import SignInForm from '@/auth/SignInForm';
 import { PATH_ADMIN } from '@/site/paths';
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 import { redirect } from 'next/navigation';
 
 export default async function SignInPage() {

src/camera/PhotoCamera.tsx

@@ -3,7 +3,7 @@ import { pathForCamera } from '@/site/paths';
 import { IoMdCamera } from 'react-icons/io';
 import { Camera } from '.';
 import EntityLink, { EntityLinkExternalProps } from '@/components/EntityLink';
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 
 export default function PhotoCamera({
   camera,

src/components/AdminChildPage.tsx

@@ -2,7 +2,7 @@ import { ReactNode } from 'react';
 import Link from 'next/link';
 import { FiArrowLeft } from 'react-icons/fi';
 import SiteGrid from './SiteGrid';
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 import Badge from './Badge';
 
 function AdminChildPage({

src/components/Badge.tsx

@@ -1,4 +1,4 @@
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 
 export default function Badge({
   children,

src/components/Checklist.tsx

@@ -1,5 +1,5 @@
 import { ReactNode } from 'react';
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 
 export default function Checklist({
   title,

src/components/ChecklistRow.tsx

@@ -1,5 +1,5 @@
 import { ReactNode } from 'react';
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 import StatusIcon from './StatusIcon';
 
 export default function ChecklistRow({

src/components/EntityLink.tsx

@@ -1,7 +1,7 @@
 import Link from 'next/link';
 import { ReactNode } from 'react';
 import Badge from './Badge';
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 
 export interface EntityLinkExternalProps {
   type?: 'icon-last' | 'icon-first' | 'icon-only' | 'text-only'

src/components/ErrorNote.tsx

@@ -1,4 +1,4 @@
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 import { BiErrorAlt } from 'react-icons/bi';
 
 export default function ErrorNote({

src/components/FieldSetWithStatus.tsx

@@ -3,7 +3,7 @@
 import { LegacyRef } from 'react';
 import { useFormStatus } from 'react-dom';
 import Spinner from './Spinner';
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 
 export default function FieldSetWithStatus({
   id,

src/components/HeaderList.tsx

@@ -1,4 +1,4 @@
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 import AnimateItems from './AnimateItems';
 import { ReactNode } from 'react';
 

src/components/IconButton.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 import Spinner, { SpinnerColor } from './Spinner';
 
 export default function IconButton({

src/components/IconPathButton.tsx

@@ -3,7 +3,7 @@
 import { useRouter } from 'next/navigation';
 import IconButton from './IconButton';
 import { useEffect, useState, useTransition } from 'react';
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 import { SpinnerColor } from './Spinner';
 
 export default function IconPathButton({

src/components/ImageInput.tsx

@@ -4,7 +4,7 @@ import { blobToImage } from '@/utility/blob';
 import { useRef, useState } from 'react';
 import { CopyExif } from '@/lib/CopyExif';
 import exifr from 'exifr';
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 import Spinner from './Spinner';
 import { ACCEPTED_PHOTO_FILE_TYPES } from '@/photo';
 import { FiUploadCloud } from 'react-icons/fi';

src/components/InfoBlock.tsx

@@ -1,4 +1,4 @@
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 import { ReactNode } from 'react';
 
 export default function InfoBlock({

src/components/Modal.tsx

@@ -2,7 +2,7 @@
 
 import { ReactNode, useEffect, useRef, useState } from 'react';
 import { motion } from 'framer-motion';
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 import useClickInsideOutside from '@/utility/useClickInsideOutside';
 import { useRouter } from 'next/navigation';
 import AnimateItems from './AnimateItems';

src/components/OGTile.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import { useEffect, useState } from 'react';
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 import Link from 'next/link';
 import { BiError } from 'react-icons/bi';
 import Spinner from '@/components/Spinner';

src/components/RepoLink.tsx

@@ -1,4 +1,4 @@
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 import Link from 'next/link';
 import { BiLogoGithub } from 'react-icons/bi';
 

src/components/ShareModal.tsx

@@ -2,7 +2,7 @@
 
 import Modal from '@/components/Modal';
 import { TbPhotoShare } from 'react-icons/tb';
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 import { BiCopy } from 'react-icons/bi';
 import { ReactNode } from 'react';
 import { shortenUrl } from '@/utility/url';

src/components/SiteGrid.tsx

@@ -1,4 +1,4 @@
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 
 export default function SiteGrid({
   className,

src/components/Spinner.tsx

@@ -1,4 +1,4 @@
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 
 const SIZE_DEFAULT = 12;
 

src/components/SubmitButtonWithStatus.tsx

@@ -3,7 +3,7 @@
 import { HTMLProps, useEffect, useRef } from 'react';
 import { useFormStatus } from 'react-dom';
 import Spinner, { SpinnerColor } from './Spinner';
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 import { toastSuccess } from '@/toast';
 
 interface Props extends HTMLProps<HTMLButtonElement> {

src/components/Switcher.tsx

@@ -1,5 +1,5 @@
 import { ReactNode } from 'react';
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 
 export default function Switcher({
   children,

src/components/SwitcherItem.tsx

@@ -1,5 +1,5 @@
 import Link from 'next/link';
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 
 export default function SwitcherItem({
   icon,

src/photo/PhotoDetailPage.tsx

@@ -3,7 +3,7 @@ import { Photo, PhotoDateRange } from '.';
 import PhotoLarge from './PhotoLarge';
 import SiteGrid from '@/components/SiteGrid';
 import PhotoGrid from './PhotoGrid';
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 import PhotoLinks from './PhotoLinks';
 import TagHeader from '@/tag/TagHeader';
 import { Camera } from '@/camera';

src/photo/PhotoForm.tsx

@@ -12,7 +12,7 @@ import NextImage from 'next/image';
 import { createPhotoAction, updatePhotoAction } from './actions';
 import SubmitButtonWithStatus from '@/components/SubmitButtonWithStatus';
 import Link from 'next/link';
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 import CanvasBlurCapture from '@/components/CanvasBlurCapture';
 import { PATH_ADMIN_PHOTOS, PATH_ADMIN_UPLOADS } from '@/site/paths';
 import {

src/photo/PhotoGrid.tsx

@@ -1,6 +1,6 @@
 import { Photo } from '.';
 import PhotoSmall from './PhotoSmall';
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 import AnimateItems from '@/components/AnimateItems';
 import { Camera } from '@/camera';
 import MorePhotos from '@/photo/MorePhotos';

src/photo/PhotoLarge.tsx

@@ -1,7 +1,7 @@
 import { Photo, photoHasCameraData, photoHasExifData, titleForPhoto } from '.';
 import SiteGrid from '@/components/SiteGrid';
 import ImageLarge from '@/components/ImageLarge';
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 import Link from 'next/link';
 import { pathForPhoto, pathForPhotoShare } from '@/site/paths';
 import PhotoTags from '@/tag/PhotoTags';

src/photo/PhotoLightbox.tsx

@@ -1,4 +1,4 @@
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 import { Photo } from '.';
 import PhotoGrid from './PhotoGrid';
 import Link from 'next/link';

src/photo/PhotoSetHeader.tsx

@@ -1,4 +1,4 @@
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 import { Photo, PhotoDateRange, dateRangeForPhotos } from '.';
 import ShareButton from '@/components/ShareButton';
 import AnimateItems from '@/components/AnimateItems';

src/photo/PhotoSmall.tsx

@@ -1,7 +1,7 @@
 import { Photo, titleForPhoto } from '.';
 import ImageSmall from '@/components/ImageSmall';
 import Link from 'next/link';
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 import { pathForPhoto } from '@/site/paths';
 import { Camera } from '@/camera';
 import { FilmSimulation } from '@/simulation';

src/photo/PhotoTiny.tsx

@@ -1,7 +1,7 @@
 import { Photo, titleForPhoto } from '.';
 import ImageTiny from '@/components/ImageTiny';
 import Link from 'next/link';
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 import { pathForPhoto } from '@/site/paths';
 
 export default function PhotoTiny({

src/photo/PhotoUpload.tsx

@@ -6,7 +6,7 @@ import { useRouter } from 'next/navigation';
 import { PATH_ADMIN_UPLOADS, pathForAdminUploadUrl } from '@/site/paths';
 import ImageInput from '../components/ImageInput';
 import { MAX_IMAGE_SIZE } from '@/services/next-image';
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 
 export default function PhotoUpload({
   shouldResize,

src/photo/PhotosEmptyState.tsx

@@ -2,7 +2,7 @@ import InfoBlock from '@/components/InfoBlock';
 import SiteGrid from '@/components/SiteGrid';
 import { IS_SITE_READY } from '@/site/config';
 import SiteChecklist from '@/site/SiteChecklist';
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 import Link from 'next/link';
 import { HiOutlinePhotograph } from 'react-icons/hi';
 

src/site/FooterAuth.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 import Link from 'next/link';
 import { useSession } from 'next-auth/react';
 import ThemeSwitcher from '@/site/ThemeSwitcher';

src/site/FooterStatic.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 import SiteGrid from '../components/SiteGrid';
 import ThemeSwitcher from '@/site/ThemeSwitcher';
 import { signOut } from 'next-auth/react';

src/site/Nav.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 import { usePathname } from 'next/navigation';
 import Link from 'next/link';
 import SiteGrid from '../components/SiteGrid';

src/site/SiteChecklistClient.tsx

@@ -2,7 +2,7 @@
 
 import { ComponentProps, ReactNode, useTransition } from 'react';
 import { useRouter } from 'next/navigation';
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 import ChecklistRow from '../components/ChecklistRow';
 import { FiExternalLink } from 'react-icons/fi';
 import {

src/toast/ToasterWithThemes.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import { clsx } from 'clsx';
+import { clsx } from 'clsx/lite';
 import { useTheme } from 'next-themes';
 import { Toaster } from 'sonner';
 

tsconfig.json

@@ -13,7 +13,7 @@
     "noEmit": true,
     "esModuleInterop": true,
     "module": "esnext",
-    "moduleResolution": "node",
+    "moduleResolution": "Bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "jsx": "preserve",