Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update all dependencies #77

Merged
merged 1 commit into from
Dec 26, 2024
Merged

Update all dependencies #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .eslintrc.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,15 @@ const config = {
project: true,
},
plugins: [
// @ts-expect-error
"react",
// @ts-expect-error
"@typescript-eslint",
// @ts-expect-error
"import",
// @ts-expect-error
"no-relative-import-paths",
// @ts-expect-error
"react-hooks",
],
extends: [
Expand Down
1 change: 0 additions & 1 deletion next.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ const config = {
eslint: {
ignoreDuringBuilds: true,
},
swcMinify: true,
};

export default withAxiom(config);
8,369 changes: 3,120 additions & 5,249 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

133 changes: 66 additions & 67 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,92 +17,91 @@
"seed": "tsx prisma/seed.ts"
},
"dependencies": {
"@hookform/resolvers": "^3.9.0",
"@hookform/resolvers": "^3.9.1",
"@next-auth/prisma-adapter": "^1.0.7",
"@prisma/client": "^5.18.0",
"@radix-ui/react-alert-dialog": "^1.1.1",
"@radix-ui/react-avatar": "^1.1.0",
"@radix-ui/react-checkbox": "^1.1.1",
"@radix-ui/react-collapsible": "^1.1.0",
"@radix-ui/react-dialog": "^1.0.5",
"@radix-ui/react-dropdown-menu": "^2.1.1",
"@radix-ui/react-icons": "^1.3.0",
"@radix-ui/react-label": "^2.1.0",
"@radix-ui/react-popover": "^1.1.1",
"@radix-ui/react-radio-group": "^1.2.0",
"@radix-ui/react-scroll-area": "^1.1.0",
"@radix-ui/react-select": "^2.1.1",
"@radix-ui/react-separator": "^1.1.0",
"@radix-ui/react-slot": "^1.1.0",
"@radix-ui/react-toast": "^1.2.1",
"@radix-ui/react-tooltip": "^1.1.2",
"@t3-oss/env-nextjs": "^0.11.0",
"@prisma/client": "^6.1.0",
"@radix-ui/react-alert-dialog": "^1.1.4",
"@radix-ui/react-avatar": "^1.1.2",
"@radix-ui/react-checkbox": "^1.1.3",
"@radix-ui/react-collapsible": "^1.1.2",
"@radix-ui/react-dialog": "^1.1.4",
"@radix-ui/react-dropdown-menu": "^2.1.4",
"@radix-ui/react-icons": "^1.3.2",
"@radix-ui/react-label": "^2.1.1",
"@radix-ui/react-popover": "^1.1.4",
"@radix-ui/react-radio-group": "^1.2.2",
"@radix-ui/react-scroll-area": "^1.2.2",
"@radix-ui/react-select": "^2.1.4",
"@radix-ui/react-separator": "^1.1.1",
"@radix-ui/react-slot": "^1.1.1",
"@radix-ui/react-toast": "^1.2.4",
"@radix-ui/react-tooltip": "^1.1.6",
"@t3-oss/env-nextjs": "^0.11.1",
"@tanstack/react-query": "^4.36.1",
"@tanstack/react-table": "^8.20.1",
"@tanstack/react-table": "^8.20.6",
"@trpc/client": "^10.45.2",
"@trpc/next": "^10.45.2",
"@trpc/react-query": "^10.43.6",
"@trpc/server": "^10.43.6",
"@upstash/ratelimit": "^2.0.1",
"@vercel/edge-config": "^1.2.1",
"@vercel/speed-insights": "^1.0.12",
"class-variance-authority": "^0.7.0",
"@trpc/react-query": "^10.45.2",
"@trpc/server": "^10.45.2",
"@upstash/ratelimit": "^2.0.5",
"@vercel/edge-config": "^1.4.0",
"@vercel/speed-insights": "^1.1.0",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
"cmdk": "^1.0.0",
"cmdk": "^1.0.4",
"lodash": "^4.17.21",
"next": "^14.2.5",
"next-auth": "^4.24.7",
"next-axiom": "^1.4.0",
"next-themes": "^0.3.0",
"next": "^15.1.2",
"next-auth": "^4.24.11",
"next-axiom": "^1.9.1",
"next-themes": "^0.4.4",
"nextjs-progressbar": "^0.0.16",
"nodemailer": "^6.9.14",
"nodemailer": "^6.9.16",
"nodemailer-sendgrid": "^1.0.3",
"react": "18.3.1",
"react": "^18.3.1",
"react-autowidth-input": "^1.0.10",
"react-dom": "18.3.1",
"react-dom": "^18.3.1",
"react-highlight-words": "^0.20.0",
"react-hook-form": "^7.52.2",
"react-hook-form": "^7.54.2",
"react-markdown": "^9.0.1",
"react-select": "^5.8.0",
"superjson": "^2.2.1",
"tailwind-merge": "^2.5.0",
"react-select": "^5.9.0",
"superjson": "^2.2.2",
"tailwind-merge": "^2.6.0",
"tailwindcss-animate": "^1.0.7",
"vaul": "^0.9.1",
"zod": "^3.23.8"
"vaul": "^1.1.2",
"zod": "^3.24.1"
},
"devDependencies": {
"@next/eslint-plugin-next": "^14.2.5",
"@playwright/test": "^1.46.0",
"@tailwindcss/forms": "^0.5.7",
"@tailwindcss/typography": "^0.5.14",
"@types/eslint": "^8.44.7",
"@types/lodash": "^4.17.7",
"@types/node": "^22.2.0",
"@types/nodemailer": "^6.4.15",
"@next/eslint-plugin-next": "^15.1.2",
"@playwright/test": "^1.49.1",
"@tailwindcss/forms": "^0.5.9",
"@tailwindcss/typography": "^0.5.15",
"@types/eslint": "^9.6.1",
"@types/lodash": "^4.17.13",
"@types/node": "^22.10.2",
"@types/nodemailer": "^6.4.17",
"@types/nodemailer-sendgrid": "^1.0.3",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"@types/react": "^19.0.2",
"@types/react-dom": "^19.0.2",
"@types/react-highlight-words": "^0.20.0",
"@typescript-eslint/eslint-plugin": "^8.0.1",
"@typescript-eslint/parser": "^8.0.1",
"@typescript-eslint/eslint-plugin": "^8.18.2",
"@typescript-eslint/parser": "^8.18.2",
"autoprefixer": "^10.4.20",
"cssnano": "^7.0.5",
"eslint": "^8.57.0",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-import": "^2.29.1",
"cssnano": "^7.0.6",
"eslint": "^9.17.0",
"eslint-import-resolver-typescript": "^3.7.0",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-no-relative-import-paths": "^1.5.5",
"eslint-plugin-react": "^7.35.0",
"eslint-plugin-react-hooks": "^4.6.2",
"postcss": "^8.4.41",
"prettier": "^3.3.3",
"prettier-plugin-tailwindcss": "^0.6.6",
"prisma": "^5.18.0",
"tailwindcss": "^3.4.9",
"tsx": "^4.17.0",
"typescript": "^5.5.4"
"eslint-plugin-react": "^7.37.3",
"eslint-plugin-react-hooks": "^5.1.0",
"postcss": "^8.4.49",
"prettier": "^3.4.2",
"prettier-plugin-tailwindcss": "^0.6.9",
"prisma": "^6.1.0",
"tailwindcss": "^3.4.17",
"tsx": "^4.19.2",
"typescript": "^5.7.2"
},
"ct3aMetadata": {
"initVersion": "7.25.0"
},
"packageManager": "[email protected]"
}
}
5 changes: 5 additions & 0 deletions prisma/migrations/20241226160846_upgrade_to_v6/migration.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
-- AlterTable
ALTER TABLE "_RelatedResources" ADD CONSTRAINT "_RelatedResources_AB_pkey" PRIMARY KEY ("A", "B");

