Skip to content

Commit

Permalink
not so quick dependency update
Browse files Browse the repository at this point in the history
  • Loading branch information
Mikaela committed Aug 4, 2024
1 parent 47e8742 commit 561236e
Show file tree
Hide file tree
Showing 10 changed files with 189 additions and 60 deletions.
8 changes: 8 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
root = true

[*]
indent_style = space

[*.json]
indent_style = tab
indent_size = tab
8 changes: 4 additions & 4 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"github>piraattipuolue/.github:renovate-config"
]
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"github>piraattipuolue/.github:renovate-config"
]
}
61 changes: 46 additions & 15 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,42 +1,73 @@
ci:
# Forĝejo/Gitea mirrors will autoclose pull requests. This should decrease
# the frequency of unnecessary PRs.
# https://github.com/pre-commit-ci/issues/issues/83
autoupdate_schedule: quarterly
skip: [pnpm-install-dev, prettier]
skip: ["prettier"]

default_language_version:
node: "lts"
# Remember .python-version !
python: "3.12"
ruby: ".ruby-version"

repos:
- repo: https://github.com/thlorenz/doctoc
rev: v2.2.0
hooks:
- id: doctoc
args: [--update-only, --notitle]

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
hooks:
- id: trailing-whitespace
args: ["--markdown-linebreak-ext", "md,markdown"]
exclude_types: [svg, tsv]
- id: end-of-file-fixer
#- id: end-of-file-fixer
- id: check-yaml
- id: check-added-large-files
- id: check-case-conflict
- id: check-executables-have-shebangs
- id: check-json
- id: check-merge-conflict
- id: check-shebang-scripts-are-executable
- id: check-toml
- id: check-xml
- id: destroyed-symlinks
- id: detect-private-key
- id: fix-byte-order-marker
- id: check-merge-conflict
- id: mixed-line-ending
args: [--fix=auto]
- id: pretty-format-json
args: [--autofix, --no-ensure-ascii]
args:
# Remember also: --no-sort-keys
# ASCII excludes the älphäbet amongst others
[
--autofix,
--indent,
"\t",
--no-ensure-ascii,
--top-keys,
"Name,name",
]

- repo: https://github.com/thlorenz/doctoc
rev: v2.2.0
- repo: https://github.com/pre-commit-ci/pre-commit-ci-config
rev: v1.6.1
hooks:
- id: doctoc
args: [--update-only, --notitle]
- id: check-pre-commit-ci-config

- 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
name: prettier
entry: corepack pnpm exec prettier --cache --ignore-unknown --write
entry: corepack pnpx prettier --cache --ignore-unknown --write
language: system

- repo: https://github.com/editorconfig-checker/editorconfig-checker.python
rev: "2.7.3"
hooks:
- id: editorconfig-checker
alias: ec
args: [-disable-max-line-length]
6 changes: 0 additions & 6 deletions .prettierrc

This file was deleted.

1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.3.4
19 changes: 13 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
source 'https://rubygems.org'
source "https://rubygems.org"
ruby file: ".ruby-version"

gem 'jekyll'
gem "jekyll"

gem 'minima'
gem "minima"
# gem "jekyll-theme-leap-day"
# gem "jekyll-theme-minimal"

group :jekyll_plugins do
gem 'jekyll-feed'
gem 'jekyll-seo-tag'
gem 'jekyll-sitemap'
gem "jekyll-feed"
gem "jekyll-seo-tag"
gem "jekyll-sitemap"
end

# Prettier Ruby
gem "prettier_print"
gem "syntax_tree"
gem "syntax_tree-haml"
gem "syntax_tree-rbs"
40 changes: 34 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,13 @@ GEM
eventmachine (1.2.7)
ffi (1.17.0-x86_64-linux-gnu)
forwardable-extended (2.6.0)
google-protobuf (4.27.2-x86_64-linux)
google-protobuf (4.27.3-x86_64-linux)
bigdecimal
rake (>= 13)
haml (6.3.0)
temple (>= 0.8.2)
thor
tilt
http_parser.rb (0.8.0)
i18n (1.14.5)
concurrent-ruby (~> 1.0)
Expand Down Expand Up @@ -52,27 +56,44 @@ GEM
listen (3.9.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
logger (1.6.0)
mercenary (0.4.0)
minima (2.5.1)
jekyll (>= 3.5, < 5.0)
jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (6.0.0)
prettier_print (1.2.1)
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)
rbs (3.5.2)
logger
rexml (3.3.4)
strscan
rouge (4.3.0)
safe_yaml (1.0.5)
sass-embedded (1.77.5-x86_64-linux-gnu)
google-protobuf (>= 3.25, < 5.0)
sass-embedded (1.77.8-x86_64-linux-gnu)
google-protobuf (~> 4.26)
strscan (3.1.0)
syntax_tree (6.2.0)
prettier_print (>= 1.2.0)
syntax_tree-haml (4.0.3)
haml (>= 5.2)
prettier_print (>= 1.2.1)
syntax_tree (>= 6.0.0)
syntax_tree-rbs (1.0.0)
prettier_print
rbs
syntax_tree (>= 2.0.1)
temple (0.10.3)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
thor (1.3.1)
tilt (2.4.0)
unicode-display_width (2.5.0)
webrick (1.8.1)

Expand All @@ -85,6 +106,13 @@ DEPENDENCIES
jekyll-seo-tag
jekyll-sitemap
minima
prettier_print
syntax_tree
syntax_tree-haml
syntax_tree-rbs

RUBY VERSION
ruby 3.3.4p94

BUNDLED WITH
2.5.9
2.5.11
2 changes: 1 addition & 1 deletion _includes/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ <h2 class="footer-heading">{{ site.title | escape }}</h2>
<ul class="contact-list">
<li class="p-name">
{%- if site.author -%}
<a href="{{ site.author.url }}">{{ site.author.name }}</a>
<a href="{{ site.author.url }}">{{ site.author.name }}</a>
{%- else -%}
{{ site.title | escape }}
{%- endif -%}
Expand Down
11 changes: 5 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
{
"devDependencies": {
"@prettier/plugin-xml": "3.4.1",
"prettier": "3.3.2",
"prettier-plugin-sh": "0.14.0"
},
"packageManager": "[email protected]+sha512.f549b8a52c9d2b8536762f99c0722205efc5af913e77835dbccc3b0b0b2ca9e7dc8022b78062c17291c48e88749c70ce88eb5a74f1fa8c4bf5e18bb46c8bd83a"
"devDependencies": {
"@aminda/global-prettier-config": "2024.28.4"
},
"packageManager": "[email protected]+sha512.38dc6fba8dba35b39340b9700112c2fe1e12f10b17134715a4aa98ccf7bb035e76fd981cf0bb384dfa98f8d6af5481c2bef2f4266a24bfa20c34eb7147ce0b5e",
"prettier": "@aminda/global-prettier-config"
}
93 changes: 77 additions & 16 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 561236e

Please sign in to comment.