Use tabs for json, rm .json, fix prettier ruby, adjust pre-commit-config

This commit is contained in:
Aminda Suomalainen 2024-08-04 08:37:54 +03:00
parent d8cb354ec8
commit 2e2e9f042e
Signed by: Mikaela
SSH Key Fingerprint: SHA256:CXLULpqNBdUKB6E6fLA1b/4SzG0HvKD19PbIePU175Q
7 changed files with 51 additions and 21 deletions

View File

@ -13,3 +13,6 @@ charset = utf-8
indent_style = space indent_style = space
# https://github.com/Mikaela/mikaela.github.io/issues/324 # https://github.com/Mikaela/mikaela.github.io/issues/324
#indent_size = 2 #indent_size = 2
[*.json]
indent_style = tab

7
.json
View File

@ -1,7 +0,0 @@
{
"why": "because it occurred to me and I can?",
"matrix": {
"MSC1769": "https://github.com/matrix-org/matrix-spec-proposals/pull/1769",
"MSC3189": "https://github.com/matrix-org/matrix-spec-proposals/pull/3189"
}
}

View File

@ -15,6 +15,7 @@ ci:
# Consistency with other tools # Consistency with other tools
default_language_version: default_language_version:
node: "lts" node: "lts"
# Remember .python-version !
python: "3.12" python: "3.12"
ruby: ".ruby-version" ruby: ".ruby-version"
@ -33,6 +34,8 @@ repos:
- id: check-json - id: check-json
- id: check-merge-conflict - id: check-merge-conflict
- id: check-shebang-scripts-are-executable - id: check-shebang-scripts-are-executable
- id: check-toml
#- id: check-xml
- id: destroyed-symlinks - id: destroyed-symlinks
- id: detect-private-key - id: detect-private-key
- id: fix-byte-order-marker - id: fix-byte-order-marker
@ -40,7 +43,7 @@ repos:
- id: mixed-line-ending - id: mixed-line-ending
args: [--fix=auto] args: [--fix=auto]
- id: pretty-format-json - id: pretty-format-json
args: [--autofix, --no-ensure-ascii] args: [--autofix, --indent, "\t", --no-ensure-ascii]
- repo: https://github.com/pre-commit/sync-pre-commit-deps - repo: https://github.com/pre-commit/sync-pre-commit-deps
rev: v0.0.1 rev: v0.0.1

View File

@ -1,10 +1,10 @@
{ {
"names": { "names": {
"_": "5f0a1b9389ca7ec3c18f9958822ce823a25c1fe513ae7413635ea1fea55a0560", "_": "5f0a1b9389ca7ec3c18f9958822ce823a25c1fe513ae7413635ea1fea55a0560",
"aminda": "5f0a1b9389ca7ec3c18f9958822ce823a25c1fe513ae7413635ea1fea55a0560", "aminda": "5f0a1b9389ca7ec3c18f9958822ce823a25c1fe513ae7413635ea1fea55a0560",
"delta": "5f0a1b9389ca7ec3c18f9958822ce823a25c1fe513ae7413635ea1fea55a0560", "delta": "5f0a1b9389ca7ec3c18f9958822ce823a25c1fe513ae7413635ea1fea55a0560",
"me": "5f0a1b9389ca7ec3c18f9958822ce823a25c1fe513ae7413635ea1fea55a0560", "me": "5f0a1b9389ca7ec3c18f9958822ce823a25c1fe513ae7413635ea1fea55a0560",
"mikaela": "5f0a1b9389ca7ec3c18f9958822ce823a25c1fe513ae7413635ea1fea55a0560", "mikaela": "5f0a1b9389ca7ec3c18f9958822ce823a25c1fe513ae7413635ea1fea55a0560",
"suomalainen": "5f0a1b9389ca7ec3c18f9958822ce823a25c1fe513ae7413635ea1fea55a0560" "suomalainen": "5f0a1b9389ca7ec3c18f9958822ce823a25c1fe513ae7413635ea1fea55a0560"
} }
} }

6
Gemfile vendored
View File

