diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index c7b20c90..97b47757 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,5 +1,5 @@ # Update the VARIANT arg in docker-compose.yml to pick a Node version -FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:20-bookworm +FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:22-bookworm # Update args in docker-compose.yaml to set the UID/GID of the "node" user. ARG USER_UID=1000 diff --git a/.devcontainer/post-create.sh b/.devcontainer/post-create.sh index 8a3ccf8c..b7019d6a 100644 --- a/.devcontainer/post-create.sh +++ b/.devcontainer/post-create.sh @@ -1,6 +1,7 @@ sudo chown -R node:node /home/node curl -fsSL https://bun.sh/install | bash -s "bun-v1.1.38" + git config diff.lockb.textconv bun git config diff.lockb.binary true diff --git a/apps/captainofbass.com/src/app/music/page.tsx b/apps/captainofbass.com/src/app/music/page.tsx index 7c3ca40c..15e85a5b 100644 --- a/apps/captainofbass.com/src/app/music/page.tsx +++ b/apps/captainofbass.com/src/app/music/page.tsx @@ -1,12 +1,11 @@ -import dynamic from 'next/dynamic' +import MusicClient from './pageClient' import { PageContainer } from '@mikeallisonjs/shared-react-components' -const DynamicMusicClient = dynamic(() => import('./pageClient'), { ssr: false }) export default function Music() { return ( - + ) } diff --git a/apps/captainssounds.com/next-env.d.ts b/apps/captainssounds.com/next-env.d.ts index 40c3d680..1b3be084 100644 --- a/apps/captainssounds.com/next-env.d.ts +++ b/apps/captainssounds.com/next-env.d.ts @@ -2,4 +2,4 @@ /// // NOTE: This file should not be edited -// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information. +// see https://nextjs.org/docs/app/api-reference/config/typescript for more information. diff --git a/apps/captainssounds.com/src/app/error.tsx b/apps/captainssounds.com/src/app/error.tsx index 6f3c781a..ca49c3ab 100644 --- a/apps/captainssounds.com/src/app/error.tsx +++ b/apps/captainssounds.com/src/app/error.tsx @@ -25,6 +25,7 @@ export default function Error({

- ) - })} - - - )) -} diff --git a/apps/captainssounds.com/src/components/productGridItems.tsx b/apps/captainssounds.com/src/components/productGridItems.tsx deleted file mode 100644 index 3a3140d8..00000000 --- a/apps/captainssounds.com/src/components/productGridItems.tsx +++ /dev/null @@ -1,37 +0,0 @@ -import Link from 'next/link' - -import type { Product } from '../lib/shopify/types' - -import Grid from './grid' -import { GridTileImage } from './grid/tile' - -export default function ProductGridItems({ - products -}: { - products: Product[] -}) { - return ( - <> - {products.map((product) => ( - - - - - - ))} - - ) -} diff --git a/apps/mikeallisonjs.com/next-env.d.ts b/apps/mikeallisonjs.com/next-env.d.ts index 4f11a03d..1b3be084 100644 --- a/apps/mikeallisonjs.com/next-env.d.ts +++ b/apps/mikeallisonjs.com/next-env.d.ts @@ -2,4 +2,4 @@ /// // NOTE: This file should not be edited -// see https://nextjs.org/docs/basic-features/typescript for more information. +// see https://nextjs.org/docs/app/api-reference/config/typescript for more information. diff --git a/bun.lockb b/bun.lockb index 3e48211b..81a59d29 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/package.json b/package.json index a57fd002..6e7bfcc1 100644 --- a/package.json +++ b/package.json @@ -54,8 +54,8 @@ "@radix-ui/react-slot": "^1.1.0", "@radix-ui/react-toggle": "^1.1.0", "@react-email/components": "^0.0.31", - "@sentry/nextjs": "^8.12.0", - "@sentry/utils": "^8.12.0", + "@sentry/nextjs": "^8.47.0", + "@sentry/utils": "^8.47.0", "@stripe/react-stripe-js": "^3.0.0", "@stripe/stripe-js": "^5.0.0", "@tabler/icons-react": "^3.6.0", @@ -63,16 +63,14 @@ "class-variance-authority": "^0.7.0", "clsx": "^2.1.1", "drizzle-orm": "^0.38.0", - "flowbite": "^2.3.0", - "flowbite-react": "^0.10.0", "form-data": "^4.0.0", "framer-motion": "^11.2.11", "geist": "^1.3.0", "lucide-react": "^0.469.0", "mailgun.js": "^10.2.1", - "next": "14.2.21", + "next": "15.1.2", "next-themes": "^0.4.0", - "posthog-js": "^1.138.0", + "posthog-js": "^1.203.1", "react": "19.0.0", "react-dom": "19.0.0", "react-email": "^3.0.0", diff --git a/packages/shared-react-components/src/musicPlayer/context.tsx b/packages/shared-react-components/src/musicPlayer/context.tsx index fc6d229b..19c58e5d 100644 --- a/packages/shared-react-components/src/musicPlayer/context.tsx +++ b/packages/shared-react-components/src/musicPlayer/context.tsx @@ -18,7 +18,7 @@ export function MusicPlayerProvider({ children, ...props }: Partial) { - const storeRef = useRef() + const storeRef = useRef(null) if (!storeRef.current) { storeRef.current = createMusicStore(props) } diff --git a/packages/shared-react-components/src/musicPlayer/player.tsx b/packages/shared-react-components/src/musicPlayer/player.tsx index 758e62bf..280d1cde 100644 --- a/packages/shared-react-components/src/musicPlayer/player.tsx +++ b/packages/shared-react-components/src/musicPlayer/player.tsx @@ -4,7 +4,7 @@ import { useEffect, useRef } from 'react' import { cn } from '@mikeallisonjs/shared-react-lib' -import { Drawer, DrawerContent } from '../drawer' +import { Drawer, DrawerContent, DrawerTitle } from '../drawer' import { useMusicPlayerContext } from './context' import Controls from './controls' @@ -123,6 +123,7 @@ export default function Player({ modal={false} > + Playlist
+ Image {selectedImage && (