refactor: update imports to use type-only imports in thunderstore-api and related packages

apps/cyberstorm-remix/app/c/community.tsx

@@ -26,7 +26,7 @@ import {
   NewLink,
   SkeletonBox,
 } from "@thunderstore/cyberstorm";
-import { classnames } from "@thunderstore/cyberstorm/src/utils/utils";
+import { classnames } from "@thunderstore/cyberstorm";
 import { DapperTs } from "@thunderstore/dapper-ts";
 
 import { type OutletContextShape } from "../root";

apps/cyberstorm-remix/app/commonComponents/CheckboxList/CheckboxList.tsx

@@ -8,7 +8,7 @@ import { memo } from "react";
 import { type TRISTATE } from "~/commonComponents/types";
 
 import { Actionable, NewIcon } from "@thunderstore/cyberstorm";
-import { classnames } from "@thunderstore/cyberstorm/src/utils/utils";
+import { classnames } from "@thunderstore/cyberstorm";
 
 import "./CheckboxList.css";
 

apps/cyberstorm-remix/app/commonComponents/Collapsible/Collapsible.tsx

@@ -3,7 +3,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { type PropsWithChildren, memo } from "react";
 
 import { NewIcon } from "@thunderstore/cyberstorm";
-import { classnames } from "@thunderstore/cyberstorm/src/utils/utils";
+import { classnames } from "@thunderstore/cyberstorm";
 
 import "./Collapsible.css";
 

apps/cyberstorm-remix/app/commonComponents/CollapsibleText/CollapsibleText.tsx

@@ -1,6 +1,6 @@
 import { type ReactElement, useState } from "react";
 
-import { classnames } from "@thunderstore/cyberstorm/src/utils/utils";
+import { classnames } from "@thunderstore/cyberstorm";
 
 import "./CollapsibleText.css";
 

apps/cyberstorm-remix/app/commonComponents/Connection/Connection.tsx

@@ -2,8 +2,8 @@ import { type ReactElement } from "react";
 
 import { NewIcon, NewSwitch } from "@thunderstore/cyberstorm";
 import { type OAuthConnection } from "@thunderstore/dapper/types";
+import type { userLinkedAccountDisconnectProviders } from "@thunderstore/thunderstore-api";
 
