search

cu-uis / cu-starterkit-project

Development repository for Pantheon's recommended (future) Drupal 9+ upstream
1 stars 2 forks source link

Bug - Merge Conflicts in Composer.json then cu_base is combined with Webform dependencies #69

Closed kreynen closed 2 years ago

kreynen commented 2 years ago

Describe the bug

When attempting to merge the cu_base changes in the root, upstream composer.json with the root, project composer.json, we are getting merge conflicts even after the initial merge conflict was resolved. This is because of a style difference in the additional level Webform adds to the custom repos.

        "tippyjs/6.x": {
            "_webform": true,
            "type": "package",
            "package": {
                "name": "tippyjs/6.x",
                "version": "6.2.6",
                "type": "drupal-library",
                "extra": {
                    "installer-name": "tippyjs/6.x"
                },
                "dist": {
                    "url": "https://unpkg.com/tippy.js@6.2.6/dist/tippy-bundle.umd.min.js",
                    "type": "file"
                }
            }
        },

It's the "tippyjs/6.x": that is different than the entries that start with just { "type":

        {
            "type": "composer",
            "url": "https://packages.drupal.org/8"
        },
        {
            "type": "path",
            "url": "upstream-configuration"
        },
        {
            "type": "package",
            "package": {
                "name": "drupal/taxonomy_revision_ui",
                "type": "drupal-module",
                "version": "1.0.0",
                "source": {
                    "type": "git",
                    "url": "https://git.drupalcode.org/sandbox/hugronaphor-3064521.git",
                    "reference": "8ecf8c3757cd5f4c2e3dde5ce05bdbb5d2f865e1"
                }
            }
        },

The result of the merge requires manually fixes. By simply added a name like "drupal/taxonomy_revision_ui": and "cu-uis/cu_base" to the custom packages we've added at the upstream level, we'd stop having these conflicts with Autopliot and drush webform:composer:update

kreynen commented 2 years ago

https://github.com/cu-uis/cu-starterkit-project/pull/70