Skip to content

Commit ef3bf8b

Browse files
authored
Merge pull request #190 from dvishal485/github-action
2 parents f8f08bb + 4451ed7 commit ef3bf8b

File tree

4 files changed

+40
-47
lines changed

4 files changed

+40
-47
lines changed

src/pages/Member/MemberProfile/index.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ import { Spinner } from "@/components/Spinner";
44
import { CurrUserCtx } from "@/contexts/current_user";
55
import { ErrorContext } from "@/contexts/error";
66
import API from "@/services/API";
7-
import { IUser, MainWebsiteRole } from "@/commonlib/types/frontend/contextTypes";
7+
import { IUser } from "@/commonlib/types/frontend/contextTypes";
8+
import { MainWebsiteRole } from "@/types/mainWebsiteRole";
89
import Permission from "@/commonlib/types/permissions";
910
import React, { useContext, useEffect, useState } from "react";
1011
import { Link, useParams } from "react-router-dom";

tsconfig.json

+34-45
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,35 @@
11
{
2-
"compilerOptions": {
3-
"target": "ES2020",
4-
"useDefineForClassFields": true,
5-
"lib": [
6-
"ES2020",
7-
"DOM",
8-
"DOM.Iterable"
9-
],
10-
"module": "ESNext",
11-
"skipLibCheck": true,
12-
/* Bundler mode */
13-
"moduleResolution": "bundler",
14-
"allowImportingTsExtensions": true,
15-
"resolveJsonModule": true,
16-
"isolatedModules": true,
17-
"noEmit": true,
18-
"jsx": "react-jsx",
19-
/* Linting */
20-
"strict": true,
21-
"noImplicitAny": false,
22-
"noUnusedLocals": true,
23-
"noUnusedParameters": false,
24-
"noFallthroughCasesInSwitch": true,
25-
"outDir": "dist",
26-
"strictNullChecks": false,
27-
"paths": {
28-
"@/*": [
29-
"./src/*"
30-
],
31-
}
32-
},
33-
"include": [
34-
"src",
35-
"public/notification-service.js"
36-
],
37-
"references": [
38-
{
39-
"path": "./tsconfig.node.json"
40-
}
41-
],
42-
"exclude": [
43-
"node_modules",
44-
"dist"
45-
],
46-
}
2+
"compilerOptions": {
3+
"target": "ES2020",
4+
"useDefineForClassFields": true,
5+
"lib": ["ES2020", "DOM", "DOM.Iterable"],
6+
"module": "ESNext",
7+
"skipLibCheck": true,
8+
/* Bundler mode */
9+
"moduleResolution": "bundler",
10+
"allowImportingTsExtensions": true,
11+
"resolveJsonModule": true,
12+
"isolatedModules": true,
13+
"noEmit": true,
14+
"jsx": "react-jsx",
15+
/* Linting */
16+
"strict": true,
17+
"noImplicitAny": false,
18+
"noUnusedLocals": true,
19+
"noUnusedParameters": false,
20+
"noFallthroughCasesInSwitch": true,
21+
"outDir": "dist",
22+
"strictNullChecks": false,
23+
"paths": {
24+
"@/types/*": ["./src/commonlib/types/*"],
25+
"@/*": ["./src/*"]
26+
}
27+
},
28+
"include": ["src", "public/notification-service.js"],
29+
"references": [
30+
{
31+
"path": "./tsconfig.node.json"
32+
}
33+
],
34+
"exclude": ["node_modules", "dist"]
35+
}

vite.config.ts

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ export default defineConfig({
88
plugins: [react()],
99
resolve: {
1010
alias: {
11+
"@/types": fileURLToPath(
12+
new URL("./src/commonlib/types", import.meta.url),
13+
),
1114
"@": fileURLToPath(new URL("./src", import.meta.url)),
1215
},
1316
},

0 commit comments

Comments
 (0)