Skip to content

Commit

Permalink
Update Dependencies (#104)
Browse files Browse the repository at this point in the history
* Update dependecies

* Fix page params

* Update eslint to new config format

* Update next config to be typescript

* Update pnpm to version 9

* Use simpler eslint config after updating node js version

* Update ci action versions

* Downgrade react in emais

* Update board members in email footer
  • Loading branch information
timoclsn authored Dec 25, 2024
1 parent 663369c commit 4be32d7
Show file tree
Hide file tree
Showing 17 changed files with 6,141 additions and 4,466 deletions.
3 changes: 0 additions & 3 deletions .eslintrc.json

This file was deleted.

20 changes: 10 additions & 10 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repo
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Install pnpm
uses: pnpm/action-setup@v2
uses: pnpm/action-setup@v4
with:
version: 8
version: 9

- name: Setup Node.js
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 22
cache: "pnpm"

- name: Install dependencies
Expand All @@ -33,17 +33,17 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repo
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Install pnpm
uses: pnpm/action-setup@v2
uses: pnpm/action-setup@v4
with:
version: 8
version: 9

- name: Setup Node.js
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 22
cache: "pnpm"

- name: Install dependencies
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,5 @@ yarn-error.log*
.env

# Generated Files
/.cache
/.cache
.react-email
8 changes: 3 additions & 5 deletions app/einblicke/[slug]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { getAllBlogPosts, getBlog } from "lib/content";
import { createGenerateMetadata } from "lib/metadata";

export const generateMetadata = createGenerateMetadata(async ({ params }) => {
const { slug } = params;
const { slug } = await params;
const { data } = await getBlog(slug);

return {
Expand All @@ -22,13 +22,11 @@ export const generateStaticParams = async () => {
};

interface Props {
params: {
slug: string;
};
params: Promise<{ slug: string }>;
}

const BlogPostPage = async ({ params }: Props) => {
const { slug } = params;
const { slug } = await params;
const { data, content } = await getBlog(slug);

return (
Expand Down
8 changes: 3 additions & 5 deletions app/mitglieder/[slug]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { createGenerateMetadata } from "lib/metadata";
import Image from "next/image";

export const generateMetadata = createGenerateMetadata(async ({ params }) => {
const { slug } = params;
const { slug } = await params;
const allMembers = await getWebsiteMembers();
const member = allMembers.find((member) => member.slug === slug);
if (!member) return {};
Expand All @@ -33,13 +33,11 @@ export const generateStaticParams = async () => {
};

interface Props {
params: {
slug: string;
};
params: Promise<{ slug: string }>;
}

const MemberPage = async ({ params }: Props) => {
const { slug } = params;
const { slug } = await params;
const member = await getWebsiteMemberBySlug(slug);
const otherMembers = await getRandomOtherMembers(member, 5);

Expand Down
8 changes: 4 additions & 4 deletions components/Await/Await.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ReactNode, Suspense } from 'react';
import { ErrorBoundary } from '../ErrorBoundary/ErrorBoundary';
import { JSX, ReactNode, Suspense } from "react";
import { ErrorBoundary } from "../ErrorBoundary/ErrorBoundary";

interface AwaitProps<T> {
promise: Promise<T>;
Expand Down Expand Up @@ -28,8 +28,8 @@ export const Await = <T extends unknown>({
};

interface InnerAwaitProps<T> {
promise: AwaitProps<T>['promise'];
children: AwaitProps<T>['children'];
promise: AwaitProps<T>["promise"];
children: AwaitProps<T>["children"];
}

const InnerAwait = async <T extends unknown>({
Expand Down
2 changes: 2 additions & 0 deletions components/icons/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { JSX } from "react";

export * from "./Arrow";
export * from "./Book";
export * from "./Calendar";
Expand Down
2 changes: 1 addition & 1 deletion emails/components/Footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export const Footer = ({ greeting }: Props) => {
{greeting}
<br />
<br />
<Bold>Till, Nina, Jochen, Piet und Norman</Bold>
<Bold>Till, Nina, Patrick, Uta und Norman</Bold>
<br />
<Italic>Dein Makers League Vorstand</Italic>
</Text>
Expand Down
8 changes: 4 additions & 4 deletions emails/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
"export": "email export"
},
"dependencies": {
"@react-email/components": "0.0.23",
"react-email": "3.0.1",
"react": "^18.3.1"
"@react-email/components": "0.0.31",
"react-email": "3.0.4",
"react": "^18.2.0"
},
"devDependencies": {
"@types/react": "18.3.4",
"@types/react": "18.3.12",
"@types/react-dom": "18.3.0"
}
}
Loading

0 comments on commit 4be32d7

Please sign in to comment.