From 1adb2e4231df70a6edd98885e5588c75fb8f2846 Mon Sep 17 00:00:00 2001 From: Chris Ruppel Date: Thu, 21 Dec 2023 14:33:05 +0100 Subject: [PATCH 1/3] chore: enable SDC plus deps Refs: CD-483 --- config/core.extension.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/core.extension.yml b/config/core.extension.yml index 8ee40fbb..86827e59 100644 --- a/config/core.extension.yml +++ b/config/core.extension.yml @@ -50,10 +50,12 @@ module: path_alias: 0 responsive_image: 0 samples: 0 + sdc: 0 search: 0 search_api: 0 search_api_db: 0 select_a11y: 0 + serialization: 0 social_api: 0 social_auth: 0 social_auth_hid: 0 From b174fd77d358e530d5d4b40d9221ab181955955d Mon Sep 17 00:00:00 2001 From: Chris Ruppel Date: Wed, 3 Jan 2024 10:56:34 +0100 Subject: [PATCH 2/3] chore: migrate site's sub-theme to be SDC-ready Refs: CD-483 --- .../common_design_subtheme.libraries.yml | 8 ++++---- .../{components => libraries}/README.md | 0 .../cd-language-switcher/cd-language-switcher.css | 0 .../{components => libraries}/cd/cd-header/cd-logo.css | 0 .../cds-paragraphs/cds-paragraphs.css | 0 .../{components => libraries}/google-cse/google-cse.css | 0 6 files changed, 4 insertions(+), 4 deletions(-) rename html/themes/custom/common_design_subtheme/{components => libraries}/README.md (100%) rename html/themes/custom/common_design_subtheme/{components => libraries}/cd-language-switcher/cd-language-switcher.css (100%) rename html/themes/custom/common_design_subtheme/{components => libraries}/cd/cd-header/cd-logo.css (100%) rename html/themes/custom/common_design_subtheme/{components => libraries}/cds-paragraphs/cds-paragraphs.css (100%) rename html/themes/custom/common_design_subtheme/{components => libraries}/google-cse/google-cse.css (100%) diff --git a/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml b/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml index 07f461de..5ebb5d54 100644 --- a/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml +++ b/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml @@ -22,19 +22,19 @@ global-styling: cds-header: css: theme: - components/cd/cd-header/cd-logo.css: {} + libraries/cd/cd-header/cd-logo.css: {} cd-language-switcher: css: theme: - components/cd-language-switcher/cd-language-switcher.css: {} + libraries/cd-language-switcher/cd-language-switcher.css: {} cds-paragraphs: css: component: - components/cds-paragraphs/cds-paragraphs.css: {} + libraries/cds-paragraphs/cds-paragraphs.css: {} google-cse: css: theme: - components/google-cse/google-cse.css: {} + libraries/google-cse/google-cse.css: {} diff --git a/html/themes/custom/common_design_subtheme/components/README.md b/html/themes/custom/common_design_subtheme/libraries/README.md similarity index 100% rename from html/themes/custom/common_design_subtheme/components/README.md rename to html/themes/custom/common_design_subtheme/libraries/README.md diff --git a/html/themes/custom/common_design_subtheme/components/cd-language-switcher/cd-language-switcher.css b/html/themes/custom/common_design_subtheme/libraries/cd-language-switcher/cd-language-switcher.css similarity index 100% rename from html/themes/custom/common_design_subtheme/components/cd-language-switcher/cd-language-switcher.css rename to html/themes/custom/common_design_subtheme/libraries/cd-language-switcher/cd-language-switcher.css diff --git a/html/themes/custom/common_design_subtheme/components/cd/cd-header/cd-logo.css b/html/themes/custom/common_design_subtheme/libraries/cd/cd-header/cd-logo.css similarity index 100% rename from html/themes/custom/common_design_subtheme/components/cd/cd-header/cd-logo.css rename to html/themes/custom/common_design_subtheme/libraries/cd/cd-header/cd-logo.css diff --git a/html/themes/custom/common_design_subtheme/components/cds-paragraphs/cds-paragraphs.css b/html/themes/custom/common_design_subtheme/libraries/cds-paragraphs/cds-paragraphs.css similarity index 100% rename from html/themes/custom/common_design_subtheme/components/cds-paragraphs/cds-paragraphs.css rename to html/themes/custom/common_design_subtheme/libraries/cds-paragraphs/cds-paragraphs.css diff --git a/html/themes/custom/common_design_subtheme/components/google-cse/google-cse.css b/html/themes/custom/common_design_subtheme/libraries/google-cse/google-cse.css similarity index 100% rename from html/themes/custom/common_design_subtheme/components/google-cse/google-cse.css rename to html/themes/custom/common_design_subtheme/libraries/google-cse/google-cse.css From 74df3d4b905af60b3a25127b922e2438e415e5bf Mon Sep 17 00:00:00 2001 From: Chris Ruppel Date: Fri, 5 Jan 2024 08:29:48 +0100 Subject: [PATCH 3/3] chore(deps): bump common_design to 9.3.0 Refs: CD-483 --- composer.json | 2 +- composer.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index e3c25217..fde61f6b 100644 --- a/composer.json +++ b/composer.json @@ -145,7 +145,7 @@ "drush/drush": "^11.0", "oomphinc/composer-installers-extender": "^2.0", "slevomat/coding-standard": "^8", - "unocha/common_design": "^9.2", + "unocha/common_design": "^9", "unocha/ocha_integrations": "^2", "unocha/ocha_media_content": "dev-main", "unocha/ocha_monitoring": "^1.0", diff --git a/composer.lock b/composer.lock index 2c7ae280..89b80d28 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "017295319884dd9cca06931f72d23100", + "content-hash": "aee53115c03a1728998407efeceed2be", "packages": [ { "name": "asm89/stack-cors", @@ -8325,20 +8325,20 @@ }, { "name": "unocha/common_design", - "version": "v9.2.2", + "version": "v9.3.0", "source": { "type": "git", "url": "https://github.com/UN-OCHA/common_design.git", - "reference": "f582963b5848d92b42de871b628f52c5a9f34930" + "reference": "5d5bba22242b2ac19716d45f4f385b9c9b2d020d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/f582963b5848d92b42de871b628f52c5a9f34930", - "reference": "f582963b5848d92b42de871b628f52c5a9f34930", + "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/5d5bba22242b2ac19716d45f4f385b9c9b2d020d", + "reference": "5d5bba22242b2ac19716d45f4f385b9c9b2d020d", "shasum": "" }, "require": { - "composer/installers": "^1.2", + "composer/installers": "^1.2 || ^2", "drupal/stable": "^2.0" }, "type": "drupal-theme", @@ -8349,9 +8349,9 @@ "description": "OCHA Common Design base theme for Drupal 9+", "support": { "issues": "https://github.com/UN-OCHA/common_design/issues", - "source": "https://github.com/UN-OCHA/common_design/tree/v9.2.2" + "source": "https://github.com/UN-OCHA/common_design/tree/v9.3.0" }, - "time": "2023-10-26T10:03:06+00:00" + "time": "2024-01-04T12:36:24+00:00" }, { "name": "unocha/ocha_integrations", @@ -9896,5 +9896,5 @@ "platform-overrides": { "php": "8.2" }, - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.3.0" }