Skip to content

Commit 59fe06b

Browse files
committed
fix(ci): harden isolated workspace dependency resolution
1 parent 1deddcc commit 59fe06b

13 files changed

Lines changed: 113 additions & 19 deletions

File tree

apps/mobile/src/components/ui/lightbox/ImageViewing/index.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// Original code copied and simplified from the link below as the codebase is currently not maintained:
99
// https://github.com/jobtoday/react-native-image-viewing
1010

11-
// import * as ScreenOrientation from "expo-screen-orientation"
1211
import * as React from "react"
1312
import { useCallback, useMemo, useState } from "react"
1413
import { LayoutAnimation, PixelRatio, ScrollView, StyleSheet, View } from "react-native"
@@ -47,7 +46,6 @@ type Rect = {
4746
height: number
4847
}
4948

50-
// const { PORTRAIT_UP } = ScreenOrientation.OrientationLock
5149
const PIXEL_RATIO = PixelRatio.get()
5250
const SLOW_SPRING: WithSpringConfig = {
5351
mass: isIOS ? 1.25 : 0.75,

packages/internal/components/package.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@
6464
"@types/hast": "3.0.4",
6565
"@types/unist": "3.0.3",
6666
"class-variance-authority": "0.7.1",
67+
"clsx": "2.1.1",
6768
"dayjs": "1.11.19",
69+
"es-toolkit": "1.44.0",
6870
"foxact": "0.2.52",
6971
"hast-util-to-jsx-runtime": "2.3.6",
7072
"hast-util-to-text": "4.0.2",
@@ -77,14 +79,17 @@
7779
"react-blurhash": "0.3.0",
7880
"react-fast-marquee": "1.6.5",
7981
"react-hook-form": "7.71.1",
82+
"react-hotkeys-hook": "5.2.4",
8083
"react-i18next": "16.5.4",
84+
"react-router": "7.13.0",
8185
"rehype-infer-description-meta": "2.0.0",
8286
"rehype-parse": "9.0.1",
8387
"rehype-sanitize": "6.0.0",
8488
"rehype-stringify": "10.0.1",
8589
"remark-directive": "4.0.0",
8690
"remark-gfm": "4.0.1",
8791
"remark-gh-alerts": "0.0.3",
92+
"remark-parse": "11.0.0",
8893
"remark-rehype": "11.1.2",
8994
"sonner": "2.0.7",
9095
"tailwindcss-uikit-colors": "catalog:",
@@ -94,7 +99,8 @@
9499
"use-context-selector": "2.0.0",
95100
"usehooks-ts": "3.1.1",
96101
"vaul": "1.1.2",
97-
"vfile": "5.3.7"
102+
"vfile": "5.3.7",
103+
"zustand": "5.0.11"
98104
},
99105
"devDependencies": {
100106
"@follow/configs": "workspace:*",

packages/internal/components/src/providers/event-provider.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import { viewportAtom } from "@follow/components/atoms/viewport.js"
21
import { throttle } from "es-toolkit/compat"
32
import { useIsomorphicLayoutEffect } from "foxact/use-isomorphic-layout-effect"
43
import { useStore } from "jotai"
54
import type { FC } from "react"
65

76
import { mouseAtom } from "../atoms/mouse"
7+
import { viewportAtom } from "../atoms/viewport"
88

99
export const EventProvider: FC = () => {
1010
const store = useStore()

packages/internal/components/src/providers/stable-router-provider.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
import { setNavigate, setRoute } from "@follow/components/atoms/route.js"
21
import { useLayoutEffect } from "react"
32
import type { NavigateFunction } from "react-router"
43
import { useLocation, useNavigate, useParams, useSearchParams } from "react-router"
54

5+
import { setNavigate, setRoute } from "../atoms/route"
6+
67
// eslint-disable-next-line @typescript-eslint/no-empty-object-type
78
export interface CustomRoute {}
89
export interface GlobalRoute extends CustomRoute {

packages/internal/components/src/ui/button/action-button.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
import {
2-
useFocusable,
3-
useGlobalFocusableScopeSelector,
4-
} from "@follow/components/common/Focusable/index.js"
51
import type { EnhanceSet } from "@follow/utils"
62
import { stopPropagation } from "@follow/utils/dom"
73
import { cn, getOS } from "@follow/utils/utils"
@@ -10,6 +6,7 @@ import { useCallback, useState } from "react"
106
import type { Options } from "react-hotkeys-hook"
117
import { useHotkeys } from "react-hotkeys-hook"
128

9+
import { useFocusable, useGlobalFocusableScopeSelector } from "../../common/Focusable"
1310
import { KbdCombined } from "../kbd/Kbd"
1411
import { Tooltip, TooltipContent, TooltipPortal, TooltipTrigger } from "../tooltip"
1512

packages/internal/components/src/ui/button/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import { useMobile } from "@follow/components/hooks/useMobile.js"
2-
import { LoadingCircle } from "@follow/components/ui/loading/index.jsx"
31
import { cn } from "@follow/utils/utils"
42
import type { VariantProps } from "class-variance-authority"
53
import type { HTMLMotionProps } from "motion/react"
64
import { m } from "motion/react"
75
import * as React from "react"
86

7+
import { useMobile } from "../../hooks/useMobile"
8+
import { LoadingCircle } from "../loading"
99
import { styledButtonVariant } from "./variants"
1010

1111
export interface BaseButtonProps {

packages/internal/components/src/ui/context-menu/context-menu.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,4 +219,4 @@ export {
219219
ContextMenuTrigger,
220220
}
221221

222-
export { RootPortal as ContextMenuPortal } from "@follow/components/ui/portal/index.jsx"
222+
export { RootPortal as ContextMenuPortal } from "../portal"

packages/internal/components/src/ui/key-value-editor/index.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
import { Button } from "@follow/components/ui/button/index.js"
2-
import { Input } from "@follow/components/ui/input/index.js"
31
import { cn } from "@follow/utils/utils"
42
import { useCallback, useEffect, useRef, useState } from "react"
53

4+
import { Button } from "../button"
5+
import { Input } from "../input"
6+
67
export interface KeyValuePair {
78
key: string
89
value: string

packages/internal/components/src/ui/tooltip/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { Spring } from "@follow/components/constants/spring.js"
21
import { cn } from "@follow/utils/utils"
32
import * as TooltipPrimitive from "@radix-ui/react-tooltip"
43
import { m } from "motion/react"
54
import * as React from "react"
65

6+
import { Spring } from "../../constants/spring"
77
import { tooltipStyle, tooltipStyles } from "./styles"
88

99
const TooltipProvider = TooltipPrimitive.Provider

packages/internal/components/src/utils/selector.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
import { useMobile } from "@follow/components/hooks/useMobile.js"
2-
import { useViewport } from "@follow/components/hooks/useViewport.js"
31
import type { ComponentType, ReactNode, RefAttributes } from "react"
42
import { lazy, Suspense } from "react"
53

4+
import { useMobile } from "../hooks/useMobile"
5+
import { useViewport } from "../hooks/useViewport"
6+
67
export function withResponsiveComponent<P extends object>(
78
desktopImport: () => Promise<{ default: ComponentType<P> }>,
89
mobileImport: () => Promise<{ default: ComponentType<P> }>,

0 commit comments

Comments
 (0)