Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,9 @@ module.exports = [
react: require('eslint-plugin-react'),
'react-hooks': require('eslint-plugin-react-hooks'),
},
rules: {
'react/react-in-jsx-scope': 'off',
},
},

//backend and components package rule override
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
},
"resolutions": {
"**/@types/node": "^22.9.0",
"@types/react": "^17.0.4",
"@types/react": "^19.1.1",
"body-parser": "2.2.0",
"minimatch": "^3.0.8"
},
Expand Down
5 changes: 3 additions & 2 deletions packages/alexa/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@
"extends": "../../tsconfig.settings.json",
"compilerOptions": {
"keyofStringsOnly": false,
"baseUrl": ".",
"baseUrl": "./",
"outDir": "lib",
"rootDir": "src",
"strictNullChecks": true,
"experimentalDecorators": true,
"esModuleInterop": true,
"module": "CommonJS",
"moduleResolution": "node",
"module": "commonjs",
"resolveJsonModule": true,
"sourceMap": false,
"inlineSources": false
Expand Down
6 changes: 3 additions & 3 deletions packages/api/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"extends": "../../tsconfig.settings.json",
"compilerOptions": {
"jsx": "react",
"jsx": "react-jsx",
"outDir": "lib",
"rootDir": "src",
"strict": true,
"strictNullChecks": true,
"target": "ESNext",
"lib": ["ESNEXT", "DOM"],
"esModuleInterop": true,
"moduleResolution": "Node",
"module": "CommonJS",
"moduleResolution": "node",
"module": "commonjs",
"keyofStringsOnly": false
},
"include": ["src/**/*"]
Expand Down
5 changes: 3 additions & 2 deletions packages/authorizer/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@
"strictNullChecks": true,
"experimentalDecorators": true,
"esModuleInterop": true,
"module": "CommonJS",
"moduleResolution": "node",
"module": "commonjs",
"resolveJsonModule": true,
"sourceMap": false,
"inlineSources": false,
"jsx": "react"
"jsx": "react-jsx"
},
"include": ["src/**/*"]
}
5 changes: 2 additions & 3 deletions packages/backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
"dependencies": {
"@graphql-tools/schema": "^10.0.25",
"@lara/api": "^1.0.0",
"@types/jest": "^30.0.0",
"apollo-server-lambda": "^3.13.0",
"aws-sdk": "^2.950.0",
"casual": "^1.6.2",
Expand All @@ -34,11 +33,11 @@
"devDependencies": {
"@types/aws-lambda": "^8.10.76",
"@types/i18n": "^0.13.0",
"@types/jest": "^29.1.2",
"@types/jest": "^30.0.0",
"@types/jsonwebtoken": "^9.0.3",
"@types/object-hash": "^3.0.6",
"@types/uuid": "^8.3.0",
"jest": "^30.0.5",
"ts-jest": "^29.0.3"
"ts-jest": "^29.4.1"
}
}
5 changes: 3 additions & 2 deletions packages/backend/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@
"strictNullChecks": true,
"experimentalDecorators": true,
"esModuleInterop": true,
"module": "CommonJS",
"moduleResolution": "node",
"module": "commonjs",
"resolveJsonModule": true,
"sourceMap": false,
"inlineSources": false,
"jsx": "react"
"jsx": "react-jsx"
},
"references": [{ "path": "../api" }],
"include": ["src/**/*"],
Expand Down
3 changes: 2 additions & 1 deletion packages/cleanup/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"strictNullChecks": true,
"experimentalDecorators": true,
"esModuleInterop": true,
"module": "CommonJS",
"moduleResolution": "node",
"module": "commonjs",
"resolveJsonModule": true,
"sourceMap": false,
"inlineSources": false
Expand Down
7 changes: 3 additions & 4 deletions packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,13 @@
},
"dependencies": {
"@rebass/grid": "^6.1.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-router-dom": "^5.2.0",
"react": "^19.1.1",
"react-dom": "^19.1.1",
"styled-components": "^6.1.19",
"styled-modern-normalize": "^0.2.0"
},
"devDependencies": {
"@types/react": "^17.0.9",
"@types/react": "^19.1.10",
"@types/rebass__grid": "^6.0.6",
"@types/styled-components": "^5.1.3"
}
Expand Down
4 changes: 3 additions & 1 deletion packages/components/src/admin-overview.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react'
import React, { JSX, ReactNode } from 'react'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

muss React nach neuem JSX transform noch explizit importiert werden?

import styled from 'styled-components'

import { Spacings } from './spacing'
Expand All @@ -10,6 +10,7 @@ const AdminOverviewGrid = styled.div`

type AdminOverviewLayoutProps = {
heading: JSX.Element
children: ReactNode
}

export const AdminOverviewLayout: React.FC<AdminOverviewLayoutProps> = ({ heading, children }) => {
Expand All @@ -29,6 +30,7 @@ const AdminCreateUserGrid = styled.div`
type AdminCreateUserLayoutProps = {
headline: JSX.Element
description: JSX.Element
children: ReactNode
}

export const AdminCreateUserLayout: React.FC<AdminCreateUserLayoutProps> = ({ headline, description, children }) => {
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/alexa-settings.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react'
import React, { JSX } from 'react'
import styled from 'styled-components'

import { StyledIcon } from './icons'
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/application-settings-layout.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react'
import React, { JSX } from 'react'
import styled from 'styled-components'
import { FontSizes } from './font-size'

Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/archive.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Link } from 'react-router-dom'
import { Link } from 'react-router'
import styled from 'styled-components'

import { Container } from './container'
Expand Down
3 changes: 2 additions & 1 deletion packages/components/src/avatar-layout.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react'
import React, { JSX, ReactNode } from 'react'
import styled from 'styled-components'

import { BorderRadii } from './border-radius'
Expand Down Expand Up @@ -32,6 +32,7 @@ const StyledLoadingIconWrapper = styled.div`

interface AvatarLayoutProps {
size: number
children: ReactNode
loadingIcon: JSX.Element
noImageIcon: JSX.Element
}
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/button-layout.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { ButtonHTMLAttributes } from 'react'
import React, { JSX, ButtonHTMLAttributes } from 'react'
import styled, { css } from 'styled-components'
import { BorderRadii } from './border-radius'
import { FontSizes } from './font-size'
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/comment-bubble-layout.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react'
import React, { JSX } from 'react'
import styled from 'styled-components'

import { BorderRadii } from './border-radius'
Expand Down
3 changes: 2 additions & 1 deletion packages/components/src/day-input-layout.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react'
import React, { JSX, ReactNode } from 'react'
import styled from 'styled-components'
import { FontSizes } from './font-size'
import { Spacings } from './spacing'
Expand Down Expand Up @@ -47,6 +47,7 @@ interface DayInputLayoutInterface {
statusLabel: JSX.Element
total?: JSX.Element
commentsection?: JSX.Element
children: ReactNode
}

export const DayInputLayout: React.FC<DayInputLayoutInterface> = ({
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/dropdown-layout.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react'
import { Link } from 'react-router-dom'
import { Link } from 'react-router'
import styled, { css } from 'styled-components'

import { BorderRadii } from './border-radius'
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/edit-user-content.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react'
import React, { JSX } from 'react'
import styled from 'styled-components'

import { Spacings } from './spacing'
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/edit-user.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react'
import React, { JSX } from 'react'
import styled from 'styled-components'

import { Container } from './container'
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/entry-input-layout.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { HTMLAttributes } from 'react'
import React, { JSX, HTMLAttributes } from 'react'
import styled from 'styled-components'

import { Spacings } from './spacing'
Expand Down
3 changes: 2 additions & 1 deletion packages/components/src/faq.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react'
import React, { JSX, ReactNode } from 'react'
import styled from 'styled-components'
import { BorderRadii } from './border-radius'
import { FontSizes } from './font-size'
Expand Down Expand Up @@ -28,6 +28,7 @@ const StyledFAQHeader = styled.div`
type FaqLayoutProps = {
title: JSX.Element
search: JSX.Element
children: ReactNode
}

export const FaqLayout: React.FC<FaqLayoutProps> = ({ title, search, children }) => {
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/logo.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useContext } from 'react'
import React, { JSX, useContext } from 'react'
import { ThemeContext } from 'styled-components'

