Verified Commit 02630b55 authored by Théodore Biadala's avatar Théodore Biadala
Browse files

Issue #3382447 by gapple, catch: Libraries using jquery_ui assets directly... 

Issue #3382447 by gapple, catch: Libraries using jquery_ui assets directly shouldn't duplicate files
parent cc0c9fdd

core/core.libraries.yml

+27 −32
Original line number Diff line number Diff line
@@ -405,42 +405,54 @@ loadjs: 
  js:

    assets/vendor/loadjs/loadjs.min.js: { minified: true }



drupal.autocomplete:

# Common files for libraries that still rely on jQuery UI components.

# @todo Remove when no longer required by drupal.autocomplete and drupal.dialog.

internal.jquery_ui:

  version: VERSION

  js:

    misc/autocomplete.js: { weight: -1 }

    # The remaining JavaScript assets previously came from core/jquery.ui, a

    # deprecated library.

    # All weights are based on the requirements defined within each file.

    # @todo replace with solution in https://drupal.org/node/3076171

    assets/vendor/jquery.ui/ui/widgets/autocomplete-min.js: { weight: -11.7, minified: true }

    assets/vendor/jquery.ui/ui/labels-min.js: { weight: -11.7, minified: true }

    assets/vendor/jquery.ui/ui/widgets/menu-min.js: { weight: -11.7, minified: true }

    assets/vendor/jquery.ui/ui/data-min.js: { weight: -11.8, minified: true }

    assets/vendor/jquery.ui/ui/disable-selection-min.js: { weight: -11.8, minified: true }

    assets/vendor/jquery.ui/ui/focusable-min.js: { weight: -11.8, minified: true }

    assets/vendor/jquery.ui/ui/form-min.js: { weight: -11.8, minified: true }

    assets/vendor/jquery.ui/ui/ie-min.js: { weight: -11.8, minified: true }

    assets/vendor/jquery.ui/ui/jquery-patch-min.js: { weight: -11.8, minified: true }

    assets/vendor/jquery.ui/ui/scroll-parent-min.js: { weight: -11.8, minified: true }

    assets/vendor/jquery.ui/ui/unique-id-min.js: { weight: -11.8, minified: true }

    assets/vendor/jquery.ui/ui/focusable-min.js: { weight: -11.8, minified: true }

    assets/vendor/jquery.ui/ui/ie-min.js: { weight: -11.8, minified: true }

    assets/vendor/jquery.ui/ui/keycode-min.js: { weight: -11.8, minified: true }

    assets/vendor/jquery.ui/ui/plugin-min.js: { weight: -11.8, minified: true }

    assets/vendor/jquery.ui/ui/safe-active-element-min.js: { weight: -11.8, minified: true }

    assets/vendor/jquery.ui/ui/safe-blur-min.js: { weight: -11.8, minified: true }

    assets/vendor/jquery.ui/ui/scroll-parent-min.js: { weight: -11.8, minified: true }

    assets/vendor/jquery.ui/ui/unique-id-min.js: { weight: -11.8, minified: true }

    assets/vendor/jquery.ui/ui/widget-min.js: { weight: -11.8, minified: true }

    assets/vendor/jquery.ui/ui/version-min.js: { weight: -11.9, minified: true }

  css:

    component:

      assets/vendor/jquery.ui/themes/base/core.css: { weight: -11.8 }

    theme:

      assets/vendor/jquery.ui/themes/base/theme.css: { weight: -11.8 }

  dependencies:

    - core/jquery



drupal.autocomplete:

  version: VERSION

  js:

    misc/autocomplete.js: { weight: -1 }

    # The remaining JavaScript assets previously came from core/jquery.ui, a

    # deprecated library.

    # All weights are based on the requirements defined within each file.

    # @todo replace with solution in https://drupal.org/node/3076171

    assets/vendor/jquery.ui/ui/widgets/autocomplete-min.js: { weight: -11.7, minified: true }

    assets/vendor/jquery.ui/ui/widgets/menu-min.js: { weight: -11.7, minified: true }

  # All CSS assets previously came from core/jquery.ui, a deprecated library.

  # @todo replace with solution found in https://drupal.org/node/3076171

  css:

    component:

      assets/vendor/jquery.ui/themes/base/autocomplete.css: { weight: -11.7 }

      assets/vendor/jquery.ui/themes/base/menu.css: { weight: -11.7 }

      assets/vendor/jquery.ui/themes/base/core.css: { weight: -11.8 }

    theme:

      assets/vendor/jquery.ui/themes/base/theme.css: { weight: -11.8 }

  dependencies:

    - core/jquery

    - core/internal.jquery_ui

    - core/drupal

    - core/drupalSettings

    - core/drupal.ajax
