diff --git a/app/chat/components/BaseChat.tsx b/app/chat/components/BaseChat.tsx index 5dc0a982..f5e69c9e 100644 --- a/app/chat/components/BaseChat.tsx +++ b/app/chat/components/BaseChat.tsx @@ -6,7 +6,7 @@ import type { JSONValue, Message } from 'ai'; import React, { type RefCallback, useEffect, useState } from 'react'; import { ClientOnly } from 'remix-utils/client-only'; import { Menu } from '~/layout/sidebar/Menu.client'; -import { Workbench } from '~/shared/workbench/components/Workbench.client'; +import { Workbench } from '~/workbench/components/Workbench.client'; import { classNames } from '~/shared/utils/classNames'; import { PROVIDER_LIST } from '~/shared/utils/constants'; import { Messages } from './Messages.client'; @@ -26,12 +26,12 @@ import type { ModelInfo } from '~/shared/lib/providers/types'; import ProgressCompilation from './ProgressCompilation'; import type { ProgressAnnotation } from '~/shared/types/context'; import { SupabaseChatAlert } from '~/chat/components/alerts/SupabaseAlert'; -import { expoUrlAtom } from '~/shared/workbench/stores/qrCodeStore'; +import { expoUrlAtom } from '~/workbench/stores/qrCodeStore'; import { useStore } from '@nanostores/react'; import { StickToBottom, useStickToBottomContext } from '~/chat/hooks/StickToBottom'; import { ChatBox } from './chatBox/ChatBox'; import type { DesignScheme } from '~/shared/types/design-scheme'; -import type { ElementInfo } from '~/shared/workbench/components/ui/Inspector'; +import type { ElementInfo } from '~/workbench/components/ui/Inspector'; const TEXTAREA_MIN_HEIGHT = 76; diff --git a/app/chat/components/Chat.client.tsx b/app/chat/components/Chat.client.tsx index 88b55d99..b7704e69 100644 --- a/app/chat/components/Chat.client.tsx +++ b/app/chat/components/Chat.client.tsx @@ -11,7 +11,7 @@ import { cssTransition, toast, ToastContainer } from 'react-toastify'; import { useMessageParser, usePromptEnhancer, useShortcuts } from '~/shared/hooks'; import { description, useChatHistory } from '~/shared/lib/persistence'; import { chatStore } from '~/chat/stores/chat'; -import { workbenchStore } from '~/shared/workbench/stores/workbench'; +import { workbenchStore } from '~/workbench/stores/workbench'; import { DEFAULT_MODEL, DEFAULT_PROVIDER, PROMPT_COOKIE_KEY, PROVIDER_LIST } from '~/shared/utils/constants'; import { cubicEasingFn } from '~/shared/utils/easings'; import { createScopedLogger, renderLogger } from '~/shared/utils/logger'; @@ -28,7 +28,7 @@ import { streamingState } from '~/shared/stores/streaming'; import { filesToArtifacts } from '~/shared/utils/fileUtils'; import { supabaseConnection } from '~/shared/stores/supabase'; import { defaultDesignScheme, type DesignScheme } from '~/shared/types/design-scheme'; -import type { ElementInfo } from '~/shared/workbench/components/ui/Inspector'; +import type { ElementInfo } from '~/workbench/components/ui/Inspector'; const toastAnimation = cssTransition({ enter: 'animated fadeInRight', diff --git a/app/chat/components/chatBox/ChatBox.tsx b/app/chat/components/chatBox/ChatBox.tsx index fc270f04..1be61a45 100644 --- a/app/chat/components/chatBox/ChatBox.tsx +++ b/app/chat/components/chatBox/ChatBox.tsx @@ -12,12 +12,12 @@ import { IconButton } from '~/shared/components/ui/IconButton'; import { toast } from 'react-toastify'; import { SpeechRecognitionButton } from '~/chat/components/chatBox/SpeechRecognition'; import { SupabaseConnection } from './SupabaseConnection'; -import { ExpoQrModal } from '~/shared/workbench/components/ui/ExpoQrModal'; +import { ExpoQrModal } from '~/workbench/components/ui/ExpoQrModal'; import styles from '~/chat/components/BaseChat.module.scss'; import type { ProviderInfo } from '~/shared/types/model'; import { ColorSchemeDialog } from '~/shared/components/ui/ColorSchemeDialog'; import type { DesignScheme } from '~/shared/types/design-scheme'; -import type { ElementInfo } from '~/shared/workbench/components/ui/Inspector'; +import type { ElementInfo } from '~/workbench/components/ui/Inspector'; interface ChatBoxProps { isModelSettingsCollapsed: boolean; diff --git a/app/chat/components/chatExportAndImport/ExportChatButton.tsx b/app/chat/components/chatExportAndImport/ExportChatButton.tsx index 62880da1..c6680e54 100644 --- a/app/chat/components/chatExportAndImport/ExportChatButton.tsx +++ b/app/chat/components/chatExportAndImport/ExportChatButton.tsx @@ -1,5 +1,5 @@ import * as DropdownMenu from '@radix-ui/react-dropdown-menu'; -import { workbenchStore } from '~/shared/workbench/stores/workbench'; +import { workbenchStore } from '~/workbench/stores/workbench'; import { classNames } from '~/shared/utils/classNames'; export const ExportChatButton = ({ exportChat }: { exportChat?: () => void }) => { diff --git a/app/chat/components/messages/Artifact.tsx b/app/chat/components/messages/Artifact.tsx index 6b37c95b..c3de8369 100644 --- a/app/chat/components/messages/Artifact.tsx +++ b/app/chat/components/messages/Artifact.tsx @@ -4,7 +4,7 @@ import { computed } from 'nanostores'; import { memo, useEffect, useRef, useState } from 'react'; import { createHighlighter, type BundledLanguage, type BundledTheme, type HighlighterGeneric } from 'shiki'; import type { ActionState } from '~/shared/lib/runtime/action-runner'; -import { workbenchStore } from '~/shared/workbench/stores/workbench'; +import { workbenchStore } from '~/workbench/stores/workbench'; import { classNames } from '~/shared/utils/classNames'; import { cubicEasingFn } from '~/shared/utils/easings'; import { WORK_DIR } from '~/shared/utils/constants'; diff --git a/app/chat/components/messages/AssistantMessage.tsx b/app/chat/components/messages/AssistantMessage.tsx index de46e9eb..07bc39ee 100644 --- a/app/chat/components/messages/AssistantMessage.tsx +++ b/app/chat/components/messages/AssistantMessage.tsx @@ -2,7 +2,7 @@ import { memo, Fragment } from 'react'; import { Markdown } from '~/chat/components/markdown/Markdown'; import type { JSONValue } from 'ai'; import Popover from '~/shared/components/ui/Popover'; -import { workbenchStore } from '~/shared/workbench/stores/workbench'; +import { workbenchStore } from '~/workbench/stores/workbench'; import { WORK_DIR } from '~/shared/utils/constants'; import WithTooltip from '~/shared/components/ui/Tooltip'; import type { Message } from 'ai'; diff --git a/app/layout/header/components/DeployButton.tsx b/app/layout/header/components/DeployButton.tsx index 544fc155..9f52fa5d 100644 --- a/app/layout/header/components/DeployButton.tsx +++ b/app/layout/header/components/DeployButton.tsx @@ -2,7 +2,7 @@ import * as DropdownMenu from '@radix-ui/react-dropdown-menu'; import { useStore } from '@nanostores/react'; import { netlifyConnection } from '~/shared/stores/netlify'; import { vercelConnection } from '~/shared/stores/vercel'; -import { workbenchStore } from '~/shared/workbench/stores/workbench'; +import { workbenchStore } from '~/workbench/stores/workbench'; import { streamingState } from '~/shared/stores/streaming'; import { classNames } from '~/shared/utils/classNames'; import { useState } from 'react'; diff --git a/app/layout/header/components/HeaderActionButtons.client.tsx b/app/layout/header/components/HeaderActionButtons.client.tsx index da4b328d..67a54b58 100644 --- a/app/layout/header/components/HeaderActionButtons.client.tsx +++ b/app/layout/header/components/HeaderActionButtons.client.tsx @@ -1,5 +1,5 @@ import { useStore } from '@nanostores/react'; -import { workbenchStore } from '~/shared/workbench/stores/workbench'; +import { workbenchStore } from '~/workbench/stores/workbench'; import { useState } from 'react'; import { streamingState } from '~/shared/stores/streaming'; import { ExportChatButton } from '~/chat/components/chatExportAndImport/ExportChatButton'; diff --git a/app/layout/header/hooks/useNetlifyDeploy.tsx b/app/layout/header/hooks/useNetlifyDeploy.tsx index 4febb250..03891f85 100644 --- a/app/layout/header/hooks/useNetlifyDeploy.tsx +++ b/app/layout/header/hooks/useNetlifyDeploy.tsx @@ -1,7 +1,7 @@ import { toast } from 'react-toastify'; import { useStore } from '@nanostores/react'; import { netlifyConnection } from '~/shared/stores/netlify'; -import { workbenchStore } from '~/shared/workbench/stores/workbench'; +import { workbenchStore } from '~/workbench/stores/workbench'; import { webcontainer } from '~/shared/lib/webcontainer'; import { path } from '~/shared/utils/path'; import { useState } from 'react'; diff --git a/app/layout/header/hooks/useVercelDeploy.tsx b/app/layout/header/hooks/useVercelDeploy.tsx index 739002d1..dd818732 100644 --- a/app/layout/header/hooks/useVercelDeploy.tsx +++ b/app/layout/header/hooks/useVercelDeploy.tsx @@ -1,7 +1,7 @@ import { toast } from 'react-toastify'; import { useStore } from '@nanostores/react'; import { vercelConnection } from '~/shared/stores/vercel'; -import { workbenchStore } from '~/shared/workbench/stores/workbench'; +import { workbenchStore } from '~/workbench/stores/workbench'; import { webcontainer } from '~/shared/lib/webcontainer'; import { path } from '~/shared/utils/path'; import { useState } from 'react'; diff --git a/app/settings/tabs/connections/components/PushToGitHubDialog.tsx b/app/settings/tabs/connections/components/PushToGitHubDialog.tsx index 85ff7816..0ecb07df 100644 --- a/app/settings/tabs/connections/components/PushToGitHubDialog.tsx +++ b/app/settings/tabs/connections/components/PushToGitHubDialog.tsx @@ -9,10 +9,10 @@ import { getLocalStorage } from '~/shared/lib/persistence'; import { classNames } from '~/shared/utils/classNames'; import type { GitHubUserResponse } from '~/shared/components/github/types/GitHub'; import { logStore } from '~/shared/stores/logs'; -import { workbenchStore } from '~/shared/workbench/stores/workbench'; +import { workbenchStore } from '~/workbench/stores/workbench'; import { extractRelativePath } from '~/shared/utils/diff'; import { formatSize } from '~/shared/utils/formatSize'; -import type { FileMap, File } from '~/shared/workbench/stores/files'; +import type { FileMap, File } from '~/workbench/stores/files'; // UI Components import { Badge, EmptyState, StatusIndicator, SearchInput } from '~/shared/components/ui'; diff --git a/app/shared/hooks/useMessageParser.ts b/app/shared/hooks/useMessageParser.ts index 1a4a8ee8..f42b81b8 100644 --- a/app/shared/hooks/useMessageParser.ts +++ b/app/shared/hooks/useMessageParser.ts @@ -1,7 +1,7 @@ import type { Message } from 'ai'; import { useCallback, useState } from 'react'; import { StreamingMessageParser } from '~/shared/lib/runtime/message-parser'; -import { workbenchStore } from '~/shared/workbench/stores/workbench'; +import { workbenchStore } from '~/workbench/stores/workbench'; import { createScopedLogger } from '~/shared/utils/logger'; const logger = createScopedLogger('useMessageParser'); diff --git a/app/shared/lib/persistence/types.ts b/app/shared/lib/persistence/types.ts index 0ff04215..7289cca2 100644 --- a/app/shared/lib/persistence/types.ts +++ b/app/shared/lib/persistence/types.ts @@ -1,4 +1,4 @@ -import type { FileMap } from '~/shared/workbench/stores/files'; +import type { FileMap } from '~/workbench/stores/files'; export interface Snapshot { chatIndex: string; diff --git a/app/shared/lib/persistence/useChatHistory.ts b/app/shared/lib/persistence/useChatHistory.ts index a613c89f..12e102ab 100644 --- a/app/shared/lib/persistence/useChatHistory.ts +++ b/app/shared/lib/persistence/useChatHistory.ts @@ -3,7 +3,7 @@ import { useState, useEffect, useCallback } from 'react'; import { atom } from 'nanostores'; import { generateId, type JSONValue, type Message } from 'ai'; import { toast } from 'react-toastify'; -import { workbenchStore } from '~/shared/workbench/stores/workbench'; +import { workbenchStore } from '~/workbench/stores/workbench'; import { logStore } from '~/shared/stores/logs'; // Import logStore import { getMessages, @@ -17,7 +17,7 @@ import { setSnapshot, type IChatMetadata, } from './db'; -import type { FileMap } from '~/shared/workbench/stores/files'; +import type { FileMap } from '~/workbench/stores/files'; import type { Snapshot } from './types'; import { webcontainer } from '~/shared/lib/webcontainer'; import { detectProjectCommands, createCommandActionsString } from '~/shared/utils/projectCommands'; diff --git a/app/shared/lib/webcontainer/index.ts b/app/shared/lib/webcontainer/index.ts index 9eb6b7d7..7b8b6b1f 100644 --- a/app/shared/lib/webcontainer/index.ts +++ b/app/shared/lib/webcontainer/index.ts @@ -32,7 +32,7 @@ if (!import.meta.env.SSR) { .then(async (webcontainer) => { webcontainerContext.loaded = true; - const { workbenchStore } = await import('~/shared/workbench/stores/workbench'); + const { workbenchStore } = await import('~/workbench/stores/workbench'); const response = await fetch('/inspector-script.js'); const inspectorScript = await response.text(); diff --git a/app/shared/utils/diff.ts b/app/shared/utils/diff.ts index 9119b37f..906266e5 100644 --- a/app/shared/utils/diff.ts +++ b/app/shared/utils/diff.ts @@ -1,5 +1,5 @@ import { createTwoFilesPatch } from 'diff'; -import type { FileMap } from '~/shared/workbench/stores/files'; +import type { FileMap } from '~/workbench/stores/files'; import { MODIFICATIONS_TAG_NAME, WORK_DIR } from './constants'; export const modificationsRegex = new RegExp( diff --git a/app/shared/utils/shell.ts b/app/shared/utils/shell.ts index aadfc276..e547375a 100644 --- a/app/shared/utils/shell.ts +++ b/app/shared/utils/shell.ts @@ -1,8 +1,8 @@ import type { WebContainer, WebContainerProcess } from '@webcontainer/api'; -import type { ITerminal } from '~/shared/workbench/components/terminal/types/terminal'; +import type { ITerminal } from '~/workbench/components/terminal/types/terminal'; import { withResolvers } from './promises'; import { atom } from 'nanostores'; -import { expoUrlAtom } from '~/shared/workbench/stores/qrCodeStore'; +import { expoUrlAtom } from '~/workbench/stores/qrCodeStore'; export async function newShellProcess(webcontainer: WebContainer, terminal: ITerminal) { const args: string[] = []; diff --git a/app/shared/workbench/components/EditorPanel.tsx b/app/workbench/components/EditorPanel.tsx similarity index 97% rename from app/shared/workbench/components/EditorPanel.tsx rename to app/workbench/components/EditorPanel.tsx index 3bed831a..ee3bcc7b 100644 --- a/app/shared/workbench/components/EditorPanel.tsx +++ b/app/workbench/components/EditorPanel.tsx @@ -9,10 +9,10 @@ import { type OnChangeCallback as OnEditorChange, type OnSaveCallback as OnEditorSave, type OnScrollCallback as OnEditorScroll, -} from '~/shared/workbench/components/editor/codemirror/CodeMirrorEditor'; +} from '~/workbench/components/editor/codemirror/CodeMirrorEditor'; import { PanelHeader } from '~/shared/components/ui/PanelHeader'; import { PanelHeaderButton } from '~/shared/components/ui/PanelHeaderButton'; -import type { FileMap } from '~/shared/workbench/stores/files'; +import type { FileMap } from '~/workbench/stores/files'; import type { FileHistory } from '~/shared/types/actions'; import { themeStore } from '~/shared/stores/theme'; import { WORK_DIR } from '~/shared/utils/constants'; @@ -21,7 +21,7 @@ import { isMobile } from '~/shared/utils/mobile'; import { FileBreadcrumb } from './ui/FileBreadcrumb'; import { FileTree } from './ui/FileTree'; import { DEFAULT_TERMINAL_SIZE, TerminalTabs } from './terminal/TerminalTabs'; -import { workbenchStore } from '~/shared/workbench/stores/workbench'; +import { workbenchStore } from '~/workbench/stores/workbench'; import { Search } from './ui/Search'; // <-- Ensure Search is imported import { classNames } from '~/shared/utils/classNames'; // <-- Import classNames if not already present import { LockManager } from './ui/LockManager'; // <-- Import LockManager diff --git a/app/shared/workbench/components/Preview.tsx b/app/workbench/components/Preview.tsx similarity index 99% rename from app/shared/workbench/components/Preview.tsx rename to app/workbench/components/Preview.tsx index ae30b219..d77160bd 100644 --- a/app/shared/workbench/components/Preview.tsx +++ b/app/workbench/components/Preview.tsx @@ -1,11 +1,11 @@ import { memo, useCallback, useEffect, useRef, useState } from 'react'; import { useStore } from '@nanostores/react'; import { IconButton } from '~/shared/components/ui/IconButton'; -import { workbenchStore } from '~/shared/workbench/stores/workbench'; +import { workbenchStore } from '~/workbench/stores/workbench'; import { PortDropdown } from './ui/PortDropdown'; import { ScreenshotSelector } from './ui/ScreenshotSelector'; -import { expoUrlAtom } from '~/shared/workbench/stores/qrCodeStore'; -import { ExpoQrModal } from '~/shared/workbench/components/ui/ExpoQrModal'; +import { expoUrlAtom } from '~/workbench/stores/qrCodeStore'; +import { ExpoQrModal } from '~/workbench/components/ui/ExpoQrModal'; import type { ElementInfo } from './ui/Inspector'; type ResizeSide = 'left' | 'right' | null; diff --git a/app/shared/workbench/components/Workbench.client.tsx b/app/workbench/components/Workbench.client.tsx similarity index 99% rename from app/shared/workbench/components/Workbench.client.tsx rename to app/workbench/components/Workbench.client.tsx index aa3c64c0..706f5b4b 100644 --- a/app/shared/workbench/components/Workbench.client.tsx +++ b/app/workbench/components/Workbench.client.tsx @@ -11,11 +11,11 @@ import { DiffView } from './ui/DiffView'; import { type OnChangeCallback as OnEditorChange, type OnScrollCallback as OnEditorScroll, -} from '~/shared/workbench/components/editor/codemirror/CodeMirrorEditor'; +} from '~/workbench/components/editor/codemirror/CodeMirrorEditor'; import { IconButton } from '~/shared/components/ui/IconButton'; import { PanelHeaderButton } from '~/shared/components/ui/PanelHeaderButton'; import { Slider, type SliderOptions } from '~/shared/components/ui/Slider'; -import { workbenchStore, type WorkbenchViewType } from '~/shared/workbench/stores/workbench'; +import { workbenchStore, type WorkbenchViewType } from '~/workbench/stores/workbench'; import { classNames } from '~/shared/utils/classNames'; import { cubicEasingFn } from '~/shared/utils/easings'; import { renderLogger } from '~/shared/utils/logger'; diff --git a/app/shared/workbench/components/editor/codemirror/BinaryContent.tsx b/app/workbench/components/editor/codemirror/BinaryContent.tsx similarity index 100% rename from app/shared/workbench/components/editor/codemirror/BinaryContent.tsx rename to app/workbench/components/editor/codemirror/BinaryContent.tsx diff --git a/app/shared/workbench/components/editor/codemirror/CodeMirrorEditor.tsx b/app/workbench/components/editor/codemirror/CodeMirrorEditor.tsx similarity index 100% rename from app/shared/workbench/components/editor/codemirror/CodeMirrorEditor.tsx rename to app/workbench/components/editor/codemirror/CodeMirrorEditor.tsx diff --git a/app/shared/workbench/components/editor/codemirror/EnvMasking.ts b/app/workbench/components/editor/codemirror/EnvMasking.ts similarity index 100% rename from app/shared/workbench/components/editor/codemirror/EnvMasking.ts rename to app/workbench/components/editor/codemirror/EnvMasking.ts diff --git a/app/shared/workbench/components/editor/codemirror/cm-theme.ts b/app/workbench/components/editor/codemirror/cm-theme.ts similarity index 100% rename from app/shared/workbench/components/editor/codemirror/cm-theme.ts rename to app/workbench/components/editor/codemirror/cm-theme.ts diff --git a/app/shared/workbench/components/editor/codemirror/indent.ts b/app/workbench/components/editor/codemirror/indent.ts similarity index 100% rename from app/shared/workbench/components/editor/codemirror/indent.ts rename to app/workbench/components/editor/codemirror/indent.ts diff --git a/app/shared/workbench/components/editor/codemirror/languages.ts b/app/workbench/components/editor/codemirror/languages.ts similarity index 100% rename from app/shared/workbench/components/editor/codemirror/languages.ts rename to app/workbench/components/editor/codemirror/languages.ts diff --git a/app/shared/workbench/components/terminal/Terminal.tsx b/app/workbench/components/terminal/Terminal.tsx similarity index 100% rename from app/shared/workbench/components/terminal/Terminal.tsx rename to app/workbench/components/terminal/Terminal.tsx diff --git a/app/shared/workbench/components/terminal/TerminalTabs.tsx b/app/workbench/components/terminal/TerminalTabs.tsx similarity index 99% rename from app/shared/workbench/components/terminal/TerminalTabs.tsx rename to app/workbench/components/terminal/TerminalTabs.tsx index 5221b3d9..35cda84f 100644 --- a/app/shared/workbench/components/terminal/TerminalTabs.tsx +++ b/app/workbench/components/terminal/TerminalTabs.tsx @@ -4,7 +4,7 @@ import { Panel, type ImperativePanelHandle } from 'react-resizable-panels'; import { IconButton } from '~/shared/components/ui/IconButton'; import { shortcutEventEmitter } from '~/shared/hooks'; import { themeStore } from '~/shared/stores/theme'; -import { workbenchStore } from '~/shared/workbench/stores/workbench'; +import { workbenchStore } from '~/workbench/stores/workbench'; import { classNames } from '~/shared/utils/classNames'; import { Terminal, type TerminalRef } from './Terminal'; import { createScopedLogger } from '~/shared/utils/logger'; diff --git a/app/shared/workbench/components/terminal/theme.ts b/app/workbench/components/terminal/theme.ts similarity index 100% rename from app/shared/workbench/components/terminal/theme.ts rename to app/workbench/components/terminal/theme.ts diff --git a/app/shared/workbench/components/terminal/types/terminal.ts b/app/workbench/components/terminal/types/terminal.ts similarity index 100% rename from app/shared/workbench/components/terminal/types/terminal.ts rename to app/workbench/components/terminal/types/terminal.ts diff --git a/app/shared/workbench/components/ui/DiffView.tsx b/app/workbench/components/ui/DiffView.tsx similarity index 99% rename from app/shared/workbench/components/ui/DiffView.tsx rename to app/workbench/components/ui/DiffView.tsx index 56fcda62..3f234395 100644 --- a/app/shared/workbench/components/ui/DiffView.tsx +++ b/app/workbench/components/ui/DiffView.tsx @@ -1,8 +1,8 @@ import { memo, useMemo, useState, useEffect, useCallback } from 'react'; import { useStore } from '@nanostores/react'; -import { workbenchStore } from '~/shared/workbench/stores/workbench'; -import type { FileMap } from '~/shared/workbench/stores/files'; -import type { EditorDocument } from '~/shared/workbench/components/editor/codemirror/CodeMirrorEditor'; +import { workbenchStore } from '~/workbench/stores/workbench'; +import type { FileMap } from '~/workbench/stores/files'; +import type { EditorDocument } from '~/workbench/components/editor/codemirror/CodeMirrorEditor'; import { diffLines, type Change } from 'diff'; import { getHighlighter } from 'shiki'; import '~/styles/diff-view.css'; diff --git a/app/shared/workbench/components/ui/ExpoQrModal.tsx b/app/workbench/components/ui/ExpoQrModal.tsx similarity index 96% rename from app/shared/workbench/components/ui/ExpoQrModal.tsx rename to app/workbench/components/ui/ExpoQrModal.tsx index b23a9736..93015271 100644 --- a/app/shared/workbench/components/ui/ExpoQrModal.tsx +++ b/app/workbench/components/ui/ExpoQrModal.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { Dialog, DialogTitle, DialogDescription, DialogRoot } from '~/shared/components/ui/Dialog'; import { useStore } from '@nanostores/react'; -import { expoUrlAtom } from '~/shared/workbench/stores/qrCodeStore'; +import { expoUrlAtom } from '~/workbench/stores/qrCodeStore'; import { QRCode } from 'react-qrcode-logo'; interface ExpoQrModalProps { diff --git a/app/shared/workbench/components/ui/FileBreadcrumb.tsx b/app/workbench/components/ui/FileBreadcrumb.tsx similarity index 98% rename from app/shared/workbench/components/ui/FileBreadcrumb.tsx rename to app/workbench/components/ui/FileBreadcrumb.tsx index f7af1db7..11873dda 100644 --- a/app/shared/workbench/components/ui/FileBreadcrumb.tsx +++ b/app/workbench/components/ui/FileBreadcrumb.tsx @@ -1,7 +1,7 @@ import * as DropdownMenu from '@radix-ui/react-dropdown-menu'; import { AnimatePresence, motion, type Variants } from 'framer-motion'; import { memo, useEffect, useRef, useState } from 'react'; -import type { FileMap } from '~/shared/workbench/stores/files'; +import type { FileMap } from '~/workbench/stores/files'; import { classNames } from '~/shared/utils/classNames'; import { WORK_DIR } from '~/shared/utils/constants'; import { cubicEasingFn } from '~/shared/utils/easings'; diff --git a/app/shared/workbench/components/ui/FileTree.tsx b/app/workbench/components/ui/FileTree.tsx similarity index 99% rename from app/shared/workbench/components/ui/FileTree.tsx rename to app/workbench/components/ui/FileTree.tsx index b9b7067f..f2616e62 100644 --- a/app/shared/workbench/components/ui/FileTree.tsx +++ b/app/workbench/components/ui/FileTree.tsx @@ -1,11 +1,11 @@ import { memo, useCallback, useEffect, useMemo, useRef, useState, type ReactNode } from 'react'; -import type { FileMap } from '~/shared/workbench/stores/files'; +import type { FileMap } from '~/workbench/stores/files'; import { classNames } from '~/shared/utils/classNames'; import { createScopedLogger, renderLogger } from '~/shared/utils/logger'; import * as ContextMenu from '@radix-ui/react-context-menu'; import type { FileHistory } from '~/shared/types/actions'; import { diffLines, type Change } from 'diff'; -import { workbenchStore } from '~/shared/workbench/stores/workbench'; +import { workbenchStore } from '~/workbench/stores/workbench'; import { toast } from 'react-toastify'; import { path } from '~/shared/utils/path'; diff --git a/app/shared/workbench/components/ui/Inspector.tsx b/app/workbench/components/ui/Inspector.tsx similarity index 100% rename from app/shared/workbench/components/ui/Inspector.tsx rename to app/workbench/components/ui/Inspector.tsx diff --git a/app/shared/workbench/components/ui/InspectorPanel.tsx b/app/workbench/components/ui/InspectorPanel.tsx similarity index 100% rename from app/shared/workbench/components/ui/InspectorPanel.tsx rename to app/workbench/components/ui/InspectorPanel.tsx diff --git a/app/shared/workbench/components/ui/LockManager.tsx b/app/workbench/components/ui/LockManager.tsx similarity index 99% rename from app/shared/workbench/components/ui/LockManager.tsx rename to app/workbench/components/ui/LockManager.tsx index 0ff17180..09382e77 100644 --- a/app/shared/workbench/components/ui/LockManager.tsx +++ b/app/workbench/components/ui/LockManager.tsx @@ -1,5 +1,5 @@ import { useState, useEffect } from 'react'; -import { workbenchStore } from '~/shared/workbench/stores/workbench'; +import { workbenchStore } from '~/workbench/stores/workbench'; import { classNames } from '~/shared/utils/classNames'; import { Checkbox } from '~/shared/components/ui/Checkbox'; import { toast } from '~/shared/components/ui/use-toast'; diff --git a/app/shared/workbench/components/ui/PortDropdown.tsx b/app/workbench/components/ui/PortDropdown.tsx similarity index 97% rename from app/shared/workbench/components/ui/PortDropdown.tsx rename to app/workbench/components/ui/PortDropdown.tsx index f8d17ddc..ae9a53da 100644 --- a/app/shared/workbench/components/ui/PortDropdown.tsx +++ b/app/workbench/components/ui/PortDropdown.tsx @@ -1,5 +1,5 @@ import { memo, useEffect, useRef } from 'react'; -import type { PreviewInfo } from '~/shared/workbench/stores/previews'; +import type { PreviewInfo } from '~/workbench/stores/previews'; interface PortDropdownProps { activePreviewIndex: number; diff --git a/app/shared/workbench/components/ui/ScreenshotSelector.tsx b/app/workbench/components/ui/ScreenshotSelector.tsx similarity index 100% rename from app/shared/workbench/components/ui/ScreenshotSelector.tsx rename to app/workbench/components/ui/ScreenshotSelector.tsx diff --git a/app/shared/workbench/components/ui/Search.tsx b/app/workbench/components/ui/Search.tsx similarity index 99% rename from app/shared/workbench/components/ui/Search.tsx rename to app/workbench/components/ui/Search.tsx index 6dab4b5a..aa709e1d 100644 --- a/app/shared/workbench/components/ui/Search.tsx +++ b/app/workbench/components/ui/Search.tsx @@ -1,6 +1,6 @@ import { useState, useMemo, useCallback, useEffect } from 'react'; import type { TextSearchOptions, TextSearchOnProgressCallback, WebContainer } from '@webcontainer/api'; -import { workbenchStore } from '~/shared/workbench/stores/workbench'; +import { workbenchStore } from '~/workbench/stores/workbench'; import { webcontainer } from '~/shared/lib/webcontainer'; import { WORK_DIR } from '~/shared/utils/constants'; import { debounce } from '~/shared/utils/debounce'; diff --git a/app/shared/workbench/stores/editor.ts b/app/workbench/stores/editor.ts similarity index 96% rename from app/shared/workbench/stores/editor.ts rename to app/workbench/stores/editor.ts index 2c474f42..81f70d4f 100644 --- a/app/shared/workbench/stores/editor.ts +++ b/app/workbench/stores/editor.ts @@ -1,5 +1,5 @@ import { atom, computed, map, type MapStore, type WritableAtom } from 'nanostores'; -import type { EditorDocument, ScrollPosition } from '~/shared/workbench/components/editor/codemirror/CodeMirrorEditor'; +import type { EditorDocument, ScrollPosition } from '~/workbench/components/editor/codemirror/CodeMirrorEditor'; import type { FileMap, FilesStore } from './files'; import { createScopedLogger } from '~/shared/utils/logger'; diff --git a/app/shared/workbench/stores/files.ts b/app/workbench/stores/files.ts similarity index 100% rename from app/shared/workbench/stores/files.ts rename to app/workbench/stores/files.ts diff --git a/app/shared/workbench/stores/previews.ts b/app/workbench/stores/previews.ts similarity index 100% rename from app/shared/workbench/stores/previews.ts rename to app/workbench/stores/previews.ts diff --git a/app/shared/workbench/stores/qrCodeStore.ts b/app/workbench/stores/qrCodeStore.ts similarity index 100% rename from app/shared/workbench/stores/qrCodeStore.ts rename to app/workbench/stores/qrCodeStore.ts diff --git a/app/shared/workbench/stores/terminal.ts b/app/workbench/stores/terminal.ts similarity index 95% rename from app/shared/workbench/stores/terminal.ts rename to app/workbench/stores/terminal.ts index 8fb3b071..6ff70b57 100644 --- a/app/shared/workbench/stores/terminal.ts +++ b/app/workbench/stores/terminal.ts @@ -1,6 +1,6 @@ import type { WebContainer, WebContainerProcess } from '@webcontainer/api'; import { atom, type WritableAtom } from 'nanostores'; -import type { ITerminal } from '~/shared/workbench/components/terminal/types/terminal'; +import type { ITerminal } from '~/workbench/components/terminal/types/terminal'; import { newBoltShellProcess, newShellProcess } from '~/shared/utils/shell'; import { coloredText } from '~/shared/utils/terminal'; diff --git a/app/shared/workbench/stores/workbench.ts b/app/workbench/stores/workbench.ts similarity index 99% rename from app/shared/workbench/stores/workbench.ts rename to app/workbench/stores/workbench.ts index f61cedaf..71a60d0b 100644 --- a/app/shared/workbench/stores/workbench.ts +++ b/app/workbench/stores/workbench.ts @@ -1,9 +1,9 @@ import { atom, map, type MapStore, type ReadableAtom, type WritableAtom } from 'nanostores'; -import type { EditorDocument, ScrollPosition } from '~/shared/workbench/components/editor/codemirror/CodeMirrorEditor'; +import type { EditorDocument, ScrollPosition } from '~/workbench/components/editor/codemirror/CodeMirrorEditor'; import { ActionRunner } from '~/shared/lib/runtime/action-runner'; import type { ActionCallbackData, ArtifactCallbackData } from '~/shared/lib/runtime/message-parser'; import { webcontainer } from '~/shared/lib/webcontainer'; -import type { ITerminal } from '~/shared/workbench/components/terminal/types/terminal'; +import type { ITerminal } from '~/workbench/components/terminal/types/terminal'; import { unreachable } from '~/shared/utils/unreachable'; import { EditorStore } from './editor'; import { FilesStore, type FileMap } from './files';