-import { type userLinkedAccountDisconnectProviders } from "../../../../../packages/thunderstore-api/src";
 import "./Connection.css";
 
 interface ConnectionProps {

apps/cyberstorm-remix/app/commonComponents/CopyButton/CopyButton.tsx

@@ -3,7 +3,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { type Dispatch, type SetStateAction, useState } from "react";
 import React from "react";
 
-import { NewIcon, Tooltip } from "@thunderstore/cyberstorm/src";
+import { NewIcon, Tooltip } from "@thunderstore/cyberstorm";
 
 import "./CopyButton.css";
 

apps/cyberstorm-remix/app/commonComponents/Navigation/Navigation.tsx

@@ -35,7 +35,7 @@ import {
   OverwolfLogo,
   ThunderstoreLogo,
 } from "@thunderstore/cyberstorm";
-import { classnames } from "@thunderstore/cyberstorm/src/utils/utils";
+import { classnames } from "@thunderstore/cyberstorm";
 import { type CurrentUser } from "@thunderstore/dapper/types";
 
 import "./MobileNavigation.css";

apps/cyberstorm-remix/app/commonComponents/PageHeader/PageHeader.tsx

@@ -1,8 +1,8 @@
 import { type PropsWithChildren, type ReactElement, memo } from "react";
 
 import { Heading, Image } from "@thunderstore/cyberstorm";
-import type { HeadingSizes } from "@thunderstore/cyberstorm-theme/src/components";
-import { classnames } from "@thunderstore/cyberstorm/src/utils/utils";
+import { classnames } from "@thunderstore/cyberstorm";
+import type { HeadingSizes } from "@thunderstore/cyberstorm-theme";
 
 import "./PageHeader.css";
 

apps/cyberstorm-remix/app/commonComponents/RadioGroup/RadioGroup.tsx

@@ -4,7 +4,7 @@ import * as RadixRadioGroup from "@radix-ui/react-radio-group";
 import { memo } from "react";
 
 import { NewIcon } from "@thunderstore/cyberstorm";
-import { classnames } from "@thunderstore/cyberstorm/src/utils/utils";
+import { classnames } from "@thunderstore/cyberstorm";
 import { type Section } from "@thunderstore/dapper/types";
 
 import "./RadioGroup.css";

apps/cyberstorm-remix/app/commonComponents/StalenessIndicator/StalenessIndicator.tsx

@@ -3,7 +3,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { type ReactNode } from "react";
 
 import { NewIcon } from "@thunderstore/cyberstorm";
-import { classnames } from "@thunderstore/cyberstorm/src/utils/utils";
+import { classnames } from "@thunderstore/cyberstorm";
 
 import "./StalenessIndicator.css";
 

apps/cyberstorm-remix/app/p/packageListing.tsx

@@ -60,7 +60,7 @@ import {
   useToast,
 } from "@thunderstore/cyberstorm";
 import { PackageLikeAction } from "@thunderstore/cyberstorm-forms";
-import type { TagVariants } from "@thunderstore/cyberstorm-theme/src/components";
+import type { TagVariants } from "@thunderstore/cyberstorm-theme";
 import { DapperTs, type DapperTsInterface } from "@thunderstore/dapper-ts";
 import type { CurrentUser } from "@thunderstore/dapper/types";
 import {

apps/cyberstorm-remix/app/p/packageVersion.tsx

@@ -43,19 +43,19 @@ import {
   NewButton,
   NewIcon,
   NewLink,
+  RelativeTime,
   SkeletonBox,
   Tabs,
-} from "@thunderstore/cyberstorm";
-import { RelativeTime } from "@thunderstore/cyberstorm/src/components/RelativeTime/RelativeTime";
-import { ThunderstoreLogo } from "@thunderstore/cyberstorm/src/svg/svg";
-import {
+  ThunderstoreLogo,
   formatFileSize,
   formatInteger,
   formatToDisplayName,
-} from "@thunderstore/cyberstorm/src/utils/utils";
+} from "@thunderstore/cyberstorm";
 import { DapperTs } from "@thunderstore/dapper-ts";
-import { getPackageVersionDetails } from "@thunderstore/dapper-ts/src/methods/packageVersion";
-import { getTeamDetails } from "@thunderstore/dapper-ts/src/methods/team";
+import {
+  getPackageVersionDetails,
+  getTeamDetails,
+} from "@thunderstore/dapper-ts";
 
 import "./packageListing.css";
 

apps/cyberstorm-remix/app/p/packageVersionWithoutCommunity.tsx

@@ -43,19 +43,19 @@ import {
   NewButton,
   NewIcon,
   NewLink,
+  RelativeTime,
   SkeletonBox,
   Tabs,
-} from "@thunderstore/cyberstorm";
-import { RelativeTime } from "@thunderstore/cyberstorm/src/components/RelativeTime/RelativeTime";
-import { ThunderstoreLogo } from "@thunderstore/cyberstorm/src/svg/svg";
-import {
+  ThunderstoreLogo,
   formatFileSize,
   formatInteger,
   formatToDisplayName,
-} from "@thunderstore/cyberstorm/src/utils/utils";
+} from "@thunderstore/cyberstorm";
 import { DapperTs } from "@thunderstore/dapper-ts";
-import { getPackageVersionDetails } from "@thunderstore/dapper-ts/src/methods/packageVersion";
-import { getTeamDetails } from "@thunderstore/dapper-ts/src/methods/team";
+import {
+  getPackageVersionDetails,
+  getTeamDetails,
+} from "@thunderstore/dapper-ts";
 
 import "./packageListing.css";
 

