Remove duplicate and dead code (#161)

Author: brookslybrand

app/lib/color-scheme.tsx

@@ -1,7 +1,7 @@
 import { useMemo } from "react";
 import { useNavigation, useRouteLoaderData } from "@remix-run/react";
-import { useIsomorphicLayoutEffect } from "~/lib/misc";
 import type { loader as rootLoader } from "~/root";
+import { useLayoutEffect } from "~/ui/primitives/utils";
 
 export type ColorScheme = "dark" | "light" | "system";
 
@@ -40,7 +40,7 @@ function ColorSchemeScriptImpl() {
   );
 
   // Set
-  useIsomorphicLayoutEffect(() => {
+  useLayoutEffect(() => {
     switch (colorScheme) {
       case "light":
         document.documentElement.classList.remove("dark");
@@ -60,7 +60,7 @@ function ColorSchemeScriptImpl() {
 
   // always sync the color scheme if "system" is used
   // this accounts for the docs pages adding some classnames to documentElement in root
-  useIsomorphicLayoutEffect(() => {
+  useLayoutEffect(() => {
     if (colorScheme === "system") {
       let media = window.matchMedia("(prefers-color-scheme: dark)");
       syncColorScheme(media);

app/lib/conf.ts

@@ -169,21 +169,6 @@ export function isTalkArray(arr: any): arr is Array<Talk> {
   return Array.isArray(arr) && arr.every(isTalk);
 }
 
-export function isScheduleItemRawArray(
-  arr: any,
-): arr is Array<ScheduleItemRaw> {
-  return Array.isArray(arr) && arr.every(isScheduleItemRaw);
-}
-
 export function isScheduleItemArray(arr: any): arr is Array<ScheduleItem> {
   return Array.isArray(arr) && arr.every(isScheduleItem);
 }
-
-export function sluggify(string: string) {
-  return string
-    .toLowerCase()
-    .replace(/[ .':]/g, " ")
-    .split(" ")
-    .filter(Boolean)
-    .join("-");
-}

app/lib/conf2022.server.ts

@@ -22,13 +22,13 @@ import {
   isTalk,
   isTalkArray,
   isTalkScheduleItemRaw,
-  sluggify,
 } from "./conf";
 
 import speakersYamlFileContents from "../../data/conf/2022/speakers.yaml?raw";
 import sponsorsYamlFileContents from "../../data/conf/2022/sponsors.yaml?raw";
 import talksYamlFileContents from "../../data/conf/2022/talks.yaml?raw";
 import scheduleYamlFileContents from "../../data/conf/2022/schedule.yaml?raw";
+import { slugify } from "~/ui/primitives/utils";
 
 let cache = new LRUCache<
   string,
@@ -54,7 +54,7 @@ export async function getSpeakers() {
     let speakerRawWithDefaults = {
       bioHTML,
       type: "speaker",
-      slug: sluggify(speakerRaw.name),
+      slug: slugify(speakerRaw.name),
       ...speakerRaw,
     };
     invariant(

app/lib/conf2023.server.ts

@@ -3,7 +3,6 @@ import { DateTime } from "luxon";
 import yaml from "yaml";
 import invariant from "tiny-invariant";
 import {
-  sluggify,
   validateSessionizeSessionData,
   validateSessionizeSpeakerData,
 } from "./conf2023";
@@ -18,6 +17,7 @@ import type {
 } from "./conf2023";
 import type { Sponsor } from "./conf";
 import { isSponsor, isSponsorArray } from "./conf";
+import { slugify } from "~/ui/primitives/utils";
 
 const CONF_TIME_ZONE = "America/Denver";
 const NO_CACHE =
@@ -341,7 +341,7 @@ function modelSpeaker(speaker: SessionizeSpeakerData): Speaker {
     nameFirst,
     nameLast,
     nameFull,
-    slug: sluggify(nameFull),
+    slug: slugify(nameFull),
     imgUrl,
     twitterHandle,
     isTopSpeaker: !!speaker.isTopSpeaker,
@@ -365,7 +365,7 @@ function modelSpeakerSession(session: SessionizeSessionData): SpeakerSession {
           return {
             id: speaker.id,
             name: speaker.name,
-            slug: sluggify(speaker.name),
+            slug: slugify(speaker.name),
           };
         })
       : [];

app/lib/conf2023.ts

@@ -1,11 +1,4 @@
 import type { DateTime } from "luxon";
-import { sluggify } from "~/lib/conf";
-
-export { sluggify };
-
-export function getSpeakerSlug(speaker: Speaker) {
-  return sluggify(speaker.nameFull);
-}
 
 export function validateSessionizeSpeakerData(
   data: unknown,

app/lib/misc.ts

@@ -5,7 +5,7 @@ import { getRepoContent } from "./gh-docs/repo-content";
 import { processMarkdown } from "./md.server";
 import type { Octokit } from "octokit";
 import resourcesYamlFileContents from "../../data/resources.yaml?raw";
-import { slugify } from "./misc";
+import { slugify } from "~/ui/primitives/utils";
 
 // TODO: parse this with zod
 let _resources: ResourceYamlData[] = yaml.parse(resourcesYamlFileContents);

app/lib/resources.server.ts

@@ -23,8 +23,8 @@ import { removeTrailingSlashes, isProductionHost } from "~/lib/http.server";
 import { ColorSchemeScript, useColorScheme } from "~/lib/color-scheme";
 import { parseColorScheme } from "~/lib/color-scheme.server";
 import iconsHref from "~/icons.svg";
-import { canUseDOM } from "~/lib/misc";
 import cx from "clsx";
+import { canUseDOM } from "./ui/primitives/utils";
 
 export async function loader({ request }: LoaderFunctionArgs) {
   removeTrailingSlashes(request);

app/root.tsx

@@ -1,9 +1,9 @@
 import type { Category, Resource } from "~/lib/resources.server";
 import { InitCodeblock, ResourceTag, useCreateTagUrl } from "~/ui/resources";
 import { Link, useSearchParams } from "@remix-run/react";
-import { slugify } from "~/lib/misc";
 import cx from "clsx";
 import iconsHref from "~/icons.svg";
+import { slugify } from "~/ui/primitives/utils";
 
 export let categories = ["all", "templates", "libraries"];
 

app/routes/_extras.resources._index/ui.tsx

@@ -5,8 +5,8 @@ import { Fragment, forwardRef, useEffect, useRef } from "react";
 import type { ShowcaseExample } from "~/lib/showcase.server";
 import { showcaseExamples } from "~/lib/showcase.server";
 import { clsx } from "clsx";
-import { useHydrated } from "~/lib/misc";
 import { CACHE_CONTROL } from "~/lib/http.server";
+import { useHydrated } from "~/ui/primitives/utils";
 
 export const loader = async ({ request }: LoaderFunctionArgs) => {
   let requestUrl = new URL(request.url);