Commit 7e4b6408 authored by Paulo Henrique Cota Starling's avatar Paulo Henrique Cota Starling Committed by Jacob Rockowitz
Browse files

Issue #3246508 by jrockowitz, paulocs: [Drupal 9.x] Only require Tippy 6.x

parent 54463b51

composer.libraries.json

+0 −16
Changes for composer.libraries.json: 0 added lines, 16 removed lines.
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ 
        "signature_pad/signature_pad": "*",

        "svg-pan-zoom/svg-pan-zoom": "*",

        "tabby/tabby": "*",

        "tippyjs/5.x": "*",

        "tippyjs/6.x": "*"

    },

    "suggest": {
@@ -421,21 +420,6 @@ 
                }

            }

        },

        "tippyjs/5.x": {

            "type": "package",

            "package": {

                "name": "tippyjs/5.x",

                "version": "5.2.1",

                "type": "drupal-library",

                "extra": {

                    "installer-name": "tippyjs/5.x"

                },

                "dist": {

                    "url": "https://unpkg.com/tippy.js@5.2.1/dist/tippy-bundle.iife.min.js",

                    "type": "file"

                }

            }

        },

        "tippyjs/6.x": {

            "type": "package",

            "package": {

includes/webform.libraries.inc

+0 −9
Changes for includes/webform.libraries.inc: 0 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -59,15 +59,6 @@ function webform_library_info_alter(&$libraries, $extension) { 
  /** @var \Drupal\webform\WebformLibrariesManagerInterface $libraries_manager */

  $libraries_manager = \Drupal::service('webform.libraries_manager');



  // Use Tippy.js 6.x which is compatible with Drupal 9.x.

  if (isset($libraries['libraries.tippyjs']) && floatval(\Drupal::VERSION) >= 9) {

    $tippyjs_library = $libraries_manager->getLibrary('tippyjs/6.x');

    $libraries['libraries.tippyjs']['directory'] = 'tippyjs/6.x';

    $libraries['libraries.tippyjs']['version'] = $tippyjs_library['version'];

    $libraries['libraries.tippyjs']['cdn'] = ['/libraries/tippyjs/6.x/' => 'https://unpkg.com/tippy.js@' . $tippyjs_library['version'] . '/dist/'];

    $libraries['libraries.tippyjs']['js'] = ['/libraries/tippyjs/6.x/' . basename($tippyjs_library['download_url']->toString()) => []];

  }



  // If webform date element in D8 use the old dependency on 'core/drupal.date'.

  if (isset($libraries['webform.element.date'])

    && floatval(\Drupal::VERSION) < 9

js/webform.tooltip.js

+0 −1
Changes for js/webform.tooltip.js: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
    delay: 100

  };



  // @see https://atomiks.github.io/tippyjs/v5/all-props/

  // @see https://atomiks.github.io/tippyjs/v6/all-props/

  Drupal.webform = Drupal.webform || {};

src/WebformLibrariesManager.php

+1 −13
Changes for src/WebformLibrariesManager.php: 1 added line, 13 removed lines.
Original line number Diff line number Diff line
@@ -464,22 +464,10 @@ class WebformLibrariesManager implements WebformLibrariesManagerInterface { 
      'download_url' => Url::fromUri('https://github.com/cferdinandi/tabby/archive/v12.0.3.zip'),

      'version' => '12.0.3',

    ];

    // Drupal 8 and 9 supports different version of PopperJS which is a

    // dependency for TipperJS.

    // @see https://www.drupal.org/node/3112670

    $libraries['tippyjs/5.x'] = [

      'title' => $this->t('Tippy.j (5.x)'),

      'description' => $this->t("Tippy.js is the complete tooltip, popover, dropdown, and menu solution for the web, powered by Popper."),

      'notes' => $this->t('Tippy.js is used to provide a tooltips. Tippy.js 5.x is compatible with Drupal 8.x.'),

      'homepage_url' => Url::fromUri('https://github.com/atomiks/tippyjs'),

      'download_url' => Url::fromUri('https://unpkg.com/tippy.js@5.2.1/dist/tippy-bundle.iife.min.js'),

      'version' => '5.2.1',

      'core' => 8,

    ];

    $libraries['tippyjs/6.x'] = [

      'title' => $this->t('Tippy.js (6.x)'),

      'description' => $this->t("Tippy.js is the complete tooltip, popover, dropdown, and menu solution for the web, powered by Popper."),

      'notes' => $this->t('Tippy.js is used to provide a tooltips. Tippy.js 6.x is compatible with Drupal 9.x.'),

      'notes' => $this->t('Tippy.js is used to provide a tooltips.'),

      'homepage_url' => Url::fromUri('https://github.com/atomiks/tippyjs'),

      'download_url' => Url::fromUri('https://unpkg.com/tippy.js@6.2.6/dist/tippy-bundle.umd.min.js'),

      'version' => '6.2.6',

webform.libraries.yml

+7 −7
Changes for webform.libraries.yml: 7 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -1317,20 +1317,20 @@ libraries.tabby: 
  js:

    /libraries/tabby/dist/js/tabby.min.js: {}



# Tippy.js 5.x is compatible with Drupal 8.x.

# Library info is altered to switch to Tippy.js 6.x for Drupal 9.x compatibility.

# @see webform_library_info_alter()

libraries.tippyjs:

  remote: https://github.com/atomiks/tippyjs

  version: '5.2.1'

  version: '6.2.6'

  license:

    name: MIT

    url: https://github.com/atomiks/tippyjs/blob/master/LICENSE

    gpl-compatible: true

  directory: tippyjs/5.x

  directory: tippyjs/6.x

  cdn:

    /libraries/tippyjs/5.x/: https://unpkg.com/tippy.js@5.2.1/dist/

    /libraries/tippyjs/6.x/: https://unpkg.com/tippy.js@6.2.6/dist/

  js:

    /libraries/tippyjs/5.x/tippy-bundle.iife.min.js: {}

    /libraries/tippyjs/6.x/tippy.umd.min.js: { minified: true }

  css:

    component:

      /libraries/tippyjs/6.x/tippy.css: {}

  dependencies:

    - core/popperjs