From d5d23728f7e3f2d7f4686803e5855c35e022b626 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rn=20Fauske?= <jorn@ramsalt.com>
Date: Sat, 27 Jul 2024 11:42:19 +0200
Subject: [PATCH] Fix composer.json errors left from merge conflicts

---
 composer.json | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/composer.json b/composer.json
index 1f33eeb45..1dec26207 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,6 @@
 {
     "name": "ramsalt/drupal-project",
-    "description": "Project template for Drupal 10 projects with Composer",
-    "type": "project",
+    "description": "Project template for Drupal 11 projects with Composer",
     "license": "GPL-2.0-or-later",
     "type": "project",
     "authors": [
@@ -71,8 +70,16 @@
     "extra": {
         "composer-exit-on-patch-failure": true,
         "drupal-scaffold": {
+            "allowed-packages": [
+                "ramsalt/drupal-scaffold"
+            ],
             "file-mapping": {
                 "[project-root]/.gitignore": false,
+                "[web-root]/sites/development.services.yml": {
+                    "mode": "replace",
+                    "path": "web/core/assets/scaffold/files/development.services.yml",
+                    "overwrite": false
+                },
                 "[web-root]/INSTALL.txt": false,
                 "[web-root]/README.txt": false
             },
@@ -122,21 +129,6 @@
             "ramsaltmedia-module",
             "ramsaltmedia-theme"
         ],
-        "drupal-scaffold": {
-            "allowed-packages": [
-                "ramsalt/drupal-scaffold"
-            ],
-            "locations": {
-                "web-root": "web/"
-            },
-            "file-mapping": {
-                "[web-root]/sites/development.services.yml": {
-                    "mode": "replace",
-                    "path": "web/core/assets/scaffold/files/development.services.yml",
-                    "overwrite": false
-                }
-            }
-        },
         "patchLevel": {
             "drupal/core": "-p2"
         },
@@ -157,4 +149,5 @@
             "DrupalProject\\composer\\ScriptHandler::createRequiredFiles"
         ]
     }
+    }
 }