Skip to content

Commit

Permalink
add prettier overrides for json files (epicweb-dev#167)
Browse files Browse the repository at this point in the history
  • Loading branch information
onemen authored Jun 12, 2023
1 parent b1ad014 commit 40b35d0
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 40 deletions.
1 change: 0 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,4 @@ node_modules
/coverage
/prisma/migrations

package.json
package-lock.json
8 changes: 8 additions & 0 deletions .prettierrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,12 @@ module.exports = {
tabWidth: 2,
trailingComma: 'all',
useTabs: true,
overrides: [
{
files: ['**/*.json'],
options: {
useTabs: false,
},
},
],
}
12 changes: 6 additions & 6 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"recommendations": [
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode",
"prisma.prisma",
"bradlc.vscode-tailwindcss"
]
"recommendations": [
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode",
"prisma.prisma",
"bradlc.vscode-tailwindcss"
]
}
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"build": "run-s build:*",
"build:remix": "remix build --sourcemap",
"build:server": "tsx ./other/build-server.ts",
"dev": "remix dev -c \"node ./server/dev-server.js\" --no-restart",
"dev": "remix dev -c \"npm run dev:server\" --no-restart",
"dev:server": "cross-env MOCKS=true tsx watch --clear-screen=false --ignore \"app/**\" --ignore \"build/**\" --ignore \"node_modules/**\" --inspect ./index.js",
"prisma:studio": "prisma studio",
"format": "prettier --write .",
"lint": "eslint --cache --cache-location ./node_modules/.cache/eslint .",
Expand Down
64 changes: 32 additions & 32 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
{
"include": [
"remix.env.d.ts",
"**/*.ts",
"**/*.tsx",
"./tests/setup/setup-test-env.ts"
],
"compilerOptions": {
"lib": ["DOM", "DOM.Iterable", "ES2022"],
"types": [],
"isolatedModules": true,
"esModuleInterop": true,
"jsx": "react-jsx",
"module": "nodenext",
"moduleResolution": "nodenext",
"resolveJsonModule": true,
"target": "ES2022",
"strict": true,
"noImplicitAny": true,
"allowJs": true,
"forceConsistentCasingInFileNames": true,
"baseUrl": ".",
"paths": {
"~/*": ["./app/*"],
"prisma/*": ["./prisma/*"],
"tests/*": ["./tests/*"]
},
"skipLibCheck": true,
"allowImportingTsExtensions": true,
"typeRoots": ["./types", "./node_modules/@types"],
"include": [
"remix.env.d.ts",
"**/*.ts",
"**/*.tsx",
"./tests/setup/setup-test-env.ts"
],
"compilerOptions": {
"lib": ["DOM", "DOM.Iterable", "ES2022"],
"types": [],
"isolatedModules": true,
"esModuleInterop": true,
"jsx": "react-jsx",
"module": "nodenext",
"moduleResolution": "nodenext",
"resolveJsonModule": true,
"target": "ES2022",
"strict": true,
"noImplicitAny": true,
"allowJs": true,
"forceConsistentCasingInFileNames": true,
"baseUrl": ".",
"paths": {
"~/*": ["./app/*"],
"prisma/*": ["./prisma/*"],
"tests/*": ["./tests/*"]
},
"skipLibCheck": true,
"allowImportingTsExtensions": true,
"typeRoots": ["./types", "./node_modules/@types"],

// Remix takes care of building everything in `remix build`.
"noEmit": true
}
// Remix takes care of building everything in `remix build`.
"noEmit": true
}
}

0 comments on commit 40b35d0

Please sign in to comment.