From 379e08de7df7e1d7fd488d390edeed66369c6b9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ph=C3=A9na=20Proxima?= Date: Fri, 14 May 2021 19:14:56 -0400 Subject: [PATCH] Security updated Lightning Layout to 2.10. --- composer.json | 2 +- composer.lock | 74 +++++++++++++++++++++++---------------------------- 2 files changed, 35 insertions(+), 41 deletions(-) diff --git a/composer.json b/composer.json index 709fb00e..148a91b7 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ "drupal/libraries": "^3.0", "drupal/lightning_api": "^4.4", "drupal/lightning_core": "^5.2", - "drupal/lightning_layout": "^2.6", + "drupal/lightning_layout": "^2.10", "drupal/lightning_media": "^3.21 || ^4.6", "drupal/lightning_workflow": "^3.14", "drupal/profile_switcher": "^1.0-alpha5" diff --git a/composer.lock b/composer.lock index 30f7b29f..ed953765 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "614aefb8357a27db5f2364becae041ee", + "content-hash": "308c43ffb2489622df9e41ae38633315", "packages": [ { "name": "asm89/stack-cors", @@ -2429,17 +2429,17 @@ }, { "name": "drupal/ctools", - "version": "3.5.0", + "version": "3.6.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/ctools.git", - "reference": "8.x-3.5" + "reference": "8.x-3.6" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/ctools-8.x-3.5.zip", - "reference": "8.x-3.5", - "shasum": "0113cd1e787ff3bde088c836c2d79d14136b0013" + "url": "https://ftp.drupal.org/files/projects/ctools-8.x-3.6.zip", + "reference": "8.x-3.6", + "shasum": "9a849bb6ac9f4d02603d04b3265b35b7329e1ef5" }, "require": { "drupal/core": "^8.8 || ^9" @@ -2447,8 +2447,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-3.5", - "datestamp": "1618592931", + "version": "8.x-3.6", + "datestamp": "1620838181", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -4069,23 +4069,23 @@ }, { "name": "drupal/lightning_layout", - "version": "2.9.0", + "version": "2.10.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/lightning_layout.git", - "reference": "8.x-2.9" + "reference": "8.x-2.10" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/lightning_layout-8.x-2.9.zip", - "reference": "8.x-2.9", - "shasum": "11fce790dada5b986234d07aedffb75dbb346933" + "url": "https://ftp.drupal.org/files/projects/lightning_layout-8.x-2.10.zip", + "reference": "8.x-2.10", + "shasum": "87646fdc9080ad01cc10e8ac25e6abf71be0650d" }, "require": { "cweagans/composer-patches": "^1.6", "drupal/bg_image_formatter": "^1.10", "drupal/core": "^8.7.13 || ^9.0.0", - "drupal/ctools": "^3.0", + "drupal/ctools": "^3.6", "drupal/entity_block": "^1.0", "drupal/entity_browser_block": "^1.0", "drupal/layout_builder_restrictions": "^2.7", @@ -4111,29 +4111,29 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.9", - "datestamp": "1605114496", + "version": "8.x-2.10", + "datestamp": "1621032307", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" } }, "drupal-scaffold": { - "locations": { - "web-root": "docroot/" - }, "file-mapping": { - "[project-root]/.gitattributes": false, "[project-root]/.editorconfig": false, - "[web-root]/example.gitignore": false, + "[project-root]/.gitattributes": false, "[web-root]/.csslintrc": false, + "[web-root]/INSTALL.txt": false, + "[web-root]/example.gitignore": false, "[web-root]/modules/README.txt": false, "[web-root]/profiles/README.txt": false, + "[web-root]/robots.txt": false, "[web-root]/sites/README.txt": false, "[web-root]/themes/README.txt": false, - "[web-root]/INSTALL.txt": false, - "[web-root]/robots.txt": false, "[web-root]/web.config": false + }, + "locations": { + "web-root": "docroot/" } }, "enable-patching": true, @@ -4158,34 +4158,28 @@ "drupal/core": "-p2" }, "patches": { - "drupal/panels": { - "2878684 - Use String.match to correlate regions when switching Layouts in Panels IPE": "https://www.drupal.org/files/issues/panels-ipe-2878684-3.patch" - }, "drupal/panelizer": { "2778565 - Multilingual support for Panelizer": "https://www.drupal.org/files/issues/2020-03-23/2778565-47.patch" + }, + "drupal/panels": { + "2878684 - Use String.match to correlate regions when switching Layouts in Panels IPE": "https://www.drupal.org/files/issues/panels-ipe-2878684-3.patch" } } }, "notification-url": "https://packages.drupal.org/8/downloads", "scripts": { "post-install-cmd": [ - "@push" - ], - "post-update-cmd": [ - "@push" + "@putenv DIR=./docroot/modules/lightning_layout", + "mkdir -p $DIR", + "ln -s -f $PWD/config $DIR", + "ln -s -f $PWD/modules $DIR", + "ln -s -f $PWD/src $DIR", + "ln -s -f $PWD/tests $DIR", + "find $PWD -name 'lightning_layout.*' -depth 1 -exec ln -s -f {} $DIR ';'", + "cp -f phpunit.xml ./docroot/core" ], "nuke": [ "rm -r -f docroot vendor" - ], - "pull": [ - "cp -R -f ./docroot/modules/contrib/lightning_layout/* ." - ], - "push": [ - "rm -r -f ./docroot/modules/contrib/lightning_layout", - "mkdir -p ./docroot/modules/contrib/lightning_layout", - "@composer archive --file lightning_layout", - "tar -x -f lightning_layout.tar -C ./docroot/modules/contrib/lightning_layout", - "rm lightning_layout.tar" ] }, "license": [