Skip to content

Commit 40b35d0

Browse files
authored
add prettier overrides for json files (#167)
1 parent b1ad014 commit 40b35d0

File tree

5 files changed

+48
-40
lines changed

5 files changed

+48
-40
lines changed

.prettierignore

-1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,4 @@ node_modules
1212
/coverage
1313
/prisma/migrations
1414

15-
package.json
1615
package-lock.json

.prettierrc.cjs

+8
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,12 @@ module.exports = {
1717
tabWidth: 2,
1818
trailingComma: 'all',
1919
useTabs: true,
20+
overrides: [
21+
{
22+
files: ['**/*.json'],
23+
options: {
24+
useTabs: false,
25+
},
26+
},
27+
],
2028
}

.vscode/extensions.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"recommendations": [
3-
"dbaeumer.vscode-eslint",
4-
"esbenp.prettier-vscode",
5-
"prisma.prisma",
6-
"bradlc.vscode-tailwindcss"
7-
]
2+
"recommendations": [
3+
"dbaeumer.vscode-eslint",
4+
"esbenp.prettier-vscode",
5+
"prisma.prisma",
6+
"bradlc.vscode-tailwindcss"
7+
]
88
}

package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
"build": "run-s build:*",
1111
"build:remix": "remix build --sourcemap",
1212
"build:server": "tsx ./other/build-server.ts",
13-
"dev": "remix dev -c \"node ./server/dev-server.js\" --no-restart",
13+
"dev": "remix dev -c \"npm run dev:server\" --no-restart",
14+
"dev:server": "cross-env MOCKS=true tsx watch --clear-screen=false --ignore \"app/**\" --ignore \"build/**\" --ignore \"node_modules/**\" --inspect ./index.js",
1415
"prisma:studio": "prisma studio",
1516
"format": "prettier --write .",
1617
"lint": "eslint --cache --cache-location ./node_modules/.cache/eslint .",

tsconfig.json

+32-32
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
{
2-
"include": [
3-
"remix.env.d.ts",
4-
"**/*.ts",
5-
"**/*.tsx",
6-
"./tests/setup/setup-test-env.ts"
7-
],
8-
"compilerOptions": {
9-
"lib": ["DOM", "DOM.Iterable", "ES2022"],
10-
"types": [],
11-
"isolatedModules": true,
12-
"esModuleInterop": true,
13-
"jsx": "react-jsx",
14-
"module": "nodenext",
15-
"moduleResolution": "nodenext",
16-
"resolveJsonModule": true,
17-
"target": "ES2022",
18-
"strict": true,
19-
"noImplicitAny": true,
20-
"allowJs": true,
21-
"forceConsistentCasingInFileNames": true,
22-
"baseUrl": ".",
23-
"paths": {
24-
"~/*": ["./app/*"],
25-
"prisma/*": ["./prisma/*"],
26-
"tests/*": ["./tests/*"]
27-
},
28-
"skipLibCheck": true,
29-
"allowImportingTsExtensions": true,
30-
"typeRoots": ["./types", "./node_modules/@types"],
2+
"include": [
3+
"remix.env.d.ts",
4+
"**/*.ts",
5+
"**/*.tsx",
6+
"./tests/setup/setup-test-env.ts"
7+
],
8+
"compilerOptions": {
9+
"lib": ["DOM", "DOM.Iterable", "ES2022"],
10+
"types": [],
11+
"isolatedModules": true,
12+
"esModuleInterop": true,
13+
"jsx": "react-jsx",
14+
"module": "nodenext",
15+
"moduleResolution": "nodenext",
16+
"resolveJsonModule": true,
17+
"target": "ES2022",
18+
"strict": true,
19+
"noImplicitAny": true,
20+
"allowJs": true,
21+
"forceConsistentCasingInFileNames": true,
22+
"baseUrl": ".",
23+
"paths": {
24+
"~/*": ["./app/*"],
25+
"prisma/*": ["./prisma/*"],
26+
"tests/*": ["./tests/*"]
27+
},
28+
"skipLibCheck": true,
29+
"allowImportingTsExtensions": true,
30+
"typeRoots": ["./types", "./node_modules/@types"],
3131

32-
// Remix takes care of building everything in `remix build`.
33-
"noEmit": true
34-
}
32+
// Remix takes care of building everything in `remix build`.
33+
"noEmit": true
34+
}
3535
}

0 commit comments

Comments
 (0)