Skip to content

Commit

Permalink
Merge pull request #42 from fork/feature/v4
Browse files Browse the repository at this point in the history
Feature/v4
  • Loading branch information
holmey committed Jan 12, 2024
2 parents 7152087 + cb08d6e commit e4a46de
Show file tree
Hide file tree
Showing 47 changed files with 1,067 additions and 1,544 deletions.
5 changes: 1 addition & 4 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@ insert_final_newline = true
indent_size = 4
trim_trailing_whitespace = false

[site/templates/**.php]
indent_size = 2

[site/snippets/**.php]
[*.php]
indent_size = 2

[package.json,.{babelrc,editorconfig,eslintrc,lintstagedrc,stylelintrc}]
Expand Down
43 changes: 0 additions & 43 deletions .githooks/commit-msg

This file was deleted.

33 changes: 0 additions & 33 deletions .githooks/pre-commit

This file was deleted.

4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ pnpm-lock.yaml
/vendor
/kirby
/site/plugins/*
/site/config/vite.config.php
/site/config/retour.yml

# Editors
# (sensitive workspace files)
Expand Down Expand Up @@ -47,10 +49,10 @@ dist
!public/assets/dist
.dev
content/home/.lock
.vite

# CS Fixer
# --------
.php-cs-fixer.cache
site/logs/retour
cghooks.lock

2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,6 @@ For more information on Docker basics related to Kirby you can find a very good
- [Meta Knight – SEO for Kirby](https://github.com/diesdasdigital/kirby-meta-knight)
- [Kirby Navigation Field](https://github.com/chrisbeluga/kirby-navigation)
- [Kirby Vite Plugin](https://github.com/arnoson/kirby-vite)
- [Kirby Fields Block](https://github.com/jongacnik/kirby-fields-block)
- [Kirby 3 Extended Writer](https://github.com/coralic/kirby-extended-writer)

## License

Expand Down
51 changes: 21 additions & 30 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,25 @@
{
"name": "fork/kirby-starterkit",
"description": "Kirby Starterkit",
"homepage": "https://fork.de",
"type": "project",
"keywords": [
"kirby",
"cms",
"starterkit"
],
"authors": [
{
"name": "Fork Unstable Media GmbH",
"homepage": "https://fork.de"
}
],
"require": {
"getkirby/cms": "^3.9.4",
"bnomei/kirby3-security-headers": "^2.5.4",
"getkirby/staticache": "^1.0.1",
"distantnative/retour-for-kirby": "^4.4.2",
"diesdasdigital/kirby-meta-knight": "^1.2.2",
"belugadigital/kirby-navigation": "^3.0.1",
"arnoson/kirby-vite": "^3.0.7",
"jg/kirby-fields-block": "^1.2.1",
"coralic/kirby-extended-writer": "^1.1.1",
"medienbaecker/autoresize": "^2.1.4"
"getkirby/cms": "^4.0",
"getkirby/staticache": "^1.0",
"arnoson/kirby-vite": "^5.0",
"tobimori/kirby-seo": "^0.4",
"distantnative/retour-for-kirby": "^5.0"
},
"config": {
"optimize-autoloader": true,
Expand All @@ -19,25 +29,6 @@
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^3.17",
"phpstan/phpstan": "^1.10.15",
"brainmaestro/composer-git-hooks": "v3.0.0-alpha.1"
},
"scripts": {
"post-install-cmd": [
"./vendor/bin/cghooks add --ignore-lock"
],
"post-update-cmd": [
"./vendor/bin/cghooks update"
]
},
"extra": {
"hooks": {
"pre-commit": [
"./.githooks/pre-commit"
],
"commit-msg": [
"./.githooks/commit-msg"
]
}
"phpstan/phpstan": "^1.10.15"
}
}
Loading

0 comments on commit e4a46de

Please sign in to comment.