diff --git a/packages/client-telegram/src/messageManager.ts b/packages/client-telegram/src/messageManager.ts index 0389f28fcc..21fd87384e 100644 --- a/packages/client-telegram/src/messageManager.ts +++ b/packages/client-telegram/src/messageManager.ts @@ -24,7 +24,7 @@ import { MESSAGE_CONSTANTS, TIMING_CONSTANTS, RESPONSE_CHANCES, - TEAM_COORDINATION + TEAM_COORDINATION, } from "./constants"; import fs from "fs"; @@ -169,25 +169,35 @@ export class MessageManager { this.bot = bot; this.runtime = runtime; - this._initializeTeamMemberUsernames().catch(error => - elizaLogger.error("Error initializing team member usernames:", error) + this._initializeTeamMemberUsernames().catch((error) => + elizaLogger.error( + "Error initializing team member usernames:", + error + ) ); } private async _initializeTeamMemberUsernames(): Promise { - if (!this.runtime.character.clientConfig?.telegram?.isPartOfTeam) return; + if (!this.runtime.character.clientConfig?.telegram?.isPartOfTeam) + return; - const teamAgentIds = this.runtime.character.clientConfig.telegram.teamAgentIds || []; + const teamAgentIds = + this.runtime.character.clientConfig.telegram.teamAgentIds || []; for (const id of teamAgentIds) { try { const chat = await this.bot.telegram.getChat(id); - if ('username' in chat && chat.username) { + if ("username" in chat && chat.username) { this.teamMemberUsernames.set(id, chat.username); - elizaLogger.info(`Cached username for team member ${id}: ${chat.username}`); + elizaLogger.info( + `Cached username for team member ${id}: ${chat.username}` + ); } } catch (error) { - elizaLogger.error(`Error getting username for team member ${id}:`, error); + elizaLogger.error( + `Error getting username for team member ${id}:`, + error + ); } } } @@ -197,7 +207,7 @@ export class MessageManager { } private _getNormalizedUserId(id: string | number): string { - return id.toString().replace(/[^0-9]/g, ''); + return id.toString().replace(/[^0-9]/g, ""); } private _isTeamMember(userId: string | number): boolean { @@ -205,23 +215,30 @@ export class MessageManager { if (!teamConfig?.isPartOfTeam || !teamConfig.teamAgentIds) return false; const normalizedUserId = this._getNormalizedUserId(userId); - return teamConfig.teamAgentIds.some(teamId => - this._getNormalizedUserId(teamId) === normalizedUserId + return teamConfig.teamAgentIds.some( + (teamId) => this._getNormalizedUserId(teamId) === normalizedUserId ); } private _isTeamLeader(): boolean { - return this.bot.botInfo?.id.toString() === this.runtime.character.clientConfig?.telegram?.teamLeaderId; + return ( + this.bot.botInfo?.id.toString() === + this.runtime.character.clientConfig?.telegram?.teamLeaderId + ); } private _isTeamCoordinationRequest(content: string): boolean { const contentLower = content.toLowerCase(); - return TEAM_COORDINATION.KEYWORDS?.some(keyword => + return TEAM_COORDINATION.KEYWORDS?.some((keyword) => contentLower.includes(keyword.toLowerCase()) ); } - private _isRelevantToTeamMember(content: string, chatId: string, lastAgentMemory: Memory | null = null): boolean { + private _isRelevantToTeamMember( + content: string, + chatId: string, + lastAgentMemory: Memory | null = null + ): boolean { const teamConfig = this.runtime.character.clientConfig?.telegram; // Check leader's context based on last message @@ -236,7 +253,10 @@ export class MessageManager { lastAgentMemory.content.text.toLowerCase() ); - return similarity >= MESSAGE_CONSTANTS.DEFAULT_SIMILARITY_THRESHOLD_FOLLOW_UPS; + return ( + similarity >= + MESSAGE_CONSTANTS.DEFAULT_SIMILARITY_THRESHOLD_FOLLOW_UPS + ); } // Check team member keywords @@ -245,16 +265,20 @@ export class MessageManager { } // Check if content matches any team member keywords - return teamConfig.teamMemberInterestKeywords.some(keyword => + return teamConfig.teamMemberInterestKeywords.some((keyword) => content.toLowerCase().includes(keyword.toLowerCase()) ); } - private async _analyzeContextSimilarity(currentMessage: string, previousContext?: MessageContext, agentLastMessage?: string): Promise { + private async _analyzeContextSimilarity( + currentMessage: string, + previousContext?: MessageContext, + agentLastMessage?: string + ): Promise { if (!previousContext) return 1; const timeDiff = Date.now() - previousContext.timestamp; - const timeWeight = Math.max(0, 1 - (timeDiff / (5 * 60 * 1000))); + const timeWeight = Math.max(0, 1 - timeDiff / (5 * 60 * 1000)); const similarity = cosineSimilarity( currentMessage.toLowerCase(), @@ -265,9 +289,16 @@ export class MessageManager { return similarity * timeWeight; } - private async _shouldRespondBasedOnContext(message: Message, chatState: InterestChats[string]): Promise { - const messageText = 'text' in message ? message.text : - 'caption' in message ? (message as any).caption : ''; + private async _shouldRespondBasedOnContext( + message: Message, + chatState: InterestChats[string] + ): Promise { + const messageText = + "text" in message + ? message.text + : "caption" in message + ? (message as any).caption + : ""; if (!messageText) return false; @@ -275,42 +306,46 @@ export class MessageManager { if (this._isMessageForMe(message)) return true; // If we're not the current handler, don't respond - if (chatState?.currentHandler !== this.bot.botInfo?.id.toString()) return false; + if (chatState?.currentHandler !== this.bot.botInfo?.id.toString()) + return false; // Check if we have messages to compare if (!chatState.messages?.length) return false; // Get last user message (not from the bot) - const lastUserMessage = [...chatState.messages] - .reverse() - .find((m, index) => + const lastUserMessage = [...chatState.messages].reverse().find( + (m, index) => index > 0 && // Skip first message (current) m.userId !== this.runtime.agentId - ); + ); if (!lastUserMessage) return false; const lastSelfMemories = await this.runtime.messageManager.getMemories({ - roomId: stringToUuid(message.chat.id.toString() + "-" + this.runtime.agentId), + roomId: stringToUuid( + message.chat.id.toString() + "-" + this.runtime.agentId + ), unique: false, - count: 5 + count: 5, }); - const lastSelfSortedMemories = lastSelfMemories?.filter(m => m.userId === this.runtime.agentId) + const lastSelfSortedMemories = lastSelfMemories + ?.filter((m) => m.userId === this.runtime.agentId) .sort((a, b) => (b.createdAt || 0) - (a.createdAt || 0)); // Calculate context similarity const contextSimilarity = await this._analyzeContextSimilarity( messageText, { - content: lastUserMessage.content.text || '', - timestamp: Date.now() + content: lastUserMessage.content.text || "", + timestamp: Date.now(), }, lastSelfSortedMemories?.[0]?.content?.text ); const similarityThreshold = - this.runtime.character.clientConfig?.telegram?.messageSimilarityThreshold || + this.runtime.character.clientConfig?.telegram + ?.messageSimilarityThreshold || chatState.contextSimilarityThreshold || MESSAGE_CONSTANTS.DEFAULT_SIMILARITY_THRESHOLD; @@ -321,19 +356,31 @@ export class MessageManager { const botUsername = this.bot.botInfo?.username; if (!botUsername) return false; - const messageText = 'text' in message ? message.text : - 'caption' in message ? (message as any).caption : ''; + const messageText = + "text" in message + ? message.text + : "caption" in message + ? (message as any).caption + : ""; if (!messageText) return false; - const isReplyToBot = (message as any).reply_to_message?.from?.is_bot === true && - (message as any).reply_to_message?.from?.username === botUsername; + const isReplyToBot = + (message as any).reply_to_message?.from?.is_bot === true && + (message as any).reply_to_message?.from?.username === botUsername; const isMentioned = messageText.includes(`@${botUsername}`); - const hasUsername = messageText.toLowerCase().includes(botUsername.toLowerCase()); - - return isReplyToBot || isMentioned || (!this.runtime.character.clientConfig?.telegram?.shouldRespondOnlyToMentions && hasUsername); + const hasUsername = messageText + .toLowerCase() + .includes(botUsername.toLowerCase()); + + return ( + isReplyToBot || + isMentioned || + (!this.runtime.character.clientConfig?.telegram + ?.shouldRespondOnlyToMentions && + hasUsername) + ); } - private _checkInterest(chatId: string): boolean { const chatState = this.interestChats[chatId]; if (!chatState) return false; @@ -344,17 +391,30 @@ export class MessageManager { if (timeSinceLastMessage > MESSAGE_CONSTANTS.INTEREST_DECAY_TIME) { delete this.interestChats[chatId]; return false; - } else if (timeSinceLastMessage > MESSAGE_CONSTANTS.PARTIAL_INTEREST_DECAY) { - return this._isRelevantToTeamMember(lastMessage?.content.text || '', chatId); + } else if ( + timeSinceLastMessage > MESSAGE_CONSTANTS.PARTIAL_INTEREST_DECAY + ) { + return this._isRelevantToTeamMember( + lastMessage?.content.text || "", + chatId + ); } // Team leader specific checks if (this._isTeamLeader() && chatState.messages.length > 0) { - if (!this._isRelevantToTeamMember(lastMessage?.content.text || '', chatId)) { - const recentTeamResponses = chatState.messages.slice(-3).some(m => - m.userId !== this.runtime.agentId && - this._isTeamMember(m.userId.toString()) - ); + if ( + !this._isRelevantToTeamMember( + lastMessage?.content.text || "", + chatId + ) + ) { + const recentTeamResponses = chatState.messages + .slice(-3) + .some( + (m) => + m.userId !== this.runtime.agentId && + this._isTeamMember(m.userId.toString()) + ); if (recentTeamResponses) { delete this.interestChats[chatId]; @@ -373,7 +433,7 @@ export class MessageManager { try { let imageUrl: string | null = null; - elizaLogger.info(`Telegram Message: ${message}`) + elizaLogger.info(`Telegram Message: ${message}`); if ("photo" in message && message.photo?.length > 0) { const photo = message.photo[message.photo.length - 1]; @@ -412,8 +472,10 @@ export class MessageManager { message: Message, state: State ): Promise { - - if (this.runtime.character.clientConfig?.telegram?.shouldRespondOnlyToMentions) { + if ( + this.runtime.character.clientConfig?.telegram + ?.shouldRespondOnlyToMentions + ) { return this._isMessageForMe(message); } @@ -422,7 +484,7 @@ export class MessageManager { "text" in message && message.text?.includes(`@${this.bot.botInfo?.username}`) ) { - elizaLogger.info(`Bot mentioned`) + elizaLogger.info(`Bot mentioned`); return true; } @@ -442,41 +504,62 @@ export class MessageManager { const chatId = message.chat.id.toString(); const chatState = this.interestChats[chatId]; - const messageText = 'text' in message ? message.text : - 'caption' in message ? (message as any).caption : ''; + const messageText = + "text" in message + ? message.text + : "caption" in message + ? (message as any).caption + : ""; // Check if team member has direct interest first - if (this.runtime.character.clientConfig?.discord?.isPartOfTeam && + if ( + this.runtime.character.clientConfig?.discord?.isPartOfTeam && !this._isTeamLeader() && - this._isRelevantToTeamMember(messageText, chatId)) { - + this._isRelevantToTeamMember(messageText, chatId) + ) { return true; } // Team-based response logic if (this.runtime.character.clientConfig?.telegram?.isPartOfTeam) { // Team coordination - if(this._isTeamCoordinationRequest(messageText)) { + if (this._isTeamCoordinationRequest(messageText)) { if (this._isTeamLeader()) { return true; } else { - const randomDelay = Math.floor(Math.random() * (TIMING_CONSTANTS.TEAM_MEMBER_DELAY_MAX - TIMING_CONSTANTS.TEAM_MEMBER_DELAY_MIN)) + - TIMING_CONSTANTS.TEAM_MEMBER_DELAY_MIN; // 1-3 second random delay - await new Promise(resolve => setTimeout(resolve, randomDelay)); + const randomDelay = + Math.floor( + Math.random() * + (TIMING_CONSTANTS.TEAM_MEMBER_DELAY_MAX - + TIMING_CONSTANTS.TEAM_MEMBER_DELAY_MIN) + ) + TIMING_CONSTANTS.TEAM_MEMBER_DELAY_MIN; // 1-3 second random delay + await new Promise((resolve) => + setTimeout(resolve, randomDelay) + ); return true; } } - if (!this._isTeamLeader() && this._isRelevantToTeamMember(messageText, chatId)) { + if ( + !this._isTeamLeader() && + this._isRelevantToTeamMember(messageText, chatId) + ) { // Add small delay for non-leader responses - await new Promise(resolve => setTimeout(resolve, TIMING_CONSTANTS.TEAM_MEMBER_DELAY)); //1.5 second delay + await new Promise((resolve) => + setTimeout(resolve, TIMING_CONSTANTS.TEAM_MEMBER_DELAY) + ); //1.5 second delay // If leader has responded in last few seconds, reduce chance of responding if (chatState.messages?.length) { - const recentMessages = chatState.messages.slice(-MESSAGE_CONSTANTS.RECENT_MESSAGE_COUNT); - const leaderResponded = recentMessages.some(m => - m.userId === this.runtime.character.clientConfig?.telegram?.teamLeaderId && - Date.now() - chatState.lastMessageSent < 3000 + const recentMessages = chatState.messages.slice( + -MESSAGE_CONSTANTS.RECENT_MESSAGE_COUNT + ); + const leaderResponded = recentMessages.some( + (m) => + m.userId === + this.runtime.character.clientConfig?.telegram + ?.teamLeaderId && + Date.now() - chatState.lastMessageSent < 3000 ); if (leaderResponded) { @@ -489,17 +572,29 @@ export class MessageManager { } // If I'm the leader but message doesn't match my keywords, add delay and check for team responses - if (this._isTeamLeader() && !this._isRelevantToTeamMember(messageText, chatId)) { - const randomDelay = Math.floor(Math.random() * (TIMING_CONSTANTS.LEADER_DELAY_MAX - TIMING_CONSTANTS.LEADER_DELAY_MIN)) + - TIMING_CONSTANTS.LEADER_DELAY_MIN; // 2-4 second random delay - await new Promise(resolve => setTimeout(resolve, randomDelay)); + if ( + this._isTeamLeader() && + !this._isRelevantToTeamMember(messageText, chatId) + ) { + const randomDelay = + Math.floor( + Math.random() * + (TIMING_CONSTANTS.LEADER_DELAY_MAX - + TIMING_CONSTANTS.LEADER_DELAY_MIN) + ) + TIMING_CONSTANTS.LEADER_DELAY_MIN; // 2-4 second random delay + await new Promise((resolve) => + setTimeout(resolve, randomDelay) + ); // After delay, check if another team member has already responded if (chatState?.messages?.length) { - const recentResponses = chatState.messages.slice(-MESSAGE_CONSTANTS.RECENT_MESSAGE_COUNT); - const otherTeamMemberResponded = recentResponses.some(m => - m.userId !== this.runtime.agentId && - this._isTeamMember(m.userId) + const recentResponses = chatState.messages.slice( + -MESSAGE_CONSTANTS.RECENT_MESSAGE_COUNT + ); + const otherTeamMemberResponded = recentResponses.some( + (m) => + m.userId !== this.runtime.agentId && + this._isTeamMember(m.userId) ); if (otherTeamMemberResponded) { @@ -512,7 +607,8 @@ export class MessageManager { if (this._isMessageForMe(message)) { const channelState = this.interestChats[chatId]; if (channelState) { - channelState.currentHandler = this.bot.botInfo?.id.toString() + channelState.currentHandler = + this.bot.botInfo?.id.toString(); channelState.lastMessageSent = Date.now(); } return true; @@ -520,43 +616,43 @@ export class MessageManager { // Don't respond if another teammate is handling the conversation if (chatState?.currentHandler) { - if (chatState.currentHandler !== this.bot.botInfo?.id.toString() && - this._isTeamMember(chatState.currentHandler)) { + if ( + chatState.currentHandler !== + this.bot.botInfo?.id.toString() && + this._isTeamMember(chatState.currentHandler) + ) { return false; } } // Natural conversation cadence if (!this._isMessageForMe(message) && this.interestChats[chatId]) { - - const recentMessages = this.interestChats[chatId].messages - .slice(-MESSAGE_CONSTANTS.CHAT_HISTORY_COUNT); - const ourMessageCount = recentMessages.filter(m => - m.userId === this.runtime.agentId + const recentMessages = this.interestChats[ + chatId + ].messages.slice(-MESSAGE_CONSTANTS.CHAT_HISTORY_COUNT); + const ourMessageCount = recentMessages.filter( + (m) => m.userId === this.runtime.agentId ).length; if (ourMessageCount > 2) { - const responseChance = Math.pow(0.5, ourMessageCount - 2); if (Math.random() > responseChance) { return; } } } - } // Check context-based response for team conversations if (chatState?.currentHandler) { - const shouldRespondContext = await this._shouldRespondBasedOnContext(message, chatState); + const shouldRespondContext = + await this._shouldRespondBasedOnContext(message, chatState); if (!shouldRespondContext) { return false; } - } - // Use AI to decide for text or captions if ("text" in message || ("caption" in message && message.caption)) { const shouldRespondContext = composeContext({ @@ -728,40 +824,50 @@ export class MessageManager { const message = ctx.message; const chatId = ctx.chat?.id.toString(); - const messageText = 'text' in message ? message.text : - 'caption' in message ? (message as any).caption : ''; + const messageText = + "text" in message + ? message.text + : "caption" in message + ? (message as any).caption + : ""; // Add team handling at the start - if (this.runtime.character.clientConfig?.telegram?.isPartOfTeam && - !this.runtime.character.clientConfig?.telegram?.shouldRespondOnlyToMentions) { - + if ( + this.runtime.character.clientConfig?.telegram?.isPartOfTeam && + !this.runtime.character.clientConfig?.telegram + ?.shouldRespondOnlyToMentions + ) { const isDirectlyMentioned = this._isMessageForMe(message); const hasInterest = this._checkInterest(chatId); - // Non-leader team member showing interest based on keywords - if (!this._isTeamLeader() && this._isRelevantToTeamMember(messageText, chatId)) { - + if ( + !this._isTeamLeader() && + this._isRelevantToTeamMember(messageText, chatId) + ) { this.interestChats[chatId] = { currentHandler: this.bot.botInfo?.id.toString(), lastMessageSent: Date.now(), - messages: [] + messages: [], }; } const isTeamRequest = this._isTeamCoordinationRequest(messageText); const isLeader = this._isTeamLeader(); - // Check for continued interest if (hasInterest && !isDirectlyMentioned) { - const lastSelfMemories = await this.runtime.messageManager.getMemories({ - roomId: stringToUuid(chatId + "-" + this.runtime.agentId), - unique: false, - count: 5 - }); - - const lastSelfSortedMemories = lastSelfMemories?.filter(m => m.userId === this.runtime.agentId) + const lastSelfMemories = + await this.runtime.messageManager.getMemories({ + roomId: stringToUuid( + chatId + "-" + this.runtime.agentId + ), + unique: false, + count: 5, + }); + + const lastSelfSortedMemories = lastSelfMemories + ?.filter((m) => m.userId === this.runtime.agentId) .sort((a, b) => (b.createdAt || 0) - (a.createdAt || 0)); const isRelevant = this._isRelevantToTeamMember( @@ -782,35 +888,39 @@ export class MessageManager { this.interestChats[chatId] = { currentHandler: this.bot.botInfo?.id.toString(), lastMessageSent: Date.now(), - messages: [] + messages: [], }; } else { this.interestChats[chatId] = { currentHandler: this.bot.botInfo?.id.toString(), lastMessageSent: Date.now(), - messages: [] + messages: [], }; if (!isDirectlyMentioned) { this.interestChats[chatId].lastMessageSent = 0; } - } } // Check for other team member mentions using cached usernames - const otherTeamMembers = this.runtime.character.clientConfig.telegram.teamAgentIds.filter( - id => id !== this.bot.botInfo?.id.toString() - ); + const otherTeamMembers = + this.runtime.character.clientConfig.telegram.teamAgentIds.filter( + (id) => id !== this.bot.botInfo?.id.toString() + ); - const mentionedTeamMember = otherTeamMembers.find(id => { + const mentionedTeamMember = otherTeamMembers.find((id) => { const username = this._getTeamMemberUsername(id); return username && messageText?.includes(`@${username}`); }); // If another team member is mentioned, clear our interest if (mentionedTeamMember) { - if (hasInterest || this.interestChats[chatId]?.currentHandler === this.bot.botInfo?.id.toString()) { + if ( + hasInterest || + this.interestChats[chatId]?.currentHandler === + this.bot.botInfo?.id.toString() + ) { delete this.interestChats[chatId]; // Only return if we're not the mentioned member @@ -825,7 +935,7 @@ export class MessageManager { this.interestChats[chatId] = { currentHandler: this.bot.botInfo?.id.toString(), lastMessageSent: Date.now(), - messages: [] + messages: [], }; } else if (!isTeamRequest && !hasInterest) { return; @@ -835,13 +945,20 @@ export class MessageManager { if (this.interestChats[chatId]) { this.interestChats[chatId].messages.push({ userId: stringToUuid(ctx.from.id.toString()), - userName: ctx.from.username || ctx.from.first_name || "Unknown User", - content: { text: messageText, source: "telegram" } + userName: + ctx.from.username || + ctx.from.first_name || + "Unknown User", + content: { text: messageText, source: "telegram" }, }); - if (this.interestChats[chatId].messages.length > MESSAGE_CONSTANTS.MAX_MESSAGES) { - this.interestChats[chatId].messages = - this.interestChats[chatId].messages.slice(-MESSAGE_CONSTANTS.MAX_MESSAGES); + if ( + this.interestChats[chatId].messages.length > + MESSAGE_CONSTANTS.MAX_MESSAGES + ) { + this.interestChats[chatId].messages = this.interestChats[ + chatId + ].messages.slice(-MESSAGE_CONSTANTS.MAX_MESSAGES); } } } @@ -1008,12 +1125,14 @@ export class MessageManager { state = await this.runtime.updateRecentMessageState(state); // Handle any resulting actions - await this.runtime.processActions( + + const actionResult: any = await this.runtime.processActions( memory, responseMessages, state, callback ); + console.log("actionResult", actionResult); } await this.runtime.evaluate(memory, state, shouldRespond); @@ -1022,4 +1141,4 @@ export class MessageManager { elizaLogger.error("Error sending message:", error); } } -} \ No newline at end of file +} diff --git a/packages/client-xmtp/src/index.ts b/packages/client-xmtp/src/index.ts index 642341a616..644780bd24 100644 --- a/packages/client-xmtp/src/index.ts +++ b/packages/client-xmtp/src/index.ts @@ -48,10 +48,12 @@ export const XmtpClientInterface: Client = { start: async (runtime: IAgentRuntime) => { if (!xmtp) { elizaRuntime = runtime; + xmtp = new XMTP(onMessage, { privateKey: process.env.EVM_PRIVATE_KEY, }); await xmtp.init(); + elizaLogger.success("✅ XMTP client started"); elizaLogger.info(`XMTP address: ${xmtp.address}`); elizaLogger.info(`Share it on `); diff --git a/packages/core/src/generation.ts b/packages/core/src/generation.ts index dba21e5112..905ab86910 100644 --- a/packages/core/src/generation.ts +++ b/packages/core/src/generation.ts @@ -904,7 +904,6 @@ export async function generateMessageResponse({ context, modelClass, }); - // try parsing the response as JSON, if null then try again const parsedContent = parseJSONObjectFromText(response) as Content; if (!parsedContent) { @@ -1066,8 +1065,12 @@ export const generateImage = async ( num_inference_steps: modelSettings?.steps ?? 50, guidance_scale: data.guidanceScale || 3.5, num_images: data.count, - enable_safety_checker: runtime.getSetting("FAL_AI_ENABLE_SAFETY_CHECKER") === "true", - safety_tolerance: Number(runtime.getSetting("FAL_AI_SAFETY_TOLERANCE") || "2"), + enable_safety_checker: + runtime.getSetting("FAL_AI_ENABLE_SAFETY_CHECKER") === + "true", + safety_tolerance: Number( + runtime.getSetting("FAL_AI_SAFETY_TOLERANCE") || "2" + ), output_format: "png" as const, seed: data.seed ?? 6252023, ...(runtime.getSetting("FAL_AI_LORA_PATH") diff --git a/packages/plugin-concierge/src/index.ts b/packages/plugin-concierge/src/index.ts index 3b2fc2a896..1bd96dcb8e 100644 --- a/packages/plugin-concierge/src/index.ts +++ b/packages/plugin-concierge/src/index.ts @@ -22,6 +22,4 @@ export const conciergePlugin: Plugin = { transferAction, swapAction, ], - - // Add evaluators and providers if needed }; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 46445be17d..37bd80dbaf 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -96,12 +96,6 @@ importers: vitest: specifier: 2.1.5 version: 2.1.5(@types/node@22.10.2)(jsdom@25.0.1(bufferutil@4.0.8)(canvas@2.11.2(encoding@0.1.13))(utf-8-validate@5.0.10))(terser@5.37.0) -<<<<<<< HEAD - zx: - specifier: ^8.2.4 - version: 8.2.4 -======= ->>>>>>> origin/develop agent: dependencies: @@ -156,6 +150,9 @@ importers: '@ai16z/plugin-concierge': specifier: workspace:* version: link:../packages/plugin-concierge + '@ai16z/plugin-concierge': + specifier: workspace:* + version: link:../packages/plugin-concierge '@ai16z/plugin-conflux': specifier: workspace:* version: link:../packages/plugin-conflux @@ -518,9 +515,6 @@ importers: express: specifier: 4.21.1 version: 4.21.1 - morgan: - specifier: ^1.10.0 - version: 1.10.0 multer: specifier: 1.4.5-lts.1 version: 1.4.5-lts.1 @@ -730,7 +724,6 @@ importers: tsup: specifier: 8.3.5 version: 8.3.5(@swc/core@1.10.1(@swc/helpers@0.5.15))(jiti@2.4.1)(postcss@8.4.49)(typescript@5.6.3)(yaml@2.6.1) -<<<<<<< HEAD packages/client-xmtp: dependencies: @@ -738,14 +731,12 @@ importers: specifier: workspace:* version: link:../core xmtp: - specifier: ^0.0.8 - version: 0.0.8(bufferutil@4.0.8)(utf-8-validate@5.0.10)(zod@3.23.8) + specifier: ^0.0.4 + version: 0.0.4(bufferutil@4.0.8)(utf-8-validate@5.0.10)(zod@3.23.8) devDependencies: tsup: specifier: 8.3.5 version: 8.3.5(@swc/core@1.10.1(@swc/helpers@0.5.15))(jiti@2.4.1)(postcss@8.4.49)(typescript@5.6.3)(yaml@2.6.1) -======= ->>>>>>> origin/develop packages/core: dependencies: @@ -1019,7 +1010,6 @@ importers: tsup: specifier: 8.3.5 version: 8.3.5(@swc/core@1.10.1(@swc/helpers@0.5.15))(jiti@2.4.1)(postcss@8.4.49)(typescript@5.6.3)(yaml@2.6.1) -<<<<<<< HEAD packages/plugin-concierge: dependencies: @@ -1038,8 +1028,24 @@ importers: tsup: specifier: 8.3.5 version: 8.3.5(@swc/core@1.10.1(@swc/helpers@0.5.15))(jiti@2.4.1)(postcss@8.4.49)(typescript@5.6.3)(yaml@2.6.1) -======= ->>>>>>> origin/develop + + packages/plugin-concierge: + dependencies: + '@ai16z/eliza': + specifier: workspace:* + version: link:../core + '@coinbase/cbpay-js': + specifier: ^2.4.0 + version: 2.4.0 + '@coinbase/coinbase-sdk': + specifier: 0.11.2 + version: 0.11.2(bufferutil@4.0.8)(typescript@5.6.3)(utf-8-validate@5.0.10)(zod@3.23.8) + build: + specifier: ^0.1.4 + version: 0.1.4 + tsup: + specifier: 8.3.5 + version: 8.3.5(@swc/core@1.10.1(@swc/helpers@0.5.15))(jiti@2.4.1)(postcss@8.4.49)(typescript@5.6.3)(yaml@2.6.1) packages/plugin-conflux: dependencies: @@ -1840,12 +1846,9 @@ packages: resolution: {integrity: sha512-29lUK80d1muEQqiUsSo+3A0yP6CdspgC95EnKBMi22Xlwt79i/En4Vr67+cXhU+cZjbti3TgGGC5wy1stIywVQ==} engines: {node: '>=0.8'} -<<<<<<< HEAD '@adraffy/ens-normalize@1.10.0': resolution: {integrity: sha512-nA9XHtlAkYfJxY7bce8DcN7eKxWWCWkU+1GR9d+U6MbNpfwQp8TI7vqOsBsMcHoT4mBu2kypKoSKnghEzOOq5Q==} -======= ->>>>>>> origin/develop '@adraffy/ens-normalize@1.10.1': resolution: {integrity: sha512-96Z2IP3mYmF1Xg2cDm8f1gWGf/HUVedQ3FMifV4kG/PQ4yEP51xDtRAEfhVNt5f/uzpNkZHwWQuUcu6D6K+Ekw==} @@ -3008,7 +3011,6 @@ packages: '@cfworker/json-schema@4.0.3': resolution: {integrity: sha512-ZykIcDTVv5UNmKWSTLAs3VukO6NDJkkSKxrgUTDPBkAlORVT3H9n5DbRjRl8xIotklscHdbLIa0b9+y3mQq73g==} -<<<<<<< HEAD '@changesets/apply-release-plan@7.0.7': resolution: {integrity: sha512-qnPOcmmmnD0MfMg9DjU1/onORFyRpDXkMMl2IJg9mECY6RnxL3wN0TCCc92b2sXt1jt8DgjAUUsZYGUGTdYIXA==} @@ -3064,8 +3066,6 @@ packages: '@changesets/write@0.3.2': resolution: {integrity: sha512-kDxDrPNpUgsjDbWBvUo27PzKX4gqeKOlhibaOXDJA6kuBisGqNHv/HwGJrAu8U/dSf8ZEFIeHIPtvSlZI1kULw==} -======= ->>>>>>> origin/develop '@chevrotain/cst-dts-gen@11.0.3': resolution: {integrity: sha512-BvIKpRLeS/8UbfxXxgC33xOumsacaeCKAjAeLyOn7Pcp95HiRbrpl14S+9vaZLolnbssPIUuiUd8IvgkRyt6NQ==} @@ -3102,7 +3102,15 @@ packages: '@coinbase-samples/advanced-sdk-ts@file:packages/plugin-coinbase/advanced-sdk-ts': resolution: {directory: packages/plugin-coinbase/advanced-sdk-ts, type: directory} -<<<<<<< HEAD + '@coinbase/cbpay-js@2.4.0': + resolution: {integrity: sha512-7Zy1P6v5CTaBuFYowFmvKJ4KyBngVjsPpLkjSi4DWJhVHMgLIkDUINSloRU0Idgt2rFA/PLIm2gXneR3OoQbrA==} + engines: {node: '>= 14'} + peerDependencies: + regenerator-runtime: ^0.13.9 + peerDependenciesMeta: + regenerator-runtime: + optional: true + '@coinbase/cbpay-js@2.4.0': resolution: {integrity: sha512-7Zy1P6v5CTaBuFYowFmvKJ4KyBngVjsPpLkjSi4DWJhVHMgLIkDUINSloRU0Idgt2rFA/PLIm2gXneR3OoQbrA==} engines: {node: '>= 14'} @@ -3118,22 +3126,21 @@ packages: '@coinbase/coinbase-sdk@0.11.2': resolution: {integrity: sha512-9kEL0aOGqVYabCHsbF5t5VrdfQ92T88N9nQ7RfhbpwEOiWUl8QXGy/NnMpuVtR+p4tpoJrev5Zm8rIGwtmH8LQ==} -======= - '@coinbase/coinbase-sdk@0.10.0': - resolution: {integrity: sha512-sqLH7dE/0XSn5jHddjVrC1PR77sQUEytYcQAlH2d8STqRARcvddxVAByECUIL32MpbdJY7Wca3KfSa6qo811Mg==} + '@coinbase/coinbase-sdk@0.11.2': + resolution: {integrity: sha512-9kEL0aOGqVYabCHsbF5t5VrdfQ92T88N9nQ7RfhbpwEOiWUl8QXGy/NnMpuVtR+p4tpoJrev5Zm8rIGwtmH8LQ==} ->>>>>>> origin/develop '@colors/colors@1.5.0': resolution: {integrity: sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==} engines: {node: '>=0.1.90'} -<<<<<<< HEAD '@colors/colors@1.6.0': resolution: {integrity: sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==} engines: {node: '>=0.1.90'} -======= ->>>>>>> origin/develop + '@colors/colors@1.6.0': + resolution: {integrity: sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==} + engines: {node: '>=0.1.90'} + '@commitlint/cli@18.6.1': resolution: {integrity: sha512-5IDE0a+lWGdkOvKH892HHAZgbAjcj1mT5QrfA/SVbLJV/BbBMGyKN0W5mhgjekPJJwEQdVNvhl9PwUacY58Usw==} engines: {node: '>=v18'} @@ -3483,12 +3490,12 @@ packages: peerDependencies: postcss: ^8.4 -<<<<<<< HEAD '@dabh/diagnostics@2.0.3': resolution: {integrity: sha512-hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA==} -======= ->>>>>>> origin/develop + '@dabh/diagnostics@2.0.3': + resolution: {integrity: sha512-hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA==} + '@deepgram/captions@1.2.0': resolution: {integrity: sha512-8B1C/oTxTxyHlSFubAhNRgCbQ2SQ5wwvtlByn8sDYZvdDtdn/VE2yEPZ4BvUnrKWmsbTQY6/ooLV+9Ka2qmDSQ==} engines: {node: '>=18.0.0'} @@ -4519,7 +4526,6 @@ packages: peerDependencies: graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 -<<<<<<< HEAD '@grpc/grpc-js@1.12.5': resolution: {integrity: sha512-d3iiHxdpg5+ZcJ6jnDSOT8Z0O0VMVGy34jAnYLUX8yd36b1qn8f1TwOA/Lc7TsOh03IkPJ38eGI5qD2EjNkoEA==} engines: {node: '>=12.10.0'} @@ -4529,8 +4535,6 @@ packages: engines: {node: '>=6'} hasBin: true -======= ->>>>>>> origin/develop '@hapi/hoek@9.3.0': resolution: {integrity: sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==} @@ -4810,12 +4814,9 @@ packages: '@jridgewell/trace-mapping@0.3.9': resolution: {integrity: sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==} -<<<<<<< HEAD '@js-sdsl/ordered-map@4.4.2': resolution: {integrity: sha512-iUKgm52T8HOE/makSxjqoWhe95ZJA1/G1sYsGev2JDKUSS14KAgg1LHb+Ba+IPow0xflbnSkOsZcO08C7w1gYw==} -======= ->>>>>>> origin/develop '@jspm/core@2.1.0': resolution: {integrity: sha512-3sRl+pkyFY/kLmHl0cgHiFp2xEqErA8N3ECjMs7serSUBmoJ70lBa0PG5t0IM6WJgdZNyyI0R8YFfi5wM8+mzg==} @@ -4977,15 +4978,12 @@ packages: resolution: {integrity: sha512-Z7C/xXCiGWsg0KuKsHTKJxbWhpI3Vs5GwLfOean7MGyVFGqdRgBbAjOCh6u4bbjPc/8MJ2pZmK/0DLdCbivLDA==} engines: {node: '>=8'} -<<<<<<< HEAD '@manypkg/find-root@1.1.0': resolution: {integrity: sha512-mki5uBvhHzO8kYYix/WRy2WX8S3B5wdVSc9D6KcU5lQNglP2yt58/VfLuAK49glRXChosY8ap2oJ1qgma3GUVA==} '@manypkg/get-packages@1.1.3': resolution: {integrity: sha512-fo+QhuU3qE/2TQMQmbVMqaQ6EWbMhi4ABWP+O4AM1NqPBuy0OrApV5LO6BrrgnhtAHS2NH6RrVk9OL181tTi8A==} -======= ->>>>>>> origin/develop '@mapbox/node-pre-gyp@1.0.11': resolution: {integrity: sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==} hasBin: true @@ -6016,7 +6014,6 @@ packages: '@polka/url@1.0.0-next.28': resolution: {integrity: sha512-8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw==} -<<<<<<< HEAD '@protobuf-ts/grpc-transport@2.9.4': resolution: {integrity: sha512-CgjTR3utmkMkkThpfgtOz9tNR9ZARbNoQYL7TCKqFU2sgAX0LgzAkwOx+sfgtUsZn9J08+yvn307nNJdYocLRA==} peerDependencies: @@ -6028,8 +6025,6 @@ packages: '@protobuf-ts/runtime@2.9.4': resolution: {integrity: sha512-vHRFWtJJB/SiogWDF0ypoKfRIZ41Kq+G9cEFj6Qm1eQaAhJ1LDFvgZ7Ja4tb3iLOQhz0PaoPnnOijF1qmEqTxg==} -======= ->>>>>>> origin/develop '@protobufjs/aspromise@1.1.2': resolution: {integrity: sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==} @@ -6620,12 +6615,9 @@ packages: '@scure/bip32@1.1.5': resolution: {integrity: sha512-XyNh1rB0SkEqd3tXcXMi+Xe1fvg+kUIcoRIEujP1Jgv7DqW2r9lg3Ah0NkFaCs9sTkQAQA8kw7xiRXzENi9Rtw==} -<<<<<<< HEAD '@scure/bip32@1.3.2': resolution: {integrity: sha512-N1ZhksgwD3OBlwTv3R6KFEcPojl/W4ElJOeCZdi+vuI5QmTFwLq3OFf2zd2ROpKvxFdgZ6hUpb0dx9bVNEwYCA==} -======= ->>>>>>> origin/develop '@scure/bip32@1.4.0': resolution: {integrity: sha512-sVUpc0Vq3tXCkDGYVWGIZTRfnvu8LoTDaev7vbwh0omSvVORONr960MQWdKqJDCReIEmTj3PAr73O3aoxz7OPg==} @@ -6638,12 +6630,9 @@ packages: '@scure/bip39@1.1.1': resolution: {integrity: sha512-t+wDck2rVkh65Hmv280fYdVdY25J9YeEUIgn2LG1WM6gxFkGzcksoDiUkWVpVp3Oex9xGC68JU2dSbUfwZ2jPg==} -<<<<<<< HEAD '@scure/bip39@1.2.1': resolution: {integrity: sha512-Z3/Fsz1yr904dduJD0NpiyRHhRYHdcnyh73FZWiV+/qhWi83wNJ3NWolYqCEN+ZWsUz2TWwajJggcRE9r1zUYg==} -======= ->>>>>>> origin/develop '@scure/bip39@1.3.0': resolution: {integrity: sha512-disdg7gHuTDZtY+ZdkmLpPCk7fxZSu3gBiEGuoC1XYxv9cGx3Z6cpTggCgW6odSOOIXCiDjuGejW+aJKCY/pIQ==} @@ -7630,12 +7619,6 @@ packages: '@types/fluent-ffmpeg@2.1.27': resolution: {integrity: sha512-QiDWjihpUhriISNoBi2hJBRUUmoj/BMTYcfz+F+ZM9hHWBYABFAE6hjP/TbCZC0GWwlpa3FzvHH9RzFeRusZ7A==} -<<<<<<< HEAD - '@types/fs-extra@11.0.4': - resolution: {integrity: sha512-yTbItCNreRooED33qjunPthRcSjERP1r4MqCZc7wv0u2sUkzTFp45tgUfS5+r7FrZPdmCCNflLhVSP/o+SemsQ==} - -======= ->>>>>>> origin/develop '@types/geojson@7946.0.15': resolution: {integrity: sha512-9oSxFzDCT2Rj6DfcHF8G++jxBKS7mBqXl5xrRW+Kbvjry6Uduya2iiwqHPhVXpasAVMBYKkEPGgKhd3+/HZ6xA==} @@ -7690,12 +7673,6 @@ packages: '@types/json-schema@7.0.15': resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==} -<<<<<<< HEAD - '@types/jsonfile@6.1.4': - resolution: {integrity: sha512-D5qGUYwjvnNNextdU59/+fI+spnwtTFmyQP0h+PfIOSkNfpU6AOICUOkm4i0OnSk+NyjdPJrxCDro0sJsWlRpQ==} - -======= ->>>>>>> origin/develop '@types/jsonwebtoken@9.0.7': resolution: {integrity: sha512-ugo316mmTYBl2g81zDFnZ7cfxlut3o+/EQdaP7J8QN2kY6lJ22hmQYCK5EHcJHbrW+dkCGSCPgbG8JtYj6qSrg==} @@ -7853,12 +7830,12 @@ packages: '@types/tar@6.1.13': resolution: {integrity: sha512-IznnlmU5f4WcGTh2ltRu/Ijpmk8wiWXfF0VA4s+HPjHZgvFggk1YaIkbo5krX/zUCzWF8N/l4+W/LNxnvAJ8nw==} -<<<<<<< HEAD '@types/triple-beam@1.3.5': resolution: {integrity: sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw==} -======= ->>>>>>> origin/develop + '@types/triple-beam@1.3.5': + resolution: {integrity: sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw==} + '@types/trusted-types@2.0.7': resolution: {integrity: sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==} @@ -8294,7 +8271,6 @@ packages: '@webassemblyjs/wast-printer@1.14.1': resolution: {integrity: sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==} -<<<<<<< HEAD '@xmtp/consent-proof-signature@0.1.4': resolution: {integrity: sha512-XyLOVcHUsdD+7IpS4D6J5mgRRjZfHr8TaC8G4KNIqYojOWZ7hPUlZZnbfQYKxghafjxaASdAbp4E4UFPqVSF7A==} @@ -8344,8 +8320,6 @@ packages: resolution: {integrity: sha512-T0huvHMGprjcmsvDE/SG58uZQ2iPoogMpmeN6+WfvjaBioPlK90PAEPnu4cYOjTZE7rUsBPUU+bJk3HXNWLv4A==} engines: {node: '>=20'} -======= ->>>>>>> origin/develop '@xtuc/ieee754@1.2.0': resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==} @@ -8398,7 +8372,6 @@ packages: zod: optional: true -<<<<<<< HEAD abitype@1.0.0: resolution: {integrity: sha512-NMeMah//6bJ56H5XRj8QCV4AwuW6hB6zqz2LnhhLdcWVQOsXki6/Pn3APeqxCma62nXIcmZWdu1DlHWS74umVQ==} peerDependencies: @@ -8410,8 +8383,6 @@ packages: zod: optional: true -======= ->>>>>>> origin/develop abitype@1.0.6: resolution: {integrity: sha512-MMSqYh4+C/aVqI2RQaWqbvI4Kxo5cQV40WQ4QFtDnNzCkqChm8MuENhElmynZlO0qUy/ObkEUaXtKqYnx1Kp3A==} peerDependencies: @@ -8761,12 +8732,9 @@ packages: resolution: {integrity: sha512-LElXdjswlqjWrPpJFg1Fx4wpkOCxj1TDHlSV4PlaRxHGWko024xICaa97ZkMfs6DRKlCguiAI+rbXv5GWwXIkg==} hasBin: true -<<<<<<< HEAD async-mutex@0.5.0: resolution: {integrity: sha512-1A94B18jkJ3DYq284ohPxoXbfTA5HsQ7/Mf4DEhcyLx3Bz27Rh59iScbB6EPiP+B+joue6YCxcMXSbFC1tZKwA==} -======= ->>>>>>> origin/develop async-retry@1.3.3: resolution: {integrity: sha512-wfr/jstw9xNi/0teMHrRW7dsz3Lt5ARhYNZ2ewpadnhaIp5mbALhOAP+EAdsC7t4Z6wqsDVv9+W6gm1Dk9mEyw==} @@ -8970,13 +8938,6 @@ packages: resolution: {integrity: sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A==} engines: {node: '>=6.0.0'} -<<<<<<< HEAD - basic-auth@2.0.1: - resolution: {integrity: sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==} - engines: {node: '>= 0.8'} - -======= ->>>>>>> origin/develop basic-ftp@5.0.5: resolution: {integrity: sha512-4Bcg1P8xhUuqcii/S0Z9wiHIrQVPMermM1any+MX5GeGD7faD3/msQUDGLol9wOcz4/jbg/WJnGqoJF6LiBdtg==} engines: {node: '>=10.0.0'} @@ -9005,13 +8966,10 @@ packages: bent@7.3.12: resolution: {integrity: sha512-T3yrKnVGB63zRuoco/7Ybl7BwwGZR0lceoVG5XmQyMIH9s19SV5m+a8qam4if0zQuAmOQTyPTPmsQBdAorGK3w==} -<<<<<<< HEAD better-path-resolve@1.0.0: resolution: {integrity: sha512-pbnl5XzGBdrFU/wT4jqmJVPn2B6UHPBOhzMQkY/SPUPB6QtUXtmBHBIwCbXJol93mOpGMnQyP/+BB19q04xj7g==} engines: {node: '>=4'} -======= ->>>>>>> origin/develop better-sqlite3@11.6.0: resolution: {integrity: sha512-2J6k/eVxcFYY2SsTxsXrj6XylzHWPxveCn4fKPKZFv/Vqn/Cd7lOuX4d7rGQXT5zL+97MkNL3nSbCrIoe3LkgA==} @@ -9259,13 +9217,14 @@ packages: resolution: {integrity: sha512-4T53u4PdgsXqKaIctwF8ifXlRTTmEPJ8iEPWFdGZvcf7sbwYo6FKFEX9eNNAnzFZ7EzJAQ3CJeOtCRA4rDp7Pw==} engines: {node: '>=6.14.2'} -<<<<<<< HEAD build@0.1.4: resolution: {integrity: sha512-KwbDJ/zrsU8KZRRMfoURG14cKIAStUlS8D5jBDvtrZbwO5FEkYqc3oB8HIhRiyD64A48w1lc+sOmQ+mmBw5U/Q==} engines: {node: '>v0.4.12'} -======= ->>>>>>> origin/develop + build@0.1.4: + resolution: {integrity: sha512-KwbDJ/zrsU8KZRRMfoURG14cKIAStUlS8D5jBDvtrZbwO5FEkYqc3oB8HIhRiyD64A48w1lc+sOmQ+mmBw5U/Q==} + engines: {node: '>v0.4.12'} + builtin-modules@3.3.0: resolution: {integrity: sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==} engines: {node: '>=6'} @@ -9661,22 +9620,22 @@ packages: collect-v8-coverage@1.0.2: resolution: {integrity: sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==} -<<<<<<< HEAD color-convert@1.9.3: resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==} -======= ->>>>>>> origin/develop + color-convert@1.9.3: + resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==} + color-convert@2.0.1: resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==} engines: {node: '>=7.0.0'} -<<<<<<< HEAD color-name@1.1.3: resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==} -======= ->>>>>>> origin/develop + color-name@1.1.3: + resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==} + color-name@1.1.4: resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==} @@ -9687,12 +9646,12 @@ packages: resolution: {integrity: sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==} hasBin: true -<<<<<<< HEAD color@3.2.1: resolution: {integrity: sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==} -======= ->>>>>>> origin/develop + color@3.2.1: + resolution: {integrity: sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==} + color@4.2.3: resolution: {integrity: sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==} engines: {node: '>=12.5.0'} @@ -9703,12 +9662,12 @@ packages: colorette@2.0.20: resolution: {integrity: sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==} -<<<<<<< HEAD colorspace@1.1.4: resolution: {integrity: sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==} -======= ->>>>>>> origin/develop + colorspace@1.1.4: + resolution: {integrity: sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==} + columnify@1.6.0: resolution: {integrity: sha512-lomjuFZKfM6MSAnV9aCZC9sc0qGbmZdfygNv+nCpqVkSKdCxCklLtd16O0EILGkImHw9ZpHkAnHaB+8Zxq5W6Q==} engines: {node: '>=8.0.0'} @@ -10147,13 +10106,14 @@ packages: engines: {node: '>=4'} hasBin: true -<<<<<<< HEAD cssmin@0.3.2: resolution: {integrity: sha512-bynxGIAJ8ybrnFobjsQotIjA8HFDDgPwbeUWNXXXfR+B4f9kkxdcUyagJoQCSUOfMV+ZZ6bMn8bvbozlCzUGwQ==} hasBin: true -======= ->>>>>>> origin/develop + cssmin@0.3.2: + resolution: {integrity: sha512-bynxGIAJ8ybrnFobjsQotIjA8HFDDgPwbeUWNXXXfR+B4f9kkxdcUyagJoQCSUOfMV+ZZ6bMn8bvbozlCzUGwQ==} + hasBin: true + cssnano-preset-advanced@6.1.2: resolution: {integrity: sha512-Nhao7eD8ph2DoHolEzQs5CfRpiEP0xa1HBdnFZ82kvqdmbwVBUr2r1QuQ4t1pi+D1ZpqpcO4T+wy/7RxzJ/WPQ==} engines: {node: ^14 || ^16 || >=18.0} @@ -10641,13 +10601,10 @@ packages: resolution: {integrity: sha512-rlpvsxUtM0PQvy9iZe640/IWwWYyBsTApREbA1pHOpmOUIl9MkP/U4z7vTtg4Oaojvqhxt7sdufnT0EzGaR31g==} engines: {node: '>=4'} -<<<<<<< HEAD detect-indent@6.1.0: resolution: {integrity: sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==} engines: {node: '>=8'} -======= ->>>>>>> origin/develop detect-libc@1.0.3: resolution: {integrity: sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==} engines: {node: '>=0.10'} @@ -10912,12 +10869,12 @@ packages: emoticon@4.1.0: resolution: {integrity: sha512-VWZfnxqwNcc51hIy/sbOdEem6D+cVtpPzEEtVAFdaas30+1dgkyaOQ4sQ6Bp0tOMqWO1v+HQfYaoodOkdhK6SQ==} -<<<<<<< HEAD enabled@2.0.0: resolution: {integrity: sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==} -======= ->>>>>>> origin/develop + enabled@2.0.0: + resolution: {integrity: sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==} + encode-utf8@1.0.3: resolution: {integrity: sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw==} @@ -11353,12 +11310,9 @@ packages: extend@3.0.2: resolution: {integrity: sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==} -<<<<<<< HEAD extendable-error@0.1.7: resolution: {integrity: sha512-UOiS2in6/Q0FK0R0q6UY9vYpQ21mr/Qn1KOnte7vsACuNJf514WvCCUHSRCPcgjPT2bAhNIJdlE6bVap1GKmeg==} -======= ->>>>>>> origin/develop external-editor@3.1.0: resolution: {integrity: sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==} engines: {node: '>=4'} @@ -11452,12 +11406,12 @@ packages: picomatch: optional: true -<<<<<<< HEAD fecha@4.2.3: resolution: {integrity: sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==} -======= ->>>>>>> origin/develop + fecha@4.2.3: + resolution: {integrity: sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==} + feed@4.2.2: resolution: {integrity: sha512-u5/sxGfiMfZNtJ3OvQpXcvotFpYkL0n9u9mM2vkui2nGo8b4wvDkJ8gAkYqbA8QpGyFCv3RK0Z+Iv+9veCS9bQ==} engines: {node: '>=0.4.0'} @@ -11571,12 +11525,12 @@ packages: resolution: {integrity: sha512-Be3narBNt2s6bsaqP6Jzq91heDgOEaDCJAXcE3qcma/EJBSy5FB4cvO31XBInuAuKBx8Kptf8dkhjK0IOru39Q==} engines: {node: '>=18'} -<<<<<<< HEAD fn.name@1.1.0: resolution: {integrity: sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==} -======= ->>>>>>> origin/develop + fn.name@1.1.0: + resolution: {integrity: sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==} + follow-redirects@1.15.9: resolution: {integrity: sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==} engines: {node: '>=4.0'} @@ -11692,13 +11646,10 @@ packages: resolution: {integrity: sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==} engines: {node: '>=6 <7 || >=8'} -<<<<<<< HEAD fs-extra@8.1.0: resolution: {integrity: sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==} engines: {node: '>=6 <7 || >=8'} -======= ->>>>>>> origin/develop fs-extra@9.1.0: resolution: {integrity: sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==} engines: {node: '>=10'} @@ -12134,13 +12085,10 @@ packages: resolution: {integrity: sha512-vXm0l45VbcHEVlTCzs8M+s0VeYsB2lnlAaThoLKGXr3bE/VWDOelNUnycUPEhKEaXARL2TEFjBOyUiM6+55KBg==} engines: {node: '>= 0.10'} -<<<<<<< HEAD hash-base@3.1.0: resolution: {integrity: sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==} engines: {node: '>=4'} -======= ->>>>>>> origin/develop hash.js@1.1.7: resolution: {integrity: sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==} @@ -12374,12 +12322,9 @@ packages: resolution: {integrity: sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==} engines: {node: '>= 14'} -<<<<<<< HEAD human-id@1.0.2: resolution: {integrity: sha512-UNopramDEhHJD+VR+ehk8rOslwSfByxPIZyJRfV739NDhN5LF1fa1MqnzKm2lGTQRjNrjK19Q5fhkgIfjlVUKw==} -======= ->>>>>>> origin/develop human-signals@2.1.0: resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==} engines: {node: '>=10.17.0'} @@ -12861,13 +12806,10 @@ packages: resolution: {integrity: sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==} engines: {node: '>= 0.4'} -<<<<<<< HEAD is-subdir@1.2.0: resolution: {integrity: sha512-2AT6j+gXe/1ueqbW6fLZJiIw3F8iXGJtt0yDrZaBhAZEG1raiTxKWU+IPqMCzQAXOUCKdA4UDMgacKH25XG2Cw==} engines: {node: '>=4'} -======= ->>>>>>> origin/develop is-symbol@1.1.1: resolution: {integrity: sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==} engines: {node: '>= 0.4'} @@ -12915,13 +12857,10 @@ packages: resolution: {integrity: sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==} engines: {node: '>= 0.4'} -<<<<<<< HEAD is-windows@1.0.2: resolution: {integrity: sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==} engines: {node: '>=0.10.0'} -======= ->>>>>>> origin/develop is-wsl@2.2.0: resolution: {integrity: sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==} engines: {node: '>=8'} @@ -12978,14 +12917,11 @@ packages: peerDependencies: ws: '*' -<<<<<<< HEAD isows@1.0.3: resolution: {integrity: sha512-2cKei4vlmg2cxEjm3wVSqn8pcoRF/LX/wpifuuNquFO4SQmPwarClT+SUCA2lt+l581tTeZIPIZuIDo2jWN1fg==} peerDependencies: ws: '*' -======= ->>>>>>> origin/develop isows@1.0.6: resolution: {integrity: sha512-lPHCayd40oW98/I0uvgaHKWCSvkzY27LjWLbtzOm64yQ+G3Q5npjjbdppU65iZXkK1Zt+kH9pfegli0AYfwYYw==} peerDependencies: @@ -13231,13 +13167,14 @@ packages: js-tokens@4.0.0: resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} -<<<<<<< HEAD js-yaml@0.3.7: resolution: {integrity: sha512-/7PsVDNP2tVe2Z1cF9kTEkjamIwz4aooDpRKmN1+g/9eePCgcxsv4QDvEbxO0EH+gdDD7MLyDoR6BASo3hH51g==} engines: {node: '> 0.4.11'} -======= ->>>>>>> origin/develop + js-yaml@0.3.7: + resolution: {integrity: sha512-/7PsVDNP2tVe2Z1cF9kTEkjamIwz4aooDpRKmN1+g/9eePCgcxsv4QDvEbxO0EH+gdDD7MLyDoR6BASo3hH51g==} + engines: {node: '> 0.4.11'} + js-yaml@3.14.1: resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==} hasBin: true @@ -13278,14 +13215,16 @@ packages: engines: {node: '>=6'} hasBin: true -<<<<<<< HEAD jsmin@1.0.1: resolution: {integrity: sha512-OPuL5X/bFKgVdMvEIX3hnpx3jbVpFCrEM8pKPXjFkZUqg521r41ijdyTz7vACOhW6o1neVlcLyd+wkbK5fNHRg==} engines: {node: '>=0.1.93'} hasBin: true -======= ->>>>>>> origin/develop + jsmin@1.0.1: + resolution: {integrity: sha512-OPuL5X/bFKgVdMvEIX3hnpx3jbVpFCrEM8pKPXjFkZUqg521r41ijdyTz7vACOhW6o1neVlcLyd+wkbK5fNHRg==} + engines: {node: '>=0.1.93'} + hasBin: true + json-bigint@1.0.0: resolution: {integrity: sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==} @@ -13400,13 +13339,14 @@ packages: resolution: {integrity: sha512-+KJGIyHgkGuIq3IEBNftfhW/LfWhXUIY6OmyVWjliu5KH1y0fw7VQ8YndE2O4qZdMSd9SqbnC8GOcZEy0Om7sA==} engines: {node: '>=18'} -<<<<<<< HEAD jxLoader@0.1.1: resolution: {integrity: sha512-ClEvAj3K68y8uKhub3RgTmcRPo5DfIWvtxqrKQdDPyZ1UVHIIKvVvjrAsJFSVL5wjv0rt5iH9SMCZ0XRKNzeUA==} engines: {node: '>v0.4.10'} -======= ->>>>>>> origin/develop + jxLoader@0.1.1: + resolution: {integrity: sha512-ClEvAj3K68y8uKhub3RgTmcRPo5DfIWvtxqrKQdDPyZ1UVHIIKvVvjrAsJFSVL5wjv0rt5iH9SMCZ0XRKNzeUA==} + engines: {node: '>v0.4.10'} + katex@0.16.15: resolution: {integrity: sha512-yE9YJIEAk2aZ+FL/G8r+UGw0CTUzEA8ZFy6E+8tc3spHUKq3qBnzCkI1CQwGoI9atJhVyFPEypQsTY7mJ1Pi9w==} hasBin: true @@ -13450,12 +13390,12 @@ packages: kolorist@1.8.0: resolution: {integrity: sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==} -<<<<<<< HEAD kuler@2.0.0: resolution: {integrity: sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==} -======= ->>>>>>> origin/develop + kuler@2.0.0: + resolution: {integrity: sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==} + kuromoji@0.1.2: resolution: {integrity: sha512-V0dUf+C2LpcPEXhoHLMAop/bOht16Dyr+mDiIE39yX3vqau7p80De/koFqpiTcL1zzdZlc3xuHZ8u5gjYRfFaQ==} @@ -13774,13 +13714,14 @@ packages: resolution: {integrity: sha512-9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w==} engines: {node: '>=18'} -<<<<<<< HEAD logform@2.7.0: resolution: {integrity: sha512-TFYA4jnP7PVbmlBIfhlSe+WKxs9dklXMTEGcBCIvLhE/Tn3H6Gk1norupVW7m5Cnd4bLcr08AytbyV/xj7f/kQ==} engines: {node: '>= 12.0.0'} -======= ->>>>>>> origin/develop + logform@2.7.0: + resolution: {integrity: sha512-TFYA4jnP7PVbmlBIfhlSe+WKxs9dklXMTEGcBCIvLhE/Tn3H6Gk1norupVW7m5Cnd4bLcr08AytbyV/xj7f/kQ==} + engines: {node: '>= 12.0.0'} + long@5.2.3: resolution: {integrity: sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==} @@ -14405,17 +14346,14 @@ packages: moment@2.30.1: resolution: {integrity: sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==} -<<<<<<< HEAD moo-server@1.3.0: resolution: {integrity: sha512-9A8/eor2DXwpv1+a4pZAAydqLFVrWoKoO1fzdzqLUhYVXAO1Kgd1FR2gFZi7YdHzF0s4W8cDNwCfKJQrvLqxDw==} engines: {node: '>v0.4.10'} - morgan@1.10.0: - resolution: {integrity: sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==} - engines: {node: '>= 0.8.0'} + moo-server@1.3.0: + resolution: {integrity: sha512-9A8/eor2DXwpv1+a4pZAAydqLFVrWoKoO1fzdzqLUhYVXAO1Kgd1FR2gFZi7YdHzF0s4W8cDNwCfKJQrvLqxDw==} + engines: {node: '>v0.4.10'} -======= ->>>>>>> origin/develop motion@10.16.2: resolution: {integrity: sha512-p+PurYqfUdcJZvtnmAqu5fJgV2kR0uLFQuBKtLeFVTrYEVllI99tiOTSefVNYuip9ELTEkepIIDftNdze76NAQ==} @@ -14869,17 +14807,10 @@ packages: on-exit-leak-free@0.2.0: resolution: {integrity: sha512-dqaz3u44QbRXQooZLTUKU41ZrzYrcvLISVgbrzbyCMxpmSLJvZ3ZamIJIZ29P6OhZIkNIQKosdeM6t1LYbA9hg==} -<<<<<<< HEAD on-exit-leak-free@2.1.2: resolution: {integrity: sha512-0eJJY6hXLGf1udHwfNftBqH+g73EU4B504nZeKpz1sYRKafAghwxEJunB2O7rDZkL4PGfsMVnTXZ2EjibbqcsA==} engines: {node: '>=14.0.0'} - on-finished@2.3.0: - resolution: {integrity: sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==} - engines: {node: '>= 0.8'} - -======= ->>>>>>> origin/develop on-finished@2.4.1: resolution: {integrity: sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==} engines: {node: '>= 0.8'} @@ -14891,12 +14822,12 @@ packages: once@1.4.0: resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==} -<<<<<<< HEAD one-time@1.0.0: resolution: {integrity: sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==} -======= ->>>>>>> origin/develop + one-time@1.0.0: + resolution: {integrity: sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==} + onetime@5.1.2: resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==} engines: {node: '>=6'} @@ -14981,12 +14912,9 @@ packages: otpauth@9.3.6: resolution: {integrity: sha512-eIcCvuEvcAAPHxUKC9Q4uCe0Fh/yRc5jv9z+f/kvyIF2LPrhgAOuLB7J9CssGYhND/BL8M9hlHBTFmffpoQlMQ==} -<<<<<<< HEAD outdent@0.5.0: resolution: {integrity: sha512-/jHxFIzoMXdqPzTaCpFzAAWhpkSjZPF4Vsn6jAfNpmbH/ymsmd7Qc6VE9BGn0L6YMj6uwpQLxCECpus4ukKS9Q==} -======= ->>>>>>> origin/develop ox@0.1.2: resolution: {integrity: sha512-ak/8K0Rtphg9vnRJlbOdaX9R7cmxD2MiSthjWGaQdMk3D7hrAlDoM+6Lxn7hN52Za3vrXfZ7enfke/5WjolDww==} peerDependencies: @@ -15003,13 +14931,10 @@ packages: resolution: {integrity: sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw==} engines: {node: '>=12.20'} -<<<<<<< HEAD p-filter@2.1.0: resolution: {integrity: sha512-ZBxxZ5sL2HghephhpGAQdoskxplTwr7ICaehZwLIlfL6acuVgZPm8yBNuRAFBGEqtD/hmUeq9eqLg2ys9Xr/yw==} engines: {node: '>=8'} -======= ->>>>>>> origin/develop p-finally@1.0.0: resolution: {integrity: sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==} engines: {node: '>=4'} @@ -15054,13 +14979,10 @@ packages: resolution: {integrity: sha512-RpYIIK1zXSNEOdwxcfe7FdvGcs7+y5n8rifMhMNWvaxRNMPINJHF5GDeuVxWqnfrcHPSCnp7Oo5yNXHId9Av2Q==} engines: {node: '>=8'} -<<<<<<< HEAD p-map@2.1.0: resolution: {integrity: sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==} engines: {node: '>=6'} -======= ->>>>>>> origin/develop p-map@4.0.0: resolution: {integrity: sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==} engines: {node: '>=10'} @@ -15404,7 +15326,6 @@ packages: pino-abstract-transport@0.5.0: resolution: {integrity: sha512-+KAgmVeqXYbTtU2FScx1XS3kNyfZ5TrXY07V96QnUSFqo2gAqlvmaxH67Lj7SWazqsMabf+58ctdTcBgnOLUOQ==} -<<<<<<< HEAD pino-abstract-transport@1.2.0: resolution: {integrity: sha512-Guhh8EZfPCfH+PMXAb6rKOjGQEoy0xlAIn+irODG5kgfYV+BQ0rGYYWTIel3P5mmyXqkYkPmdIkywsn6QKUR1Q==} @@ -15414,22 +15335,14 @@ packages: pino-std-serializers@6.2.2: resolution: {integrity: sha512-cHjPPsE+vhj/tnhCy/wiMh3M3z3h/j15zHQX+S9GkTBgqJuTuJzYJ4gUyACLhDaJ7kk9ba9iRDmbH2tJU03OiA==} -======= - pino-std-serializers@4.0.0: - resolution: {integrity: sha512-cK0pekc1Kjy5w9V2/n+8MkZwusa6EyyxfeQCB799CQRhRt/CqYKiWs5adeu8Shve2ZNffvfC/7J64A2PJo1W/Q==} - ->>>>>>> origin/develop pino@7.11.0: resolution: {integrity: sha512-dMACeu63HtRLmCG8VKdy4cShCPKaYDR4youZqoSWLxl5Gu99HUw8bw75thbPv9Nip+H+QYX8o3ZJbTdVZZ2TVg==} hasBin: true -<<<<<<< HEAD pino@8.21.0: resolution: {integrity: sha512-ip4qdzjkAyDDZklUaZkcRFb2iA118H9SgRh8yzTkSQK8HilsOJF7rSY8HoW5+I0M46AZgX/pxbprf2vvzQCE0Q==} hasBin: true -======= ->>>>>>> origin/develop pirates@4.0.6: resolution: {integrity: sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==} engines: {node: '>= 6'} @@ -16191,14 +16104,11 @@ packages: resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} engines: {node: '>= 0.8.0'} -<<<<<<< HEAD prettier@2.8.8: resolution: {integrity: sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==} engines: {node: '>=10.13.0'} hasBin: true -======= ->>>>>>> origin/develop prettier@3.4.1: resolution: {integrity: sha512-G+YdqtITVZmOJje6QkXQWzl3fSfMxFwm1tjTyo9exhkmWSqC4Yhd1+lug++IlR2mvRVAxEDDWYkQdeSztajqgg==} engines: {node: '>=14'} @@ -16272,12 +16182,9 @@ packages: process-warning@1.0.0: resolution: {integrity: sha512-du4wfLyj4yCZq1VupnVSZmRsPJsNuxoDQFdCFHLaYiEbFBD7QE0a+I4D7hOxrVnh78QE/YipFAj9lXHiXocV+Q==} -<<<<<<< HEAD process-warning@3.0.0: resolution: {integrity: sha512-mqn0kFRl0EoqhnL0GQ0veqFHyIN1yig9RHh/InzORTUiZHFRAur+aMtRkELNwGs9aNwKS6tg/An4NYBPGwvtzQ==} -======= ->>>>>>> origin/develop process@0.11.10: resolution: {integrity: sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==} engines: {node: '>= 0.6.0'} @@ -16308,12 +16215,12 @@ packages: resolution: {integrity: sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==} engines: {node: '>=10'} -<<<<<<< HEAD promised-io@0.3.6: resolution: {integrity: sha512-bNwZusuNIW4m0SPR8jooSyndD35ggirHlxVl/UhIaZD/F0OBv9ebfc6tNmbpZts3QXHggkjIBH8lvtnzhtcz0A==} -======= ->>>>>>> origin/develop + promised-io@0.3.6: + resolution: {integrity: sha512-bNwZusuNIW4m0SPR8jooSyndD35ggirHlxVl/UhIaZD/F0OBv9ebfc6tNmbpZts3QXHggkjIBH8lvtnzhtcz0A==} + promptly@2.2.0: resolution: {integrity: sha512-aC9j+BZsRSSzEsXBNBwDnAxujdx19HycZoKgRgzWnS8eOHg1asuf9heuLprfbe739zY3IdUQx+Egv6Jn135WHA==} @@ -16685,13 +16592,10 @@ packages: resolution: {integrity: sha512-X1Fu3dPuk/8ZLsMhEj5f4wFAF0DWoK7qhGJvgaijocXxBmSToKfbFtqbxMO7bVjNA1dmE5huAzjXj/ey86iw9Q==} engines: {node: '>=12'} -<<<<<<< HEAD read-yaml-file@1.1.0: resolution: {integrity: sha512-VIMnQi/Z4HT2Fxuwg5KrY174U1VdUIASQVWXXyqtNRtxSr9IYkn1rsI6Tb6HsrHCmB7gVpNwX6JxPTHcH6IoTA==} engines: {node: '>=6'} -======= ->>>>>>> origin/develop read@1.0.7: resolution: {integrity: sha512-rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ==} engines: {node: '>=0.8'} @@ -16713,13 +16617,10 @@ packages: resolution: {integrity: sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==} engines: {node: '>= 6'} -<<<<<<< HEAD readable-stream@4.6.0: resolution: {integrity: sha512-cbAdYt0VcnpN2Bekq7PU+k363ZRsPwJoEEJOEtSJQlJXzwaxt3FIo/uL+KeDSGIjJqtkwyge4KQgD2S2kd+CQw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} -======= ->>>>>>> origin/develop readdirp@3.6.0: resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==} engines: {node: '>=8.10.0'} @@ -16742,13 +16643,10 @@ packages: resolution: {integrity: sha512-r/H9MzAWtrv8aSVjPCMFpDMl5q66GqtmmRkRjpHTsp4zBAa+snZyiQNlMONiUmEJcsnaw0wCauJ2GWODr/aFkg==} engines: {node: '>= 12.13.0'} -<<<<<<< HEAD real-require@0.2.0: resolution: {integrity: sha512-57frrGM/OCTLqLOAh0mhVA9VBMHd+9U7Zb2THMGdBUoZVOtGbJzjxsYGDJ3A9AYYCP4hn6y1TVbaOfzWtm5GFg==} engines: {node: '>= 12.13.0'} -======= ->>>>>>> origin/develop rechoir@0.6.2: resolution: {integrity: sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==} engines: {node: '>= 0.10'} @@ -17420,12 +17318,9 @@ packages: sonic-boom@2.8.0: resolution: {integrity: sha512-kuonw1YOYYNOve5iHdSahXPOK49GqwA+LZhI6Wz/l0rP57iKyXXIHaRagOBHAPmGwJC6od2Z9zgvZ5loSgMlVg==} -<<<<<<< HEAD sonic-boom@3.8.1: resolution: {integrity: sha512-y4Z8LCDBuum+PBP3lSV7RHrXscqksve/bi0as7mhwVnBW+/wUqKT/2Kb7um8yqcFy0duYbbPxzt89Zy2nOCaxg==} -======= ->>>>>>> origin/develop sort-css-media-queries@2.2.0: resolution: {integrity: sha512-0xtkGhWCC9MGt/EzgnvbbbKhqWjl1+/rncmhTh5qCpbYguXh6S/qwePfv/JQ8jePXXmqingylxoC49pCkSPIbA==} engines: {node: '>= 6.3.0'} @@ -17469,12 +17364,9 @@ packages: spawn-command@0.0.2: resolution: {integrity: sha512-zC8zGoGkmc8J9ndvml8Xksr1Amk9qBujgbF0JAIWO7kXr43w0h/0GJNM/Vustixu+YE8N/MTrQ7N31FvHUACxQ==} -<<<<<<< HEAD spawndamnit@3.0.1: resolution: {integrity: sha512-MmnduQUuHCoFckZoWnXsTg7JaiLBJrKFj9UI2MbRPGaJeVpsLcVBu6P/IGZovziM/YBsellCmsprgNA+w0CzVg==} -======= ->>>>>>> origin/develop spdx-correct@3.2.0: resolution: {integrity: sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==} @@ -17567,12 +17459,12 @@ packages: peerDependencies: svelte: ^4.0.0 || ^5.0.0-next.0 -<<<<<<< HEAD stack-trace@0.0.10: resolution: {integrity: sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==} -======= ->>>>>>> origin/develop + stack-trace@0.0.10: + resolution: {integrity: sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==} + stack-utils@2.0.6: resolution: {integrity: sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==} engines: {node: '>=10'} @@ -17905,13 +17797,10 @@ packages: resolution: {integrity: sha512-xZFXEGbG7SNC3itwBzI3RYjq/cEhBkx2hJuKGIUOcEULmkQExXiHat2z/qkISYsuR+IKumhEfKKbV5qXmhICFQ==} engines: {node: '>=4'} -<<<<<<< HEAD term-size@2.2.1: resolution: {integrity: sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==} engines: {node: '>=8'} -======= ->>>>>>> origin/develop terser-webpack-plugin@5.3.11: resolution: {integrity: sha512-RVCsMfuD0+cTt3EwX8hSl2Ks56EbFHWmhluwcqoPKtBnfjiT6olaq7PRIRfhyU8nnC2MrnDrBLfrD/RGE+cVXQ==} engines: {node: '>= 10.13.0'} @@ -17958,12 +17847,12 @@ packages: resolution: {integrity: sha512-te/NtwBwfiNRLf9Ijqx3T0nlqZiQ2XrrtBvu+cLL8ZRrGkO0NHTug8MYFKyoSrv/sHTaSKfilUkizV6XhxMJ3g==} engines: {node: '>=8'} -<<<<<<< HEAD text-hex@1.0.0: resolution: {integrity: sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==} -======= ->>>>>>> origin/develop + text-hex@1.0.0: + resolution: {integrity: sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==} + text-table@0.2.0: resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==} @@ -17980,12 +17869,9 @@ packages: thread-stream@0.15.2: resolution: {integrity: sha512-UkEhKIg2pD+fjkHQKyJO3yoIvAP3N6RlNFt2dUhcS1FGvCD1cQa1M/PGknCLFIyZdtJOWQjejp7bdNqmN7zwdA==} -<<<<<<< HEAD thread-stream@2.7.0: resolution: {integrity: sha512-qQiRWsU/wvNolI6tbbCKd9iKaTnCXsTwVxhhKM6nctPdujTyztjlbUkUTUymidWcMnZ5pWR0ej4a0tjsW021vw==} -======= ->>>>>>> origin/develop throttleit@2.1.0: resolution: {integrity: sha512-nt6AMGKW1p/70DF/hGBdJB57B8Tspmbp5gfJ8ilhLnt7kkr2ye7hzD6NVG8GGErk2HWF34igrL2CXmNIkzKqKw==} engines: {node: '>=18'} @@ -18017,13 +17903,14 @@ packages: resolution: {integrity: sha512-wFH7+SEAcKfJpfLPkrgMPvvwnEtj8W4IurvEyrKsDleXnKLCDw71w8jltvfLa8Rm4qQxxT4jmDBYbJG/z7qoww==} engines: {node: '>=0.12'} -<<<<<<< HEAD timespan@2.3.0: resolution: {integrity: sha512-0Jq9+58T2wbOyLth0EU+AUb6JMGCLaTWIykJFa7hyAybjVH9gpVMTfUAwo5fWAvtFt2Tjh/Elg8JtgNpnMnM8g==} engines: {node: '>= 0.2.0'} -======= ->>>>>>> origin/develop + timespan@2.3.0: + resolution: {integrity: sha512-0Jq9+58T2wbOyLth0EU+AUb6JMGCLaTWIykJFa7hyAybjVH9gpVMTfUAwo5fWAvtFt2Tjh/Elg8JtgNpnMnM8g==} + engines: {node: '>= 0.2.0'} + tiny-emitter@2.1.0: resolution: {integrity: sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==} @@ -18170,13 +18057,14 @@ packages: resolution: {integrity: sha512-jRKj0n0jXWo6kh62nA5TEh3+4igKDXLvzBJcPpiizP7oOolUrYIxmVBG9TOtHYFHoddUk6YvAkGeGoSVTXfQXQ==} engines: {node: '>=12'} -<<<<<<< HEAD triple-beam@1.4.1: resolution: {integrity: sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==} engines: {node: '>= 14.0.0'} -======= ->>>>>>> origin/develop + triple-beam@1.4.1: + resolution: {integrity: sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==} + engines: {node: '>= 14.0.0'} + trough@1.0.5: resolution: {integrity: sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==} @@ -18469,13 +18357,14 @@ packages: ufo@1.5.4: resolution: {integrity: sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ==} -<<<<<<< HEAD uglify-js@1.3.5: resolution: {integrity: sha512-YPX1DjKtom8l9XslmPFQnqWzTBkvI4N0pbkzLuPZZ4QTyig0uQqvZz9NgUdfEV+qccJzi7fVcGWdESvRIjWptQ==} hasBin: true -======= ->>>>>>> origin/develop + uglify-js@1.3.5: + resolution: {integrity: sha512-YPX1DjKtom8l9XslmPFQnqWzTBkvI4N0pbkzLuPZZ4QTyig0uQqvZz9NgUdfEV+qccJzi7fVcGWdESvRIjWptQ==} + hasBin: true + uglify-js@3.19.3: resolution: {integrity: sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==} engines: {node: '>=0.8.0'} @@ -18917,7 +18806,6 @@ packages: typescript: optional: true -<<<<<<< HEAD viem@2.7.15: resolution: {integrity: sha512-I2RMQpg1/MC7fXVjHxeXRPU9k/WEOvZajK/KZSr7DChS0AaZ7uovsQWppwBn2wvZWguTCIRAHqzMwIEGku95yQ==} peerDependencies: @@ -18926,8 +18814,6 @@ packages: typescript: optional: true -======= ->>>>>>> origin/develop vite-node@2.1.4: resolution: {integrity: sha512-kqa9v+oi4HwkG6g8ufRnb5AeplcRw8jUF6/7/Qz1qRQOXHImG8YnLbB+LLszENwFnoBl9xIf9nVdCFzNd7GQEg==} engines: {node: ^18.0.0 || >=20.0.0} @@ -19356,7 +19242,6 @@ packages: wildcard@2.0.1: resolution: {integrity: sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==} -<<<<<<< HEAD winston-transport@4.9.0: resolution: {integrity: sha512-8drMJ4rkgaPo1Me4zD/3WLfI/zPdA9o2IipKODunnGDcuqbHwjsbB79ylv04LCGGzU0xQ6vTznOMpQGaLhhm6A==} engines: {node: '>= 12.0.0'} @@ -19365,8 +19250,14 @@ packages: resolution: {integrity: sha512-DLiFIXYC5fMPxaRg832S6F5mJYvePtmO5G9v9IgUFPhXm9/GkXarH/TUrBAVzhTCzAj9anE/+GjrgXp/54nOgw==} engines: {node: '>= 12.0.0'} -======= ->>>>>>> origin/develop + winston-transport@4.9.0: + resolution: {integrity: sha512-8drMJ4rkgaPo1Me4zD/3WLfI/zPdA9o2IipKODunnGDcuqbHwjsbB79ylv04LCGGzU0xQ6vTznOMpQGaLhhm6A==} + engines: {node: '>= 12.0.0'} + + winston@3.17.0: + resolution: {integrity: sha512-DLiFIXYC5fMPxaRg832S6F5mJYvePtmO5G9v9IgUFPhXm9/GkXarH/TUrBAVzhTCzAj9anE/+GjrgXp/54nOgw==} + engines: {node: '>= 12.0.0'} + word-wrap@1.2.5: resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==} engines: {node: '>=0.10.0'} @@ -19396,14 +19287,16 @@ packages: wrappy@1.0.2: resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==} -<<<<<<< HEAD wrench@1.3.9: resolution: {integrity: sha512-srTJQmLTP5YtW+F5zDuqjMEZqLLr/eJOZfDI5ibfPfRMeDh3oBUefAscuH0q5wBKE339ptH/S/0D18ZkfOfmKQ==} engines: {node: '>=0.1.97'} deprecated: wrench.js is deprecated! You should check out fs-extra (https://github.com/jprichardson/node-fs-extra) for any operations you were using wrench for. Thanks for all the usage over the years. -======= ->>>>>>> origin/develop + wrench@1.3.9: + resolution: {integrity: sha512-srTJQmLTP5YtW+F5zDuqjMEZqLLr/eJOZfDI5ibfPfRMeDh3oBUefAscuH0q5wBKE339ptH/S/0D18ZkfOfmKQ==} + engines: {node: '>=0.1.97'} + deprecated: wrench.js is deprecated! You should check out fs-extra (https://github.com/jprichardson/node-fs-extra) for any operations you were using wrench for. Thanks for all the usage over the years. + write-file-atomic@2.4.3: resolution: {integrity: sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==} @@ -19506,13 +19399,10 @@ packages: xmlchars@2.2.0: resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==} -<<<<<<< HEAD - xmtp@0.0.8: - resolution: {integrity: sha512-TFChlIoKCktfd2gq2pxqXyoL6FOEI+WKL3GPv1wKaMA6cPFM999hT31+q8RZYUfLZifrTz663tRjjTlh6I8g0g==} + xmtp@0.0.4: + resolution: {integrity: sha512-PHftGldJuEok+Hzze481isqypwXtJ357QibFJdkHtvv+4svFU+knSVgZ1FJnSuOoVTM72jJ5b2qfd/jMcWPzDA==} engines: {node: '>=20'} -======= ->>>>>>> origin/develop xtend@4.0.2: resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==} engines: {node: '>=0.4'} @@ -19627,14 +19517,6 @@ packages: zwitch@2.0.4: resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} -<<<<<<< HEAD - zx@8.2.4: - resolution: {integrity: sha512-g9wVU+5+M+zVen/3IyAZfsZFmeqb6vDfjqFggakviz5uLK7OAejOirX+jeTOkyvAh/OYRlCgw+SdqzN7F61QVQ==} - engines: {node: '>= 12.17.0'} - hasBin: true - -======= ->>>>>>> origin/develop snapshots: '@0glabs/0g-ts-sdk@0.2.1(bufferutil@4.0.8)(ethers@6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))(utf-8-validate@5.0.10)': @@ -19662,20 +19544,13 @@ snapshots: '@acuminous/bitsyntax@0.1.2': dependencies: buffer-more-ints: 1.0.0 -<<<<<<< HEAD - debug: 4.4.0 -======= debug: 4.4.0(supports-color@8.1.1) ->>>>>>> origin/develop safe-buffer: 5.1.2 transitivePeerDependencies: - supports-color -<<<<<<< HEAD '@adraffy/ens-normalize@1.10.0': {} -======= ->>>>>>> origin/develop '@adraffy/ens-normalize@1.10.1': {} '@adraffy/ens-normalize@1.11.0': {} @@ -21552,7 +21427,6 @@ snapshots: '@cfworker/json-schema@4.0.3': {} -<<<<<<< HEAD '@changesets/apply-release-plan@7.0.7': dependencies: '@changesets/config': 3.0.5 @@ -21695,8 +21569,6 @@ snapshots: human-id: 1.0.2 prettier: 2.8.8 -======= ->>>>>>> origin/develop '@chevrotain/cst-dts-gen@11.0.3': dependencies: '@chevrotain/gast': 11.0.3 @@ -21745,14 +21617,37 @@ snapshots: transitivePeerDependencies: - encoding -<<<<<<< HEAD + '@coinbase/cbpay-js@2.4.0': {} + '@coinbase/cbpay-js@2.4.0': {} '@coinbase/coinbase-sdk@0.10.0(bufferutil@4.0.8)(typescript@5.6.3)(utf-8-validate@5.0.10)(zod@3.23.8)': dependencies: '@scure/bip32': 1.6.0 abitype: 1.0.7(typescript@5.6.3)(zod@3.23.8) - axios: 1.7.9 + axios: 1.7.9(debug@4.4.0) + axios-mock-adapter: 1.22.0(axios@1.7.9) + axios-retry: 4.5.0(axios@1.7.9) + bip32: 4.0.0 + bip39: 3.1.0 + decimal.js: 10.4.3 + dotenv: 16.4.7 + ethers: 6.13.4(bufferutil@4.0.8)(utf-8-validate@5.0.10) + node-jose: 2.2.0 + secp256k1: 5.0.1 + viem: 2.21.54(bufferutil@4.0.8)(typescript@5.6.3)(utf-8-validate@5.0.10)(zod@3.23.8) + transitivePeerDependencies: + - bufferutil + - debug + - typescript + - utf-8-validate + - zod + + '@coinbase/coinbase-sdk@0.11.2(bufferutil@4.0.8)(typescript@5.6.3)(utf-8-validate@5.0.10)(zod@3.23.8)': + dependencies: + '@scure/bip32': 1.6.0 + abitype: 1.0.7(typescript@5.6.3)(zod@3.23.8) + axios: 1.7.9(debug@4.4.0) axios-mock-adapter: 1.22.0(axios@1.7.9) axios-retry: 4.5.0(axios@1.7.9) bip32: 4.0.0 @@ -21771,9 +21666,6 @@ snapshots: - zod '@coinbase/coinbase-sdk@0.11.2(bufferutil@4.0.8)(typescript@5.6.3)(utf-8-validate@5.0.10)(zod@3.23.8)': -======= - '@coinbase/coinbase-sdk@0.10.0(bufferutil@4.0.8)(typescript@5.6.3)(utf-8-validate@5.0.10)(zod@3.23.8)': ->>>>>>> origin/develop dependencies: '@scure/bip32': 1.6.0 abitype: 1.0.7(typescript@5.6.3)(zod@3.23.8) @@ -21798,11 +21690,10 @@ snapshots: '@colors/colors@1.5.0': optional: true -<<<<<<< HEAD '@colors/colors@1.6.0': {} -======= ->>>>>>> origin/develop + '@colors/colors@1.6.0': {} + '@commitlint/cli@18.6.1(@types/node@22.10.2)(typescript@5.6.3)': dependencies: '@commitlint/format': 18.6.1 @@ -22229,15 +22120,18 @@ snapshots: dependencies: postcss: 8.4.49 -<<<<<<< HEAD '@dabh/diagnostics@2.0.3': dependencies: colorspace: 1.1.4 enabled: 2.0.0 kuler: 2.0.0 -======= ->>>>>>> origin/develop + '@dabh/diagnostics@2.0.3': + dependencies: + colorspace: 1.1.4 + enabled: 2.0.0 + kuler: 2.0.0 + '@deepgram/captions@1.2.0': dependencies: dayjs: 1.11.13 @@ -23497,7 +23391,7 @@ snapshots: '@eslint/config-array@0.19.1': dependencies: '@eslint/object-schema': 2.1.5 - debug: 4.4.0 + debug: 4.4.0(supports-color@8.1.1) minimatch: 3.1.2 transitivePeerDependencies: - supports-color @@ -23523,7 +23417,7 @@ snapshots: '@eslint/eslintrc@3.2.0': dependencies: ajv: 6.12.6 - debug: 4.4.0 + debug: 4.4.0(supports-color@8.1.1) espree: 10.3.0 globals: 14.0.0 ignore: 5.3.2 @@ -23916,7 +23810,6 @@ snapshots: dependencies: graphql: 16.10.0 -<<<<<<< HEAD '@grpc/grpc-js@1.12.5': dependencies: '@grpc/proto-loader': 0.7.13 @@ -23931,10 +23824,6 @@ snapshots: '@hapi/hoek@9.3.0': {} -======= - '@hapi/hoek@9.3.0': {} - ->>>>>>> origin/develop '@hapi/topo@5.1.0': dependencies: '@hapi/hoek': 9.3.0 @@ -24321,19 +24210,12 @@ snapshots: '@jridgewell/resolve-uri': 3.1.2 '@jridgewell/sourcemap-codec': 1.5.0 -<<<<<<< HEAD '@js-sdsl/ordered-map@4.4.2': {} '@jspm/core@2.1.0': {} '@kikobeats/time-span@1.0.5': {} -======= - '@jspm/core@2.1.0': {} - - '@kikobeats/time-span@1.0.5': {} - ->>>>>>> origin/develop '@kwsites/file-exists@1.1.1': dependencies: debug: 4.4.0(supports-color@8.1.1) @@ -24789,7 +24671,6 @@ snapshots: '@lukeed/csprng@1.1.0': {} -<<<<<<< HEAD '@manypkg/find-root@1.1.0': dependencies: '@babel/runtime': 7.26.0 @@ -24806,8 +24687,6 @@ snapshots: globby: 11.1.0 read-yaml-file: 1.1.0 -======= ->>>>>>> origin/develop '@mapbox/node-pre-gyp@1.0.11(encoding@0.1.13)': dependencies: detect-libc: 2.0.3 @@ -26315,7 +26194,6 @@ snapshots: '@polka/url@1.0.0-next.28': {} -<<<<<<< HEAD '@protobuf-ts/grpc-transport@2.9.4(@grpc/grpc-js@1.12.5)': dependencies: '@grpc/grpc-js': 1.12.5 @@ -26336,16 +26214,6 @@ snapshots: '@protobufjs/eventemitter@1.1.0': {} -======= - '@protobufjs/aspromise@1.1.2': {} - - '@protobufjs/base64@1.1.2': {} - - '@protobufjs/codegen@2.0.4': {} - - '@protobufjs/eventemitter@1.1.0': {} - ->>>>>>> origin/develop '@protobufjs/fetch@1.1.0': dependencies: '@protobufjs/aspromise': 1.1.2 @@ -26894,15 +26762,12 @@ snapshots: '@noble/secp256k1': 1.7.1 '@scure/base': 1.1.9 -<<<<<<< HEAD '@scure/bip32@1.3.2': dependencies: '@noble/curves': 1.2.0 '@noble/hashes': 1.3.3 '@scure/base': 1.1.9 -======= ->>>>>>> origin/develop '@scure/bip32@1.4.0': dependencies: '@noble/curves': 1.4.2 @@ -26926,14 +26791,11 @@ snapshots: '@noble/hashes': 1.2.0 '@scure/base': 1.1.9 -<<<<<<< HEAD '@scure/bip39@1.2.1': dependencies: '@noble/hashes': 1.3.3 '@scure/base': 1.1.9 -======= ->>>>>>> origin/develop '@scure/bip39@1.3.0': dependencies: '@noble/hashes': 1.4.0 @@ -28352,19 +28214,8 @@ snapshots: dependencies: '@types/node': 20.17.9 -<<<<<<< HEAD - '@types/fs-extra@11.0.4': - dependencies: - '@types/jsonfile': 6.1.4 - '@types/node': 20.17.9 - optional: true - - '@types/geojson@7946.0.15': {} - -======= '@types/geojson@7946.0.15': {} ->>>>>>> origin/develop '@types/glob@8.1.0': dependencies: '@types/minimatch': 5.1.2 @@ -28419,21 +28270,6 @@ snapshots: '@types/json-schema@7.0.15': {} -<<<<<<< HEAD - '@types/jsonfile@6.1.4': - dependencies: - '@types/node': 20.17.9 - optional: true - - '@types/jsonwebtoken@9.0.7': - dependencies: - '@types/node': 20.17.9 - - '@types/keyv@3.1.4': - dependencies: - '@types/node': 20.17.9 - -======= '@types/jsonwebtoken@9.0.7': dependencies: '@types/node': 20.17.9 @@ -28442,7 +28278,6 @@ snapshots: dependencies: '@types/node': 20.17.9 ->>>>>>> origin/develop '@types/lodash.isstring@4.0.9': dependencies: '@types/lodash': 4.17.13 @@ -28612,24 +28447,10 @@ snapshots: '@types/node': 20.17.9 minipass: 4.2.8 -<<<<<<< HEAD '@types/triple-beam@1.3.5': {} - '@types/trusted-types@2.0.7': {} - - '@types/unist@2.0.11': {} - - '@types/unist@3.0.3': {} - - '@types/uuid@10.0.0': {} - - '@types/uuid@8.3.4': {} - - '@types/wav-encoder@1.3.3': {} - - '@types/webrtc@0.0.37': {} + '@types/triple-beam@1.3.5': {} -======= '@types/trusted-types@2.0.7': {} '@types/unist@2.0.11': {} @@ -28644,7 +28465,6 @@ snapshots: '@types/webrtc@0.0.37': {} ->>>>>>> origin/develop '@types/ws@7.4.7': dependencies: '@types/node': 20.17.9 @@ -28727,11 +28547,7 @@ snapshots: '@typescript-eslint/types': 8.16.0 '@typescript-eslint/typescript-estree': 8.16.0(typescript@5.6.3) '@typescript-eslint/visitor-keys': 8.16.0 -<<<<<<< HEAD - debug: 4.4.0 -======= debug: 4.4.0(supports-color@8.1.1) ->>>>>>> origin/develop eslint: 9.16.0(jiti@2.4.1) optionalDependencies: typescript: 5.6.3 @@ -28764,11 +28580,7 @@ snapshots: dependencies: '@typescript-eslint/typescript-estree': 8.16.0(typescript@5.6.3) '@typescript-eslint/utils': 8.16.0(eslint@9.16.0(jiti@2.4.1))(typescript@5.6.3) -<<<<<<< HEAD - debug: 4.4.0 -======= debug: 4.4.0(supports-color@8.1.1) ->>>>>>> origin/develop eslint: 9.16.0(jiti@2.4.1) ts-api-utils: 1.4.3(typescript@5.6.3) optionalDependencies: @@ -28799,7 +28611,7 @@ snapshots: dependencies: '@typescript-eslint/types': 8.16.0 '@typescript-eslint/visitor-keys': 8.16.0 - debug: 4.4.0 + debug: 4.4.0(supports-color@8.1.1) fast-glob: 3.3.2 is-glob: 4.0.3 minimatch: 9.0.5 @@ -29450,7 +29262,6 @@ snapshots: '@webassemblyjs/ast': 1.14.1 '@xtuc/long': 4.2.2 -<<<<<<< HEAD '@xmtp/consent-proof-signature@0.1.4': dependencies: '@xmtp/proto': 3.72.4 @@ -29550,14 +29361,6 @@ snapshots: '@yarnpkg/lockfile@1.1.0': {} -======= - '@xtuc/ieee754@1.2.0': {} - - '@xtuc/long@4.2.2': {} - - '@yarnpkg/lockfile@1.1.0': {} - ->>>>>>> origin/develop '@yarnpkg/parsers@3.0.0-rc.46': dependencies: js-yaml: 3.14.1 @@ -29594,14 +29397,11 @@ snapshots: optionalDependencies: zod: 3.23.8 -<<<<<<< HEAD abitype@1.0.0(typescript@5.6.3)(zod@3.23.8): optionalDependencies: typescript: 5.6.3 zod: 3.23.8 -======= ->>>>>>> origin/develop abitype@1.0.6(typescript@5.6.3)(zod@3.23.8): optionalDependencies: typescript: 5.6.3 @@ -29638,8 +29438,6 @@ snapshots: acorn-walk@7.2.0: {} acorn-walk@8.3.4: -<<<<<<< HEAD -======= dependencies: acorn: 8.14.0 @@ -29660,29 +29458,8 @@ snapshots: agent-base@5.1.1: {} agent-base@6.0.2: ->>>>>>> origin/develop dependencies: - acorn: 8.14.0 - - acorn@7.4.1: {} - - acorn@8.14.0: {} - - add-stream@1.0.0: {} - - address@1.2.2: {} - - adm-zip@0.4.16: {} - - aes-js@3.0.0: {} - - aes-js@4.0.0-beta.5: {} - - agent-base@5.1.1: {} - - agent-base@6.0.2: - dependencies: - debug: 4.4.0 + debug: 4.4.0(supports-color@8.1.1) transitivePeerDependencies: - supports-color @@ -29965,13 +29742,10 @@ snapshots: astring@1.9.0: {} -<<<<<<< HEAD async-mutex@0.5.0: dependencies: tslib: 2.8.1 -======= ->>>>>>> origin/develop async-retry@1.3.3: dependencies: retry: 0.13.1 @@ -30037,13 +29811,13 @@ snapshots: axios-mock-adapter@1.22.0(axios@1.7.9): dependencies: - axios: 1.7.9 + axios: 1.7.9(debug@4.4.0) fast-deep-equal: 3.1.3 is-buffer: 2.0.5 axios-retry@4.5.0(axios@1.7.9): dependencies: - axios: 1.7.9 + axios: 1.7.9(debug@4.4.0) is-retry-allowed: 2.2.0 axios@0.21.4: @@ -30054,7 +29828,7 @@ snapshots: axios@0.27.2: dependencies: - follow-redirects: 1.15.9 + follow-redirects: 1.15.9(debug@4.4.0) form-data: 4.0.1 transitivePeerDependencies: - debug @@ -30083,17 +29857,6 @@ snapshots: transitivePeerDependencies: - debug -<<<<<<< HEAD - axios@1.7.9: - dependencies: - follow-redirects: 1.15.9 - form-data: 4.0.1 - proxy-from-env: 1.1.0 - transitivePeerDependencies: - - debug - -======= ->>>>>>> origin/develop axios@1.7.9(debug@4.4.0): dependencies: follow-redirects: 1.15.9(debug@4.4.0) @@ -30295,21 +30058,10 @@ snapshots: base64url@3.0.1: {} -<<<<<<< HEAD - basic-auth@2.0.1: - dependencies: - safe-buffer: 5.1.2 - basic-ftp@5.0.5: {} batch@0.6.1: {} -======= - basic-ftp@5.0.5: {} - - batch@0.6.1: {} - ->>>>>>> origin/develop bcp-47-match@1.0.3: {} bcrypt-pbkdf@1.0.2: @@ -30330,13 +30082,10 @@ snapshots: caseless: 0.12.0 is-stream: 2.0.1 -<<<<<<< HEAD better-path-resolve@1.0.0: dependencies: is-windows: 1.0.2 -======= ->>>>>>> origin/develop better-sqlite3@11.6.0: dependencies: bindings: 1.5.0 @@ -30731,7 +30480,6 @@ snapshots: dependencies: node-gyp-build: 4.8.4 -<<<<<<< HEAD build@0.1.4: dependencies: cssmin: 0.3.2 @@ -30745,16 +30493,23 @@ snapshots: winston: 3.17.0 wrench: 1.3.9 - builtin-modules@3.3.0: {} - - builtin-status-codes@3.0.0: {} + build@0.1.4: + dependencies: + cssmin: 0.3.2 + jsmin: 1.0.1 + jxLoader: 0.1.1 + moo-server: 1.3.0 + promised-io: 0.3.6 + timespan: 2.3.0 + uglify-js: 1.3.5 + walker: 1.0.8 + winston: 3.17.0 + wrench: 1.3.9 -======= builtin-modules@3.3.0: {} builtin-status-codes@3.0.0: {} ->>>>>>> origin/develop bundle-require@5.0.0(esbuild@0.24.0): dependencies: esbuild: 0.24.0 @@ -31224,26 +30979,24 @@ snapshots: collect-v8-coverage@1.0.2: {} -<<<<<<< HEAD color-convert@1.9.3: dependencies: color-name: 1.1.3 -======= ->>>>>>> origin/develop + color-convert@1.9.3: + dependencies: + color-name: 1.1.3 + color-convert@2.0.1: dependencies: color-name: 1.1.4 -<<<<<<< HEAD color-name@1.1.3: {} - color-name@1.1.4: {} + color-name@1.1.3: {} -======= color-name@1.1.4: {} ->>>>>>> origin/develop color-string@1.9.1: dependencies: color-name: 1.1.4 @@ -31251,14 +31004,16 @@ snapshots: color-support@1.1.3: {} -<<<<<<< HEAD color@3.2.1: dependencies: color-convert: 1.9.3 color-string: 1.9.1 -======= ->>>>>>> origin/develop + color@3.2.1: + dependencies: + color-convert: 1.9.3 + color-string: 1.9.1 + color@4.2.3: dependencies: color-convert: 2.0.1 @@ -31268,14 +31023,16 @@ snapshots: colorette@2.0.20: {} -<<<<<<< HEAD colorspace@1.1.4: dependencies: color: 3.2.1 text-hex: 1.0.0 -======= ->>>>>>> origin/develop + colorspace@1.1.4: + dependencies: + color: 3.2.1 + text-hex: 1.0.0 + columnify@1.6.0: dependencies: strip-ansi: 6.0.1 @@ -31804,11 +31561,10 @@ snapshots: cssesc@3.0.0: {} -<<<<<<< HEAD cssmin@0.3.2: {} -======= ->>>>>>> origin/develop + cssmin@0.3.2: {} + cssnano-preset-advanced@6.1.2(postcss@8.4.49): dependencies: autoprefixer: 10.4.20(postcss@8.4.49) @@ -32200,19 +31956,9 @@ snapshots: dependencies: ms: 2.1.3 -<<<<<<< HEAD - debug@4.4.0: - dependencies: - ms: 2.1.3 - - debug@4.4.0(supports-color@5.5.0): - dependencies: - ms: 2.1.3 -======= debug@4.4.0(supports-color@5.5.0): dependencies: ms: 2.1.3 ->>>>>>> origin/develop optionalDependencies: supports-color: 5.5.0 @@ -32349,7 +32095,6 @@ snapshots: detect-indent@5.0.0: {} -<<<<<<< HEAD detect-indent@6.1.0: {} detect-libc@1.0.3: {} @@ -32362,18 +32107,6 @@ snapshots: detect-node@2.1.0: {} -======= - detect-libc@1.0.3: {} - - detect-libc@2.0.3: {} - - detect-newline@3.1.0: {} - - detect-node-es@1.1.0: {} - - detect-node@2.1.0: {} - ->>>>>>> origin/develop detect-port-alt@1.1.6: dependencies: address: 1.2.2 @@ -32697,23 +32430,16 @@ snapshots: emoticon@4.1.0: {} -<<<<<<< HEAD enabled@2.0.0: {} - encode-utf8@1.0.3: {} - - encodeurl@1.0.2: {} - - encodeurl@2.0.0: {} + enabled@2.0.0: {} -======= encode-utf8@1.0.3: {} encodeurl@1.0.2: {} encodeurl@2.0.0: {} ->>>>>>> origin/develop encoding@0.1.13: dependencies: iconv-lite: 0.6.3 @@ -33096,7 +32822,7 @@ snapshots: ajv: 6.12.6 chalk: 4.1.2 cross-spawn: 7.0.6 - debug: 4.4.0 + debug: 4.4.0(supports-color@8.1.1) escape-string-regexp: 4.0.0 eslint-scope: 8.2.0 eslint-visitor-keys: 4.2.0 @@ -33458,11 +33184,8 @@ snapshots: extend@3.0.2: {} -<<<<<<< HEAD extendable-error@0.1.7: {} -======= ->>>>>>> origin/develop external-editor@3.1.0: dependencies: chardet: 0.7.0 @@ -33556,11 +33279,10 @@ snapshots: optionalDependencies: picomatch: 4.0.2 -<<<<<<< HEAD fecha@4.2.3: {} -======= ->>>>>>> origin/develop + fecha@4.2.3: {} + feed@4.2.2: dependencies: xml-js: 1.6.11 @@ -33689,13 +33411,10 @@ snapshots: async: 0.2.10 which: 1.3.1 -<<<<<<< HEAD fn.name@1.1.0: {} - follow-redirects@1.15.9: {} + fn.name@1.1.0: {} -======= ->>>>>>> origin/develop follow-redirects@1.15.9(debug@4.3.7): optionalDependencies: debug: 4.3.7 @@ -33827,15 +33546,12 @@ snapshots: jsonfile: 4.0.0 universalify: 0.1.2 -<<<<<<< HEAD fs-extra@8.1.0: dependencies: graceful-fs: 4.2.11 jsonfile: 4.0.0 universalify: 0.1.2 -======= ->>>>>>> origin/develop fs-extra@9.1.0: dependencies: at-least-node: 1.0.0 @@ -34413,15 +34129,12 @@ snapshots: inherits: 2.0.4 safe-buffer: 5.2.1 -<<<<<<< HEAD hash-base@3.1.0: dependencies: inherits: 2.0.4 readable-stream: 3.6.2 safe-buffer: 5.2.1 -======= ->>>>>>> origin/develop hash.js@1.1.7: dependencies: inherits: 2.0.4 @@ -34746,7 +34459,7 @@ snapshots: http-proxy-agent@7.0.2: dependencies: agent-base: 7.1.3 - debug: 4.4.0 + debug: 4.4.0(supports-color@8.1.1) transitivePeerDependencies: - supports-color @@ -34804,30 +34517,23 @@ snapshots: https-proxy-agent@5.0.1: dependencies: agent-base: 6.0.2 - debug: 4.4.0 + debug: 4.4.0(supports-color@8.1.1) transitivePeerDependencies: - supports-color https-proxy-agent@7.0.6: dependencies: agent-base: 7.1.3 - debug: 4.4.0 + debug: 4.4.0(supports-color@8.1.1) transitivePeerDependencies: - supports-color -<<<<<<< HEAD human-id@1.0.2: {} human-signals@2.1.0: {} human-signals@5.0.0: {} -======= - human-signals@2.1.0: {} - - human-signals@5.0.0: {} - ->>>>>>> origin/develop humanize-ms@1.2.1: dependencies: ms: 2.1.3 @@ -35257,13 +34963,10 @@ snapshots: call-bound: 1.0.3 has-tostringtag: 1.0.2 -<<<<<<< HEAD is-subdir@1.2.0: dependencies: better-path-resolve: 1.0.0 -======= ->>>>>>> origin/develop is-symbol@1.1.1: dependencies: call-bound: 1.0.3 @@ -35303,11 +35006,8 @@ snapshots: call-bind: 1.0.8 get-intrinsic: 1.2.6 -<<<<<<< HEAD is-windows@1.0.2: {} -======= ->>>>>>> origin/develop is-wsl@2.2.0: dependencies: is-docker: 2.2.1 @@ -35358,13 +35058,10 @@ snapshots: dependencies: ws: 8.18.0(bufferutil@4.0.8)(utf-8-validate@5.0.10) -<<<<<<< HEAD isows@1.0.3(ws@8.13.0(bufferutil@4.0.8)(utf-8-validate@5.0.10)): dependencies: ws: 8.13.0(bufferutil@4.0.8)(utf-8-validate@5.0.10) -======= ->>>>>>> origin/develop isows@1.0.6(ws@8.18.0(bufferutil@4.0.8)(utf-8-validate@5.0.10)): dependencies: ws: 8.18.0(bufferutil@4.0.8)(utf-8-validate@5.0.10) @@ -36035,11 +35732,10 @@ snapshots: js-tokens@4.0.0: {} -<<<<<<< HEAD js-yaml@0.3.7: {} -======= ->>>>>>> origin/develop + js-yaml@0.3.7: {} + js-yaml@3.14.1: dependencies: argparse: 1.0.10 @@ -36091,11 +35787,10 @@ snapshots: jsesc@3.1.0: {} -<<<<<<< HEAD jsmin@1.0.1: {} -======= ->>>>>>> origin/develop + jsmin@1.0.1: {} + json-bigint@1.0.0: dependencies: bignumber.js: 9.1.2 @@ -36218,7 +35913,6 @@ snapshots: jwt-decode@4.0.0: {} -<<<<<<< HEAD jxLoader@0.1.1: dependencies: js-yaml: 0.3.7 @@ -36226,8 +35920,13 @@ snapshots: promised-io: 0.3.6 walker: 1.0.8 -======= ->>>>>>> origin/develop + jxLoader@0.1.1: + dependencies: + js-yaml: 0.3.7 + moo-server: 1.3.0 + promised-io: 0.3.6 + walker: 1.0.8 + katex@0.16.15: dependencies: commander: 8.3.0 @@ -36268,11 +35967,10 @@ snapshots: kolorist@1.8.0: {} -<<<<<<< HEAD kuler@2.0.0: {} -======= ->>>>>>> origin/develop + kuler@2.0.0: {} + kuromoji@0.1.2: dependencies: async: 2.6.4 @@ -36690,7 +36388,6 @@ snapshots: strip-ansi: 7.1.0 wrap-ansi: 9.0.0 -<<<<<<< HEAD logform@2.7.0: dependencies: '@colors/colors': 1.6.0 @@ -36700,16 +36397,19 @@ snapshots: safe-stable-stringify: 2.5.0 triple-beam: 1.4.1 - long@5.2.3: {} - - longest-streak@3.1.0: {} + logform@2.7.0: + dependencies: + '@colors/colors': 1.6.0 + '@types/triple-beam': 1.3.5 + fecha: 4.2.3 + ms: 2.1.3 + safe-stable-stringify: 2.5.0 + triple-beam: 1.4.1 -======= long@5.2.3: {} longest-streak@3.1.0: {} ->>>>>>> origin/develop loose-envify@1.4.0: dependencies: js-tokens: 4.0.0 @@ -37691,21 +37391,10 @@ snapshots: moment@2.30.1: {} -<<<<<<< HEAD moo-server@1.3.0: {} - morgan@1.10.0: - dependencies: - basic-auth: 2.0.1 - debug: 2.6.9 - depd: 2.0.0 - on-finished: 2.3.0 - on-headers: 1.0.2 - transitivePeerDependencies: - - supports-color + moo-server@1.3.0: {} -======= ->>>>>>> origin/develop motion@10.16.2: dependencies: '@motionone/animation': 10.18.0 @@ -38195,7 +37884,7 @@ snapshots: '@yarnpkg/lockfile': 1.1.0 '@yarnpkg/parsers': 3.0.0-rc.46 '@zkochan/js-yaml': 0.0.7 - axios: 1.7.9 + axios: 1.7.9(debug@4.4.0) chalk: 4.1.0 cli-cursor: 3.1.0 cli-spinners: 2.6.1 @@ -38306,38 +37995,26 @@ snapshots: on-exit-leak-free@0.2.0: {} -<<<<<<< HEAD on-exit-leak-free@2.1.2: {} - on-finished@2.3.0: - dependencies: - ee-first: 1.1.1 - - on-finished@2.4.1: - dependencies: - ee-first: 1.1.1 - - on-headers@1.0.2: {} - -======= on-finished@2.4.1: dependencies: ee-first: 1.1.1 on-headers@1.0.2: {} ->>>>>>> origin/develop once@1.4.0: dependencies: wrappy: 1.0.2 -<<<<<<< HEAD one-time@1.0.0: dependencies: fn.name: 1.1.0 -======= ->>>>>>> origin/develop + one-time@1.0.0: + dependencies: + fn.name: 1.1.0 + onetime@5.1.2: dependencies: mimic-fn: 2.1.0 @@ -38468,11 +38145,8 @@ snapshots: dependencies: '@noble/hashes': 1.6.1 -<<<<<<< HEAD outdent@0.5.0: {} -======= ->>>>>>> origin/develop ox@0.1.2(typescript@5.6.3)(zod@3.23.8): dependencies: '@adraffy/ens-normalize': 1.11.0 @@ -38491,17 +38165,12 @@ snapshots: p-cancelable@3.0.0: {} -<<<<<<< HEAD p-filter@2.1.0: dependencies: p-map: 2.1.0 p-finally@1.0.0: {} -======= - p-finally@1.0.0: {} - ->>>>>>> origin/develop p-limit@1.3.0: dependencies: p-try: 1.0.0 @@ -38540,11 +38209,8 @@ snapshots: p-map-series@2.1.0: {} -<<<<<<< HEAD p-map@2.1.0: {} -======= ->>>>>>> origin/develop p-map@4.0.0: dependencies: aggregate-error: 3.1.0 @@ -38898,7 +38564,6 @@ snapshots: duplexify: 4.1.3 split2: 4.2.0 -<<<<<<< HEAD pino-abstract-transport@1.2.0: dependencies: readable-stream: 4.6.0 @@ -38908,10 +38573,6 @@ snapshots: pino-std-serializers@6.2.2: {} -======= - pino-std-serializers@4.0.0: {} - ->>>>>>> origin/develop pino@7.11.0: dependencies: atomic-sleep: 1.0.0 @@ -38926,7 +38587,6 @@ snapshots: sonic-boom: 2.8.0 thread-stream: 0.15.2 -<<<<<<< HEAD pino@8.21.0: dependencies: atomic-sleep: 1.0.0 @@ -38943,10 +38603,6 @@ snapshots: pirates@4.0.6: {} -======= - pirates@4.0.6: {} - ->>>>>>> origin/develop pkg-dir@4.2.0: dependencies: find-up: 4.1.0 @@ -39756,19 +39412,12 @@ snapshots: prelude-ls@1.2.1: {} -<<<<<<< HEAD prettier@2.8.8: {} prettier@3.4.1: {} pretty-bytes@6.1.1: {} -======= - prettier@3.4.1: {} - - pretty-bytes@6.1.1: {} - ->>>>>>> origin/develop pretty-error@4.0.0: dependencies: lodash: 4.17.21 @@ -39815,7 +39464,6 @@ snapshots: process-warning@1.0.0: {} -<<<<<<< HEAD process-warning@3.0.0: {} process@0.11.10: {} @@ -39830,30 +39478,15 @@ snapshots: promise-inflight@1.0.1: {} -======= - process@0.11.10: {} - - proggy@2.0.0: {} - - progress@2.0.3: {} - - promise-all-reject-late@1.0.1: {} - - promise-call-limit@3.0.2: {} - - promise-inflight@1.0.1: {} - ->>>>>>> origin/develop promise-retry@2.0.1: dependencies: err-code: 2.0.3 retry: 0.12.0 -<<<<<<< HEAD promised-io@0.3.6: {} -======= ->>>>>>> origin/develop + promised-io@0.3.6: {} + promptly@2.2.0: dependencies: read: 1.0.7 @@ -40352,7 +39985,6 @@ snapshots: parse-json: 5.2.0 type-fest: 1.4.0 -<<<<<<< HEAD read-yaml-file@1.1.0: dependencies: graceful-fs: 4.2.11 @@ -40360,8 +39992,6 @@ snapshots: pify: 4.0.1 strip-bom: 3.0.0 -======= ->>>>>>> origin/develop read@1.0.7: dependencies: mute-stream: 0.0.8 @@ -40400,7 +40030,6 @@ snapshots: string_decoder: 1.3.0 util-deprecate: 1.0.2 -<<<<<<< HEAD readable-stream@4.6.0: dependencies: abort-controller: 3.0.0 @@ -40409,8 +40038,6 @@ snapshots: process: 0.11.10 string_decoder: 1.3.0 -======= ->>>>>>> origin/develop readdirp@3.6.0: dependencies: picomatch: 2.3.1 @@ -40425,11 +40052,8 @@ snapshots: real-require@0.1.0: {} -<<<<<<< HEAD real-require@0.2.0: {} -======= ->>>>>>> origin/develop rechoir@0.6.2: dependencies: resolve: 1.22.9 @@ -40765,7 +40389,7 @@ snapshots: ripemd160@2.0.2: dependencies: - hash-base: 3.0.5 + hash-base: 3.1.0 inherits: 2.0.4 rlp@2.2.7: @@ -41313,7 +40937,7 @@ snapshots: socks-proxy-agent@8.0.5: dependencies: agent-base: 7.1.3 - debug: 4.4.0 + debug: 4.4.0(supports-color@8.1.1) socks: 2.8.3 transitivePeerDependencies: - supports-color @@ -41339,17 +40963,12 @@ snapshots: dependencies: atomic-sleep: 1.0.0 -<<<<<<< HEAD sonic-boom@3.8.1: dependencies: atomic-sleep: 1.0.0 sort-css-media-queries@2.2.0: {} -======= - sort-css-media-queries@2.2.0: {} - ->>>>>>> origin/develop sort-keys@2.0.0: dependencies: is-plain-obj: 1.1.0 @@ -41382,14 +41001,11 @@ snapshots: spawn-command@0.0.2: {} -<<<<<<< HEAD spawndamnit@3.0.1: dependencies: cross-spawn: 7.0.6 signal-exit: 4.1.0 -======= ->>>>>>> origin/develop spdx-correct@3.2.0: dependencies: spdx-expression-parse: 3.0.1 @@ -41496,11 +41112,10 @@ snapshots: svelte: 5.14.1 swrev: 4.0.0 -<<<<<<< HEAD stack-trace@0.0.10: {} -======= ->>>>>>> origin/develop + stack-trace@0.0.10: {} + stack-utils@2.0.6: dependencies: escape-string-regexp: 2.0.0 @@ -41916,11 +41531,8 @@ snapshots: temp-dir@1.0.0: {} -<<<<<<< HEAD term-size@2.2.1: {} -======= ->>>>>>> origin/develop terser-webpack-plugin@5.3.11(@swc/core@1.10.1(@swc/helpers@0.5.15))(webpack@5.97.1(@swc/core@1.10.1(@swc/helpers@0.5.15))): dependencies: '@jridgewell/trace-mapping': 0.3.25 @@ -41963,19 +41575,14 @@ snapshots: text-extensions@2.4.0: {} -<<<<<<< HEAD text-hex@1.0.0: {} - text-table@0.2.0: {} - - thenby@1.3.4: {} + text-hex@1.0.0: {} -======= text-table@0.2.0: {} thenby@1.3.4: {} ->>>>>>> origin/develop thenify-all@1.6.0: dependencies: thenify: 3.3.1 @@ -41988,17 +41595,12 @@ snapshots: dependencies: real-require: 0.1.0 -<<<<<<< HEAD thread-stream@2.7.0: dependencies: real-require: 0.2.0 throttleit@2.1.0: {} -======= - throttleit@2.1.0: {} - ->>>>>>> origin/develop through2@2.0.5: dependencies: readable-stream: 2.3.8 @@ -42027,20 +41629,10 @@ snapshots: es5-ext: 0.10.64 next-tick: 1.1.0 -<<<<<<< HEAD timespan@2.3.0: {} - tiny-emitter@2.1.0: {} - - tiny-invariant@1.3.3: {} - - tiny-warning@1.0.3: {} - - tinybench@2.9.0: {} - - tinyexec@0.3.1: {} + timespan@2.3.0: {} -======= tiny-emitter@2.1.0: {} tiny-invariant@1.3.3: {} @@ -42051,7 +41643,6 @@ snapshots: tinyexec@0.3.1: {} ->>>>>>> origin/develop tinyglobby@0.2.10: dependencies: fdir: 6.4.2(picomatch@4.0.2) @@ -42164,19 +41755,14 @@ snapshots: trim-newlines@4.1.1: {} -<<<<<<< HEAD triple-beam@1.4.1: {} - trough@1.0.5: {} - - trough@2.2.0: {} + triple-beam@1.4.1: {} -======= trough@1.0.5: {} trough@2.2.0: {} ->>>>>>> origin/develop ts-api-utils@1.4.3(typescript@5.6.3): dependencies: typescript: 5.6.3 @@ -42330,7 +41916,7 @@ snapshots: cac: 6.7.14 chokidar: 4.0.2 consola: 3.2.3 - debug: 4.4.0 + debug: 4.4.0(supports-color@8.1.1) esbuild: 0.24.0 joycon: 3.1.1 picocolors: 1.1.1 @@ -42357,7 +41943,7 @@ snapshots: tuf-js@2.2.1: dependencies: '@tufjs/models': 2.0.1 - debug: 4.4.0 + debug: 4.4.0(supports-color@8.1.1) make-fetch-happen: 13.0.1 transitivePeerDependencies: - supports-color @@ -42525,11 +42111,10 @@ snapshots: ufo@1.5.4: {} -<<<<<<< HEAD uglify-js@1.3.5: {} -======= ->>>>>>> origin/develop + uglify-js@1.3.5: {} + uglify-js@3.19.3: optional: true @@ -42996,7 +42581,6 @@ snapshots: - utf-8-validate - zod -<<<<<<< HEAD viem@2.7.15(bufferutil@4.0.8)(typescript@5.6.3)(utf-8-validate@5.0.10)(zod@3.23.8): dependencies: '@adraffy/ens-normalize': 1.10.0 @@ -43014,8 +42598,6 @@ snapshots: - utf-8-validate - zod -======= ->>>>>>> origin/develop vite-node@2.1.4(@types/node@22.10.2)(terser@5.37.0): dependencies: cac: 6.7.14 @@ -43034,37 +42616,12 @@ snapshots: - terser vite-node@2.1.5(@types/node@22.10.2)(terser@5.37.0): -<<<<<<< HEAD - dependencies: - cac: 6.7.14 - debug: 4.4.0 - es-module-lexer: 1.5.4 - pathe: 1.1.2 - vite: 5.4.11(@types/node@22.10.2)(terser@5.37.0) - transitivePeerDependencies: - - '@types/node' - - less - - lightningcss - - sass - - sass-embedded - - stylus - - sugarss - - supports-color - - terser - - vite-node@2.1.5(@types/node@22.8.4)(terser@5.37.0): -======= ->>>>>>> origin/develop dependencies: cac: 6.7.14 debug: 4.4.0(supports-color@8.1.1) es-module-lexer: 1.5.4 pathe: 1.1.2 -<<<<<<< HEAD - vite: 5.4.11(@types/node@22.8.4)(terser@5.37.0) -======= vite: 5.4.11(@types/node@22.10.2)(terser@5.37.0) ->>>>>>> origin/develop transitivePeerDependencies: - '@types/node' - less @@ -43076,10 +42633,6 @@ snapshots: - supports-color - terser -<<<<<<< HEAD - vite-plugin-top-level-await@1.4.4(@swc/helpers@0.5.15)(rollup@4.28.1)(vite@client+@tanstack+router-plugin+vite): - dependencies: -======= vite-node@2.1.5(@types/node@22.8.4)(terser@5.37.0): dependencies: cac: 6.7.14 @@ -43100,7 +42653,6 @@ snapshots: vite-plugin-top-level-await@1.4.4(@swc/helpers@0.5.15)(rollup@4.28.1)(vite@client+@tanstack+router-plugin+vite): dependencies: ->>>>>>> origin/develop '@rollup/plugin-virtual': 3.0.2(rollup@4.28.1) '@swc/core': 1.10.1(@swc/helpers@0.5.15) uuid: 10.0.0 @@ -43173,45 +42725,6 @@ snapshots: dependencies: '@vitest/expect': 2.1.5 '@vitest/mocker': 2.1.5(vite@5.4.11(@types/node@22.10.2)(terser@5.37.0)) -<<<<<<< HEAD - '@vitest/pretty-format': 2.1.8 - '@vitest/runner': 2.1.5 - '@vitest/snapshot': 2.1.5 - '@vitest/spy': 2.1.5 - '@vitest/utils': 2.1.5 - chai: 5.1.2 - debug: 4.4.0 - expect-type: 1.1.0 - magic-string: 0.30.17 - pathe: 1.1.2 - std-env: 3.8.0 - tinybench: 2.9.0 - tinyexec: 0.3.1 - tinypool: 1.0.2 - tinyrainbow: 1.2.0 - vite: 5.4.11(@types/node@22.10.2)(terser@5.37.0) - vite-node: 2.1.5(@types/node@22.10.2)(terser@5.37.0) - why-is-node-running: 2.3.0 - optionalDependencies: - '@types/node': 22.10.2 - jsdom: 25.0.1(bufferutil@4.0.8)(canvas@2.11.2(encoding@0.1.13))(utf-8-validate@5.0.10) - transitivePeerDependencies: - - less - - lightningcss - - msw - - sass - - sass-embedded - - stylus - - sugarss - - supports-color - - terser - - vitest@2.1.5(@types/node@22.8.4)(jsdom@25.0.1(bufferutil@4.0.8)(canvas@2.11.2(encoding@0.1.13))(utf-8-validate@5.0.10))(terser@5.37.0): - dependencies: - '@vitest/expect': 2.1.5 - '@vitest/mocker': 2.1.5(vite@5.4.11(@types/node@22.10.2)(terser@5.37.0)) -======= ->>>>>>> origin/develop '@vitest/pretty-format': 2.1.8 '@vitest/runner': 2.1.5 '@vitest/snapshot': 2.1.5 @@ -43227,12 +42740,6 @@ snapshots: tinyexec: 0.3.1 tinypool: 1.0.2 tinyrainbow: 1.2.0 -<<<<<<< HEAD - vite: 5.4.11(@types/node@22.8.4)(terser@5.37.0) - vite-node: 2.1.5(@types/node@22.8.4)(terser@5.37.0) - why-is-node-running: 2.3.0 - optionalDependencies: -======= vite: 5.4.11(@types/node@22.10.2)(terser@5.37.0) vite-node: 2.1.5(@types/node@22.10.2)(terser@5.37.0) why-is-node-running: 2.3.0 @@ -43273,7 +42780,6 @@ snapshots: vite-node: 2.1.5(@types/node@22.8.4)(terser@5.37.0) why-is-node-running: 2.3.0 optionalDependencies: ->>>>>>> origin/develop '@types/node': 22.8.4 jsdom: 25.0.1(bufferutil@4.0.8)(canvas@2.11.2(encoding@0.1.13))(utf-8-validate@5.0.10) transitivePeerDependencies: @@ -43873,7 +43379,6 @@ snapshots: wildcard@2.0.1: {} -<<<<<<< HEAD winston-transport@4.9.0: dependencies: logform: 2.7.0 @@ -43894,20 +43399,32 @@ snapshots: triple-beam: 1.4.1 winston-transport: 4.9.0 - word-wrap@1.2.5: {} - - wordwrap@1.0.0: {} + winston-transport@4.9.0: + dependencies: + logform: 2.7.0 + readable-stream: 3.6.2 + triple-beam: 1.4.1 - workerpool@6.5.1: {} + winston@3.17.0: + dependencies: + '@colors/colors': 1.6.0 + '@dabh/diagnostics': 2.0.3 + async: 3.2.6 + is-stream: 2.0.1 + logform: 2.7.0 + one-time: 1.0.0 + readable-stream: 3.6.2 + safe-stable-stringify: 2.5.0 + stack-trace: 0.0.10 + triple-beam: 1.4.1 + winston-transport: 4.9.0 -======= word-wrap@1.2.5: {} wordwrap@1.0.0: {} workerpool@6.5.1: {} ->>>>>>> origin/develop wrap-ansi@6.2.0: dependencies: ansi-styles: 4.3.0 @@ -43934,11 +43451,10 @@ snapshots: wrappy@1.0.2: {} -<<<<<<< HEAD wrench@1.3.9: {} -======= ->>>>>>> origin/develop + wrench@1.3.9: {} + write-file-atomic@2.4.3: dependencies: graceful-fs: 4.2.11 @@ -44019,8 +43535,7 @@ snapshots: xmlchars@2.2.0: {} -<<<<<<< HEAD - xmtp@0.0.8(bufferutil@4.0.8)(utf-8-validate@5.0.10)(zod@3.23.8): + xmtp@0.0.4(bufferutil@4.0.8)(utf-8-validate@5.0.10)(zod@3.23.8): dependencies: '@changesets/changelog-git': 0.2.0 '@changesets/cli': 2.27.11 @@ -44061,28 +43576,6 @@ snapshots: yaml@2.6.1: {} -======= - xtend@4.0.2: {} - - y18n@4.0.3: {} - - y18n@5.0.8: {} - - yaeti@0.0.6: {} - - yallist@3.1.1: {} - - yallist@4.0.0: {} - - yallist@5.0.0: {} - - yaml@1.10.2: {} - - yaml@2.5.1: {} - - yaml@2.6.1: {} - ->>>>>>> origin/develop yargs-parser@18.1.3: dependencies: camelcase: 5.3.1 @@ -44179,11 +43672,3 @@ snapshots: zwitch@1.0.5: {} zwitch@2.0.4: {} -<<<<<<< HEAD - - zx@8.2.4: - optionalDependencies: - '@types/fs-extra': 11.0.4 - '@types/node': 20.17.9 -======= ->>>>>>> origin/develop