You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
is used to ensure that your scaffold files are updated every time drupal/core is
55
-
updated. If you customize any of the "scaffolding" files (commonly `.htaccess`),
57
+
is used to ensure that your scaffold files are updated every time `drupal/core`
58
+
is updated.
59
+
60
+
If you customize any of the "scaffolding" files (commonly `.htaccess`),
56
61
you may need to merge conflicts if any of your modified files are updated in a
57
62
new release of Drupal core.
58
63
59
-
Follow the steps below to update your core files.
64
+
Follow the steps below to update your Drupal core files.
60
65
61
66
1. Run `composer update "drupal/core-*" --with-dependencies` to update Drupal Core and its dependencies.
62
67
2. Run `git diff` to determine if any of the scaffolding files have changed.
63
68
Review the files for any changes and restore any customizations to
64
69
`.htaccess` or `robots.txt`.
65
-
1. Commit everything all together in a single commit, so `web` will remain in
70
+
3. Commit everything all together in a single commit, so `web` will remain in
66
71
sync with the `core` when checking out branches or running `git bisect`.
67
-
1. In the event that there are non-trivial conflicts in step 2, you may wish
72
+
4. In the event that there are non-trivial conflicts in step 2, you may wish
68
73
to perform these steps on a branch, and use `git merge` to combine the
69
74
updated core files with your customized files. This facilitates the use
70
75
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;
71
76
keeping all of your modifications at the beginning or end of the file is a
72
77
good strategy to keep merges easy.
73
78
74
-
## FAQ
79
+
## FAQs
75
80
76
81
### Should I commit the contrib modules I download?
77
82
78
83
Composer recommends **no**. They provide [argumentation against but also
79
-
workrounds if a project decides to do it anyway](https://getcomposer.org/doc/faqs/should-i-commit-the-dependencies-in-my-vendor-directory.md).
84
+
workarounds if a project decides to do it anyway](https://getcomposer.org/doc/faqs/should-i-commit-the-dependencies-in-my-vendor-directory.md).
80
85
81
86
### Should I commit the scaffolding files?
82
87
83
88
The [Drupal Composer Scaffold](https://github.com/drupal/core-composer-scaffold)
84
-
plugin can download the scaffold files (like index.php, update.php, ...) to the
85
-
web/ directory of your project. If you have not customized those files you could
86
-
choose to not check them into your version control system (e.g. git). If that is
87
-
the case for your project it might be convenient to automatically run the
88
-
drupal-scaffold plugin after every install or update of your project. You can
89
-
achieve that by registering `@composer drupal:scaffold` as post-install and
90
-
post-update command in your composer.json:
89
+
plugin can download the scaffold files (like `index.php`, `update.php` etc.) to
90
+
the `web` directory of your project. If you have not customized those files you
91
+
could choose to not check them into your version control system (e.g. git).
92
+
If that is the case for your project, it might be convenient to automatically
93
+
run the drupal-scaffold plugin after every install or update of your project.
94
+
You can achieve that by registering `@composer drupal:scaffold` as `post-install`
95
+
and `post-update` command in your `composer.json`:
91
96
92
97
```json
93
98
"scripts": {
@@ -102,14 +107,14 @@ post-update command in your composer.json:
102
107
},
103
108
```
104
109
105
-
### How can I apply patches to downloaded modules?
110
+
### How can I apply patches to included dependencies?
106
111
107
-
If you need to apply patches (depending on the project being modified, a pull
108
-
request is often a better solution), you can do so with the
0 commit comments