-- DropIndex
DROP INDEX "_RelatedResources_AB_unique";
2 changes: 1 addition & 1 deletion prisma/migrations/migration_lock.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Please do not edit this file manually
# It should be added in your version-control system (i.e. Git)
# It should be added in your version-control system (e.g., Git)
provider = "postgresql"
6 changes: 4 additions & 2 deletions src/components/lesson-plan.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
PlusIcon,
} from "@radix-ui/react-icons";
import Link from "next/link";
import { useMemo, useState } from "react";
import { type AnchorHTMLAttributes, type RefAttributes, useMemo, useState } from "react";
import ReactMarkdown from "react-markdown";
import type * as z from "zod";

Expand Down Expand Up @@ -222,7 +222,9 @@ export function SingleLessonPlanComponent({
components={{
h1: ({ ...props }) => <h3 {...props} />,
h2: ({ ...props }) => <h3 {...props} />,
a: ({ href, ref, ...props }) => {
a: (props: AnchorHTMLAttributes<HTMLAnchorElement> & RefAttributes<HTMLAnchorElement>) => {
const { href, ref } = props;

if (!href?.startsWith("resource/")) {
return (
<a
Expand Down
5 changes: 3 additions & 2 deletions src/components/resource.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { type ResourceConfiguration, ResourceType } from "@prisma/client";
import { uniqBy } from "lodash";
import Link from "next/link";
import { useMemo } from "react";
import { type AnchorHTMLAttributes, type RefAttributes, useMemo } from "react";
import ReactMarkdown from "react-markdown";
import type * as z from "zod";

Expand Down Expand Up @@ -210,7 +210,8 @@ export function SingleResourceComponent({
className="prose prose-zinc max-w-full rounded-md dark:prose-invert lg:prose-lg prose-headings:my-8 prose-h2:scroll-m-20 prose-h2:border-b prose-h2:pb-2 prose-h2:text-3xl prose-h2:font-semibold prose-h2:tracking-tight prose-h2:first:mt-0"
components={{
h1: ({ ...props }) => <h2 {...props} />,
a: ({ href, ref, ...props }) => {
a: (props: AnchorHTMLAttributes<HTMLAnchorElement> & RefAttributes<HTMLAnchorElement>) => {
const { href, ref } = props;
if (!href?.startsWith("resource/")) {
return (
<a
Expand Down
4 changes: 1 addition & 3 deletions src/components/theme-provider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
"use client";

import { ThemeProvider as NextThemesProvider } from "next-themes";
import { type ThemeProviderProps } from "next-themes/dist/types";
import * as React from "react";
import { ThemeProvider as NextThemesProvider, type ThemeProviderProps } from "next-themes";

export function ThemeProvider({ children, ...props }: ThemeProviderProps) {
return <NextThemesProvider {...props}>{children}</NextThemesProvider>;
Expand Down
8 changes: 6 additions & 2 deletions src/env.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,12 @@ export const env = createEnv({
),
GOOGLE_CLIENT_ID: z.string(),
GOOGLE_CLIENT_SECRET: z.string(),
UPSTASH_REDIS_REST_URL: z.string(),
UPSTASH_REDIS_REST_TOKEN: z.string(),
UPSTASH_REDIS_REST_URL: process.env.NODE_ENV === "production"
? z.string()
: z.string().optional(),
UPSTASH_REDIS_REST_TOKEN: process.env.NODE_ENV === "production"
? z.string()
: z.string().optional(),
EMAIL_SERVER_USER: z.string(),
EMAIL_SERVER_PASSWORD: z.string(),
EMAIL_SERVER_HOST: z.string(),
Expand Down
4 changes: 2 additions & 2 deletions src/server/auth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ export const authOptions: NextAuthOptions = {
try {
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access
if (session.name) token.name = session.name;
} catch (error) {}
} catch {}

try {
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access
if (session.image) token.image = session.image;
} catch (error) {}
} catch {}
}

return token;
Expand Down
Binary file modified ...rowse-resources.spec.ts-snapshots/browse-resources-dark-Mobile-Safari-linux.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...owse-resources.spec.ts-snapshots/browse-resources-light-Mobile-Safari-linux.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...s.spec.ts-snapshots/browse-resources-reset-filters-dark-Mobile-Safari-linux.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ....spec.ts-snapshots/browse-resources-reset-filters-light-Mobile-Safari-linux.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...es.spec.ts-snapshots/browse-resources-with-filters-dark-Mobile-Safari-linux.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...s.spec.ts-snapshots/browse-resources-with-filters-light-Mobile-Safari-linux.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/homepage.spec.ts-snapshots/home-dark-Mobile-Safari-linux.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/homepage.spec.ts-snapshots/home-light-Mobile-Safari-linux.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/lesson-plan.spec.ts-snapshots/demo-lesson-plan-dark-Mobile-Safari-linux.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/lesson-plan.spec.ts-snapshots/demo-lesson-plan-light-Mobile-Safari-linux.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/resource.spec.ts-snapshots/blue-ball-dark-Mobile-Safari-linux.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/resource.spec.ts-snapshots/blue-ball-light-Mobile-Safari-linux.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading