Skip to content

Commit 671b016

Browse files
m-houstonm-houston
committed
Merge remote-tracking branch 'origin/CCM-11990_AddingConfigApp' into CCM-11990_AddingConfigApp
# Conflicts: # package-lock.json # package.json
2 parents c9966a7 + 96edc64 commit 671b016

5 files changed

Lines changed: 6586 additions & 9005 deletions

File tree

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ version.json
1616
node_modules
1717
.node-version
1818
*/node_modules
19+
.next
20+
*/.next
1921
/.pnp
2022
.pnp.js
2123
/build

‎frontend/package.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,8 @@
4141
},
4242
"overrides": {
4343
"react": "^19.0.0"
44+
},
45+
"eslintConfig": {
46+
"extends": ["next/core-web-vitals"]
4447
}
4548
}

‎frontend/src/app/layout.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import type { ReactNode } from "react";
1+
import React from "react";
22

3-
type RootLayoutProps = Readonly<{ children: ReactNode }>;
4-
5-
export default function RootLayout({ children }: RootLayoutProps) {
3+
export default function RootLayout({
4+
children,
5+
}: Readonly<{ children: React.ReactNode }>) {
66
return (
77
<html lang="en">
88
<body>{children}</body>

0 commit comments

Comments
 (0)