@ -14,3 +14,9 @@ gem "jekyll-sitemap"
gem "jekyll-seo-tag" gem "jekyll-seo-tag"
# Required for `bundle exec jekyll serve` # Required for `bundle exec jekyll serve`
gem "webrick" gem "webrick"
# Required for https://www.npmjs.com/package/@prettier/plugin-ruby
gem "prettier_print"
gem "syntax_tree"
gem "syntax_tree-haml"
gem "syntax_tree-rbs"

25
Gemfile.lock generated
View File

@ -53,6 +53,10 @@ GEM
google-protobuf (4.27.3-x86_64-linux) google-protobuf (4.27.3-x86_64-linux)
bigdecimal bigdecimal
rake (>= 13) rake (>= 13)
haml (6.3.0)
temple (>= 0.8.2)
thor
tilt
html-pipeline (2.14.3) html-pipeline (2.14.3)
activesupport (>= 2) activesupport (>= 2)
nokogiri (>= 1.4) nokogiri (>= 1.4)
@ -98,6 +102,7 @@ GEM
listen (3.9.0) listen (3.9.0)
rb-fsevent (~> 0.10, >= 0.10.3) rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10) rb-inotify (~> 0.9, >= 0.9.10)
logger (1.6.0)
mercenary (0.4.0) mercenary (0.4.0)
mini_portile2 (2.8.7) mini_portile2 (2.8.7)
minima (2.5.1) minima (2.5.1)
@ -123,12 +128,15 @@ GEM
racc (~> 1.4) racc (~> 1.4)
pathutil (0.16.2) pathutil (0.16.2)
forwardable-extended (~> 2.6) forwardable-extended (~> 2.6)
prettier_print (1.2.1)
public_suffix (6.0.1) public_suffix (6.0.1)
racc (1.8.1) racc (1.8.1)
rake (13.2.1) rake (13.2.1)
rb-fsevent (0.11.2) rb-fsevent (0.11.2)
rb-inotify (0.11.1) rb-inotify (0.11.1)
ffi (~> 1.0) ffi (~> 1.0)
rbs (3.5.2)
logger
rexml (3.3.4) rexml (3.3.4)
strscan strscan
rouge (4.3.0) rouge (4.3.0)
@ -179,8 +187,21 @@ GEM
sass-embedded (1.77.8-x86_64-linux-musl) sass-embedded (1.77.8-x86_64-linux-musl)
google-protobuf (~> 4.26) google-protobuf (~> 4.26)
strscan (3.1.0) 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) terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3) unicode-display_width (>= 1.1.1, < 3)
thor (1.3.1)
tilt (2.4.0)
tzinfo (2.0.6) tzinfo (2.0.6)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
unicode-display_width (2.5.0) unicode-display_width (2.5.0)
@ -220,6 +241,10 @@ DEPENDENCIES
jekyll-seo-tag jekyll-seo-tag
jekyll-sitemap jekyll-sitemap
minima minima
prettier_print
syntax_tree
syntax_tree-haml
syntax_tree-rbs
webrick webrick
RUBY VERSION RUBY VERSION

10
package.json vendored
View File

@ -1,7 +1,7 @@
{ {
"devDependencies": { "devDependencies": {
"@aminda/global-prettier-config": "2024.28.4" "@aminda/global-prettier-config": "2024.28.4"
}, },
"packageManager": "pnpm@9.6.0+sha512.38dc6fba8dba35b39340b9700112c2fe1e12f10b17134715a4aa98ccf7bb035e76fd981cf0bb384dfa98f8d6af5481c2bef2f4266a24bfa20c34eb7147ce0b5e", "packageManager": "pnpm@9.6.0+sha512.38dc6fba8dba35b39340b9700112c2fe1e12f10b17134715a4aa98ccf7bb035e76fd981cf0bb384dfa98f8d6af5481c2bef2f4266a24bfa20c34eb7147ce0b5e",
"prettier": "@aminda/global-prettier-config" "prettier": "@aminda/global-prettier-config"
} }