From 9197a9e4c40476d797b6deacb6557d6c6eb151cb Mon Sep 17 00:00:00 2001 From: Jon Pugh Date: Wed, 4 Sep 2024 14:29:27 -0400 Subject: [PATCH] remove site_manager --- composer.json | 3 +-- composer.lock | 72 ++++++++++----------------------------------------- 2 files changed, 15 insertions(+), 60 deletions(-) diff --git a/composer.json b/composer.json index a134cd23f..f3d908bbb 100644 --- a/composer.json +++ b/composer.json @@ -17,8 +17,7 @@ "drupal/devshop": "dev-feature/refactor-2.x", "drupal/gin": "^3.0@RC", "drupal/gin_toolbar": "^1.0@RC", - "drupal/site": "2.x-dev", - "drupal/site_manager": "2.x-dev", + "drupal/site": "3.x-dev", "drush/drush": "^12.4.3", "oomphinc/composer-installers-extender": "^2.0", "vlucas/phpdotenv": "^5.1", diff --git a/composer.lock b/composer.lock index 94bf1bfdd..dfc2b607a 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": "d3a9975385fa370950ae921ca1356cbd", + "content-hash": "e586e37356b54c738bf5df8b51a024e5", "packages": [ { "name": "asm89/stack-cors", @@ -1902,11 +1902,11 @@ }, { "name": "drupal/site", - "version": "dev-2.x", + "version": "dev-3.x", "source": { "type": "git", "url": "https://git.drupalcode.org/project/site.git", - "reference": "d9f0d9bd245aba0f52a7bc1113b23c9d6a70beac" + "reference": "7f83055ec3ab5d3d4102408837733a97a81cb8e5" }, "require": { "drupal/admin_toolbar": "^3.4", @@ -1918,65 +1918,20 @@ "type": "drupal-module", "extra": { "branch-alias": { - "dev-2.x": "2.x-dev" + "dev-3.x": "3.x-dev" }, "drupal": { - "version": "2.2.0-rc3+11-dev", - "datestamp": "1724973882", + "version": "3.x-dev", + "datestamp": "1725474510", "security-coverage": { "status": "not-covered", "message": "Dev releases are not covered by Drupal security advisories." } }, - "patches": [] - }, - "notification-url": "https://packages.drupal.org/8/downloads", - "license": [ - "GPL-2.0-or-later" - ], - "authors": [ - { - "name": "Drupal Operations Contributors", - "homepage": "https://git.drupalcode.org/project/operations/-/graphs/1.x?ref_type=heads" - }, - { - "name": "Jon Pugh", - "role": "author", - "email": "jon@thinkdrop.net", - "homepage": "https://thinkdrop.net" - } - ], - "description": "Provides a Site entity about your website. Tracks state, metadata, and configuration changes over time using revisions.", - "homepage": "https://drupal.org/project/operations", - "support": { - "source": "https://git.drupalcode.org/project/operations", - "chat": "https://drupal.slack.com/archives/C05CM6A9UDN", - "issues": "https://www.drupal.org/project/issues/operations?categories=All" - } - }, - { - "name": "drupal/site_manager", - "version": "dev-2.x", - "source": { - "type": "git", - "url": "https://git.drupalcode.org/project/site_manager.git", - "reference": "c8e86dc71bc420f9b54f86158eba68d60ded9fa7" - }, - "require": { - "drupal/core": "^9 || ^10", - "drupal/site": "^2.0" - }, - "type": "drupal-module", - "extra": { - "branch-alias": { - "dev-2.x": "2.x-dev" - }, - "drupal": { - "version": "2.1.0-beta1+0-dev", - "datestamp": "1712162058", - "security-coverage": { - "status": "not-covered", - "message": "Dev releases are not covered by Drupal security advisories." + "enable-patching": true, + "patches": { + "drupal/core": { + "Issue 2685749: Add a Machine Name widget to core.": "https://www.drupal.org/files/issues/2024-06-21/machine-name-widget-2685749-140.patch" } } }, @@ -1996,7 +1951,7 @@ "homepage": "https://thinkdrop.net" } ], - "description": "A manager for other sites. Collect Site Entities in a central location.", + "description": "Provides a Site entity about your website. Tracks state, metadata, and configuration changes over time using revisions.", "homepage": "https://drupal.org/project/operations", "support": { "source": "https://git.drupalcode.org/project/operations", @@ -12591,8 +12546,9 @@ "minimum-stability": "dev", "stability-flags": { "drupal/devshop": 20, - "drupal/site": 20, - "drupal/site_manager": 20 + "drupal/gin": 5, + "drupal/gin_toolbar": 5, + "drupal/site": 20 }, "prefer-stable": true, "prefer-lowest": false,