export interface LogoProps {
Expand Down
3 changes: 2 additions & 1 deletion packages/components/src/modal-layout.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react'
import React, { JSX, ReactNode } from 'react'
import styled from 'styled-components'

import { Container } from './container'
Expand All @@ -16,6 +16,7 @@ export interface ModelStylingProps extends ModalOverlayProps, ModalContainerProp

interface ModalLayoutProps extends ModelStylingProps {
button: JSX.Element
children: ReactNode
}

const ModalOverlay = styled.div<ModalOverlayProps>`
Expand Down
4 changes: 2 additions & 2 deletions packages/components/src/navigation-button-link.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react'
import { Link, LinkProps } from 'react-router-dom'
import React, { JSX } from 'react'
import { Link, LinkProps } from 'react-router'
import styled from 'styled-components'

import { BorderRadii } from './border-radius'
Expand Down
3 changes: 1 addition & 2 deletions packages/components/src/navigation.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import React from 'react'
import { Link, NavLink, NavLinkProps } from 'react-router-dom'
import { Link, NavLink, NavLinkProps } from 'react-router'
import styled, { css } from 'styled-components'

import { Flex } from '@rebass/grid'
Expand Down
5 changes: 3 additions & 2 deletions packages/components/src/support.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react'
import { Link } from 'react-router-dom'
import React, { JSX, ReactNode } from 'react'
import { Link } from 'react-router'
import styled from 'styled-components'

import { Container } from './container'
Expand Down Expand Up @@ -71,6 +71,7 @@ export const StyledSupportTile: React.FC<StyledSupportTileProps> = ({ title, bod

type StyledSupportLayoutProps = {
illustration: JSX.Element
children: ReactNode
}

export const StyledSupportLayout: React.FC<StyledSupportLayoutProps> = ({ illustration, children }) => {
Expand Down
1 change: 0 additions & 1 deletion packages/components/src/text-time-input.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { FlexProps } from '@rebass/grid'
import React from 'react'
import styled, { css } from 'styled-components'
import { StyledEntryValueWrapper } from './entry-input-layout'
import { FontSizes } from './font-size'
Expand Down
3 changes: 2 additions & 1 deletion packages/components/src/trainee-overview-layout.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react'
import React, { JSX, ReactNode } from 'react'
import styled from 'styled-components'

import { Flex } from '@rebass/grid'
Expand Down Expand Up @@ -40,6 +40,7 @@ interface TraineeOverviewLayoutProps {
readonly name: string
readonly icon: JSX.Element
readonly caption: string
readonly children: ReactNode
}

export const TraineeOverviewLayout: React.FC<TraineeOverviewLayoutProps> = ({
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/trainee-row.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import styled from 'styled-components'
import { NavLink } from 'react-router-dom'
import { NavLink } from 'react-router'
import { FontSizes } from './font-size'
import { Spacings } from './spacing'
import { StyledIcon } from './icons'
Expand Down
3 changes: 1 addition & 2 deletions packages/components/src/unstyled-link.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import React from 'react'
import { Link, LinkProps } from 'react-router-dom'
import { Link, LinkProps } from 'react-router'
import styled from 'styled-components'

interface UnstyledLinkProps extends LinkProps {
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/user-form.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react'
import React, { JSX } from 'react'
import styled from 'styled-components'

import { Spacings } from './spacing'
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/user-info.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react'
import React, { JSX } from 'react'
import styled from 'styled-components'

import { FontSizes } from './font-size'
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/week-overview.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Link } from 'react-router-dom'
import { Link } from 'react-router'
import styled from 'styled-components'

import { FontSizes } from './font-size'
Expand Down
3 changes: 2 additions & 1 deletion packages/components/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"outDir": "lib",
"rootDir": "src",
"strictNullChecks": true,
"module": "CommonJS"
"moduleResolution": "bundler",
"module": "es2020"
},
"include": ["src/**/*"]
}
6 changes: 3 additions & 3 deletions packages/email/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"extends": "../../tsconfig.settings.json",
"compilerOptions": {
"jsx": "react",
"jsx": "react-jsx",
"outDir": "lib",
"rootDir": "src",
"strict": true,
"strictNullChecks": true,
"target": "ESNext",
"lib": ["ESNEXT", "DOM"],
"esModuleInterop": true,
"moduleResolution": "Node",
"module": "CommonJS",
"moduleResolution": "node",
"module": "commonjs",
"keyofStringsOnly": false
},
"references": [{ "path": "../api" }],
Expand Down
Loading