From b9b8576048fb9f4e89d773b3007a22b8f1b6a2a2 Mon Sep 17 00:00:00 2001 From: Chris Thompson Date: Wed, 16 Nov 2022 16:19:30 -0500 Subject: [PATCH] Remove direct includes from composer, update block_class and drutopia_site drutopia_site (dev) now includes patch for autosave_form --- composer.json | 10 ++---- composer.lock | 86 ++++++++++++++++++++++++++++----------------------- 2 files changed, 50 insertions(+), 46 deletions(-) diff --git a/composer.json b/composer.json index 4e190bb..878a21f 100644 --- a/composer.json +++ b/composer.json @@ -35,11 +35,9 @@ "composer/installers": "^1.9", "cweagans/composer-patches": "^1.7", "drupal/allowed_formats": "^1.1", - "drupal/antibot": "^1.2", "drupal/auto_entitylabel": "^3.0@beta", - "drupal/autosave_form": "1.x-dev", "drupal/backup_migrate": "^5", - "drupal/block_class": "^1", + "drupal/block_class": "^2.0", "drupal/ckeditor_markdown": "^1.3", "drupal/ckeditorheight": "^1", "drupal/classitup": "^1", @@ -63,6 +61,7 @@ "drupal/drutopia_core": "dev-8.x-1.x as 1.x-dev", "drupal/drutopia_organization": "1.0.x-dev", "drupal/drutopia_paragraph_title": "1.x-dev", + "drupal/drutopia_site": "1.x-dev@dev", "drupal/easy_breadcrumb": "^2.0", "drupal/eca": "^1.0", "drupal/eca_context": "^1.0", @@ -219,10 +218,7 @@ }, "drupal/ds": { "Parent theme template inheritance bug": "https://www.drupal.org/files/issues/2021-02-22/2895316-12.patch" - }, - "drupal/autosave_form": { - "Autosave not working on content creation": "https://www.drupal.org/files/issues/2021-09-10/2924006-39.patch" - } + } } }, "scripts": { diff --git a/composer.lock b/composer.lock index 608cc67..c9647a3 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": "3c742c0b7f61bebfa5d97618a7caf573", + "content-hash": "a17b0d9b617c443eca5bcd7c032fa1f7", "packages": [ { "name": "abraham/twitteroauth", @@ -2160,26 +2160,29 @@ }, { "name": "drupal/admin_toolbar", - "version": "2.5.0", + "version": "3.2.1", "source": { "type": "git", "url": "https://git.drupalcode.org/project/admin_toolbar.git", - "reference": "8.x-2.5" + "reference": "3.2.1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/admin_toolbar-8.x-2.5.zip", - "reference": "8.x-2.5", - "shasum": "c71e58051b8d6818272df96d14cb11407d5e5ceb" + "url": "https://ftp.drupal.org/files/projects/admin_toolbar-3.2.1.zip", + "reference": "3.2.1", + "shasum": "7a4bfb716e269be4ca03b7f04e29e4439ec6cf93" }, "require": { "drupal/core": "^8.8.0 || ^9.0" }, + "require-dev": { + "drupal/admin_toolbar_tools": "*" + }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.5", - "datestamp": "1629907119", + "version": "3.2.1", + "datestamp": "1665044276", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -2794,26 +2797,26 @@ }, { "name": "drupal/block_class", - "version": "1.3.0", + "version": "2.0.8", "source": { "type": "git", "url": "https://git.drupalcode.org/project/block_class.git", - "reference": "8.x-1.3" + "reference": "2.0.8" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/block_class-8.x-1.3.zip", - "reference": "8.x-1.3", - "shasum": "29cfdb646ef83210f0eced30b38243339158fe3f" + "url": "https://ftp.drupal.org/files/projects/block_class-2.0.8.zip", + "reference": "2.0.8", + "shasum": "ddadc2bf2a5b7863717469fbbbd0d7e1289795cd" }, "require": { - "drupal/core": "^8 || ^9" + "drupal/core": "^8 || ^9 || ^10" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.3", - "datestamp": "1615217722", + "version": "2.0.8", + "datestamp": "1668284029", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -2833,7 +2836,6 @@ { "name": "Renato Gonçalves (RenatoG)", "homepage": "https://www.drupal.org/u/RenatoG", - "email": "renatog@ciandt.com", "role": "Maintainer" }, { @@ -4918,17 +4920,17 @@ }, { "name": "drupal/ctools", - "version": "3.12.0", + "version": "3.13.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/ctools.git", - "reference": "8.x-3.12" + "reference": "8.x-3.13" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/ctools-8.x-3.12.zip", - "reference": "8.x-3.12", - "shasum": "3146b8f7f9e5a586ff68c836fd84bba7cdee42f6" + "url": "https://ftp.drupal.org/files/projects/ctools-8.x-3.13.zip", + "reference": "8.x-3.13", + "shasum": "b84176544265d4c6aa17917d66335527c9498c5a" }, "require": { "drupal/core": "^9.3 || ^10" @@ -4936,8 +4938,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-3.12", - "datestamp": "1668486476", + "version": "8.x-3.13", + "datestamp": "1668631846", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6853,23 +6855,17 @@ }, { "name": "drupal/drutopia_site", - "version": "1.1.0", + "version": "dev-1.x", "source": { "type": "git", "url": "https://git.drupalcode.org/project/drutopia_site.git", - "reference": "8.x-1.1" - }, - "dist": { - "type": "zip", - "url": "https://ftp.drupal.org/files/projects/drutopia_site-8.x-1.1.zip", - "reference": "8.x-1.1", - "shasum": "f0b5b4f3a80ce9fd5ad26256b8e7046698a300f6" + "reference": "f92e92a0137aefc9beb078fd1e54d213faae257d" }, "require": { - "drupal/admin_toolbar": "^2.2", + "drupal/admin_toolbar": "^3.0", "drupal/admin_toolbar_links_access_filter": "*", "drupal/admin_toolbar_tools": "*", - "drupal/autosave_form": "^1.1", + "drupal/autosave_form": "1.x-dev", "drupal/ckeditor": "*", "drupal/ckeditorheight": "^1.8", "drupal/config_actions": "^1.1", @@ -6884,12 +6880,20 @@ }, "type": "drupal-module", "extra": { + "branch-alias": { + "dev-1.x": "1.x-dev" + }, "drupal": { - "version": "8.x-1.1", - "datestamp": "1621288089", + "version": "8.x-1.1+3-dev", + "datestamp": "1668633296", "security-coverage": { - "status": "covered", - "message": "Covered by Drupal's security advisory policy" + "status": "not-covered", + "message": "Dev releases are not covered by Drupal security advisories." + } + }, + "patches": { + "drupal/autosave_form": { + "Autosave not working on content creation": "https://www.drupal.org/files/issues/2021-09-10/2924006-39.patch" } } }, @@ -6917,6 +6921,10 @@ { "name": "rosemarymann", "homepage": "https://www.drupal.org/user/837536" + }, + { + "name": "wolcen", + "homepage": "https://www.drupal.org/user/3099655" } ], "description": "Drutopia site is a base feature providing site components.", @@ -24615,7 +24623,6 @@ "minimum-stability": "dev", "stability-flags": { "drupal/auto_entitylabel": 10, - "drupal/autosave_form": 20, "drupal/coffee": 20, "drupal/comment_notify": 20, "drupal/convert_bundles": 15, @@ -24624,6 +24631,7 @@ "drupal/drutopia_core": 20, "drupal/drutopia_organization": 20, "drupal/drutopia_paragraph_title": 20, + "drupal/drutopia_site": 20, "drupal/entitygroupfield": 15, "drupal/feeds": 10, "drupal/footnotes": 20,