From 72287677d491af230f4418cb9320a49f33933612 Mon Sep 17 00:00:00 2001 From: developomp Date: Sun, 9 Jul 2023 12:41:43 +0900 Subject: [PATCH] chore: add shared prettier config --- .prettierrc | 19 +------------------ apps/blog/.prettierrc | 5 ----- apps/blog/.prettierrc.cjs | 4 ++++ apps/blog/package.json | 1 + apps/main/.prettierignore | 17 ----------------- apps/main/.prettierrc | 6 ------ apps/main/.prettierrc.cjs | 10 ++++++++++ apps/main/package.json | 1 + apps/portfolio/.prettierrc | 5 ----- apps/portfolio/.prettierrc.cjs | 4 ++++ apps/portfolio/package.json | 1 + packages/content/.prettierrc | 14 +------------- packages/content/package.json | 1 + packages/eslint-config/.prettierrc | 13 +------------ packages/eslint-config/package.json | 1 + packages/prettier-config/index.json | 19 +++++++++++++++++++ packages/prettier-config/package.json | 5 +++++ packages/tailwind-config/.prettierrc | 5 +---- packages/tailwind-config/package.json | 1 + pnpm-lock.yaml | 20 ++++++++++++++++++++ 20 files changed, 72 insertions(+), 80 deletions(-) delete mode 100644 apps/blog/.prettierrc create mode 100644 apps/blog/.prettierrc.cjs delete mode 100644 apps/main/.prettierignore delete mode 100644 apps/main/.prettierrc create mode 100644 apps/main/.prettierrc.cjs delete mode 100644 apps/portfolio/.prettierrc create mode 100644 apps/portfolio/.prettierrc.cjs create mode 100644 packages/prettier-config/index.json create mode 100644 packages/prettier-config/package.json diff --git a/.prettierrc b/.prettierrc index 72990c1..0811e79 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,18 +1 @@ -{ - "tabWidth": 4, - "semi": false, - "overrides": [ - { - "files": "*.md", - "options": { - "tabWidth": 2 - } - }, - { - "files": ".firebaserc", - "options": { - "tabWidth": 2 - } - } - ] -} +"@developomp-site/prettier-config" diff --git a/apps/blog/.prettierrc b/apps/blog/.prettierrc deleted file mode 100644 index eb0d19b..0000000 --- a/apps/blog/.prettierrc +++ /dev/null @@ -1,5 +0,0 @@ -{ - "tabWidth": 4, - "semi": false, - "plugins": ["prettier-plugin-tailwindcss"] -} diff --git a/apps/blog/.prettierrc.cjs b/apps/blog/.prettierrc.cjs new file mode 100644 index 0000000..33f9c8c --- /dev/null +++ b/apps/blog/.prettierrc.cjs @@ -0,0 +1,4 @@ +module.exports = { + ...require("@developomp-site/prettier-config"), + plugins: ["prettier-plugin-tailwindcss"], +} diff --git a/apps/blog/package.json b/apps/blog/package.json index 6fa7220..27d1748 100644 --- a/apps/blog/package.json +++ b/apps/blog/package.json @@ -28,6 +28,7 @@ }, "devDependencies": { "@developomp-site/eslint-config": "workspace:*", + "@developomp-site/prettier-config": "workspace:*", "@developomp-site/tailwind-config": "workspace:*", "@types/highlight.js": "^10.1.0", "@types/katex": "^0.16.0", diff --git a/apps/main/.prettierignore b/apps/main/.prettierignore deleted file mode 100644 index e800e70..0000000 --- a/apps/main/.prettierignore +++ /dev/null @@ -1,17 +0,0 @@ -.DS_Store -node_modules -/build -/.svelte-kit -/package -.env -.env.* -!.env.example -.vercel -.output -vite.config.js.timestamp-* -vite.config.ts.timestamp-* - -# Ignore files for PNPM, NPM and YARN -pnpm-lock.yaml -package-lock.json -yarn.lock diff --git a/apps/main/.prettierrc b/apps/main/.prettierrc deleted file mode 100644 index 81276fb..0000000 --- a/apps/main/.prettierrc +++ /dev/null @@ -1,6 +0,0 @@ -{ - "tabWidth": 4, - "semi": false, - "plugins": ["prettier-plugin-svelte", "prettier-plugin-tailwindcss"], - "overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }] -} diff --git a/apps/main/.prettierrc.cjs b/apps/main/.prettierrc.cjs new file mode 100644 index 0000000..43acbc4 --- /dev/null +++ b/apps/main/.prettierrc.cjs @@ -0,0 +1,10 @@ +const sharedConfig = require("@developomp-site/prettier-config") + +module.exports = { + ...sharedConfig, + plugins: ["prettier-plugin-svelte", "prettier-plugin-tailwindcss"], + overrides: [ + ...sharedConfig.overrides, + { files: "*.svelte", options: { parser: "svelte" } }, + ], +} diff --git a/apps/main/package.json b/apps/main/package.json index bc0b6f7..26d6dfa 100644 --- a/apps/main/package.json +++ b/apps/main/package.json @@ -13,6 +13,7 @@ "devDependencies": { "@developomp-site/content": "workspace:*", "@developomp-site/eslint-config": "workspace:*", + "@developomp-site/prettier-config": "workspace:*", "@developomp-site/tailwind-config": "workspace:*", "@fontsource/noto-sans-kr": "^5.0.5", "@inqling/svelte-icons": "^3.3.2", diff --git a/apps/portfolio/.prettierrc b/apps/portfolio/.prettierrc deleted file mode 100644 index ac2e3a8..0000000 --- a/apps/portfolio/.prettierrc +++ /dev/null @@ -1,5 +0,0 @@ -{ - "semi": false, - "tabWidth": 4, - "plugins": ["prettier-plugin-tailwindcss"] -} diff --git a/apps/portfolio/.prettierrc.cjs b/apps/portfolio/.prettierrc.cjs new file mode 100644 index 0000000..33f9c8c --- /dev/null +++ b/apps/portfolio/.prettierrc.cjs @@ -0,0 +1,4 @@ +module.exports = { + ...require("@developomp-site/prettier-config"), + plugins: ["prettier-plugin-tailwindcss"], +} diff --git a/apps/portfolio/package.json b/apps/portfolio/package.json index 24a0abf..03c1ab3 100644 --- a/apps/portfolio/package.json +++ b/apps/portfolio/package.json @@ -23,6 +23,7 @@ }, "devDependencies": { "@developomp-site/content": "workspace:*", + "@developomp-site/prettier-config": "workspace:*", "@developomp-site/tailwind-config": "workspace:*", "@linaria/babel-preset": "^4.4.5", "@linaria/vite": "^4.2.11", diff --git a/packages/content/.prettierrc b/packages/content/.prettierrc index bbf9355..0811e79 100644 --- a/packages/content/.prettierrc +++ b/packages/content/.prettierrc @@ -1,13 +1 @@ -{ - "tabWidth": 4, - "semi": false, - "trailingComma": "es5", - "overrides": [ - { - "files": "*.md", - "options": { - "tabWidth": 2 - } - } - ] -} +"@developomp-site/prettier-config" diff --git a/packages/content/package.json b/packages/content/package.json index fdd26e6..4fc6312 100644 --- a/packages/content/package.json +++ b/packages/content/package.json @@ -41,6 +41,7 @@ }, "devDependencies": { "@developomp-site/eslint-config": "workspace:*", + "@developomp-site/prettier-config": "workspace:*", "@types/elasticlunr": "^0.9.5", "@types/jsdom": "^21.1.1", "@types/node": "^20.4.1", diff --git a/packages/eslint-config/.prettierrc b/packages/eslint-config/.prettierrc index 48832e1..0811e79 100644 --- a/packages/eslint-config/.prettierrc +++ b/packages/eslint-config/.prettierrc @@ -1,12 +1 @@ -{ - "tabWidth": 4, - "semi": false, - "overrides": [ - { - "files": "*.md", - "options": { - "tabWidth": 2 - } - } - ] -} +"@developomp-site/prettier-config" diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json index d991225..dca038c 100644 --- a/packages/eslint-config/package.json +++ b/packages/eslint-config/package.json @@ -8,6 +8,7 @@ "clean": "rm -rf node_modules" }, "devDependencies": { + "@developomp-site/prettier-config": "workspace:*", "@typescript-eslint/eslint-plugin": "^5.61.0", "@typescript-eslint/parser": "^5.61.0", "eslint": "^8.44.0", diff --git a/packages/prettier-config/index.json b/packages/prettier-config/index.json new file mode 100644 index 0000000..91efdf6 --- /dev/null +++ b/packages/prettier-config/index.json @@ -0,0 +1,19 @@ +{ + "$schema": "http://json.schemastore.org/prettierrc", + "tabWidth": 4, + "semi": false, + "overrides": [ + { + "files": "*.md", + "options": { + "tabWidth": 2 + } + }, + { + "files": ".firebaserc", + "options": { + "tabWidth": 2 + } + } + ] +} diff --git a/packages/prettier-config/package.json b/packages/prettier-config/package.json new file mode 100644 index 0000000..315d2c6 --- /dev/null +++ b/packages/prettier-config/package.json @@ -0,0 +1,5 @@ +{ + "name": "@developomp-site/prettier-config", + "version": "0.0.0", + "main": "index.json" +} diff --git a/packages/tailwind-config/.prettierrc b/packages/tailwind-config/.prettierrc index 257a7df..0811e79 100644 --- a/packages/tailwind-config/.prettierrc +++ b/packages/tailwind-config/.prettierrc @@ -1,4 +1 @@ -{ - "tabWidth": 4, - "semi": false -} +"@developomp-site/prettier-config" diff --git a/packages/tailwind-config/package.json b/packages/tailwind-config/package.json index 8d42aae..bd6d6ad 100644 --- a/packages/tailwind-config/package.json +++ b/packages/tailwind-config/package.json @@ -12,6 +12,7 @@ }, "devDependencies": { "@developomp-site/eslint-config": "workspace:*", + "@developomp-site/prettier-config": "workspace:*", "eslint": "^8.44.0", "tailwindcss": "^3.3.2" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 154fa16..b0b4433 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -72,6 +72,9 @@ importers: '@developomp-site/eslint-config': specifier: workspace:* version: link:../../packages/eslint-config + '@developomp-site/prettier-config': + specifier: workspace:* + version: link:../../packages/prettier-config '@developomp-site/tailwind-config': specifier: workspace:* version: link:../../packages/tailwind-config @@ -132,6 +135,9 @@ importers: '@developomp-site/eslint-config': specifier: workspace:* version: link:../../packages/eslint-config + '@developomp-site/prettier-config': + specifier: workspace:* + version: link:../../packages/prettier-config '@developomp-site/tailwind-config': specifier: workspace:* version: link:../../packages/tailwind-config @@ -235,6 +241,9 @@ importers: '@developomp-site/content': specifier: workspace:* version: link:../../packages/content + '@developomp-site/prettier-config': + specifier: workspace:* + version: link:../../packages/prettier-config '@developomp-site/tailwind-config': specifier: workspace:* version: link:../../packages/tailwind-config @@ -392,6 +401,9 @@ importers: '@developomp-site/eslint-config': specifier: workspace:* version: link:../eslint-config + '@developomp-site/prettier-config': + specifier: workspace:* + version: link:../prettier-config '@types/elasticlunr': specifier: ^0.9.5 version: 0.9.5 @@ -413,6 +425,9 @@ importers: packages/eslint-config: devDependencies: + '@developomp-site/prettier-config': + specifier: workspace:* + version: link:../prettier-config '@typescript-eslint/eslint-plugin': specifier: ^5.61.0 version: 5.61.0(@typescript-eslint/parser@5.61.0)(eslint@8.44.0)(typescript@5.1.6) @@ -444,11 +459,16 @@ importers: specifier: ^5.1.6 version: 5.1.6 + packages/prettier-config: {} + packages/tailwind-config: devDependencies: '@developomp-site/eslint-config': specifier: workspace:* version: link:../eslint-config + '@developomp-site/prettier-config': + specifier: workspace:* + version: link:../prettier-config eslint: specifier: ^8.44.0 version: 8.44.0