diff --git a/apps/app/actions/action.tsx b/apps/app/actions/action.tsx
index 80521ed..81b9d22 100644
--- a/apps/app/actions/action.tsx
+++ b/apps/app/actions/action.tsx
@@ -24,7 +24,11 @@ const aiPrompt = `
`;
export type ServerMessage = {
id?: number;
- name?: "should_continue" | "workspace_form" | "project_form"| "onboard_complete";
+ name?:
+ | "should_continue"
+ | "workspace_form"
+ | "project_form"
+ | "onboard_complete";
role: "user" | "assistant";
content: string;
};
diff --git a/apps/app/actions/session.ts b/apps/app/actions/session.ts
index 60e6a4d..b55cfb9 100644
--- a/apps/app/actions/session.ts
+++ b/apps/app/actions/session.ts
@@ -45,7 +45,7 @@ export const onboardingComplete = async () => {
return { success: false };
}
- return {success:true}
+ return { success: true };
} catch (error) {
return { success: false };
}
diff --git a/apps/app/components/custom/onboarding/chatbox.tsx b/apps/app/components/custom/onboarding/chatbox.tsx
index 5752d08..b86771b 100644
--- a/apps/app/components/custom/onboarding/chatbox.tsx
+++ b/apps/app/components/custom/onboarding/chatbox.tsx
@@ -56,10 +56,9 @@ export default function Chatbox() {
useEffect(() => {
const fetchAiGreeting = async () => {
- const response = await sendMessage({ prompt:"onboard me"});
+ const response = await sendMessage({ prompt: "onboard me" });
setMessages((currentMessages) => [response, ...currentMessages]);
(async () => {
-
const response = await sendMessage({ prompt: "should we continue?" });
setMessages((currentMessages) => [...currentMessages, response]);
})();
diff --git a/apps/app/components/custom/onboarding/onboard-complete.tsx b/apps/app/components/custom/onboarding/onboard-complete.tsx
index a35333d..7a57e1f 100644
--- a/apps/app/components/custom/onboarding/onboard-complete.tsx
+++ b/apps/app/components/custom/onboarding/onboard-complete.tsx
@@ -2,12 +2,15 @@ import { onboardingComplete } from "@/actions/session";
import { redirect } from "next/navigation";
export default async function OnboardComplete() {
- const res = await onboardingComplete()
- if(res.success){
- redirect("/settings")
- }
+ const res = await onboardingComplete();
+ if (res.success) {
+ redirect("/settings");
+ }
return (
-
-
Your onbaording has been completed
- );
-}
\ No newline at end of file
+
+
+ Your onbaording has been completed{" "}
+
+
+ );
+}
diff --git a/apps/app/components/custom/onboarding/workspace-form.tsx b/apps/app/components/custom/onboarding/workspace-form.tsx
index 72edcab..fa8160a 100644
--- a/apps/app/components/custom/onboarding/workspace-form.tsx
+++ b/apps/app/components/custom/onboarding/workspace-form.tsx
@@ -58,7 +58,7 @@ export default function WorkspaceForm({
useEffect(() => {
(async () => {
if (hasWorkspace) {
- console.log("hehe")
+ console.log("hehe");
const project = await sendMessage({
prompt: `call project form with workspaceId:${workspaceId}`,
});
diff --git a/apps/app/components/ui/markdown.tsx b/apps/app/components/ui/markdown.tsx
index 5fc248d..724b2a8 100644
--- a/apps/app/components/ui/markdown.tsx
+++ b/apps/app/components/ui/markdown.tsx
@@ -61,5 +61,5 @@ export const NonMemoizedMarkdown = ({ children }: { children: string }) => {
export const Markdown = React.memo(
NonMemoizedMarkdown,
- (prevProps, nextProps) => prevProps.children === nextProps.children
+ (prevProps, nextProps) => prevProps.children === nextProps.children,
);
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e5400b1..7050942 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,9 +1,5 @@
lockfileVersion: '9.0'
-settings:
- autoInstallPeers: true
- excludeLinksFromLockfile: false
-
importers:
.:
@@ -115,13 +111,8 @@ importers:
specifier: ^5.0.9
version: 5.0.9
next:
-<<<<<<< HEAD
- specifier: 15.1.1
- version: 15.1.1(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.49.0)(babel-plugin-react-compiler@19.0.0-beta-63e3235-20250105)(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028)
-=======
specifier: 15.1.3
- version: 15.1.3(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028)
->>>>>>> 7c8486ecaeb36970378579d02238f904781f5331
+ version: 15.1.3(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(babel-plugin-react-compiler@19.0.0-beta-63e3235-20250105)(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028)
prisma:
specifier: ^5.22.0
version: 5.22.0
@@ -236,14 +227,10 @@ importers:
version: 12.3.6(@types/react@18.0.26)(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028)
ai:
specifier: ^4.0.8
-<<<<<<< HEAD
- version: 4.0.8(react@19.0.0-rc-02c0e824-20241028)(zod@3.23.8)
+ version: 4.0.30(react@19.0.0-rc-02c0e824-20241028)(zod@3.24.1)
babel-plugin-react-compiler:
specifier: 19.0.0-beta-63e3235-20250105
version: 19.0.0-beta-63e3235-20250105
-=======
- version: 4.0.30(react@19.0.0-rc-02c0e824-20241028)(zod@3.24.1)
->>>>>>> 7c8486ecaeb36970378579d02238f904781f5331
class-variance-authority:
specifier: ^0.7.0
version: 0.7.1
@@ -267,7 +254,7 @@ importers:
version: 11.16.1(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028)
geist:
specifier: ^1.3.1
- version: 1.3.1(next@15.1.3(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028))
+ version: 1.3.1(next@15.1.3(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(babel-plugin-react-compiler@19.0.0-beta-63e3235-20250105)(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028))
input-otp:
specifier: ^1.4.1
version: 1.4.2(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028)
@@ -278,13 +265,8 @@ importers:
specifier: ^11.12.0
version: 11.16.1(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028)
next:
-<<<<<<< HEAD
- specifier: 15.1.1
- version: 15.1.1(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.49.0)(babel-plugin-react-compiler@19.0.0-beta-63e3235-20250105)(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028)
-=======
specifier: 15.1.3
- version: 15.1.3(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028)
->>>>>>> 7c8486ecaeb36970378579d02238f904781f5331
+ version: 15.1.3(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(babel-plugin-react-compiler@19.0.0-beta-63e3235-20250105)(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028)
next-themes:
specifier: ^0.4.3
version: 0.4.4(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028)
@@ -302,20 +284,13 @@ importers:
version: 7.54.2(react@19.0.0-rc-02c0e824-20241028)
react-intersection-observer:
specifier: ^9.13.1
-<<<<<<< HEAD
- version: 9.13.1(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028)
+ version: 9.14.1(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028)
react-markdown:
specifier: ^9.0.3
- version: 9.0.3(@types/react@18.3.12)(react@19.0.0-rc-02c0e824-20241028)
+ version: 9.0.3(@types/react@18.0.26)(react@19.0.0-rc-02c0e824-20241028)
react-scan:
specifier: ^0.0.54
- version: 0.0.54(next@15.1.1(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.49.0)(babel-plugin-react-compiler@19.0.0-beta-63e3235-20250105)(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028))(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028)(rollup@4.27.3)
-=======
- version: 9.14.1(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028)
- react-scan:
- specifier: ^0.0.54
- version: 0.0.54(next@15.1.3(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028))(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028)(rollup@4.30.1)
->>>>>>> 7c8486ecaeb36970378579d02238f904781f5331
+ version: 0.0.54(next@15.1.3(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(babel-plugin-react-compiler@19.0.0-beta-63e3235-20250105)(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028))(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028)(rollup@4.30.1)
react-spinners:
specifier: ^0.14.1
version: 0.14.1(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028)
@@ -324,14 +299,10 @@ importers:
version: 2.1.1(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028)
recharts:
specifier: ^2.13.3
-<<<<<<< HEAD
- version: 2.13.3(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028)
+ version: 2.15.0(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028)
remark-gfm:
specifier: ^4.0.0
version: 4.0.0
-=======
- version: 2.15.0(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028)
->>>>>>> 7c8486ecaeb36970378579d02238f904781f5331
sonner:
specifier: ^1.7.0
version: 1.7.1(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028)
@@ -539,13 +510,8 @@ importers:
specifier: ^11.13.1
version: 11.16.1(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028)
next:
-<<<<<<< HEAD
- specifier: 15.1.1
- version: 15.1.1(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.49.0)(babel-plugin-react-compiler@19.0.0-beta-63e3235-20250105)(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028)
-=======
specifier: 15.1.3
- version: 15.1.3(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028)
->>>>>>> 7c8486ecaeb36970378579d02238f904781f5331
+ version: 15.1.3(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(babel-plugin-react-compiler@19.0.0-beta-63e3235-20250105)(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028)
next-themes:
specifier: ^0.4.3
version: 0.4.4(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028)
@@ -12364,7 +12330,7 @@ snapshots:
axios@1.7.4(debug@4.4.0):
dependencies:
follow-redirects: 1.15.9(debug@4.4.0)
- form-data: 4.0.0
+ form-data: 4.0.1
proxy-from-env: 1.1.0
transitivePeerDependencies:
- debug
@@ -12373,7 +12339,7 @@ snapshots:
babel-plugin-react-compiler@19.0.0-beta-63e3235-20250105:
dependencies:
- '@babel/types': 7.26.0
+ '@babel/types': 7.26.3
bail@2.0.2: {}
@@ -13228,7 +13194,7 @@ snapshots:
eslint: 8.57.1
eslint-import-resolver-node: 0.3.9
eslint-import-resolver-typescript: 3.7.0(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.7.2))(eslint@8.57.1))(eslint@8.57.1)
- eslint-plugin-import: 2.31.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.7.2))(eslint-import-resolver-typescript@3.7.0)(eslint@8.57.1)
+ eslint-plugin-import: 2.31.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.7.2))(eslint-import-resolver-typescript@3.7.0(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.7.2))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
eslint-plugin-jsx-a11y: 6.10.2(eslint@8.57.1)
eslint-plugin-react: 7.37.3(eslint@8.57.1)
eslint-plugin-react-hooks: 5.1.0(eslint@8.57.1)
@@ -13248,7 +13214,7 @@ snapshots:
eslint: 8.57.1
eslint-import-resolver-node: 0.3.9
eslint-import-resolver-typescript: 3.7.0(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.7.2))(eslint@8.57.1))(eslint@8.57.1)
- eslint-plugin-import: 2.31.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.7.2))(eslint-import-resolver-typescript@3.7.0)(eslint@8.57.1)
+ eslint-plugin-import: 2.31.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.7.2))(eslint-import-resolver-typescript@3.7.0(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.7.2))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
eslint-plugin-jsx-a11y: 6.10.2(eslint@8.57.1)
eslint-plugin-react: 7.37.3(eslint@8.57.1)
eslint-plugin-react-hooks: 5.1.0(eslint@8.57.1)
@@ -13292,7 +13258,7 @@ snapshots:
is-glob: 4.0.3
stable-hash: 0.0.4
optionalDependencies:
- eslint-plugin-import: 2.31.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.7.2))(eslint-import-resolver-typescript@3.7.0)(eslint@8.57.1)
+ eslint-plugin-import: 2.31.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.7.2))(eslint-import-resolver-typescript@3.7.0(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.7.2))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
transitivePeerDependencies:
- supports-color
@@ -13368,7 +13334,7 @@ snapshots:
- eslint-import-resolver-webpack
- supports-color
- eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.7.2))(eslint-import-resolver-typescript@3.7.0)(eslint@8.57.1):
+ eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.7.2))(eslint-import-resolver-typescript@3.7.0(eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.7.2))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1):
dependencies:
'@rtsao/scc': 1.1.0
array-includes: 3.1.8
@@ -13800,13 +13766,9 @@ snapshots:
functions-have-names@1.2.3: {}
- geist@1.3.1(next@15.1.3(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028)):
+ geist@1.3.1(next@15.1.3(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(babel-plugin-react-compiler@19.0.0-beta-63e3235-20250105)(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028)):
dependencies:
-<<<<<<< HEAD
- next: 15.1.1(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.49.0)(babel-plugin-react-compiler@19.0.0-beta-63e3235-20250105)(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028)
-=======
- next: 15.1.3(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028)
->>>>>>> 7c8486ecaeb36970378579d02238f904781f5331
+ next: 15.1.3(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(babel-plugin-react-compiler@19.0.0-beta-63e3235-20250105)(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028)
geist@1.3.1(next@15.1.3(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028)):
dependencies:
@@ -15188,11 +15150,7 @@ snapshots:
- '@babel/core'
- babel-plugin-macros
-<<<<<<< HEAD
- next@15.1.1(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.49.0)(babel-plugin-react-compiler@19.0.0-beta-63e3235-20250105)(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028):
-=======
- next@15.1.3(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028):
->>>>>>> 7c8486ecaeb36970378579d02238f904781f5331
+ next@15.1.3(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(babel-plugin-react-compiler@19.0.0-beta-63e3235-20250105)(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028):
dependencies:
'@next/env': 15.1.3
'@swc/counter': 0.1.3
@@ -15213,12 +15171,8 @@ snapshots:
'@next/swc-win32-arm64-msvc': 15.1.3
'@next/swc-win32-x64-msvc': 15.1.3
'@opentelemetry/api': 1.9.0
-<<<<<<< HEAD
- '@playwright/test': 1.49.0
- babel-plugin-react-compiler: 19.0.0-beta-63e3235-20250105
-=======
'@playwright/test': 1.49.1
->>>>>>> 7c8486ecaeb36970378579d02238f904781f5331
+ babel-plugin-react-compiler: 19.0.0-beta-63e3235-20250105
sharp: 0.33.5
transitivePeerDependencies:
- '@babel/core'
@@ -15770,10 +15724,10 @@ snapshots:
react-is@18.3.1: {}
- react-markdown@9.0.3(@types/react@18.3.12)(react@19.0.0-rc-02c0e824-20241028):
+ react-markdown@9.0.3(@types/react@18.0.26)(react@19.0.0-rc-02c0e824-20241028):
dependencies:
'@types/hast': 3.0.4
- '@types/react': 18.3.12
+ '@types/react': 18.0.26
devlop: 1.1.0
hast-util-to-jsx-runtime: 2.3.2
html-url-attributes: 3.0.1
@@ -15833,11 +15787,7 @@ snapshots:
optionalDependencies:
'@types/react': 18.0.26
-<<<<<<< HEAD
- react-scan@0.0.54(next@15.1.1(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.49.0)(babel-plugin-react-compiler@19.0.0-beta-63e3235-20250105)(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028))(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028)(rollup@4.27.3):
-=======
- react-scan@0.0.54(next@15.1.3(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028))(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028)(rollup@4.30.1):
->>>>>>> 7c8486ecaeb36970378579d02238f904781f5331
+ react-scan@0.0.54(next@15.1.3(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(babel-plugin-react-compiler@19.0.0-beta-63e3235-20250105)(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028))(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028)(rollup@4.30.1):
dependencies:
'@babel/core': 7.26.0
'@babel/generator': 7.26.3
@@ -15858,11 +15808,7 @@ snapshots:
react-dom: 19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028)
tsx: 4.19.2
optionalDependencies:
-<<<<<<< HEAD
- next: 15.1.1(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.49.0)(babel-plugin-react-compiler@19.0.0-beta-63e3235-20250105)(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028)
-=======
- next: 15.1.3(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028)
->>>>>>> 7c8486ecaeb36970378579d02238f904781f5331
+ next: 15.1.3(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.49.1)(babel-plugin-react-compiler@19.0.0-beta-63e3235-20250105)(react-dom@19.0.0-rc-02c0e824-20241028(react@19.0.0-rc-02c0e824-20241028))(react@19.0.0-rc-02c0e824-20241028)
unplugin: 2.1.0
transitivePeerDependencies:
- rollup