Merge pull request #652 from UN-OCHA/feature/RW-804

[RW-804] Update to CD 9.2
UN-OCHA · Sep 28, 2023 · 3191005 · 3191005
2 parents f6cb1fe + 653a4ea
commit 3191005
Show file tree

Hide file tree

Showing 63 changed files with 10,409 additions and 8,968 deletions.
diff --git a/PATCHES/common_design-drupal-10-compatibility.patch b/PATCHES/common_design-drupal-10-compatibility.patch
diff --git a/composer.json b/composer.json
@@ -71,7 +71,7 @@
         "reliefweb/simple-autocomplete": "^v1.3",
         "reliefweb/simple-datepicker": "^v1.3",
         "symfony/uid": "^6.2",
-        "unocha/common_design": "^7.4",
+        "unocha/common_design": "^9.2",
         "webflo/drupal-finder": "^1.2.2"
     },
     "require-dev": {

diff --git a/composer.lock b/composer.lock
diff --git a/composer.patches.json b/composer.patches.json
@@ -27,9 +27,6 @@
         },
         "drush/drush": {
             "https://humanitarian.atlassian.net/browse/OPS-8026": "PATCHES/drush--timeout-override.patch"
-        },
-        "unocha/common_design": {
-            "Drupal 10 compatibility": "PATCHES/common_design-drupal-10-compatibility.patch"
         }
     }
 }
diff --git a/html/themes/custom/common_design_subtheme/.gitignore b/html/themes/custom/common_design_subtheme/.gitignore
@@ -1,7 +1,5 @@
 # dev files
 **/node_modules/
-**/.sass-cache/
-**/*.css.map
 
 # mac stuff
 **/.DS_Store
diff --git a/html/themes/custom/common_design_subtheme/.nvmrc b/html/themes/custom/common_design_subtheme/.nvmrc
@@ -1 +1 @@
-16.13.2
+18.16.1