Merge branch 'dev'

Author: hdodov

.editorconfig

@@ -2,16 +2,8 @@
 charset = utf-8
 end_of_line = lf
 
-[*.{html,php,css,scss,js,ts,vue}]
+[*.{js,vue}]
+indent_size = 4
 indent_style = tab
-trim_trailing_whitespace = true
 insert_final_newline = true
-
-[*.{yml,json}]
-indent_size = 2
-indent_style = space
-trim_trailing_whitespace = false
-
-[*.md]
-indent_size = 4
-indent_style = space
+trim_trailing_whitespace = true

.gitattributes

@@ -1,12 +1,13 @@
-.github export-ignore
-content export-ignore
-site export-ignore
-src export-ignore
-
-.gitignore export-ignore
-.gitattributes export-ignore
-.editorconfig export-ignore
-.htaccess export-ignore
-index.site.php export-ignore
-package.json export-ignore
-package-lock.json export-ignore
+/.github/               export-ignore
+/scripts/               export-ignore
+/site/                  export-ignore
+/src/                   export-ignore
+/.editorconfig          export-ignore
+/.gitattributes         export-ignore
+/.gitignore             export-ignore
+/.htaccess              export-ignore
+/.php-cs-fixer.dist.php export-ignore
+/.prettierignore        export-ignore
+/index.site.php         export-ignore
+/package-lock.json      export-ignore
+/package.json           export-ignore

.gitignore

@@ -1,19 +1,9 @@
-# Composer
-composer.phar
-/vendor
-
-# Kirby
-/kirby
-/media
-/site/accounts
-/site/sessions
-
-# Node
-/node_modules
-
-# Parcel
-/.cache
-
-# Test repos
-/content
-/remote
+/content/
+/content-origin/
+/kirby/
+/media/
+/node_modules/
+/site/accounts/
+/site/sessions/
+/vendor/
+/.php-cs-fixer.cache

.php-cs-fixer.dist.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace PhpCsFixer;
+
+$finder = Finder::create()
+	->exclude([
+		'.git',
+		'kirby',
+		'node_modules',
+		'vendor'
+	])
+	->in(__DIR__);
+
+return (new Config())
+	->setRules([
+		'@PSR12' => true
+	])
+	->setIndent("\t")
+	->setFinder($finder);

.prettierignore

@@ -0,0 +1,12 @@
+/content/
+/content-origin/
+/kirby/
+/media/
+/node_modules/
+/site/accounts/
+/site/sessions/
+/vendor/
+/composer*
+/index.css
+/index.js
+/package*

composer.json

@@ -10,11 +10,17 @@
       "homepage": "https://dodov.me/"
     }
   ],
+  "scripts": {
+    "fix": "php-cs-fixer fix"
+  },
   "require": {
-    "getkirby/cms": "^3.4",
-    "getkirby/composer-installer": "^1.1"
+    "getkirby/cms": "^3.6",
+    "getkirby/composer-installer": "^1.2"
+  },
+  "require-dev": {
+    "friendsofphp/php-cs-fixer": "^3.2"
   },
   "extra": {
     "installer-name": "git"
   }
-}
+}