From 25bf880a6b71251e89aa10404da860801c45251e Mon Sep 17 00:00:00 2001
From: Tasha Harrison <tasha_harrison@dennis.co.uk>
Date: Fri, 26 Feb 2021 12:23:52 +0000
Subject: [PATCH 1/4] CMS-1773 use composer branch of profile

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 68e0fce..b94e88b 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,7 @@
         "drupal-composer/drupal-scaffold": "^2.6",
         "behat/mink-selenium2-driver": "1.4.x-dev as 1.3.x-dev",
         "wikimedia/composer-merge-plugin": "^1.4",
-        "dennisdigital/polaris": "^3.0"
+        "dennisdigital/polaris": "dev-CMS-1773-composer-2"
     },
     "conflict": {
         "drupal/drupal": "*"

From ca82a3d2504bc7b4e8a19c4492c8f6f434f296e9 Mon Sep 17 00:00:00 2001
From: Tasha Harrison <tasha_harrison@dennis.co.uk>
Date: Fri, 26 Feb 2021 12:29:07 +0000
Subject: [PATCH 2/4] CMS-1773 remove packages no longer requried

---
 composer.json | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index b94e88b..0cfa090 100644
--- a/composer.json
+++ b/composer.json
@@ -21,11 +21,8 @@
     "require": {
         "php": ">=7.0",
         "composer/installers": "^1.2",
-        "oomphinc/composer-installers-extender": "^1.1",
         "cweagans/composer-patches": "^1.6.5",
-        "drupal-composer/drupal-scaffold": "^2.6",
-        "behat/mink-selenium2-driver": "1.4.x-dev as 1.3.x-dev",
-        "wikimedia/composer-merge-plugin": "^1.4",
+        "wikimedia/composer-merge-plugin": "^2.0.1",
         "dennisdigital/polaris": "dev-CMS-1773-composer-2"
     },
     "conflict": {

From b1051bf038866489818573cadfc4d10c8b7c4f15 Mon Sep 17 00:00:00 2001
From: Tasha Harrison <tasha_harrison@dennis.co.uk>
Date: Fri, 26 Feb 2021 14:40:44 +0000
Subject: [PATCH 3/4] CMS-1773 try to use drupal core scaffolding

---
 composer.json | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/composer.json b/composer.json
index 0cfa090..f2e015d 100644
--- a/composer.json
+++ b/composer.json
@@ -22,8 +22,9 @@
         "php": ">=7.0",
         "composer/installers": "^1.2",
         "cweagans/composer-patches": "^1.6.5",
-        "wikimedia/composer-merge-plugin": "^2.0.1",
-        "dennisdigital/polaris": "dev-CMS-1773-composer-2"
+        "dennisdigital/polaris": "dev-CMS-1773-composer-2",
+        "drupal/core-composer-scaffold": "^9.1",
+        "wikimedia/composer-merge-plugin": "^2.0.1"
     },
     "conflict": {
         "drupal/drupal": "*"
@@ -37,30 +38,29 @@
         ],
         "files": ["load.environment.php"]
     },
-    "scripts": {
-        "drupal-scaffold": "DrupalComposer\\DrupalScaffold\\Plugin::scaffold",
-        "pre-install-cmd": [
-            "DrupalProject\\composer\\ScriptHandler::checkComposerVersion"
-        ],
-        "pre-update-cmd": [
-            "DrupalProject\\composer\\ScriptHandler::checkComposerVersion"
-        ],
-        "post-install-cmd": [
-            "@drupal-scaffold",
-            "DrupalProject\\composer\\ScriptHandler::createRequiredFiles"
-        ],
-        "post-update-cmd": [
-            "@drupal-scaffold",
-            "DrupalProject\\composer\\ScriptHandler::createRequiredFiles",
-            "echo # drush cim -y",
-            "echo # drush updb -y",
-            "echo # drush cex -y",
-            "echo # git status"
-        ]
-    },
     "extra": {
         "composer-exit-on-patch-failure": true,
         "installer-types": ["bower-asset"],
+        "locations": {
+            "web-root": "./docroot"
+        },
+        "file-mapping": {
+            "[web-root]/.csslintrc": "assets/.csslintrc",
+            "[web-root]/.editorconfig": "assets/.editorconfig",
+            "[web-root]/.eslintignore": "assets/.eslintignore",
+            "[web-root]/.eslintrc.json": "assets/.eslintrc.json",
+            "[web-root]/.gitattributes": "assets/.gitattributes",
+            "[web-root]/.ht.router.php": "assets/.ht.router.php",
+            "[web-root]/.htaccess": "assets/.htaccess",
+            "[web-root]/sites/default/default.services.yml": "assets/default.services.yml",
+            "[web-root]/sites/default/default.settings.php": "assets/default.settings.php",
+            "[web-root]/sites/example.settings.local.php": "assets/example.settings.local.php",
+            "[web-root]/sites/example.sites.php": "assets/example.sites.php",
+            "[web-root]/index.php": "assets/index.php",
+            "[web-root]/robots.txt": "assets/robots.txt",
+            "[web-root]/update.php": "assets/update.php",
+            "[web-root]/web.config": "assets/web.config"
+        },
         "installer-paths": {
             "web/core": ["type:drupal-core"],
             "web/libraries/{$name}": [

From 696c8a21ec3d6ccc248dba520262ddfad50cafd7 Mon Sep 17 00:00:00 2001
From: Tasha Harrison <tasha_harrison@dennis.co.uk>
Date: Fri, 26 Feb 2021 14:51:26 +0000
Subject: [PATCH 4/4] CMS-1773 add web-root correctly

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index f2e015d..a8dd2f7 100644
--- a/composer.json
+++ b/composer.json
@@ -42,7 +42,7 @@
         "composer-exit-on-patch-failure": true,
         "installer-types": ["bower-asset"],
         "locations": {
-            "web-root": "./docroot"
+            "web-root": "web/"
         },
         "file-mapping": {
             "[web-root]/.csslintrc": "assets/.csslintrc",