From bf120be3c34256719929f4dff905d4b7c590fcac Mon Sep 17 00:00:00 2001 From: Aminda Suomalainen Date: Sat, 6 Jul 2024 10:23:11 +0300 Subject: [PATCH] the usual --- .bundle/config | 2 -- .github/dependabot.yml | 30 ------------------------------ .github/renovate.json5 | 5 +++++ .gitignore | 1 + .pre-commit-config.yaml | 19 +++++++++++++++---- .prettierrc | 7 +++++++ .ruby-version | 1 + package.json | 7 +++++-- pnpm-lock.yaml | 24 ------------------------ 9 files changed, 34 insertions(+), 62 deletions(-) delete mode 100644 .bundle/config delete mode 100644 .github/dependabot.yml create mode 100644 .github/renovate.json5 create mode 100644 .ruby-version delete mode 100644 pnpm-lock.yaml diff --git a/.bundle/config b/.bundle/config deleted file mode 100644 index 236922881..000000000 --- a/.bundle/config +++ /dev/null @@ -1,2 +0,0 @@ ---- -BUNDLE_PATH: "vendor/bundle" diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index 304d2b673..000000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,30 +0,0 @@ -version: 2 -updates: - - package-ecosystem: "bundler" - directory: "/" - schedule: - interval: "daily" - timezone: "Europe/Helsinki" - groups: - bundler: - patterns: - - "*" - - - package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "daily" - timezone: "Europe/Helsinki" - groups: - github-actions: - patterns: - - "*" - - - package-ecosystem: "npm" - directory: "/" - schedule: - interval: "daily" - groups: - npm: - patterns: - - "*" diff --git a/.github/renovate.json5 b/.github/renovate.json5 new file mode 100644 index 000000000..4bd33159f --- /dev/null +++ b/.github/renovate.json5 @@ -0,0 +1,5 @@ +/** @format */ + +{ + extends: ["local>Mikaela/shell-things:.renovate-shared"], +} diff --git a/.gitignore b/.gitignore index 3f63a063e..ad93fe013 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ _site vendor/ .bundle node_modules/ +pnpm-lock.yaml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5a0dbdd35..bf273e21d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,3 +1,5 @@ +# @format + # SPDX-FileCopyrightText: 2023 Aminda Suomalainen # # SPDX-License-Identifier: CC0-1.0 @@ -10,6 +12,7 @@ ci: # touch. # https://github.com/pre-commit-ci/issues/issues/83 autoupdate_schedule: quarterly + skip: [pnpm-install-dev, prettier] # Use pypy3 for the Python hooks. Except don't, see .gitlab-ci.yml #default_language_version: @@ -51,7 +54,7 @@ repos: args: [--update-only, --notitle] - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.28.4 + rev: 0.28.6 hooks: - id: check-dependabot - id: check-github-workflows @@ -62,11 +65,19 @@ repos: # hooks: # - id: reuse - - repo: https://github.com/rbubley/mirrors-prettier - rev: "v3.3.0" + - repo: local hooks: + - id: pnpm-install-dev + name: Install pnpm dev dependencies + entry: corepack pnpm install -D + language: system + always_run: true + #verbose: true + pass_filenames: false - id: prettier - exclude_types: [json] + name: prettier + entry: corepack pnpm exec prettier --cache --ignore-unknown --write + language: system - repo: https://github.com/editorconfig-checker/editorconfig-checker.python rev: "2.7.3" diff --git a/.prettierrc b/.prettierrc index e69de29bb..304a4d4da 100644 --- a/.prettierrc +++ b/.prettierrc @@ -0,0 +1,7 @@ +{ + "insertPragma": true, + "proseWrap": "always", + "singleAttributePerLine": true, + "plugins": ["@prettier/plugin-xml", "prettier-plugin-sh"], + "overrides": [{ "files": ".prettierrc", "options": { "parser": "json" } }] +} diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..619b53766 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +3.3.3 diff --git a/package.json b/package.json index d85dc9d61..ec4d9ed66 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,8 @@ { "devDependencies": { - "prettier": "3.3.0" - } + "@prettier/plugin-xml": "3.4.1", + "prettier": "3.3.0", + "prettier-plugin-sh": "0.14.0" + }, + "packageManager": "pnpm@9.4.0+sha512.f549b8a52c9d2b8536762f99c0722205efc5af913e77835dbccc3b0b0b2ca9e7dc8022b78062c17291c48e88749c70ce88eb5a74f1fa8c4bf5e18bb46c8bd83a" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml deleted file mode 100644 index ae165e4bc..000000000 --- a/pnpm-lock.yaml +++ /dev/null @@ -1,24 +0,0 @@ -lockfileVersion: "9.0" - -settings: - autoInstallPeers: true - excludeLinksFromLockfile: false - -importers: - .: - devDependencies: - prettier: - specifier: 3.3.0 - version: 3.3.0 - -packages: - prettier@3.3.0: - resolution: - { - integrity: sha512-J9odKxERhCQ10OC2yb93583f6UnYutOeiV5i0zEDS7UGTdUt0u+y8erxl3lBKvwo/JHyyoEdXjwp4dke9oyZ/g==, - } - engines: { node: ">=14" } - hasBin: true - -snapshots: - prettier@3.3.0: {}