diff --git a/.gitignore b/.gitignore index 9f529ba..6dd75fe 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,3 @@ vendor/ *_original .cache/** node_modules/** -pnpm-lock.yaml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 0382cb2..df8651f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -12,9 +12,11 @@ ci: # https://github.com/pre-commit-ci/issues/issues/83 autoupdate_schedule: quarterly -# Use pypy3 for the Python hooks. Except don't, see .gitlab-ci.yml -#default_language_version: -# python: pypy3 +default_language_version: + node: "lts" + # Remember .python-version ! + python: "3.12" + ruby: ".ruby-version" repos: - repo: https://github.com/pre-commit/pre-commit-hooks @@ -62,14 +64,14 @@ repos: ] - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.28.6 + rev: 0.29.0 hooks: - id: check-dependabot - id: check-github-workflows - id: check-gitlab-ci - repo: https://github.com/fsfe/reuse-tool - rev: v4.0.2 + rev: v4.0.3 hooks: - id: reuse exclude: ^.cache\/.*$ @@ -78,11 +80,8 @@ repos: hooks: - id: prettier name: prettier - entry: corepack pnpm exec prettier --cache --ignore-unknown --write + entry: corepack pnpx prettier --cache --ignore-unknown --write language: system - # Better handled by pretty-format-json from pre-commit-hooks. - # Remember to have *.json in .prettierignore! - exclude_types: [json] # Fedora: perl-Image-ExifTool - id: exiftool diff --git a/.prettierrc b/.prettierrc deleted file mode 100644 index c924e5f..0000000 --- a/.prettierrc +++ /dev/null @@ -1,4 +0,0 @@ -{ - "plugins": ["@prettier/plugin-xml", "prettier-plugin-sh"], - "overrides": [{ "files": ".prettierrc", "options": { "parser": "json" } }] -} diff --git a/package.json b/package.json index cd671a0..270eafb 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,6 @@ { "devDependencies": { - "@prettier/plugin-xml": "3.4.1", - "prettier": "3.3.2", - "prettier-plugin-sh": "0.14.0" + "@aminda/global-prettier-config": "2024.28.4" }, - "packageManager": "pnpm@9.4.0+sha512.f549b8a52c9d2b8536762f99c0722205efc5af913e77835dbccc3b0b0b2ca9e7dc8022b78062c17291c48e88749c70ce88eb5a74f1fa8c4bf5e18bb46c8bd83a" + "packageManager": "pnpm@9.6.0+sha512.38dc6fba8dba35b39340b9700112c2fe1e12f10b17134715a4aa98ccf7bb035e76fd981cf0bb384dfa98f8d6af5481c2bef2f4266a24bfa20c34eb7147ce0b5e" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml new file mode 100644 index 0000000..67bdaa5 --- /dev/null +++ b/pnpm-lock.yaml @@ -0,0 +1,174 @@ +lockfileVersion: "9.0" + +settings: + autoInstallPeers: true + excludeLinksFromLockfile: false + +importers: + .: + devDependencies: + "@aminda/global-prettier-config": + specifier: 2024.28.4 + version: 2024.28.4 + +packages: + "@aminda/global-prettier-config@2024.28.4": + resolution: + { + integrity: sha512-VjyTd8fFRnLgZRAMDRr9pm5hknnsVxpTCshvvE7RAiuH72hUzC82rm5vXDJjrhkedWJir2qZjmiC5Vo2LoR4tw==, + } + + "@prettier/plugin-ruby@4.0.4": + resolution: + { + integrity: sha512-lCpvfS/dQU5WrwN3AQ5vR8qrvj2h5gE41X08NNzAAXvHdM4zwwGRcP2sHSxfu6n6No+ljWCVx95NvJPFTTjCTg==, + } + peerDependencies: + prettier: ^3.0.0 + + "@prettier/plugin-xml@3.4.1": + resolution: + { + integrity: sha512-Uf/6/+9ez6z/IvZErgobZ2G9n1ybxF5BhCd7eMcKqfoWuOzzNUxBipNo3QAP8kRC1VD18TIo84no7LhqtyDcTg==, + } + peerDependencies: + prettier: ^3.0.0 + + "@taplo/core@0.1.1": + resolution: + { + integrity: sha512-BG/zLGf5wiNXGEVPvUAAX/4ilB3PwDUY2o0MV0y47mZbDZ9ad9UK/cIQsILat3bqbPJsALVbU6k3cskNZ3vAQg==, + } + + "@taplo/lib@0.4.0-alpha.2": + resolution: + { + integrity: sha512-DV/Re3DPVY+BhBtLZ3dmP4mP6YMLSsgq9qGLXwOV38lvNF/fBlgvQswzlXmzCEefL/3q2eMoefZpOI/+GLuCNA==, + } + + "@xml-tools/parser@1.0.11": + resolution: + { + integrity: sha512-aKqQ077XnR+oQtHJlrAflaZaL7qZsulWc/i/ZEooar5JiWj1eLt0+Wg28cpa+XLney107wXqneC+oG1IZvxkTA==, + } + + chevrotain@7.1.1: + resolution: + { + integrity: sha512-wy3mC1x4ye+O+QkEinVJkPf5u2vsrDIYW9G7ZuwFl6v/Yu0LwUuT2POsb+NUWApebyxfkQq6+yDfRExbnI5rcw==, + } + + mvdan-sh@0.10.1: + resolution: + { + integrity: sha512-kMbrH0EObaKmK3nVRKUIIya1dpASHIEusM13S4V1ViHFuxuNxCo+arxoa6j/dbV22YBGjl7UKJm9QQKJ2Crzhg==, + } + + prettier-plugin-nginx@1.0.3: + resolution: + { + integrity: sha512-vV5q85s8XnV6NEgvz1gVLfZhmxAxY03MyOYj2ApBpjFkbs00lRsRkTmqO9L39ADuD18z1RRCcfZ3eVxKhI/nqg==, + } + + prettier-plugin-sh@0.14.0: + resolution: + { + integrity: sha512-hfXulj5+zEl/ulrO5kMuuTPKmXvOg0bnLHY1hKFNN/N+/903iZbNp8NyZBTsgI8dtkSgFfAEIQq0IQTyP1ZVFQ==, + } + engines: { node: ">=16.0.0" } + peerDependencies: + prettier: ^3.0.3 + + prettier-plugin-toml@2.0.1: + resolution: + { + integrity: sha512-99z1YOkViECHtXQjGIigd3talI/ybUI1zB3yniAwUrlWBXupNXThB1hM6bwSMUEj2/+tomTlMtT98F5t4s8IWA==, + } + engines: { node: ">=16.0.0" } + peerDependencies: + prettier: ^3.0.3 + + prettier@3.3.3: + resolution: + { + integrity: sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==, + } + engines: { node: ">=14" } + hasBin: true + + regexp-to-ast@0.5.0: + resolution: + { + integrity: sha512-tlbJqcMHnPKI9zSrystikWKwHkBqu2a/Sgw01h3zFjvYrMxEDYHzzoMZnUrbIfpTFEsoRnnviOXNCzFiSc54Qw==, + } + + sh-syntax@0.4.2: + resolution: + { + integrity: sha512-/l2UZ5fhGZLVZa16XQM9/Vq/hezGGbdHeVEA01uWjOL1+7Ek/gt6FquW0iKKws4a9AYPYvlz6RyVvjh3JxOteg==, + } + engines: { node: ">=16.0.0" } + + tslib@2.6.3: + resolution: + { + integrity: sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==, + } + +snapshots: + "@aminda/global-prettier-config@2024.28.4": + dependencies: + "@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-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.3 + + "@taplo/core@0.1.1": {} + + "@taplo/lib@0.4.0-alpha.2": + dependencies: + "@taplo/core": 0.1.1 + + "@xml-tools/parser@1.0.11": + dependencies: + chevrotain: 7.1.1 + + chevrotain@7.1.1: + dependencies: + regexp-to-ast: 0.5.0 + + mvdan-sh@0.10.1: {} + + prettier-plugin-nginx@1.0.3: {} + + prettier-plugin-sh@0.14.0(prettier@3.3.3): + dependencies: + mvdan-sh: 0.10.1 + prettier: 3.3.3 + sh-syntax: 0.4.2 + + prettier-plugin-toml@2.0.1(prettier@3.3.3): + dependencies: + "@taplo/lib": 0.4.0-alpha.2 + prettier: 3.3.3 + + prettier@3.3.3: {} + + regexp-to-ast@0.5.0: {} + + sh-syntax@0.4.2: + dependencies: + tslib: 2.6.3 + + tslib@2.6.3: {} diff --git a/.prettierrc.license b/pnpm-lock.yaml.license similarity index 100% rename from .prettierrc.license rename to pnpm-lock.yaml.license