@@ -518,22 +530,7 @@ drupal.dialog: 
    assets/vendor/jquery.ui/ui/widgets/resizable-min.js: { weight: -11.6, minified: true }

    assets/vendor/jquery.ui/ui/widgets/controlgroup-min.js: { weight: -11.7, minified: true }

    assets/vendor/jquery.ui/ui/form-reset-mixin-min.js: { weight: -11.7, minified: true }

    assets/vendor/jquery.ui/ui/labels-min.js: { weight: -11.7, minified: true }

    assets/vendor/jquery.ui/ui/widgets/mouse-min.js: { weight: -11.7, minified: true }

    assets/vendor/jquery.ui/ui/data-min.js: { weight: -11.8, minified: true }

    assets/vendor/jquery.ui/ui/disable-selection-min.js: { weight: -11.8, minified: true }

    assets/vendor/jquery.ui/ui/form-min.js: { weight: -11.8, minified: true }

    assets/vendor/jquery.ui/ui/jquery-patch-min.js: { weight: -11.8, minified: true }

    assets/vendor/jquery.ui/ui/scroll-parent-min.js: { weight: -11.8, minified: true }

    assets/vendor/jquery.ui/ui/unique-id-min.js: { weight: -11.8, minified: true }

    assets/vendor/jquery.ui/ui/focusable-min.js: { weight: -11.8, minified: true }

    assets/vendor/jquery.ui/ui/ie-min.js: { weight: -11.8, minified: true }

    assets/vendor/jquery.ui/ui/keycode-min.js: { weight: -11.8, minified: true }

    assets/vendor/jquery.ui/ui/plugin-min.js: { weight: -11.8, minified: true }

    assets/vendor/jquery.ui/ui/safe-active-element-min.js: { weight: -11.8, minified: true }

    assets/vendor/jquery.ui/ui/safe-blur-min.js: { weight: -11.8, minified: true }

    assets/vendor/jquery.ui/ui/widget-min.js: { weight: -11.8, minified: true }

    assets/vendor/jquery.ui/ui/version-min.js: { weight: -11.9, minified: true }

    assets/vendor/tua-body-scroll-lock/tua-bsl.umd.min.js: { weight: -1,  minified: true }

  # All CSS assets previously came from core/jquery.ui, a deprecated library.

  # @todo replace with solution found in https://drupal.org/node/2158943
@@ -544,11 +541,9 @@ drupal.dialog: 
      assets/vendor/jquery.ui/themes/base/checkboxradio.css: { weight: -11.6 }

      assets/vendor/jquery.ui/themes/base/resizable.css: { weight: -11.6 }

      assets/vendor/jquery.ui/themes/base/controlgroup.css: { weight: -11.7 }

      assets/vendor/jquery.ui/themes/base/core.css: { weight: -11.8 }

    theme:

      assets/vendor/jquery.ui/themes/base/theme.css: { weight: -11.8 }

  dependencies:

    - core/jquery

    - core/internal.jquery_ui

    - core/drupal

    - core/drupalSettings

    - core/drupal.debounce

core/tests/Drupal/FunctionalTests/Libraries/JqueryUiLibraryAssetsTest.php

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ protected function setUp(): void { 


    // All the core libraries that use jQuery UI assets.

    $libraries_to_check = [

      'internal.jquery_ui',

      'drupal.autocomplete',

      'drupal.dialog',

    ];

core/themes/claro/claro.info.yml

+1 −8
Original line number Diff line number Diff line
@@ -47,12 +47,7 @@ libraries-override: 
      component:

        misc/vertical-tabs.css: false



  core/drupal.autocomplete:

    css:

      theme:

        assets/vendor/jquery.ui/themes/base/theme.css: false



  core/drupal.tabbingmanager:

  core/internal.jquery_ui:

    css:

      theme:

        assets/vendor/jquery.ui/themes/base/theme.css: false
@@ -61,8 +56,6 @@ libraries-override: 
    css:

      component:

        assets/vendor/jquery.ui/themes/base/dialog.css: false

      theme:

        assets/vendor/jquery.ui/themes/base/theme.css: false



  user/drupal.user:

    css: