diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 0000000..b009dfb --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +lts/* diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b7fbbbf..633462d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -12,9 +12,9 @@ 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 + ruby: .ruby-version repos: - repo: https://github.com/pre-commit/pre-commit-hooks @@ -77,7 +77,7 @@ repos: 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] diff --git a/.prettierrc.json b/.prettierrc.json deleted file mode 100644 index cdc55c2..0000000 --- a/.prettierrc.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "bracketSameLine": true, - "endOfLine": "auto", - "plugins": [ - "@prettier/plugin-xml", - "prettier-plugin-sh" - ], - "proseWrap": "always", - "quoteProps": "consistent", - "singleAttributePerLine": true -} diff --git a/Gemfile.lock b/Gemfile.lock index 535be13..01ff16b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -85,12 +85,12 @@ GEM jekyll-seo-tag (~> 2.1) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) - rexml (3.3.1) + rexml (3.3.2) strscan rouge (4.3.0) safe_yaml (1.0.5) diff --git a/README.md b/README.md index e81c017..36881de 100644 --- a/README.md +++ b/README.md @@ -213,8 +213,7 @@ Pirate Party of Finland._ - Assisted in marketing the cooperative's services by exploring mass communication with `Thunderbird` extensions and `Facebook Marketplace`. -[On the job training]: - https://toimistot.te-palvelut.fi/en/work-try-out-practices-and-provisions +[On the job training]: https://toimistot.te-palvelut.fi/en/work-try-out-practices-and-provisions ## Education diff --git a/package.json b/package.json index 574ace1..270eafb 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,6 @@ { "devDependencies": { - "@prettier/plugin-xml": "3.4.1", - "prettier": "3.3.3", - "prettier-plugin-sh": "0.14.0" + "@aminda/global-prettier-config": "2024.28.4" }, - "packageManager": "pnpm@9.5.0+sha512.140036830124618d624a2187b50d04289d5a087f326c9edfc0ccd733d76c4f52c3a313d4fc148794a2a9d81553016004e6742e8cf850670268a7387fc220c903" + "packageManager": "pnpm@9.6.0+sha512.38dc6fba8dba35b39340b9700112c2fe1e12f10b17134715a4aa98ccf7bb035e76fd981cf0bb384dfa98f8d6af5481c2bef2f4266a24bfa20c34eb7147ce0b5e" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 62fe315..67bdaa5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -7,17 +7,25 @@ settings: importers: .: devDependencies: - "@prettier/plugin-xml": - specifier: 3.4.1 - version: 3.4.1(prettier@3.3.3) - prettier: - specifier: 3.3.3 - version: 3.3.3 - prettier-plugin-sh: - specifier: 0.14.0 - version: 0.14.0(prettier@3.3.3) + "@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: { @@ -26,6 +34,18 @@ packages: 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: { @@ -44,6 +64,12 @@ packages: integrity: sha512-kMbrH0EObaKmK3nVRKUIIya1dpASHIEusM13S4V1ViHFuxuNxCo+arxoa6j/dbV22YBGjl7UKJm9QQKJ2Crzhg==, } + prettier-plugin-nginx@1.0.3: + resolution: + { + integrity: sha512-vV5q85s8XnV6NEgvz1gVLfZhmxAxY03MyOYj2ApBpjFkbs00lRsRkTmqO9L39ADuD18z1RRCcfZ3eVxKhI/nqg==, + } + prettier-plugin-sh@0.14.0: resolution: { @@ -53,6 +79,15 @@ packages: 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: { @@ -81,11 +116,30 @@ packages: } 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 @@ -96,12 +150,19 @@ snapshots: 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: {}