From 72ab9a28b9feb1fd531a0beada54358b6a69e276 Mon Sep 17 00:00:00 2001 From: Christopher Torgalson Date: Thu, 6 Jun 2024 13:14:20 +0000 Subject: [PATCH 1/2] feat: makes core/drupal a global dependency This helps not to break overrides by subthemes that override e.g. localgov_base/header-js without making core/drupal a requirement. Closes #557 --- localgov_base.libraries.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/localgov_base.libraries.yml b/localgov_base.libraries.yml index 9199633e..2b79add2 100644 --- a/localgov_base.libraries.yml +++ b/localgov_base.libraries.yml @@ -17,6 +17,7 @@ global: # Declare dependencies for other libraries that we want to load # on every page. dependencies: + - core/drupal - localgov_base/grid - localgov_base/header - localgov_base/footer @@ -63,7 +64,6 @@ header-js: js: js/header.js: {} dependencies: - - core/drupal - core/drupal.debounce - core/once @@ -298,7 +298,6 @@ subsites-menu: js: js/subsites-menu.js: {} dependencies: - - core/drupal - core/drupal.debounce localgov_eu_cookie_compliance: From f35c47e0deb716064f37abab957979ee46f0af63 Mon Sep 17 00:00:00 2001 From: Christopher Torgalson Date: Fri, 7 Jun 2024 11:49:55 +0000 Subject: [PATCH 2/2] feat: restores original core/drupal dep. usage, adds as dep to guides - adds core/drupal back to header-js, subsites-menu - removes core/drupal from global - adds to guides. Closes #557 --- localgov_base.libraries.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/localgov_base.libraries.yml b/localgov_base.libraries.yml index 2b79add2..97a4e983 100644 --- a/localgov_base.libraries.yml +++ b/localgov_base.libraries.yml @@ -17,7 +17,6 @@ global: # Declare dependencies for other libraries that we want to load # on every page. dependencies: - - core/drupal - localgov_base/grid - localgov_base/header - localgov_base/footer @@ -64,6 +63,7 @@ header-js: js: js/header.js: {} dependencies: + - core/drupal - core/drupal.debounce - core/once @@ -135,6 +135,8 @@ topic-list-builder: guides: js: js/guides.js: {} + dependencies: + - core/drupal guide-nav: css: @@ -298,6 +300,7 @@ subsites-menu: js: js/subsites-menu.js: {} dependencies: + - core/drupal - core/drupal.debounce localgov_eu_cookie_compliance: