Revert "Issue #3405660 by smustgrave, quietone, Wim Leers, larowlan, lauriii:...

Revert "Issue #3405660 by smustgrave, quietone, Wim Leers, larowlan, lauriii: Remove tour from themes"

This reverts commit 3951fa4d.

core/modules/tour/tour.libraries.yml

@@ -16,17 +16,3 @@ tour-styling:
   css:
     component:
       css/tour.module.css: { media: screen }
-
-tour-claro-styling:
-  version: VERSION
-  css:
-    theme:
-      css/theme/claro-tour.theme.css: {}
-
-tour-stable9-styling:
-  version: VERSION
-  js:
-    js/theme/tour.js: {}
-  css:
-    theme:
-      css/theme/stable9-tour.module.css: {}

core/modules/tour/tour.module

@@ -115,23 +115,3 @@ function tour_tour_insert($entity) {
 function tour_tour_update($entity) {
   \Drupal::service('plugin.manager.tour.tip')->clearCachedDefinitions();
 }
-
-/**
- * Implements hook_library_info_alter().
- */
-function tour_library_info_alter(&$libraries, $extension) {
-  if ($extension === 'tour') {
-    $theme = \Drupal::service('theme.manager')->getActiveTheme()->getName();
-    $base_theme = FALSE;
-    if ($theme && !\Drupal::service('theme_handler')->listInfo()[$theme]) {
-      $base_theme = \Drupal::service('theme_handler')->listInfo()[$theme]->base_theme;
-    }
-    if (in_array('claro', [$theme, $base_theme])) {
-      $libraries['tour']['dependencies'][] = 'tour/tour-claro-styling';
-    }
-    elseif (in_array('stable9', [$theme, $base_theme])) {
-      $libraries['tour']['dependencies'][] = 'tour/tour-stable9-styling';
-    }
-  }
-
-}

core/tests/Drupal/KernelTests/Core/Asset/ResolvedLibraryDefinitionsFilesMatchTest.php

@@ -207,10 +207,7 @@ protected function getAllLibraries() {
     $extensions = $modules;
     $module_list = array_keys($modules);
     sort($module_list);
-    // Remove deprecated module Tour.
-    $module_list = array_diff($module_list, ['tour']);
-    $all_modules = array_diff($this->allModules, ['tour']);
-    $this->assertEquals($all_modules, $module_list, 'All core modules are installed.');
+    $this->assertEquals($this->allModules, $module_list, 'All core modules are installed.');
 
     $themes = $this->themeHandler->listInfo();
     $extensions += $themes;
@@ -219,8 +216,7 @@ protected function getAllLibraries() {
     $this->assertEquals($this->allThemes, $theme_list, 'All core themes are installed.');
 
     $libraries['core'] = $this->libraryDiscovery->getLibrariesByExtension('core');
-    // Remove deprecated module Tour.
-    unset($extensions['tour']);
+
     foreach ($extensions as $extension_name => $extension) {
       $library_file = $extension->getPath() . '/' . $extension_name . '.libraries.yml';
       if (is_file($this->root . '/' . $library_file)) {

core/tests/Drupal/KernelTests/Core/Theme/Stable9LibraryOverrideTest.php

@@ -26,9 +26,6 @@ class Stable9LibraryOverrideTest extends StableLibraryOverrideTestBase {
     'media/drupal.media-icon',
     'options/drupal.options-icon',
     'telephone/drupal.telephone-icon',
-    'tour/tour-styling',
-    'tour/tour-claro-styling',
-    'tour/tour-stable9-styling',
   ];
 
   /**

core/tests/Drupal/KernelTests/Core/Theme/StableLibraryOverrideTestBase.php

@@ -121,15 +121,10 @@ protected function getAllLibraries() {
     $modules = \Drupal::moduleHandler()->getModuleList();
     $module_list = array_keys($modules);
     sort($module_list);
-    // Remove deprecated module Tour.
-    $module_list = array_diff($module_list, ['tour']);
-    $all_modules = array_diff($this->allModules, ['tour']);
-    $this->assertEquals($all_modules, $module_list, 'All core modules are installed.');
+    $this->assertEquals($this->allModules, $module_list, 'All core modules are installed.');
 
     $libraries['core'] = $this->libraryDiscovery->getLibrariesByExtension('core');
 
-    // Remove deprecated module Tour.
-    unset($modules['tour']);
     foreach ($modules as $module_name => $module) {
       $library_file = $module->getPath() . '/' . $module_name . '.libraries.yml';
       if (is_file($this->root . '/' . $library_file)) {

core/themes/claro/claro.info.yml

@@ -128,6 +128,8 @@ libraries-extend:
     - claro/system.admin
   core/drupal.autocomplete:
     - claro/autocomplete
+  tour/tour-styling:
+    - claro/tour-styling
   shortcut/drupal.shortcut:
     - claro/drupal.shortcut
   core/drupal.ajax:

core/themes/claro/claro.libraries.yml

@@ -139,6 +139,12 @@ drupal.node.preview:
     theme:
       css/components/node-preview.css: {}
 
+tour-styling:
+  version: VERSION
+  css:
+    theme:
+      css/theme/tour.theme.css: {}
+
 media-form:
   version: VERSION
   css:

core/themes/olivero/css/components/site-header.css

@@ -14,7 +14,7 @@
   position: relative;
   /**
    * Ensure mobile site header is always above other elements including
-   * contextual links.
+   * contextual links, and Tour.
    */
   z-index: 101;
 }

core/themes/olivero/css/components/site-header.pcss.css

@@ -9,7 +9,7 @@
   position: relative;
   /**
    * Ensure mobile site header is always above other elements including
-   * contextual links.
+   * contextual links, and Tour.
    */
   z-index: 101;
 

core/themes/stable9/stable9.info.yml

@@ -261,6 +261,11 @@ libraries-override:
       state:
         css/toolbar.menu.css: css/toolbar/toolbar.menu.css
 
+  tour/tour-styling:
+    css:
+      component:
+        css/tour.module.css: css/tour/tour.module.css
+
   update/drupal.update.admin:
     css:
       theme:
@@ -295,3 +300,7 @@ libraries-override:
     css:
       theme:
         css/field_ui_display_mode_table.css: css/field_ui/field_ui_display_mode_table.css
+
+libraries-extend:
+  tour/tour:
+    - stable9/tour

core/themes/stable9/stable9.libraries.yml

@@ -8,3 +8,8 @@ normalize:
   css:
     base:
       css/core/assets/vendor/normalize-css/normalize.css: { weight: -20 }
+
+tour:
+  version: VERSION
+  js:
+    js/tour.js: {}