Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 0 additions & 27 deletions .env.example

This file was deleted.

36 changes: 17 additions & 19 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ This project template should provide a kickstart for managing your site dependen
## Usage

See our [install documentation](https://thunder.github.io/developer-guide/setup.html#install-thunder) on how to use Thunder project.
We also have documentation on [extending](https://thunder.github.io/developer-guide/setup.html#extend) and [updating](https://thunder.github.io/developer-guide/setup.html#update) Thunder sites.
We also have documentation on [extending](https://thunder.github.io/developer-guide/setup.html#extend) and [updating](https://thunder.github.io/developer-guide/setup.html#update) Thunder sites.

## What does the template do?

Expand All @@ -19,47 +19,45 @@ When installing the given `composer.json` some tasks are taken care of:
* Profiles (packages of type `drupal-profile`) will be placed in `docroot/profiles/contrib/`
* Downloads Drupal scaffold files such as `index.php`, or `.htaccess`
* Creates `sites/default/files`-directory.
* Latest version of drush is installed locally for use at `bin/drush`.
* Latest version of DrupalConsole is installed locally for use at `bin/drupal`.

### File update

This project will attempt to keep all of your Thunder and drupal core files up-to-date; the
project [drupal-composer/drupal-scaffold](https://github.com/drupal-composer/drupal-scaffold)
is used to ensure that your scaffold files are updated every time drupal/core is
updated. If you customize any of the "scaffolding" files (commonly .htaccess),
you may need to merge conflicts if any of your modfied files are updated in a
This project will attempt to keep all of your Thunder and drupal core files up-to-date; the
project [drupal-composer/drupal-scaffold](https://github.com/drupal-composer/drupal-scaffold)
is used to ensure that your scaffold files are updated every time drupal/core is
updated. If you customize any of the "scaffolding" files (commonly .htaccess),
you may need to merge conflicts if any of your modfied files are updated in a
new release of Drupal core.

Follow the steps below to update your thunder files.

1. Run `composer update`
1. Run `git diff` to determine if any of the scaffolding files have changed.
Review the files for any changes and restore any customizations to
1. Run `git diff` to determine if any of the scaffolding files have changed.
Review the files for any changes and restore any customizations to
`.htaccess` or `robots.txt`.
1. Commit everything all together in a single commit, so `docroot` will remain in
sync with the `core` when checking out branches or running `git bisect`.
1. In the event that there are non-trivial conflicts in step 2, you may wish
to perform these steps on a branch, and use `git merge` to combine the
updated core files with your customized files. This facilitates the use
of a [three-way merge tool such as kdiff3](http://www.gitshah.com/2010/12/how-to-setup-kdiff-as-diff-tool-for-git.html). This setup is not necessary if your changes are simple;
keeping all of your modifications at the beginning or end of the file is a
1. In the event that there are non-trivial conflicts in step 2, you may wish
to perform these steps on a branch, and use `git merge` to combine the
updated core files with your customized files. This facilitates the use
of a [three-way merge tool such as kdiff3](http://www.gitshah.com/2010/12/how-to-setup-kdiff-as-diff-tool-for-git.html). This setup is not necessary if your changes are simple;
keeping all of your modifications at the beginning or end of the file is a
good strategy to keep merges easy.

## FAQ

### Should I commit the contrib modules I download

Composer recommends **no**. They provide [argumentation against but also
Composer recommends **no**. They provide [argumentation against but also
workrounds if a project decides to do it anyway](https://getcomposer.org/doc/faqs/should-i-commit-the-dependencies-in-my-vendor-directory.md).

### How can I apply patches to downloaded modules?

If you need to apply patches (depending on the project being modified, a pull
request is often a better solution), you can do so with the
If you need to apply patches (depending on the project being modified, a pull
request is often a better solution), you can do so with the
[composer-patches](https://github.com/cweagans/composer-patches) plugin.

To add a patch to drupal module foobar insert the patches section in the extra
To add a patch to drupal module foobar insert the patches section in the extra
section of composer.json:
```json
"extra": {
Expand Down
16 changes: 6 additions & 10 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,24 +32,20 @@
}
],
"require": {
"thunder/thunder-distribution": "^7.0@STABLE",
"drupal/core-composer-scaffold": "^10.0||^11.0",
"composer/installers": "^1.2",
"drush/drush": "~12.0||~13.0",
"vlucas/phpdotenv": "^2.4",
"thunder/thunder-distribution": "^8.2@dev",
"drupal/core-composer-scaffold": "^11.0",
"composer/installers": "^2.2",
"drush/drush": "~13.0",
"oomphinc/composer-installers-extender": "^2.0"
},
"require-dev": {
"drupal/core-dev": "^10.0||^11.0"
"drupal/core-dev": "^11.0"
},
"conflict": {
"drupal/drupal": "*"
},
"minimum-stability": "dev",
"minimum-stability": "alpha",
"prefer-stable": true,
"autoload": {
"files": ["load.environment.php"]
},
"extra": {
"composer-exit-on-patch-failure": true,
"installer-types": ["bower-asset", "npm-asset"],
Expand Down
20 changes: 0 additions & 20 deletions load.environment.php

This file was deleted.