BIG REFACTORING using composer create-project drupal-composer/drupal-project

.gitignore

@@ -1,45 +1,24 @@
-# This file contains default .gitignore rules. To use it, copy it to .gitignore,
-# and it will cause files like your settings.php and user-uploaded files to be
-# excluded from Git version control. This is a common strategy to avoid
-# accidentally including private information in public repositories and patch
-# files.
-#
-# Because .gitignore can be specific to your site, this file has a different
-# name; updating Drupal core will not override your custom .gitignore file.
-
-# Ignore core when managing all of a project's dependencies with Composer
-# including Drupal core.
-core
-
-# Ignore dependencies that are managed with Composer.
-# Generally you should only ignore the root vendor directory. It's important
-# that core/assets/vendor and any other vendor directories within contrib or
-# custom module, theme, etc., are not ignored unless you purposely do so.
+# Ignore directories generated by Composer
+/drush/contrib/
 /vendor/
-/modules/contrib/
-/themes/contrib/
-/libraries/
+/web/core/
+/web/modules/contrib/
+/web/themes/contrib/
+/web/profiles/contrib/
+/web/libraries/
 
-# Ignore configuration files that may contain sensitive information.
-sites/*/settings*.php
-sites/*/services*.yml
+# Ignore sensitive information
+/web/sites/*/settings.php
+/web/sites/*/settings.local.php
 
-# Ignore paths that contain user-generated content.
-sites/*/files
-sites/*/private
+# Ignore Drupal's file directory
+/web/sites/*/files/
 
 # Ignore SimpleTest multi-site environment.
-sites/simpletest
+/web/sites/simpletest
 
-# If you prefer to store your .gitignore file in the sites/ folder, comment
-# or delete the previous settings and uncomment the following ones, instead.
+# Ignore files generated by PhpStorm
+/.idea/
 
-# Ignore configuration files that may contain sensitive information.
-# */settings*.php
-
-# Ignore paths that contain user-generated content.
-# */files
-# */private
-
-# Ignore SimpleTest multi-site environment.
-simpletest
+# Ignore .env files as they are personal
+/.env