diff --git a/client/.prettierignore b/client/.prettierignore index de4d1f00..80cb10cb 100644 --- a/client/.prettierignore +++ b/client/.prettierignore @@ -1,2 +1,4 @@ dist node_modules +**/__tests__/*.json +src/colors.json diff --git a/client/.prettierrc b/client/.prettierrc index 8258aa33..7542914d 100644 --- a/client/.prettierrc +++ b/client/.prettierrc @@ -1,8 +1,9 @@ { + "htmlWhitespaceSensitivity": "ignore", + "jsonRecursiveSort": true, + "organizeImportsSkipDestructiveCodeActions": true, + "printWidth": 88, "semi": true, "singleQuote": false, - "tabWidth": 2, - "printWidth": 88, - "organizeImportsSkipDestructiveCodeActions": true, - "htmlWhitespaceSensitivity": "ignore" + "tabWidth": 2 } diff --git a/client/package-lock.json b/client/package-lock.json index 7940f398..08d5fb5c 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -52,6 +52,7 @@ "postcss-import": "^14.1.0", "prettier": "^2.7.1", "prettier-plugin-organize-imports": "^3.1.1", + "prettier-plugin-sort-json": "^1.0.0", "prettier-plugin-tailwindcss": "^0.2.1", "replace-in-file": "^6.3.5", "sass": "^1.54.6", @@ -3346,6 +3347,12 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "node_modules/@types/prettier": { + "version": "2.7.2", + "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.2.tgz", + "integrity": "sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg==", + "dev": true + }, "node_modules/@types/semver": { "version": "7.3.13", "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz", @@ -9545,6 +9552,21 @@ } } }, + "node_modules/prettier-plugin-sort-json": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/prettier-plugin-sort-json/-/prettier-plugin-sort-json-1.0.0.tgz", + "integrity": "sha512-XgcaF/Sojax1vD6j53wNIByx0rp7ecang+A8W0eM+Ks3yBFu/qXjJNvUtC1lEWeYbNfmRs/d8FyYJCYozAVENw==", + "dev": true, + "dependencies": { + "@types/prettier": "^2.7.2" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "prettier": "^2.3.2" + } + }, "node_modules/prettier-plugin-tailwindcss": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.2.1.tgz", @@ -14372,6 +14394,12 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "@types/prettier": { + "version": "2.7.2", + "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.2.tgz", + "integrity": "sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg==", + "dev": true + }, "@types/semver": { "version": "7.3.13", "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz", @@ -18914,6 +18942,15 @@ "dev": true, "requires": {} }, + "prettier-plugin-sort-json": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/prettier-plugin-sort-json/-/prettier-plugin-sort-json-1.0.0.tgz", + "integrity": "sha512-XgcaF/Sojax1vD6j53wNIByx0rp7ecang+A8W0eM+Ks3yBFu/qXjJNvUtC1lEWeYbNfmRs/d8FyYJCYozAVENw==", + "dev": true, + "requires": { + "@types/prettier": "^2.7.2" + } + }, "prettier-plugin-tailwindcss": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.2.1.tgz", diff --git a/client/package.json b/client/package.json index 32512910..92c91e05 100644 --- a/client/package.json +++ b/client/package.json @@ -60,6 +60,7 @@ "postcss-import": "^14.1.0", "prettier": "^2.7.1", "prettier-plugin-organize-imports": "^3.1.1", + "prettier-plugin-sort-json": "^1.0.0", "prettier-plugin-tailwindcss": "^0.2.1", "replace-in-file": "^6.3.5", "sass": "^1.54.6", diff --git a/client/tsconfig.app.json b/client/tsconfig.app.json index 0d2e0c18..1a19788b 100644 --- a/client/tsconfig.app.json +++ b/client/tsconfig.app.json @@ -1,15 +1,15 @@ { - "extends": "@vue/tsconfig/tsconfig.web.json", - "include": ["env.d.ts", "src/**/*", "src/**/*.vue"], - "exclude": ["src/**/__tests__/*"], "compilerOptions": { - "lib": ["ES2021", "DOM", "DOM.Iterable"], - "composite": true, - "strict": true, "allowJs": true, "baseUrl": ".", + "composite": true, + "lib": ["ES2021", "DOM", "DOM.Iterable"], "paths": { "@/*": ["./src/*"] - } - } + }, + "strict": true + }, + "exclude": ["src/**/__tests__/*"], + "extends": "@vue/tsconfig/tsconfig.web.json", + "include": ["env.d.ts", "src/**/*", "src/**/*.vue"] } diff --git a/client/tsconfig.vite-config.json b/client/tsconfig.vite-config.json index d20d8726..e3f2fdc1 100644 --- a/client/tsconfig.vite-config.json +++ b/client/tsconfig.vite-config.json @@ -1,8 +1,8 @@ { - "extends": "@vue/tsconfig/tsconfig.node.json", - "include": ["vite.config.*"], "compilerOptions": { "composite": true, "types": ["node", "vitest"] - } + }, + "extends": "@vue/tsconfig/tsconfig.node.json", + "include": ["vite.config.*"] } diff --git a/client/tsconfig.vitest.json b/client/tsconfig.vitest.json index 67705fd2..5e470cc6 100644 --- a/client/tsconfig.vitest.json +++ b/client/tsconfig.vitest.json @@ -1,9 +1,9 @@ { - "extends": "./tsconfig.app.json", - "exclude": [], "compilerOptions": { "composite": true, "lib": [], "types": ["node", "jsdom", "vitest/globals"] - } + }, + "exclude": [], + "extends": "./tsconfig.app.json" } diff --git a/client/vue-i18n-extract.config.js b/client/vue-i18n-extract.config.js index db19bb74..211d01d8 100644 --- a/client/vue-i18n-extract.config.js +++ b/client/vue-i18n-extract.config.js @@ -1,3 +1,4 @@ +// eslint-disable-next-line module.exports = { vueFiles: "./src/**/*.?(js|vue)", languageFiles: "./src/locales/*.json",