Revert "[sparkle] internal: use new sparkle packaging - take 2 (#6091)…

…" (#7097) This reverts commit fc1ceca.
dust-tt · Sep 4, 2024 · de10202 · de10202
1 parent e6fa89e
commit de10202
Show file tree

Hide file tree

Showing 10 changed files with 146 additions and 164 deletions.
diff --git a/front/components/actions/retrieval/utils.ts b/front/components/actions/retrieval/utils.ts
@@ -1,4 +1,4 @@
-import type { Citation } from "@dust-tt/sparkle";
+import type { CitationType } from "@dust-tt/sparkle/dist/cjs/components/Citation";
 import type { RetrievalDocumentType } from "@dust-tt/types";
 import {
   getProviderFromRetrievedDocument,
@@ -22,7 +22,7 @@ export function makeLinkForRetrievedDocument(
 interface RetrievedDocumentCitation {
   href: string;
   title: string;
-  type: Exclude<React.ComponentProps<typeof Citation>["type"], undefined>;
+  type: CitationType;
 }
 
 export function makeDocumentCitations(

diff --git a/front/components/actions/websearch/utils.ts b/front/components/actions/websearch/utils.ts
@@ -1,10 +1,10 @@
-import type { Citation } from "@dust-tt/sparkle";
+import type { CitationType } from "@dust-tt/sparkle/dist/cjs/components/Citation";
 import type { WebsearchActionType } from "@dust-tt/types";
 
 interface WebsearchResultCitation {
   href: string;
   title: string;
-  type: Exclude<React.ComponentProps<typeof Citation>["type"], undefined>;
+  type: CitationType;
 }
 
 export function makeWebsearchResultsCitations(

diff --git a/front/components/assistant/conversation/ContentFragment.tsx b/front/components/assistant/conversation/ContentFragment.tsx
@@ -1,4 +1,5 @@
 import { Citation, ZoomableImageCitationWrapper } from "@dust-tt/sparkle";
+import type { CitationType } from "@dust-tt/sparkle/dist/cjs/components/Citation";
 import type { ContentFragmentType } from "@dust-tt/types";
 import { isSupportedImageContentType } from "@dust-tt/types";
 
@@ -14,7 +15,9 @@ export function ContentFragment({ message }: { message: ContentFragmentType }) {
     );
   }
 
-  const citationType = ["dust-application/slack"].includes(message.contentType)
+  const citationType: CitationType = ["dust-application/slack"].includes(
+    message.contentType
+  )
     ? "slack"
     : "document";
 

diff --git a/front/components/assistant/conversation/messages/MessageActions.tsx b/front/components/assistant/conversation/messages/MessageActions.tsx
@@ -10,7 +10,7 @@ import type {
   WorkspaceType,
 } from "@dust-tt/types";
 // TODO(2024-04-24 flav) Remove emoji-mart dependency from front.
-import type { EmojiMartData } from "@emoji-mart/data";
+import type { Emoji, EmojiMartData } from "@emoji-mart/data";
 import type { ComponentType, MouseEventHandler } from "react";
 import { useEffect, useRef, useState } from "react";
 import { useSWRConfig } from "swr";
@@ -247,7 +247,7 @@ function EmojiSelector({
           theme="light"
           previewPosition="none"
           data={emojiData ?? undefined}
-          onEmojiSelect={(emojiData) => {
+          onEmojiSelect={(emojiData: Emoji) => {
             const reaction = reactions.find((r) => r.emoji === emojiData.id);
             const hasReacted =
               (reaction &&

diff --git a/front/components/assistant_builder/InstructionScreen.tsx b/front/components/assistant_builder/InstructionScreen.tsx
@@ -5,6 +5,7 @@ import {
   Page,
   Spinner,
 } from "@dust-tt/sparkle";
+import type { ContentMessageProps } from "@dust-tt/sparkle/dist/cjs/components/ContentMessage";
 import type {
   APIError,
   AssistantCreativityLevel,
@@ -660,7 +661,7 @@ function AnimatedSuggestion({
   afterEnter,
 }: {
   suggestion: string;
-  variant?: React.ComponentProps<typeof ContentMessage>["variant"];
+  variant?: ContentMessageProps["variant"];
   afterEnter?: () => void;
 }) {
   return (

diff --git a/front/components/home/LandingLayout.tsx b/front/components/home/LandingLayout.tsx
@@ -3,9 +3,9 @@ import {
   Div3D,
   Hover3D,
   LoginIcon,
-  LogoHorizontalColorLayer1Logo,
-  LogoHorizontalColorLayer2Logo,
   LogoHorizontalColorLogo,
+  LogoHorizontalColorLogoLayer1,
+  LogoHorizontalColorLogoLayer2,
 } from "@dust-tt/sparkle";
 import { Transition } from "@headlessui/react";
 import Head from "next/head";
@@ -99,10 +99,10 @@ export default function LandingLayout({
             <Link href="/">
               <Hover3D className="relative h-[24px] w-[96px]">
                 <Div3D depth={0} className="h-[24px] w-[96px]">
-                  <LogoHorizontalColorLayer1Logo className="h-[24px] w-[96px]" />
+                  <LogoHorizontalColorLogoLayer1 className="h-[24px] w-[96px]" />
                 </Div3D>
                 <Div3D depth={25} className="absolute top-0">
-                  <LogoHorizontalColorLayer2Logo className="h-[24px] w-[96px]" />
+                  <LogoHorizontalColorLogoLayer2 className="h-[24px] w-[96px]" />
                 </Div3D>
               </Hover3D>
             </Link>

diff --git a/front/next.config.js b/front/next.config.js
@@ -65,13 +65,6 @@ module.exports = {
       tls: false,
       dgram: false,
     };
-    // Use source-map-loader for transitively include source maps of dependencies.
-    config.module.rules.push({
-      test: /\.js$/,
-      use: ["source-map-loader"],
-      enforce: "pre",
-      include: [path.resolve(__dirname, "node_modules/@dust-tt/sparkle")],
-    });
     return config;
   },
 };