diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000..0144c63 --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +@olly:registry=https://git.ollyhearn.ru/api/packages/olly/npm/ diff --git a/package-lock.json b/package-lock.json index 739015b..c868a9c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,9 +8,9 @@ "name": "mcma-webui", "version": "1.0.0", "dependencies": { + "@olly/modern-sk": "0.1.4-3", "@phosphor-icons/react": "^2.1.10", "@reduxjs/toolkit": "^2.12.0", - "modern-sk": "file:./modern-sk-0.1.2.tgz", "react": "^19.2.6", "react-dom": "^19.2.6", "react-redux": "^9.3.0", @@ -691,6 +691,20 @@ "@emnapi/runtime": "^1.7.1" } }, + "node_modules/@olly/modern-sk": { + "version": "0.1.4-3", + "resolved": "https://git.ollyhearn.ru/api/packages/olly/npm/%40olly%2Fmodern-sk/-/0.1.4-3/modern-sk-0.1.4-3.tgz", + "integrity": "sha512-h+d+Jd3DBr7d51V78p1Eb5rVrpN4PAskwQFnh2X4Dk7Q8oajiMVJuhZU1amx97bKHFDHgcOfhwc4cS8P4tFCmQ==", + "license": "MIT", + "dependencies": { + "@phosphor-icons/react": "^2.1.10", + "radix-ui": "^1.4.3" + }, + "peerDependencies": { + "react": ">=18", + "react-dom": ">=18" + } + }, "node_modules/@phosphor-icons/react": { "version": "2.1.10", "resolved": "https://registry.npmjs.org/@phosphor-icons/react/-/react-2.1.10.tgz", @@ -2464,9 +2478,6 @@ "arm64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -2481,9 +2492,6 @@ "arm64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -2498,9 +2506,6 @@ "x64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -2515,9 +2520,6 @@ "x64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -2818,9 +2820,6 @@ "arm64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -2838,9 +2837,6 @@ "arm64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -2858,9 +2854,6 @@ "x64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -2878,9 +2871,6 @@ "x64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -3707,9 +3697,6 @@ "arm64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MPL-2.0", "optional": true, "os": [ @@ -3731,9 +3718,6 @@ "arm64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MPL-2.0", "optional": true, "os": [ @@ -3755,9 +3739,6 @@ "x64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MPL-2.0", "optional": true, "os": [ @@ -3779,9 +3760,6 @@ "x64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MPL-2.0", "optional": true, "os": [ @@ -3877,20 +3855,6 @@ "node": ">=4" } }, - "node_modules/modern-sk": { - "version": "0.1.2", - "resolved": "file:modern-sk-0.1.2.tgz", - "integrity": "sha512-tKSxbtUxT0CLkGc8DK+SABlVmKsMqqQr61uvAJ8EDcrutzm+VD230hTRVzk9hp2oSo6nXeeMig7KS8v0Lz5mWw==", - "license": "MIT", - "dependencies": { - "@phosphor-icons/react": "^2.1.10", - "radix-ui": "^1.4.3" - }, - "peerDependencies": { - "react": ">=18", - "react-dom": ">=18" - } - }, "node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", diff --git a/package.json b/package.json index 7931225..9c1d279 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "dependencies": { "@phosphor-icons/react": "^2.1.10", "@reduxjs/toolkit": "^2.12.0", - "modern-sk": "file:./modern-sk-0.1.2.tgz", + "@olly/modern-sk": "0.1.4-3", "react": "^19.2.6", "react-dom": "^19.2.6", "react-redux": "^9.3.0", diff --git a/src/components/common/ConnectionStatus.tsx b/src/components/common/ConnectionStatus.tsx index dd8222c..2d5a1ff 100644 --- a/src/components/common/ConnectionStatus.tsx +++ b/src/components/common/ConnectionStatus.tsx @@ -1,4 +1,4 @@ -import { Badge, Tooltip } from 'modern-sk'; +import { Badge, Tooltip } from '@olly/modern-sk'; import { useConnectionStatus } from '../../hooks/useConnectionStatus'; import { getApiBaseUrl } from '../../config/runtime-config'; diff --git a/src/components/common/ErrorState.tsx b/src/components/common/ErrorState.tsx index 078759c..7808587 100644 --- a/src/components/common/ErrorState.tsx +++ b/src/components/common/ErrorState.tsx @@ -1,4 +1,4 @@ -import { Callout, Button } from 'modern-sk'; +import { Callout, Button } from '@olly/modern-sk'; interface ErrorStateProps { message?: string; diff --git a/src/components/player/PersistentPlayer.tsx b/src/components/player/PersistentPlayer.tsx index 1ff614d..0f559ff 100644 --- a/src/components/player/PersistentPlayer.tsx +++ b/src/components/player/PersistentPlayer.tsx @@ -1,4 +1,4 @@ -import { Slider } from 'modern-sk'; +import { Slider } from '@olly/modern-sk'; import { Icon } from '../common/Icon'; import { ArtTile } from '../common/ArtTile'; import { useAppDispatch, useAppSelector } from '../../hooks/useAppDispatch'; diff --git a/src/components/player/QueuePanel.tsx b/src/components/player/QueuePanel.tsx index e4e21ee..2e1e97d 100644 --- a/src/components/player/QueuePanel.tsx +++ b/src/components/player/QueuePanel.tsx @@ -1,4 +1,4 @@ -import { Slider, Badge } from 'modern-sk'; +import { Slider, Badge } from '@olly/modern-sk'; import { Icon } from '../common/Icon'; import { ArtTile } from '../common/ArtTile'; import { useAppDispatch, useAppSelector } from '../../hooks/useAppDispatch'; diff --git a/src/components/track/AvailabilityBadge.tsx b/src/components/track/AvailabilityBadge.tsx index f2e306a..9d61ee8 100644 --- a/src/components/track/AvailabilityBadge.tsx +++ b/src/components/track/AvailabilityBadge.tsx @@ -1,4 +1,4 @@ -import { Badge, Tooltip } from 'modern-sk'; +import { Badge, Tooltip } from '@olly/modern-sk'; import type { TrackAvailability } from '../../api/types'; interface Props { diff --git a/src/components/track/TrackContextMenu.tsx b/src/components/track/TrackContextMenu.tsx index abf77e7..953894d 100644 --- a/src/components/track/TrackContextMenu.tsx +++ b/src/components/track/TrackContextMenu.tsx @@ -5,7 +5,7 @@ import { MenuItem, MenuSeparator, IconButton, -} from 'modern-sk'; +} from '@olly/modern-sk'; import { useAppDispatch } from '../../hooks/useAppDispatch'; import { addToQueue, addNextInQueue } from '../../store/slices/queue'; import { play } from '../../store/slices/player'; diff --git a/src/components/track/TrackRow.tsx b/src/components/track/TrackRow.tsx index 64cdc23..2240c1b 100644 --- a/src/components/track/TrackRow.tsx +++ b/src/components/track/TrackRow.tsx @@ -1,4 +1,4 @@ -import { Row } from 'modern-sk'; +import { Row } from '@olly/modern-sk'; import { TrackContextMenu } from './TrackContextMenu'; import { AvailabilityBadge } from './AvailabilityBadge'; import { formatDuration } from '../../lib/format'; diff --git a/src/features/admin/AdminPage.tsx b/src/features/admin/AdminPage.tsx index 7ed1172..2a3ec56 100644 --- a/src/features/admin/AdminPage.tsx +++ b/src/features/admin/AdminPage.tsx @@ -1,4 +1,4 @@ -import { Window } from 'modern-sk'; +import { Window } from '@olly/modern-sk'; export function AdminPage() { return (