Skip to content

Commit ad507ae

Browse files
committed
Merge branch 'trunk' into renovate/typescript-5.x
2 parents b0e4c91 + 2eb3531 commit ad507ae

6 files changed

Lines changed: 2179 additions & 2894 deletions

File tree

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
- uses: actions/checkout@v3
88
- uses: actions/setup-node@v3
99
with:
10-
node-version: "16.13.1"
10+
node-version: "20.13.0"
1111
cache: "yarn"
1212
- run: "yarn install"
1313
- run: "yarn analyze"
@@ -18,7 +18,7 @@ jobs:
1818
- uses: actions/checkout@v3
1919
- uses: actions/setup-node@v3
2020
with:
21-
node-version: "16.13.1"
21+
node-version: "20.13.0"
2222
cache: "yarn"
2323
- run: "yarn install"
2424
- run: "yarn ci:test"
@@ -30,7 +30,7 @@ jobs:
3030
- uses: actions/checkout@v3
3131
- uses: actions/setup-node@v3
3232
with:
33-
node-version: "16.13.1"
33+
node-version: "20.13.0"
3434
cache: "yarn"
3535
- run: "yarn install"
3636
- run: "yarn ci:test:acc"

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
16.13.1
1+
20.13.0

cms/models/Article.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,11 @@ export class Article {
2121
return new Article(content, metadata, collections);
2222
}
2323

24-
private constructor(private content: string, private metadata: Metadata, private collections: Collection[]) {}
24+
private constructor(
25+
private content: string,
26+
private metadata: Metadata,
27+
private collections: Collection[],
28+
) {}
2529

2630
public isDraft() {
2731
return !this.metadata.published;

cms/models/Collection.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
import { ApiCollection } from "@/cms/api/ApiCollection";
22

33
export class Collection {
4-
constructor(private slug: string, private name: string) {}
4+
constructor(
5+
private slug: string,
6+
private name: string,
7+
) {}
58

69
public getSlug() {
710
return this.slug;

package.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,31 +20,31 @@
2020
"react-dom": "18.2.0",
2121
"react-icons": "4.11.0",
2222
"remark-unwrap-images": "3.0.1",
23-
"zod": "3.21.4"
23+
"zod": "3.22.4"
2424
},
2525
"devDependencies": {
26-
"@next/eslint-plugin-next": "13.4.13",
26+
"@next/eslint-plugin-next": "13.5.6",
2727
"@types/jest": "29.5.4",
2828
"@types/lodash": "4.14.200",
2929
"@types/marked": "5.0.2",
30-
"@types/node": "16.11.19",
30+
"@types/node": "20.12.11",
3131
"@types/react": "18.2.21",
3232
"@types/react-dom": "18.2.7",
3333
"@typescript-eslint/eslint-plugin": "5.62.0",
3434
"@typescript-eslint/parser": "5.62.0",
3535
"cypress": "12.17.4",
36-
"eslint": "8.46.0",
37-
"eslint-config-prettier": "8.10.0",
38-
"eslint-import-resolver-typescript": "3.5.5",
39-
"eslint-plugin-import": "2.28.0",
40-
"eslint-plugin-prettier": "4.2.1",
41-
"eslint-plugin-react": "7.33.1",
36+
"eslint": "8.57.0",
37+
"eslint-config-prettier": "9.1.0",
38+
"eslint-import-resolver-typescript": "3.6.1",
39+
"eslint-plugin-import": "2.29.1",
40+
"eslint-plugin-prettier": "5.1.3",
41+
"eslint-plugin-react": "7.34.1",
4242
"feed": "4.2.2",
4343
"jest": "29.6.4",
44-
"marked": "4.2.12",
45-
"prettier": "2.8.8",
46-
"start-server-and-test": "2.0.1",
47-
"ts-jest": "29.1.1",
44+
"marked": "4.3.0",
45+
"prettier": "3.2.5",
46+
"start-server-and-test": "2.0.3",
47+
"ts-jest": "29.1.2",
4848
"tsx": "4.9.3",
4949
"typescript": "5.4.5"
5050
},

0 commit comments

Comments
 (0)