From 6bfeaa46d817a63ed77d3c6ae4922d9e925654f1 Mon Sep 17 00:00:00 2001 From: Aminda Suomalainen Date: Sun, 14 Jul 2024 16:28:37 +0300 Subject: [PATCH] simplify prettier configuration --- .gitignore | 1 - .pre-commit-config.yaml | 10 +------ .prettierrc.json | 36 ------------------------- package.json | 10 +++---- pnpm-lock.yaml | 58 ++++++++++++++++++++--------------------- 5 files changed, 33 insertions(+), 82 deletions(-) delete mode 100644 .prettierrc.json diff --git a/.gitignore b/.gitignore index 80e12dc6..28245f8e 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,6 @@ !.nvmrc !.pre-commit-config.yaml !.prettierignore -!.prettierrc.json !.renovate-shared.json* !.reuse diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 30883747..16758c74 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -65,18 +65,10 @@ repos: - repo: local hooks: - - id: install-dev-deps - name: Install pnpm dev dependencies - entry: corepack pnpm install -D - language: system - always_run: true - #verbose: true - pass_filenames: false - id: prettier name: prettier - entry: corepack pnpm exec prettier --cache --ignore-unknown --write + entry: corepack pnpx prettier --cache --ignore-unknown --write language: system - exclude_types: [json] # .editorconfig validity checking - repo: https://github.com/editorconfig-checker/editorconfig-checker.python diff --git a/.prettierrc.json b/.prettierrc.json deleted file mode 100644 index 80c0bcfa..00000000 --- a/.prettierrc.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "bracketSameLine": true, - "endOfLine": "auto", - "insertPragma": true, - "overrides": [ - { - "files": ".prettierrc", - "options": { - "parser": "json" - } - }, - { - "files": "conf/librewolf.overrides.cfg", - "options": { - "parser": "babel" - } - }, - { - "files": "conf/autoconfig.js.online", - "options": { - "parser": "babel" - } - } - ], - "plugins": [ - "@prettier/plugin-ruby", - "@prettier/plugin-xml", - "prettier-plugin-nginx", - "prettier-plugin-sh", - "prettier-plugin-toml" - ], - "proseWrap": "always", - "quoteProps": "consistent", - "requirePragma": false, - "singleAttributePerLine": true -} diff --git a/package.json b/package.json index affeddc3..f9cebbb3 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,7 @@ { "devDependencies": { - "@prettier/plugin-ruby": "4.0.4", - "@prettier/plugin-xml": "3.4.1", - "prettier": "3.3.2", - "prettier-plugin-nginx": "1.0.3", - "prettier-plugin-sh": "0.14.0", - "prettier-plugin-toml": "2.0.1" + "@aminda/global-prettier-config": "^2024.28.3" }, - "packageManager": "pnpm@9.5.0+sha512.140036830124618d624a2187b50d04289d5a087f326c9edfc0ccd733d76c4f52c3a313d4fc148794a2a9d81553016004e6742e8cf850670268a7387fc220c903" + "packageManager": "pnpm@9.5.0+sha512.140036830124618d624a2187b50d04289d5a087f326c9edfc0ccd733d76c4f52c3a313d4fc148794a2a9d81553016004e6742e8cf850670268a7387fc220c903", + "prettier": "@aminda/global-prettier-config" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1828cc01..bebeabfd 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,26 +9,17 @@ settings: importers: .: devDependencies: - "@prettier/plugin-ruby": - specifier: 4.0.4 - version: 4.0.4(prettier@3.3.2) - "@prettier/plugin-xml": - specifier: 3.4.1 - version: 3.4.1(prettier@3.3.2) - prettier: - specifier: 3.3.2 - version: 3.3.2 - prettier-plugin-nginx: - specifier: 1.0.3 - version: 1.0.3 - prettier-plugin-sh: - specifier: 0.14.0 - version: 0.14.0(prettier@3.3.2) - prettier-plugin-toml: - specifier: 2.0.1 - version: 2.0.1(prettier@3.3.2) + "@aminda/global-prettier-config": + specifier: ^2024.28.3 + version: 2024.28.3 packages: + "@aminda/global-prettier-config@2024.28.3": + resolution: + { + integrity: sha512-hb0F/AEbeuA8TM5Z7VJBbFhc5zHMXUZfVZ+QbfTt2V1kD/zKFYf8Tl99se1ZaIegxSDdfhdMpQO75+CRy5eqhA==, + } + "@prettier/plugin-ruby@4.0.4": resolution: { @@ -99,10 +90,10 @@ packages: peerDependencies: prettier: ^3.0.3 - prettier@3.3.2: + prettier@3.3.3: resolution: { - integrity: sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==, + integrity: sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==, } engines: { node: ">=14" } hasBin: true @@ -127,14 +118,23 @@ packages: } snapshots: - "@prettier/plugin-ruby@4.0.4(prettier@3.3.2)": + "@aminda/global-prettier-config@2024.28.3": dependencies: - prettier: 3.3.2 + "@prettier/plugin-ruby": 4.0.4(prettier@3.3.3) + "@prettier/plugin-xml": 3.4.1(prettier@3.3.3) + prettier: 3.3.3 + prettier-plugin-nginx: 1.0.3 + prettier-plugin-sh: 0.14.0(prettier@3.3.3) + prettier-plugin-toml: 2.0.1(prettier@3.3.3) - "@prettier/plugin-xml@3.4.1(prettier@3.3.2)": + "@prettier/plugin-ruby@4.0.4(prettier@3.3.3)": + dependencies: + prettier: 3.3.3 + + "@prettier/plugin-xml@3.4.1(prettier@3.3.3)": dependencies: "@xml-tools/parser": 1.0.11 - prettier: 3.3.2 + prettier: 3.3.3 "@taplo/core@0.1.1": {} @@ -154,18 +154,18 @@ snapshots: prettier-plugin-nginx@1.0.3: {} - prettier-plugin-sh@0.14.0(prettier@3.3.2): + prettier-plugin-sh@0.14.0(prettier@3.3.3): dependencies: mvdan-sh: 0.10.1 - prettier: 3.3.2 + prettier: 3.3.3 sh-syntax: 0.4.2 - prettier-plugin-toml@2.0.1(prettier@3.3.2): + prettier-plugin-toml@2.0.1(prettier@3.3.3): dependencies: "@taplo/lib": 0.4.0-alpha.2 - prettier: 3.3.2 + prettier: 3.3.3 - prettier@3.3.2: {} + prettier@3.3.3: {} regexp-to-ast@0.5.0: {}