Commit 43a9a3ed authored by Jacob Rockowitz's avatar Jacob Rockowitz
Browse files

Issue #2997939 by jrockowitz: Update external libraries

parent 86ab37ef

composer.libraries.json

+15 −48
Changes for composer.libraries.json: 15 added lines, 48 removed lines.
Original line number Diff line number Diff line
@@ -10,11 +10,18 @@ 
            "name": "Jacob Rockowitz (jrockowitz)",

            "homepage": "https://www.drupal.org/u/jrockowitz",

            "role": "Maintainer"

        },

        {

            "name": "Alexander Trotsenko (bucefal91)",

            "homepage": "https://www.drupal.org/u/bucefal91",

            "role": "Co-maintainer"

        }

    ],

    "support": {

        "issues": "https://drupal.org/project/issues/webform",

        "source": "http://cgit.drupalcode.org/webform"

        "issues": "https://www.drupal.org/project/issues/webform?version=8.x",

        "source": "http://cgit.drupalcode.org/webform",

        "docs": "https://www.drupal.org/docs/8/modules/webform",

        "forum": "https://drupal.stackexchange.com/questions/tagged/webform"

    },

    "repositories": {

        "algolia.places": {
@@ -150,18 +157,18 @@ 
                }

            }

        },

        "jquery.chosen": {

        "jquery.geocomplete": {

            "_webform": true,

            "type": "package",

            "package": {

                "name": "jquery/chosen",

                "version": "1.8.7",

                "name": "jquery/geocomplete",

                "version": "1.7.0",

                "type": "drupal-library",

                "extra": {

                    "installer-name": "jquery.chosen"

                    "installer-name": "jquery.geocomplete"

                },

                "dist": {

                    "url": "https://github.com/harvesthq/chosen/releases/download/v1.8.7/chosen_v1.8.7.zip",

                    "url": "https://github.com/ubilabs/geocomplete/archive/1.7.0.zip",

                    "type": "zip"

                },

                "require": {
@@ -188,25 +195,6 @@ 
                }

            }

        },

        "jquery.icheck": {

            "_webform": true,

            "type": "package",

            "package": {

                "name": "jquery/icheck",

                "version": "1.0.2 ",

                "type": "drupal-library",

                "extra": {

                    "installer-name": "jquery.icheck"

                },

                "dist": {

                    "url": "https://github.com/fronteed/icheck/archive/1.0.2.zip",

                    "type": "zip"

                },

                "require": {

                    "composer/installers": "~1.0"

                }

            }

        },

        "jquery.image-picker": {

            "_webform": true,

            "type": "package",
@@ -340,25 +328,6 @@ 
                }

            }

        },

        "jquery.toggles": {

            "_webform": true,

            "type": "package",

            "package": {

                "name": "jquery/toggles",

                "version": "4.0.0",

                "type": "drupal-library",

                "extra": {

                    "installer-name": "jquery.toggles"

                },

                "dist": {

                    "url": "https://github.com/simontabor/jquery-toggles/archive/v4.0.0.zip",

                    "type": "zip"

                },

                "require": {

                    "composer/installers": "~1.0"

                }

            }

        },

        "progress-tracker": {

            "_webform": true,

            "type": "package",
@@ -406,9 +375,8 @@ 
        "ckeditor/image": "4.10.0",

        "ckeditor/link": "4.10.0",

        "codemirror/codemirror": "5.40.0",

        "jquery/chosen": "1.8.7",

        "jquery/geocomplete": "1.7.0",

        "jquery/hotkeys": "0.2.0",

        "jquery/icheck": "1.0.2 ",

        "jquery/image-picker": "0.3.0",

        "jquery/inputmask": "4.0.0",

        "jquery/intl-tel-input": "13.0.0",
@@ -416,7 +384,6 @@ 
        "jquery/select2": "4.0.5",

        "jquery/textcounter": "0.8.0",

        "jquery/timepicker": "1.11.13",

        "jquery/toggles": "4.0.0",

        "progress-tracker/progress-tracker": "1.4.0",

        "signature_pad/signature_pad": "2.3.0"

    }

src/Commands/WebformCliService.php

+7 −20
Changes for src/Commands/WebformCliService.php: 7 added lines, 20 removed lines.
Original line number Diff line number Diff line
@@ -602,26 +602,13 @@ class WebformCliService implements WebformCliServiceInterface { 
   * {@inheritdoc}

   */

  public function drush_webform_libraries_composer() {

    // Load existing composer.json file.

    $data = json_decode('{

  "name": "drupal/webform",

  "description": "Enables the creation of webforms and questionnaires.",

  "type": "drupal-module",

  "license": "GPL-2.0+",

  "minimum-stability": "dev",

  "homepage": "https://drupal.org/project/webform",

  "authors": [

    {

      "name": "Jacob Rockowitz (jrockowitz)",

      "homepage": "https://www.drupal.org/u/jrockowitz",

      "role": "Maintainer"

    }

  ],

  "support": {

    "issues": "https://drupal.org/project/issues/webform",

    "source": "http://cgit.drupalcode.org/webform"

  }

}', FALSE, $this->drush_webform_composer_get_json_encode_options());

    // Load existing composer.json file and unset certain properties.

    $composer_path = drupal_get_path('module', 'webform') . '/composer.json';

    $json = file_get_contents($composer_path);

    $data = json_decode($json , FALSE, $this->drush_webform_composer_get_json_encode_options());

    $data = (array) $data;

    unset($data['extra'], $data['require-dev']);

    $data = (object) $data;



    // Set disable tls.

    $this->drush_webform_composer_set_disable_tls($data);