Skip to content

Commit 2c72180

Browse files
authored
Merge pull request #3 from Softx0/develop
fix: some errors from tsnode typescript config and configuration
2 parents 8c34126 + 5aba29a commit 2c72180

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@
77
"dev": "vite",
88
"build": "tsc && vite build",
99
"preview": "vite preview",
10-
"lint-fix": "eslint src --ext js,ts,tsx --report-unused-disable-directives --max-warnings 10 --fix",
11-
"prettier-all-files": "prettier --write .",
12-
"prettier-format": "prettier --config .prettierrc ./**/*.{ts,js,html,css} --write",
13-
"prettier-watch-windows": "onchange ./**/*.{ts,js} -- prettier --write {{changed}}",
14-
"prettier-watch-mac": "onchange \"**/*.{js,ts}\" -- prettier --write {{changed}}",
15-
"lint-and-prettier": "yarn run prettier-all-files && yarn run lint-fix",
10+
"lint-fix": "eslint src --ext js,ts,tsx,jsx --report-unused-disable-directives --max-warnings 10 --fix",
11+
"prettier-format": "prettier --write .",
12+
"prettier-watch-windows": "onchange ./**/*.{ts,js,tsx,jsx} -- prettier --write {{changed}}",
13+
"prettier-watch-mac": "onchange \"**/*.{js,ts,tsx,jsx}\" -- prettier --write {{changed}}",
14+
"lint-and-prettier": "yarn run prettier-format && yarn run lint-fix",
1615
"prepare": "husky install"
1716
},
1817
"dependencies": {
@@ -30,8 +29,9 @@
3029
"@testing-library/user-event": "^14.4.3",
3130
"@types/jest": "^29.5.2",
3231
"@types/node": "^20.3.1",
33-
"@types/react": "^18.0.37",
34-
"@types/react-dom": "^18.0.11",
32+
"@types/react": "^18.2.16",
33+
"@types/react-dom": "^18.2.7",
34+
"@types/react-router-dom": "^5.3.3",
3535
"@typescript-eslint/eslint-plugin": "^5.59.0",
3636
"@typescript-eslint/parser": "^5.59.0",
3737
"@vitejs/plugin-react": "^4.0.0",

tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
"lib": ["ES2020", "DOM", "DOM.Iterable"],
66
"module": "ESNext",
77
"skipLibCheck": true,
8+
"allowSyntheticDefaultImports": true,
89

910
/* Bundler mode */
10-
"moduleResolution": "bundler",
11+
"moduleResolution": "node",
1112
"allowImportingTsExtensions": true,
1213
"resolveJsonModule": true,
1314
"isolatedModules": true,

tsconfig.node.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"composite": true,
44
"skipLibCheck": true,
55
"module": "ESNext",
6-
"moduleResolution": "bundler",
6+
"moduleResolution": "node",
77
"allowSyntheticDefaultImports": true
88
},
99
"include": ["vite.config.ts"]

0 commit comments

Comments
 (0)