apps/cyberstorm-remix/app/p/tabs/Source/Source.tsx

@@ -11,15 +11,15 @@ import ago from "s-ago";
 import { type OutletContextShape } from "~/root";
 
 import {
+  NewAlert as Alert,
   Heading,
   NewButton,
   NewIcon,
   SkeletonBox,
+  TooltipWrapper,
 } from "@thunderstore/cyberstorm";
-import { Alert } from "@thunderstore/cyberstorm/src/newComponents/Alert/Alert";
-import { TooltipWrapper } from "@thunderstore/cyberstorm/src/primitiveComponents/utils/utils";
 import { DapperTs } from "@thunderstore/dapper-ts";
-import { getPackageSource } from "@thunderstore/dapper-ts/src/methods/package";
+import { getPackageSource } from "@thunderstore/dapper-ts";
 import { isApiError } from "@thunderstore/thunderstore-api";
 
 import { CodeBoxHTML } from "../../../commonComponents/CodeBoxHTML/CodeBoxHTML";

apps/cyberstorm-remix/app/p/tabs/Versions/common.tsx

@@ -3,7 +3,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { memo } from "react";
 
 import { NewAlert, NewButton, NewIcon } from "@thunderstore/cyberstorm";
-import { ThunderstoreLogo } from "@thunderstore/cyberstorm/src/svg/svg";
+import { ThunderstoreLogo } from "@thunderstore/cyberstorm";
 
 export const ModManagerBanner = memo(function ModManagerBanner() {
   return (

apps/cyberstorm-remix/app/p/tabs/Wiki/Wiki.tsx

@@ -16,9 +16,9 @@ import { type OutletContextShape } from "~/root";
 
 import { NewButton, NewIcon, SkeletonBox } from "@thunderstore/cyberstorm";
 import { DapperTs } from "@thunderstore/dapper-ts";
-import { getPackageWiki } from "@thunderstore/dapper-ts/src/methods/package";
+import { getPackageWiki } from "@thunderstore/dapper-ts";
+import { ApiError } from "@thunderstore/thunderstore-api";
 
-import { ApiError } from "../../../../../../packages/thunderstore-api/src";
 import "./Wiki.css";
 
 export async function loader({ params }: LoaderFunctionArgs) {

apps/cyberstorm-remix/app/p/tabs/Wiki/WikiFirstPage.tsx

@@ -12,9 +12,9 @@ import {
   getPackagePermissions,
   getPackageWiki,
   getPackageWikiPage,
-} from "@thunderstore/dapper-ts/src/methods/package";
+} from "@thunderstore/dapper-ts";
+import { isApiError } from "@thunderstore/thunderstore-api";
 
-import { isApiError } from "../../../../../../packages/thunderstore-api/src";
 import "./Wiki.css";
 import { WikiContent } from "./WikiContent";
 

apps/cyberstorm-remix/app/p/tabs/Wiki/WikiNewPage.tsx

@@ -16,7 +16,7 @@ import {
   Tabs,
   useToast,
 } from "@thunderstore/cyberstorm";
-import { classnames } from "@thunderstore/cyberstorm/src/utils/utils";
+import { classnames } from "@thunderstore/cyberstorm";
 import {
   type PackageWikiPageCreateRequestData,
   postPackageWikiPageCreate,

apps/cyberstorm-remix/app/p/tabs/Wiki/WikiPage.tsx

@@ -3,7 +3,7 @@ import {
   getSessionTools,
 } from "cyberstorm/security/publicEnvVariables";
 import { Suspense } from "react";
-import { Await, useParams, type LoaderFunctionArgs } from "react-router";
+import { Await, type LoaderFunctionArgs, useParams } from "react-router";
 import { useLoaderData } from "react-router";
 
 import { SkeletonBox } from "@thunderstore/cyberstorm";
@@ -12,9 +12,9 @@ import {
   getPackagePermissions,
   getPackageWiki,
   getPackageWikiPage,
-} from "@thunderstore/dapper-ts/src/methods/package";
+} from "@thunderstore/dapper-ts";
+import { isApiError } from "@thunderstore/thunderstore-api";
 
-import { isApiError } from "../../../../../../packages/thunderstore-api/src";
 import "./Wiki.css";
 import { WikiContent } from "./WikiContent";
 

apps/cyberstorm-remix/app/p/tabs/Wiki/WikiPageEdit.tsx

@@ -22,7 +22,7 @@ import {
   Tabs,
   useToast,
 } from "@thunderstore/cyberstorm";
-import { classnames } from "@thunderstore/cyberstorm/src/utils/utils";
+import { classnames } from "@thunderstore/cyberstorm";
 import { DapperTs } from "@thunderstore/dapper-ts";
 import {
   type PackageWikiPageEditRequestData,

apps/cyberstorm-remix/app/root.tsx

@@ -29,21 +29,21 @@ import {
   LinkingProvider,
   NewBreadCrumbs,
   NewBreadCrumbsLink,
+  ToastProvider,
   isRecord,
 } from "@thunderstore/cyberstorm";
 import "@thunderstore/cyberstorm-theme";
-import Toast from "@thunderstore/cyberstorm/src/newComponents/Toast";
 import { DapperTs } from "@thunderstore/dapper-ts";
 import { type CurrentUser } from "@thunderstore/dapper/types";
 import { type RequestConfig } from "@thunderstore/thunderstore-api";
-import { NamespacedStorageManager } from "@thunderstore/ts-api-react";
 import {
+  NamespacedStorageManager,
   SESSION_STORAGE_KEY,
+  StorageManager,
   getSessionContext,
   getSessionStale,
   runSessionValidationCheck,
-} from "@thunderstore/ts-api-react/src/SessionContext";
-import { StorageManager } from "@thunderstore/ts-api-react/src/storage";
+} from "@thunderstore/ts-api-react";
 
 import type { Route } from "./+types/root";
 import { Footer } from "./commonComponents/Footer/Footer";
@@ -339,7 +339,7 @@ export function Layout({ children }: { children: React.ReactNode }) {
         )}
         <div className="container container--y container--full island layout">
           <LinkingProvider value={LinkLibrary}>
-            <Toast.Provider toastDuration={10000}>
+            <ToastProvider toastDuration={10000}>
               <TooltipProvider>
                 <NavigationWrapper
                   domain={resolvedEnvVars?.VITE_API_URL || ""}
@@ -558,7 +558,7 @@ export function Layout({ children }: { children: React.ReactNode }) {
                 <Footer />
                 {shouldShowAds ? <AdsInit /> : null}
               </TooltipProvider>
-            </Toast.Provider>
+            </ToastProvider>
           </LinkingProvider>
           <ScrollRestoration />
           <Scripts />

apps/cyberstorm-remix/app/settings/teams/Teams.tsx

@@ -5,6 +5,7 @@ import { useReducer, useState } from "react";
 import type { MetaFunction } from "react-router";
 import { useOutletContext, useRevalidator } from "react-router";
 import { PageHeader } from "~/commonComponents/PageHeader/PageHeader";
+import { RequiredIndicator } from "~/commonComponents/RequiredIndicator/RequiredIndicator";
 
 import {
   Heading,
@@ -16,8 +17,7 @@ import {
   NewTextInput,
   useToast,
 } from "@thunderstore/cyberstorm";
-import { postTeamCreate } from "@thunderstore/dapper-ts/src/methods/team";
-import { RequiredIndicator } from "~/commonComponents/RequiredIndicator/RequiredIndicator";
+import { postTeamCreate } from "@thunderstore/dapper-ts";
 import {
   type RequestConfig,
   type TeamCreateRequestData,
@@ -27,7 +27,7 @@ import { NamespacedStorageManager } from "@thunderstore/ts-api-react";
 import {
   SESSION_STORAGE_KEY,
   setSessionStale,
-} from "@thunderstore/ts-api-react/src/SessionContext";
+} from "@thunderstore/ts-api-react";
 
 import { type OutletContextShape, type RootLoadersType } from "../../root";
 import "./Teams.css";

apps/cyberstorm-remix/app/settings/teams/team/tabs/Members/MembersTable.tsx

@@ -16,7 +16,7 @@ import {
   type SelectOption,
   useToast,
 } from "@thunderstore/cyberstorm";
-import { TableSort } from "@thunderstore/cyberstorm/src/newComponents/Table/Table";
+import { NewTableSort as TableSort } from "@thunderstore/cyberstorm";
 import {
   type RequestConfig,
   type TeamMember,

apps/cyberstorm-remix/app/settings/teams/team/tabs/ServiceAccounts/ServiceAccountsTable.tsx

@@ -2,7 +2,7 @@ import { type OutletContextShape } from "app/root";
 import { useOutletContext } from "react-router";
 
 import { Heading, NewTable } from "@thunderstore/cyberstorm";
-import { TableSort } from "@thunderstore/cyberstorm/src/newComponents/Table/Table";
+import { NewTableSort as TableSort } from "@thunderstore/cyberstorm";
 import { type TeamServiceAccount } from "@thunderstore/thunderstore-api";
 
 import { ServiceAccountRemoveModal } from "./ServiceAccountRemoveModal";

apps/cyberstorm-remix/app/settings/user/Connections/Connections.tsx

@@ -12,10 +12,9 @@ import { type OutletContextShape } from "~/root";
 
 import { NewLink, OverwolfLogo, useToast } from "@thunderstore/cyberstorm";
 import { ApiError } from "@thunderstore/thunderstore-api";
+import { userLinkedAccountDisconnect } from "@thunderstore/thunderstore-api";
 import { ApiAction } from "@thunderstore/ts-api-react-actions";
 
-import { userLinkedAccountDisconnect } from "../../../../../../packages/thunderstore-api/src";
-
 type ProvidersType = {
   name: string;
   identifier: "discord" | "github" | "overwolf";

apps/cyberstorm-remix/app/tools/manifest-validator/manifestValidator.tsx

@@ -29,10 +29,7 @@ export default function ManifestValidator() {
 
   const selectOptions = currentUser
     ? currentUser.teams.map((team) => {
-        if (typeof team === "string") {
-          return { value: team, label: team };
-        }
-        return { value: team.name, label: team.name };
+        return { value: team, label: team };
       })
     : [];
 

apps/cyberstorm-remix/app/upload/upload.tsx

@@ -27,9 +27,11 @@ import {
   NewTag,
   useToast,
 } from "@thunderstore/cyberstorm";
-import { classnames } from "@thunderstore/cyberstorm/src/utils/utils";
-import { DapperTs } from "@thunderstore/dapper-ts";
-import { postPackageSubmissionMetadata } from "@thunderstore/dapper-ts/src/methods/package";
+import { classnames } from "@thunderstore/cyberstorm";
+import {
+  DapperTs,
+  postPackageSubmissionMetadata,
+} from "@thunderstore/dapper-ts";
 import {
   type PackageSubmissionResult,
   type PackageSubmissionStatus,
@@ -40,7 +42,7 @@ import {
   type IBaseUploadHandle,
   MultipartUpload,
 } from "@thunderstore/ts-uploader";
-import { type UserMedia } from "@thunderstore/ts-uploader/src/uploaders/types";
+import { type UserMedia } from "@thunderstore/ts-uploader";
 
 import { PageHeader } from "../commonComponents/PageHeader/PageHeader";
 import { type OutletContextShape } from "../root";

apps/cyberstorm-remix/cyberstorm/security/publicEnvVariables.ts

@@ -1,4 +1,4 @@
-import { getSessionContext } from "@thunderstore/ts-api-react/src/SessionContext";
+import { getSessionContext } from "@thunderstore/ts-api-react";
 
 import { isRecord } from "../utils/typeChecks";