Support for Drupal 7 is ending on 5 January 2025—it’s time to migrate to Drupal 10! Learn about the many benefits of Drupal 10 and find migration tools in our resource center.
Problem/Motivation
The wikimedia/composer-merge-plugin
plugin was removed from core, see #2912387: Stop using wikimedia/composer-merge-plugin, But its config is in composer.json still.
Proposed resolution
Remove the config from composer.json.
- "merge-plugin": {
- "recurse": true,
- "replace": false,
- "merge-extra": false
- },
Remaining tasks
User interface changes
API changes
Data model changes
Release notes snippet
Comment | File | Size | Author |
---|---|---|---|
#16 | 3153869-16.patch | 1.34 KB | jungle |
#9 | 3153869-8.9.x-9.patch | 21.51 KB | jungle |
#2 | 3153869-2.patch | 1017 bytes | jungle |
Comments
Comment #2
jungleRemoved and run composer update --lock to get the content-hash updated in composer.lock
Comment #3
NickDickinsonWildeLGTM
Comment #4
xjmI reviewed this by applying the patch and then running:
COMPOSER_ROOT_VERSION=9.1.x-dev composer update drupal/core*
The only change was this:
...Which happens seemingly randomly in various patches and releases, so out of scope and not a concern.
This looks good, but cspell is preventing me from committing it. 😂 We need to make cspell skip these files...
(And the list goes on).
Comment #5
xjmFiled #3154594: CSpell is not skipping composer.json and composer.lock, which will prevent committing dependency updates or tagging releases unless --no-verify is used.
Comment #8
xjmAlright, committed to 9.1.x by temporarily commenting out all the cspell stuff locally in our pre-commit hook (because I wanted the other checks to run).
I was surprised that this would cherry-pick cleanly to 9.0.x and pass tests, because at least the versions should be different and therefore the content would theoretically have a different hash?
I tried this:
This resulted in the following diff:
All that looks an awful lot like the out-of-scope fluff that got added when we fixed #3153677: Lockfile hash is wrong in 8.9.x since 8.9.1, causing test failures on PHP 7.3+, but at least the
content-hash
isn't changing. So it does look like this is an OK cherry-pick to 9.0.x. I guess we need a separate followup issue for the fluff.Meanwhile, setting PTBP for an 8.9.x version. Thanks!
Comment #9
jungleComming along a lot of funding info, while run
composer update --lock
.Comment #10
jungleComment #11
NickDickinsonWilde8.9 patch looks good. Although I'm concerned funding additions may add major risk of conflicts, but probably best to just quickly get it in then.
Comment #12
xjmHmm, interesting. I think we should instead take care of the extra stuff in an 8.9.x version of #3154611: Update composer.lock for 9.0.x and 8.9.x based on Composer 1.10 output, and postpone the backport on that. Otherwise there's weird overlapping scope.
Comment #13
xjmComment #14
longwaveDuplicate of #3135621: Remove wikimedia/composer-merge-plugin remnants from composer.json :(
Comment #15
jungle@longwave, sorry, I should search the issue queue first!
@xjm, please credit @longwave for working on the duplicate one if applicable! Thanks!
Comment #16
jungleAn 8.9.x one upon #3154611: Update composer.lock for 9.0.x and 8.9.x based on Composer 1.10 output, changes are clean now.
Comment #17
xjmBack to NR now that that is in.
Comment #18
xjmOh and making sure @longwave is credited per #15. Also added credit for Nick for making me think about the downsides of mixing up these two different kinds of changes. Thanks!
Comment #19
NickDickinsonWildeLooks good.
I will note that does have the random removal of bin/composer lines.
Comment #21
catchCommitted 8186b23 and pushed to 8.9.x. Thanks!