diff --git a/excalidraw-app/share/ShareDialog.tsx b/excalidraw-app/share/ShareDialog.tsx index c66972a73..68d0c66fc 100644 --- a/excalidraw-app/share/ShareDialog.tsx +++ b/excalidraw-app/share/ShareDialog.tsx @@ -12,7 +12,7 @@ import { shareIOS, shareWindows, } from "@excalidraw/excalidraw/components/icons"; -import { useUIAppState } from "@excalidraw/excalidraw/context/ui-appState"; +import { useUIAppState } from "@excalidraw/excalidraw/src/context/ui-appState"; import { useCopyStatus } from "@excalidraw/excalidraw/src/hooks/useCopiedIndicator"; import { useI18n } from "@excalidraw/excalidraw/i18n"; import { KEYS, getFrame } from "@excalidraw/common"; diff --git a/excalidraw-app/vite.config.mts b/excalidraw-app/vite.config.mts index 29e5c0430..1ad1b1ae8 100644 --- a/excalidraw-app/vite.config.mts +++ b/excalidraw-app/vite.config.mts @@ -140,6 +140,7 @@ export default defineConfig(({ mode }) => { }, workbox: { + maximumFileSizeToCacheInBytes: 3000000, // don't precache fonts, locales and separate chunks globIgnores: [ "fonts.css", diff --git a/packages/excalidraw/components/Actions.tsx b/packages/excalidraw/components/Actions.tsx index 3c9f58768..3026f3f95 100644 --- a/packages/excalidraw/components/Actions.tsx +++ b/packages/excalidraw/components/Actions.tsx @@ -34,7 +34,7 @@ import { actionToggleZenMode } from "../actions"; import { alignActionsPredicate } from "../actions/actionAlign"; import { trackEvent } from "../analytics"; -import { useTunnels } from "../context/tunnels"; +import { useTunnels } from "../src/context/tunnels"; import { t } from "../i18n"; import { diff --git a/packages/excalidraw/components/CommandPalette/CommandPalette.tsx b/packages/excalidraw/components/CommandPalette/CommandPalette.tsx index 85e98a0c6..4e59e797f 100644 --- a/packages/excalidraw/components/CommandPalette/CommandPalette.tsx +++ b/packages/excalidraw/components/CommandPalette/CommandPalette.tsx @@ -24,7 +24,7 @@ import { } from "../../actions/actionElementLink"; import { getShortcutFromShortcutName } from "../../actions/shortcuts"; import { trackEvent } from "../../analytics"; -import { useUIAppState } from "../../context/ui-appState"; +import { useUIAppState } from "../../src/context/ui-appState"; import { deburr } from "../../deburr"; import { atom, useAtom, editorJotaiStore } from "../../editor-jotai"; import { t } from "../../i18n"; diff --git a/packages/excalidraw/components/DefaultSidebar.tsx b/packages/excalidraw/components/DefaultSidebar.tsx index 4f1aa91e8..156d90e45 100644 --- a/packages/excalidraw/components/DefaultSidebar.tsx +++ b/packages/excalidraw/components/DefaultSidebar.tsx @@ -9,8 +9,8 @@ import { import type { MarkOptional, Merge } from "@excalidraw/common/utility-types"; -import { useTunnels } from "../context/tunnels"; -import { useUIAppState } from "../context/ui-appState"; +import { useTunnels } from "../src/context/tunnels"; +import { useUIAppState } from "../src/context/ui-appState"; import "../components/dropdownMenu/DropdownMenu.scss"; diff --git a/packages/excalidraw/components/EyeDropper.tsx b/packages/excalidraw/components/EyeDropper.tsx index 567cc60a6..4c77ad6f8 100644 --- a/packages/excalidraw/components/EyeDropper.tsx +++ b/packages/excalidraw/components/EyeDropper.tsx @@ -5,7 +5,7 @@ import { EVENT, KEYS, rgbToHex } from "@excalidraw/common"; import type { ExcalidrawElement } from "@excalidraw/element/types"; -import { useUIAppState } from "../context/ui-appState"; +import { useUIAppState } from "../src/context/ui-appState"; import { atom } from "../editor-jotai"; import { useCreatePortalContainer } from "../src/hooks/useCreatePortalContainer"; import { useOutsideClick } from "../src/hooks/useOutsideClick"; diff --git a/packages/excalidraw/components/LayerUI.tsx b/packages/excalidraw/components/LayerUI.tsx index bf5ba066c..fff84f641 100644 --- a/packages/excalidraw/components/LayerUI.tsx +++ b/packages/excalidraw/components/LayerUI.tsx @@ -21,8 +21,8 @@ import Scene from "../src/scene/Scene"; import { actionToggleStats } from "../actions"; import { trackEvent } from "../analytics"; import { isHandToolActive } from "../appState"; -import { TunnelsContext, useInitializeTunnels } from "../context/tunnels"; -import { UIAppStateContext } from "../context/ui-appState"; +import { TunnelsContext, useInitializeTunnels } from "../src/context/tunnels"; +import { UIAppStateContext } from "../src/context/ui-appState"; import { useAtom, useAtomValue } from "../editor-jotai"; import { t } from "../i18n"; diff --git a/packages/excalidraw/components/LibraryMenu.tsx b/packages/excalidraw/components/LibraryMenu.tsx index bafd599d3..957688740 100644 --- a/packages/excalidraw/components/LibraryMenu.tsx +++ b/packages/excalidraw/components/LibraryMenu.tsx @@ -19,7 +19,7 @@ import type { } from "@excalidraw/element/types"; import { trackEvent } from "../analytics"; -import { useUIAppState } from "../context/ui-appState"; +import { useUIAppState } from "../src/context/ui-appState"; import { distributeLibraryItemsOnSquareGrid, libraryItemsAtom, diff --git a/packages/excalidraw/components/LibraryMenuHeaderContent.tsx b/packages/excalidraw/components/LibraryMenuHeaderContent.tsx index 747b0d525..9b676a73d 100644 --- a/packages/excalidraw/components/LibraryMenuHeaderContent.tsx +++ b/packages/excalidraw/components/LibraryMenuHeaderContent.tsx @@ -3,7 +3,7 @@ import { useCallback, useState } from "react"; import { muteFSAbortError } from "@excalidraw/common"; -import { useUIAppState } from "../context/ui-appState"; +import { useUIAppState } from "../src/context/ui-appState"; import { fileOpen } from "../data/filesystem"; import { saveLibraryAsJSON } from "../data/json"; import { libraryItemsAtom } from "../data/library"; diff --git a/packages/excalidraw/components/MobileMenu.tsx b/packages/excalidraw/components/MobileMenu.tsx index 86ce16781..0469779d9 100644 --- a/packages/excalidraw/components/MobileMenu.tsx +++ b/packages/excalidraw/components/MobileMenu.tsx @@ -5,7 +5,7 @@ import { showSelectedShapeActions } from "@excalidraw/element/showSelectedShapeA import type { NonDeletedExcalidrawElement } from "@excalidraw/element/types"; import { isHandToolActive } from "../appState"; -import { useTunnels } from "../context/tunnels"; +import { useTunnels } from "../src/context/tunnels"; import { t } from "../i18n"; import { calculateScrollCenter } from "../src/scene"; import { SCROLLBAR_WIDTH, SCROLLBAR_MARGIN } from "../src/scene/scrollbars"; diff --git a/packages/excalidraw/components/OverwriteConfirm/OverwriteConfirm.tsx b/packages/excalidraw/components/OverwriteConfirm/OverwriteConfirm.tsx index f2de877e0..6f870cb1c 100644 --- a/packages/excalidraw/components/OverwriteConfirm/OverwriteConfirm.tsx +++ b/packages/excalidraw/components/OverwriteConfirm/OverwriteConfirm.tsx @@ -1,6 +1,6 @@ import React from "react"; -import { useTunnels } from "../../context/tunnels"; +import { useTunnels } from "../../src/context/tunnels"; import { useAtom } from "../../editor-jotai"; import { Dialog } from "../Dialog"; import { FilledButton } from "../FilledButton"; diff --git a/packages/excalidraw/components/Sidebar/Sidebar.tsx b/packages/excalidraw/components/Sidebar/Sidebar.tsx index b9a837c52..968e22a5f 100644 --- a/packages/excalidraw/components/Sidebar/Sidebar.tsx +++ b/packages/excalidraw/components/Sidebar/Sidebar.tsx @@ -11,7 +11,7 @@ import React, { import { EVENT, isDevEnv, KEYS, updateObject } from "@excalidraw/common"; -import { useUIAppState } from "../../context/ui-appState"; +import { useUIAppState } from "../../src/context/ui-appState"; import { atom, useSetAtom } from "../../editor-jotai"; import { useOutsideClick } from "../../src/hooks/useOutsideClick"; import { useDevice, useExcalidrawSetAppState } from "../App"; diff --git a/packages/excalidraw/components/Sidebar/SidebarTabs.tsx b/packages/excalidraw/components/Sidebar/SidebarTabs.tsx index 448840c4a..65d990a93 100644 --- a/packages/excalidraw/components/Sidebar/SidebarTabs.tsx +++ b/packages/excalidraw/components/Sidebar/SidebarTabs.tsx @@ -1,6 +1,6 @@ import * as RadixTabs from "@radix-ui/react-tabs"; -import { useUIAppState } from "../../context/ui-appState"; +import { useUIAppState } from "../../src/context/ui-appState"; import { useExcalidrawSetAppState } from "../App"; export const SidebarTabs = ({ diff --git a/packages/excalidraw/components/Sidebar/SidebarTrigger.tsx b/packages/excalidraw/components/Sidebar/SidebarTrigger.tsx index 6e8bf374c..60ae08ae9 100644 --- a/packages/excalidraw/components/Sidebar/SidebarTrigger.tsx +++ b/packages/excalidraw/components/Sidebar/SidebarTrigger.tsx @@ -1,6 +1,6 @@ import clsx from "clsx"; -import { useUIAppState } from "../../context/ui-appState"; +import { useUIAppState } from "../../src/context/ui-appState"; import { useExcalidrawSetAppState } from "../App"; import "./SidebarTrigger.scss"; diff --git a/packages/excalidraw/components/TTDDialog/TTDDialog.tsx b/packages/excalidraw/components/TTDDialog/TTDDialog.tsx index 68d230d24..6e73e52b2 100644 --- a/packages/excalidraw/components/TTDDialog/TTDDialog.tsx +++ b/packages/excalidraw/components/TTDDialog/TTDDialog.tsx @@ -5,7 +5,7 @@ import { isFiniteNumber } from "@excalidraw/math"; import type { NonDeletedExcalidrawElement } from "@excalidraw/element/types"; import { trackEvent } from "../../analytics"; -import { useUIAppState } from "../../context/ui-appState"; +import { useUIAppState } from "../../src/context/ui-appState"; import { atom, useAtom } from "../../editor-jotai"; import { t } from "../../i18n"; import { useApp, useExcalidrawSetAppState } from "../App"; diff --git a/packages/excalidraw/components/TTDDialog/TTDDialogTrigger.tsx b/packages/excalidraw/components/TTDDialog/TTDDialogTrigger.tsx index 833b659fe..55d7ca919 100644 --- a/packages/excalidraw/components/TTDDialog/TTDDialogTrigger.tsx +++ b/packages/excalidraw/components/TTDDialog/TTDDialogTrigger.tsx @@ -1,5 +1,5 @@ import { trackEvent } from "../../analytics"; -import { useTunnels } from "../../context/tunnels"; +import { useTunnels } from "../../src/context/tunnels"; import { t } from "../../i18n"; import { useExcalidrawSetAppState } from "../App"; import DropdownMenu from "../dropdownMenu/DropdownMenu"; diff --git a/packages/excalidraw/components/footer/Footer.tsx b/packages/excalidraw/components/footer/Footer.tsx index 427628e7c..dfb604c30 100644 --- a/packages/excalidraw/components/footer/Footer.tsx +++ b/packages/excalidraw/components/footer/Footer.tsx @@ -1,7 +1,7 @@ import clsx from "clsx"; import { actionShortcuts } from "../../actions"; -import { useTunnels } from "../../context/tunnels"; +import { useTunnels } from "../../src/context/tunnels"; import { ExitZenModeAction, FinalizeAction, diff --git a/packages/excalidraw/components/footer/FooterCenter.tsx b/packages/excalidraw/components/footer/FooterCenter.tsx index 6a44581de..51cdf7471 100644 --- a/packages/excalidraw/components/footer/FooterCenter.tsx +++ b/packages/excalidraw/components/footer/FooterCenter.tsx @@ -1,7 +1,7 @@ import clsx from "clsx"; -import { useTunnels } from "../../context/tunnels"; -import { useUIAppState } from "../../context/ui-appState"; +import { useTunnels } from "../../src/context/tunnels"; +import { useUIAppState } from "../../src/context/ui-appState"; import "./FooterCenter.scss"; diff --git a/packages/excalidraw/components/hoc/withInternalFallback.tsx b/packages/excalidraw/components/hoc/withInternalFallback.tsx index 298f58dd9..9dfd65623 100644 --- a/packages/excalidraw/components/hoc/withInternalFallback.tsx +++ b/packages/excalidraw/components/hoc/withInternalFallback.tsx @@ -1,6 +1,6 @@ import React, { useLayoutEffect, useRef } from "react"; -import { useTunnels } from "../../context/tunnels"; +import { useTunnels } from "../../src/context/tunnels"; import { atom } from "../../editor-jotai"; export const withInternalFallback = ( diff --git a/packages/excalidraw/components/live-collaboration/LiveCollaborationTrigger.tsx b/packages/excalidraw/components/live-collaboration/LiveCollaborationTrigger.tsx index 1aa187167..701fca725 100644 --- a/packages/excalidraw/components/live-collaboration/LiveCollaborationTrigger.tsx +++ b/packages/excalidraw/components/live-collaboration/LiveCollaborationTrigger.tsx @@ -3,7 +3,7 @@ import clsx from "clsx"; import { t } from "../../i18n"; import { Button } from "../Button"; import { share } from "../icons"; -import { useUIAppState } from "../../context/ui-appState"; +import { useUIAppState } from "../../src/context/ui-appState"; import "./LiveCollaborationTrigger.scss"; diff --git a/packages/excalidraw/components/main-menu/DefaultItems.tsx b/packages/excalidraw/components/main-menu/DefaultItems.tsx index 29a2761a1..2c3dad52b 100644 --- a/packages/excalidraw/components/main-menu/DefaultItems.tsx +++ b/packages/excalidraw/components/main-menu/DefaultItems.tsx @@ -14,7 +14,7 @@ import { } from "../../actions"; import { getShortcutFromShortcutName } from "../../actions/shortcuts"; import { trackEvent } from "../../analytics"; -import { useUIAppState } from "../../context/ui-appState"; +import { useUIAppState } from "../../src/context/ui-appState"; import { useSetAtom } from "../../editor-jotai"; import { useI18n } from "../../i18n"; import { activeConfirmDialogAtom } from "../ActiveConfirmDialog"; diff --git a/packages/excalidraw/components/main-menu/MainMenu.tsx b/packages/excalidraw/components/main-menu/MainMenu.tsx index 7c2b5fb4a..6faac8ad4 100644 --- a/packages/excalidraw/components/main-menu/MainMenu.tsx +++ b/packages/excalidraw/components/main-menu/MainMenu.tsx @@ -2,8 +2,8 @@ import React from "react"; import { composeEventHandlers } from "@excalidraw/common"; -import { useTunnels } from "../../context/tunnels"; -import { useUIAppState } from "../../context/ui-appState"; +import { useTunnels } from "../../src/context/tunnels"; +import { useUIAppState } from "../../src/context/ui-appState"; import { t } from "../../i18n"; import { useDevice, useExcalidrawSetAppState } from "../App"; import { UserList } from "../UserList"; diff --git a/packages/excalidraw/components/welcome-screen/WelcomeScreen.Center.tsx b/packages/excalidraw/components/welcome-screen/WelcomeScreen.Center.tsx index bd9b9e55b..fb54692f7 100644 --- a/packages/excalidraw/components/welcome-screen/WelcomeScreen.Center.tsx +++ b/packages/excalidraw/components/welcome-screen/WelcomeScreen.Center.tsx @@ -1,7 +1,7 @@ import { actionLoadScene, actionShortcuts } from "../../actions"; import { getShortcutFromShortcutName } from "../../actions/shortcuts"; -import { useTunnels } from "../../context/tunnels"; -import { useUIAppState } from "../../context/ui-appState"; +import { useTunnels } from "../../src/context/tunnels"; +import { useUIAppState } from "../../src/context/ui-appState"; import { t, useI18n } from "../../i18n"; import { useDevice, useExcalidrawActionManager } from "../App"; import { ExcalidrawLogo } from "../ExcalidrawLogo"; diff --git a/packages/excalidraw/components/welcome-screen/WelcomeScreen.Hints.tsx b/packages/excalidraw/components/welcome-screen/WelcomeScreen.Hints.tsx index e47a5a1d3..70c31848c 100644 --- a/packages/excalidraw/components/welcome-screen/WelcomeScreen.Hints.tsx +++ b/packages/excalidraw/components/welcome-screen/WelcomeScreen.Hints.tsx @@ -1,4 +1,4 @@ -import { useTunnels } from "../../context/tunnels"; +import { useTunnels } from "../../src/context/tunnels"; import { t } from "../../i18n"; import { WelcomeScreenHelpArrow, diff --git a/packages/excalidraw/context/tunnels.ts b/packages/excalidraw/src/context/tunnels.ts similarity index 100% rename from packages/excalidraw/context/tunnels.ts rename to packages/excalidraw/src/context/tunnels.ts diff --git a/packages/excalidraw/context/ui-appState.ts b/packages/excalidraw/src/context/ui-appState.ts similarity index 78% rename from packages/excalidraw/context/ui-appState.ts rename to packages/excalidraw/src/context/ui-appState.ts index 174b6e89c..f1806d2d7 100644 --- a/packages/excalidraw/context/ui-appState.ts +++ b/packages/excalidraw/src/context/ui-appState.ts @@ -1,6 +1,6 @@ import React from "react"; -import type { UIAppState } from "../types"; +import type { UIAppState } from "../../types"; export const UIAppStateContext = React.createContext(null!); export const useUIAppState = () => React.useContext(UIAppStateContext); diff --git a/packages/excalidraw/src/hooks/useCreatePortalContainer.ts b/packages/excalidraw/src/hooks/useCreatePortalContainer.ts index 2e3f50020..c983d1bcb 100644 --- a/packages/excalidraw/src/hooks/useCreatePortalContainer.ts +++ b/packages/excalidraw/src/hooks/useCreatePortalContainer.ts @@ -3,7 +3,7 @@ import { useState, useLayoutEffect } from "react"; import { THEME } from "@excalidraw/common"; import { useDevice, useExcalidrawContainer } from "../../components/App"; -import { useUIAppState } from "../../context/ui-appState"; +import { useUIAppState } from "../context/ui-appState"; export const useCreatePortalContainer = (opts?: { className?: string; diff --git a/packages/excalidraw/tests/lasso.test.tsx b/packages/excalidraw/tests/lasso.test.tsx index b02da4f4f..44d93910d 100644 --- a/packages/excalidraw/tests/lasso.test.tsx +++ b/packages/excalidraw/tests/lasso.test.tsx @@ -29,11 +29,11 @@ import { Excalidraw } from "../index"; import { getSelectedElements } from "../src/scene"; -import { getLassoSelectedElementIds } from "../lasso/utils"; +import { getLassoSelectedElementIds } from "../src/lasso/utils"; import { act, render } from "./test-utils"; -import type { ElementsSegmentsMap } from "../lasso/utils"; +import type { ElementsSegmentsMap } from "../src/lasso/utils"; const { h } = window;