From 15774f6e18382d66bd439da866fcec0ce45c2150 Mon Sep 17 00:00:00 2001 From: Matt Poole Date: Wed, 4 Sep 2024 16:53:43 -0400 Subject: [PATCH] BSD fixes #284: Fixed conflicts --- composer.json | 15 +++++ composer.lock | 166 +++++++++++++++++++++++++++++++++++++++++++++++++- composer.log | 3 + 3 files changed, 183 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 85922a5d..67fb5996 100644 --- a/composer.json +++ b/composer.json @@ -13,6 +13,18 @@ "type": "composer", "url": "https://packages.drupal.org/8" }, + { + "type": "package", + "package": { + "name": "northernco/ckeditor5-anchor-drupal", + "version": "0.5.0", + "type": "drupal-library", + "dist": { + "url": "https://registry.npmjs.org/@northernco/ckeditor5-anchor-drupal/-/ckeditor5-anchor-drupal-0.5.0.tgz", + "type": "tar" + } + } + }, { "type": "package", "package": { @@ -37,11 +49,13 @@ "composer/installers": "^2.0", "cweagans/composer-patches": "^1.7", "drupal/admin_toolbar": "^3.4", + "drupal/anchor_link": "^3.0@beta", "drupal/autocomplete_deluxe": "^2.0", "drupal/chosen": "^4.0", "drupal/components": "^3.0@beta", "drupal/config_ignore": "^3.3", "drupal/config_split": "^2.0", + "drupal/cookies": "^1.2", "drupal/core-composer-scaffold": "^10.1", "drupal/core-project-message": "^10.1", "drupal/core-recommended": "^10.1", @@ -80,6 +94,7 @@ "mattsqd/drupal-env": "dev-main", "mattsqd/drupal-env-lando": "dev-main", "mattsqd/robovalidate": "@alpha", + "northernco/ckeditor5-anchor-drupal": "^0.5.0", "platformsh/config-reader": "^2.4" }, "conflict": { diff --git a/composer.lock b/composer.lock index 3aee2494..e7032ecd 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": "ff089adb674ac2dbbcb3aa04198d9037", + "content-hash": "711a420f24d8d98b9b13da22122312cd", "packages": [ { "name": "asm89/stack-cors", @@ -1627,6 +1627,64 @@ "issues": "https://www.drupal.org/project/issues/admin_toolbar" } }, + { + "name": "drupal/anchor_link", + "version": "3.0.0-beta1", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/anchor_link.git", + "reference": "3.0.0-beta1" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/anchor_link-3.0.0-beta1.zip", + "reference": "3.0.0-beta1", + "shasum": "a05fafd3b9f2e808b67d07f396ba80d30f748afc" + }, + "require": { + "drupal/core": "^9 || ^10 || ^11" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "3.0.0-beta1", + "datestamp": "1718879208", + "security-coverage": { + "status": "not-covered", + "message": "Beta releases are not covered by Drupal security advisories." + } + }, + "branch-alias": { + "dev-3.0.x": "3.0.x-dev" + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "Vardot", + "homepage": "https://www.drupal.org/vardot", + "role": "Maintainer" + }, + { + "name": "Northern Commerce", + "homepage": "https://www.drupal.org/northern-commerce", + "role": "Maintainer" + }, + { + "name": "Rajab Natshah", + "homepage": "https://www.drupal.org/user/1414312" + } + ], + "description": "This plugin module adds the better link dialog and anchor related features to CKEditor in Drupal.", + "homepage": "https://www.drupal.org/project/anchor_link", + "support": { + "source": "http://cgit.drupalcode.org/anchor_link", + "issues": "https://www.drupal.org/project/issues/anchor_link" + } + }, { "name": "drupal/autocomplete_deluxe", "version": "2.0.3", @@ -2108,6 +2166,75 @@ "slack": "https://drupal.slack.com/archives/C45342CDD" } }, + { + "name": "drupal/cookies", + "version": "1.2.13", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/cookies.git", + "reference": "1.2.13" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/cookies-1.2.13.zip", + "reference": "1.2.13", + "shasum": "9f5b398283d728c065b85b4b64e5e9a05ec4c060" + }, + "require": { + "drupal/core": "^9 || ^10 || ^11", + "jfeltkamp/cookiesjsr": "^1.0.12" + }, + "require-dev": { + "drupal/asset_injector": "^2", + "drupal/facebook_pixel": "^2.0", + "drupal/google_analytics": "^4.0", + "drupal/google_tag": "^2.0", + "drupal/ivw_integration": "^2.0", + "drupal/matomo": "^1.0", + "drupal/media_entity_instagram": "^3.0", + "drupal/media_entity_twitter": "^2.0", + "drupal/recaptcha": "^3.4" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "1.2.13", + "datestamp": "1724152774", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "Anybody", + "homepage": "https://www.drupal.org/user/291091" + }, + { + "name": "grevil", + "homepage": "https://www.drupal.org/user/3668491" + }, + { + "name": "JFeltkamp", + "homepage": "https://www.drupal.org/user/2471686" + }, + { + "name": "thomas.frobieter", + "homepage": "https://www.drupal.org/user/409335" + } + ], + "description": "Cookie consent tool.", + "homepage": "https://www.drupal.org/project/cookies", + "support": { + "source": "http://cgit.drupalcode.org/cookies", + "issues": "https://www.drupal.org/project/issues/cookies" + } + }, { "name": "drupal/core", "version": "10.3.2", @@ -5702,6 +5829,33 @@ }, "time": "2024-06-28T20:10:30+00:00" }, + { + "name": "jfeltkamp/cookiesjsr", + "version": "1.0.13", + "source": { + "type": "git", + "url": "https://github.com/jfeltkamp/cookiesjsr.git", + "reference": "a25132aadb01975cbe77dc7746fd5cf15f06d246" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/jfeltkamp/cookiesjsr/zipball/a25132aadb01975cbe77dc7746fd5cf15f06d246", + "reference": "a25132aadb01975cbe77dc7746fd5cf15f06d246", + "shasum": "" + }, + "type": "drupal-library", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-2.0-or-later" + ], + "description": "Cookie consent tool.", + "homepage": "https://github.com/jfeltkamp/cookiesjsr", + "support": { + "issues": "https://github.com/jfeltkamp/cookiesjsr/issues", + "source": "https://github.com/jfeltkamp/cookiesjsr.git" + }, + "time": "2022-03-25T09:05:23+00:00" + }, { "name": "jjj/chosen", "version": "2.2.1", @@ -6834,6 +6988,15 @@ }, "time": "2024-07-01T20:03:41+00:00" }, + { + "name": "northernco/ckeditor5-anchor-drupal", + "version": "0.5.0", + "dist": { + "type": "tar", + "url": "https://registry.npmjs.org/@northernco/ckeditor5-anchor-drupal/-/ckeditor5-anchor-drupal-0.5.0.tgz" + }, + "type": "drupal-library" + }, { "name": "pear/archive_tar", "version": "1.5.0", @@ -16078,6 +16241,7 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { + "drupal/anchor_link": 10, "drupal/components": 10, "drupal/default_content": 15, "drupal/maillog": 20, diff --git a/composer.log b/composer.log index bc00aab5..9649fd8c 100644 --- a/composer.log +++ b/composer.log @@ -35,3 +35,6 @@ d0b264b8bfd2f16b57808145e6c7b950|Matt Poole|feature/BSD-212-smpt-enable|Tue Jul 59d81fa4a3cb5b4021dd9824956e194c|Matt Poole|feature/BSD-271-validation-action|Tue Aug 6 13:13:48 EDT 2024|./composer.sh update mattsqd/robovalidate 8a08b6d45145b305c16131bd11430688|Matt Poole|feature/BSD-278-update-deps|Thu Aug 15 12:05:25 EDT 2024|./composer.sh update bb805ef6ca0a258d1c8306f0b36fafec|Matt Poole|feature/BSD-287-update-deps|Wed Sep 4 10:41:04 EDT 2024|./composer.sh update +30ef2bb0122b978360bda4a19c3c9b00|Matt Poole|feature/BSD-284-gdpr-compliance|Wed Sep 4 16:48:48 EDT 2024|./composer.sh require drupal/cookies +45572e7bbb597f5c3740a8c9063c9496|Matt Poole|feature/BSD-284-gdpr-compliance|Wed Sep 4 16:48:59 EDT 2024|./composer.sh require drupal/anchor_link:^3.0@beta +a64a80ee97032a4a2898228866cf865f|Matt Poole|feature/BSD-284-gdpr-compliance|Wed Sep 4 16:49:08 EDT 2024|./composer.sh require northernco/ckeditor5-anchor-drupal