Compare commits

..
9 changed files with 1438 additions and 1551 deletions

No files matched your search

+7 -15
View File
@@ -25,20 +25,16 @@ FROM node:${NODE_VERSION} AS dependencies
WORKDIR /app
# Only manifests needed for @otunes/web and its workspace dependency (@otunes/convex).
# Mobile is intentionally omitted so its deps are never installed.
COPY package.json pnpm-lock.yaml .npmrc ./
# Mobile's manifest is never copied, so the workspace globs cannot discover it.
# The workspace file must be the real one: its overrides and patches are
# checked against the lockfile.
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml .npmrc ./
# pnpm validates patches even when their packages are outside the install filter.
COPY patches ./patches
COPY apps/web/package.json ./apps/web/
COPY packages/convex/package.json ./packages/convex/
# Explicit workspace — do not use apps/* so mobile cannot be discovered.
RUN printf '%s\n' \
'packages:' \
' - "apps/web"' \
' - "packages/convex"' \
>> pnpm-workspace.yaml \
&& printf '\n%s\n' \
RUN printf '\n%s\n' \
'supportedArchitectures.os=current' \
'supportedArchitectures.cpu=current' \
'supportedArchitectures.libc=current' \
@@ -82,15 +78,11 @@ FROM node:${NODE_VERSION} AS convex-functions
WORKDIR /app
COPY package.json pnpm-lock.yaml .npmrc ./
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml .npmrc ./
COPY patches ./patches
COPY packages/convex/package.json ./packages/convex/
RUN printf '%s\n' \
'packages:' \
' - "packages/convex"' \
> pnpm-workspace.yaml \
&& printf '\n%s\n' \
RUN printf '\n%s\n' \
'supportedArchitectures.os=current' \
'supportedArchitectures.cpu=current' \
'supportedArchitectures.libc=current' \
+1 -1
View File
@@ -1,5 +1,5 @@
import { CollectionDetailSkeleton } from "@/components/library-skeletons"
export default function Loading() {
return <CollectionDetailSkeleton search />
return <CollectionDetailSkeleton />
}
@@ -1,5 +1,5 @@
import { CollectionDetailSkeleton } from "@/components/library-skeletons"
export default function Loading() {
return <CollectionDetailSkeleton search />
return <CollectionDetailSkeleton />
}
+2 -14
View File
@@ -148,23 +148,11 @@ export function SongListSkeleton() {
)
}
/**
* Matches the header + track list layout of album and playlist pages.
* Pass `search` on playlist pages to reserve the "Find in Playlist" toolbar row.
*/
export function CollectionDetailSkeleton({
search = false,
}: {
search?: boolean
}) {
/** Matches the header + track list layout of album and playlist pages. */
export function CollectionDetailSkeleton() {
return (
<LoadingRegion className="flex h-svh flex-col overflow-hidden pb-28">
<PageHeader />
{search ? (
<div className="flex shrink-0 justify-end px-4 pt-3 pb-1">
<Skeleton className="h-9 w-full rounded-full md:w-64" />
</div>
) : null}
<div className="mx-auto w-full max-w-9/10 min-w-0">
<div className="flex flex-col gap-8 px-6 pt-6 pb-8 sm:flex-row sm:items-end">
<Skeleton className="mx-auto aspect-square w-full max-w-60 shrink-0 rounded-lg sm:mx-0" />
+18 -18
View File
@@ -287,24 +287,6 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
return (
<div className="flex h-svh flex-col">
<PageHeader openApp />
<div className="flex shrink-0 justify-end px-4 pt-3 pb-1">
<div className="relative w-full md:w-64">
<SearchIcon className="pointer-events-none absolute top-1/2 left-3 size-4 -translate-y-1/2 text-muted-foreground" />
<input
type="search"
aria-label="Find in playlist"
placeholder="Find in Playlist"
value={searchQuery}
onChange={(event) => {
setSearchQuery(event.target.value)
clearSelection()
setActiveTrackId("")
setDragIndex(null)
}}
className="h-9 w-full min-w-0 rounded-full border border-input bg-input/30 pr-3 pl-9 text-sm text-foreground transition-colors outline-none placeholder:text-muted-foreground focus-visible:border-ring focus-visible:ring-2 focus-visible:ring-ring/50"
/>
</div>
</div>
<ScrollArea className="min-h-0 flex-1">
<div className="pb-28">
<div className="mx-auto w-full max-w-9/10 min-w-0">
@@ -418,6 +400,24 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
</div>
</div>
<div className="px-6 pb-4">
<div className="relative max-w-sm">
<SearchIcon className="pointer-events-none absolute top-1/2 left-3 size-4 -translate-y-1/2 text-muted-foreground" />
<input
type="search"
aria-label="Search playlist"
placeholder="Search playlist"
value={searchQuery}
onChange={(event) => {
setSearchQuery(event.target.value)
clearSelection()
setActiveTrackId("")
setDragIndex(null)
}}
className="h-10 w-full min-w-0 rounded-full border border-input bg-input/30 pr-3 pl-9 text-sm text-foreground transition-colors outline-none placeholder:text-muted-foreground focus-visible:border-ring focus-visible:ring-2 focus-visible:ring-ring/50"
/>
</div>
</div>
{filteredSongs.length > 0 ? (
<VirtualList
count={filteredSongs.length}
+1 -12
View File
@@ -18,16 +18,5 @@
"prettier": "^3.8.3",
"prettier-plugin-tailwindcss": "^0.8.0"
},
"packageManager": "pnpm@10.1.0",
"pnpm": {
"patchedDependencies": {
"expo-audio@58.0.10": "patches/expo-audio@58.0.10.patch",
"react-native-screens@4.30.0": "patches/react-native-screens@4.30.0.patch",
"react-native-reanimated@4.7.1": "patches/react-native-reanimated@4.7.1.patch",
"expo-modules-core@58.0.24": "patches/expo-modules-core@58.0.24.patch",
"expo-file-system@58.0.10": "patches/expo-file-system@58.0.10.patch",
"@react-native-community/slider@5.2.1": "patches/@react-native-community__slider@5.2.1.patch",
"expo-router@58.0.25": "patches/expo-router@58.0.25.patch"
}
}
"packageManager": "pnpm@12.21.0"
}
-27
View File
@@ -1,27 +0,0 @@
diff --git a/build/useScreens.js b/build/useScreens.js
index fec20121290650f18f39bc18cbb9e4a2a1626133..31c32ff23b36c43f1e98c58fdd7c1727c8a839df 100644
--- a/build/useScreens.js
+++ b/build/useScreens.js
@@ -364,9 +364,6 @@ function getQualifiedRouteComponent(value) {
/*#__PURE__*/ (0, _jsxruntime().jsxs)(_zoomtransitioncontextproviders.ZoomTransitionTargetContextProvider, {
route: route,
children: [
- /*#__PURE__*/ (0, _jsxruntime().jsx)(_ZoomTransitionEnabler.ZoomTransitionEnabler, {
- route: route
- }),
/*#__PURE__*/ (0, _jsxruntime().jsx)(_react().default.Suspense, {
name: route ? `Route(${route.name})` : undefined,
fallback: // `ResolvedSuspenseFallback` only selects between statically defined
@@ -380,6 +377,12 @@ function getQualifiedRouteComponent(value) {
hideWhenNestedAtLevel: activityThreshold,
children: screenContent
}) : screenContent
+ }),
+ // Render the enabler after the screen content so the screen's scroll
+ // view stays its first descendant. react-native-screens only wires the
+ // header search bar and content insets to the first descendant chain.
+ /*#__PURE__*/ (0, _jsxruntime().jsx)(_ZoomTransitionEnabler.ZoomTransitionEnabler, {
+ route: route
})
]
})
+1363 -1463
View File
File diff suppressed because it is too large. Load diff
+45
View File
@@ -1,3 +1,48 @@
packages:
- "apps/*"
- "packages/*"
patchedDependencies:
'expo-audio@58.0.10': patches/expo-audio@58.0.10.patch
'react-native-screens@4.30.0': patches/react-native-screens@4.30.0.patch
'react-native-reanimated@4.7.1': patches/react-native-reanimated@4.7.1.patch
'expo-modules-core@58.0.24': patches/expo-modules-core@58.0.24.patch
'expo-file-system@58.0.10': patches/expo-file-system@58.0.10.patch
'@react-native-community/slider@5.2.1': patches/@react-native-community__slider@5.2.1.patch
allowBuilds:
esbuild: true
unrs-resolver: true
overrides:
'@auth/core@<=0.41.2': ^0.41.3
'@auth/core@>=0.1.0 <0.41.3': ^0.41.3
'@hono/node-server@<1.19.18': ^1.19.18
'@hono/node-server@>=1.19.10 <2.1.3': ^2.1.3
'@modelcontextprotocol/sdk@<1.32.0': ^1.32.0
'@xmldom/xmldom@>=0.7.0 <=0.8.14': ^0.8.15
'@xmldom/xmldom@>=0.9.0-beta.1 <=0.9.11': ^0.9.12
baseline-browser-mapping@>=2.0.0 <2.11.0: ^2.11.0
body-parser@>=2.0.0 <2.4.0: ^2.4.0
brace-expansion@<1.1.21: ^1.1.21
brace-expansion@>=4.0.0 <5.0.12: ^5.0.12
browserslist@<=4.28.6: ^4.28.7
compression@<1.8.2: ^1.8.2
fast-uri@>=3.0.0 <3.1.9: ^3.1.9
file-type@>=13.0.0 <21.3.1: ^21.3.1
glob@>=9.0.0 <=14.0.1: ^14.0.2
hono@<4.13.16: ^4.13.16
ip-address@<=10.7.3: ^10.7.4
js-yaml@>=4.0.0 <4.3.2: ^4.3.2
minimatch@>=7.0.0 <11.0.1: ^11.0.1
music-metadata@<11.16.0: ^11.16.0
next@>=16.2.0 <=16.4.4: ^16.4.5
node-forge@<=1.4.2: ^1.4.3
postcss-selector-parser@>=7.0.0 <7.1.6: ^7.1.6
postcss@<=8.5.22: ^8.5.23
proxy-addr@>=1.1.0 <2.0.8: ^2.0.8
qs@>=2.2.5 <6.16.0: ^6.16.0
qs@>=6.7.0 <=6.16.0: ^6.16.1
sharp@<0.35.5: ^0.35.5
shell-quote@>=1.8.4 <1.11.0: ^1.11.0
source-map-js@>=1.0.0 <1.2.2: ^1.2.2
systeminformation@<5.33.16: ^5.33.16
undici@>=7.0.0 <7.30.1: ^7.30.1
zod@<4.6.6: ^4.6.6