Skip to content

Commit c1257b2

Browse files
committed
Merge branch 'transferCourse-uiBug' of https://github.com/MTUHIDE/MTUCourses-frontend into transferCourse-uiBug
2 parents df93151 + e8a138e commit c1257b2

File tree

13 files changed

+562
-204
lines changed

13 files changed

+562
-204
lines changed

.github/workflows/lighthouse.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
3838
- name: Run Lighthouse against output
3939
id: lighthouse
40-
uses: treosh/lighthouse-ci-action@v8
40+
uses: treosh/lighthouse-ci-action@v12
4141
env:
4242
LHCI_GITHUB_APP_TOKEN: ${{ secrets.LHCI_GITHUB_APP_TOKEN }}
4343
with:

package.json

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"@testing-library/jest-dom": "^5.11.9",
2828
"@testing-library/react": "^11.2.5",
2929
"@types/dom-to-image": "^2.6.3",
30-
"@types/jest": "^26.0.20",
30+
"@types/jest": "^26.0.14",
3131
"@types/lunr": "^2.3.4",
3232
"@types/node": "^16.9.1",
3333
"@types/react": "^17.0.20",
@@ -47,6 +47,7 @@
4747
"next-unused": "^0.0.6",
4848
"nodemon": "^2.0.7",
4949
"sass": "^1.32.8",
50+
"ts-jest": "^26.4.4",
5051
"ts-node": "^9.1.1",
5152
"type-fest": "^1.0.2",
5253
"typescript": "^4.9.5",
@@ -95,6 +96,7 @@
9596
]
9697
},
9798
"jest": {
99+
"preset": "ts-jest",
98100
"moduleFileExtensions": [
99101
"js",
100102
"json",
@@ -127,6 +129,13 @@
127129
"moduleNameMapper": {
128130
"\\.(css|less|scss|sss|styl)$": "<rootDir>/node_modules/jest-css-modules",
129131
"^src/(.*)$": "<rootDir>/src/$1"
132+
},
133+
"globals": {
134+
"ts-jest": {
135+
"tsconfig": {
136+
"jsx": "react"
137+
}
138+
}
130139
}
131140
},
132141
"dependencies": {
4.59 KB
Loading

0 commit comments

Comments
 (0)