diff --git a/.editorconfig b/.editorconfig index 1671c9b9..69a2c889 100644 --- a/.editorconfig +++ b/.editorconfig @@ -14,5 +14,5 @@ trim_trailing_whitespace = false [*.{yml,yaml}] indent_size = 2 -[docker-compose.yml] -indent_size = 4 +[*.{js,ts}] +indent_size = 2 diff --git a/.gitignore b/.gitignore index f1ded131..535d4b44 100644 --- a/.gitignore +++ b/.gitignore @@ -5,9 +5,6 @@ .env .env.backup .phpunit.result.cache -.php-cs-fixer.cache -.phpstorm.meta.php -_ide_helper.php docker-compose.override.yml Homestead.json Homestead.yaml @@ -15,3 +12,7 @@ npm-debug.log yarn-error.log /.idea /.vscode +/.phpstorm.meta.php +/.php-cs-fixer.cache +/_ide_helper.php +**/.DS_Store diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 00000000..01046057 --- /dev/null +++ b/.prettierrc @@ -0,0 +1,9 @@ +{ + "options": { + "endOfLine": "lf", + "singleQuote": true, + "tabWidth": 4, + "semi": true, + "trailingComma": "all" + } +} diff --git a/.styleci.yml b/.styleci.yml index 877ea701..679a631e 100644 --- a/.styleci.yml +++ b/.styleci.yml @@ -6,7 +6,6 @@ php: finder: not-name: - index.php - - server.php js: finder: not-name: diff --git a/composer.json b/composer.json index 68abed93..1cfde5d8 100644 --- a/composer.json +++ b/composer.json @@ -69,15 +69,14 @@ "scripts": { "post-autoload-dump": [ "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump", - "@php artisan package:discover --ansi" - ], - "post-update-cmd": [ + "@php artisan package:discover --ansi", "@php artisan vendor:publish --tag=laravel-assets --ansi --force", - "@php artisan horizon:publish --ansi", - "@php artisan telescope:publish --ansi", "@php artisan ide-helper:generate", "@php artisan ide-helper:meta" ], + "post-update-cmd": [ + "Illuminate\\Foundation\\ComposerScripts::postUpdate" + ], "post-root-package-install": [ "@php -r \"file_exists('.env') || copy('.env.example', '.env');\"" ],