From 27f10677581f19f02167468376024edf16ef715b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 23 May 2023 15:58:54 +0200 Subject: [PATCH] fix --- conf/composer.json | 125 +++++++++++++++++++++------------------------ manifest.toml | 13 ++--- 2 files changed, 63 insertions(+), 75 deletions(-) diff --git a/conf/composer.json b/conf/composer.json index c9ec4a3..10a9f2c 100644 --- a/conf/composer.json +++ b/conf/composer.json @@ -1,13 +1,14 @@ { - "name": "drupal/legacy-project", - "description": "Project template for Drupal projects with composer following drupal/drupal layout", + "name": "drupal-composer/drupal-project", + "description": "Project template for Drupal 10 projects with Composer", "type": "project", "license": "GPL-2.0-or-later", - "homepage": "https://www.drupal.org/project/drupal", - "support": { - "docs": "https://www.drupal.org/docs/user_guide/en/index.html", - "chat": "https://www.drupal.org/node/314178" - }, + "authors": [ + { + "name": "", + "role": "" + } + ], "repositories": [ { "type": "composer", @@ -15,27 +16,53 @@ } ], "require": { - "composer/installers": "^2.0", - "drupal/core-composer-scaffold": "^10.0", - "drupal/core-project-message": "^10.0", - "drupal/core-recommended": "^10.0", - "drupal/core-vendor-hardening": "^10.0" + "php": ">=8.1", + "composer/installers": "^2.1", + "cweagans/composer-patches": "^1.7", + "drupal/core-composer-scaffold": "^10.0.0", + "drupal/core-recommended": "^10.0.0", + "drush/drush": "^11.4.0", + "vlucas/phpdotenv": "^5.1", + "webflo/drupal-finder": "^1.2" + }, + "require-dev": { + "drupal/core-dev": "^10.0.0" }, "conflict": { "drupal/drupal": "*" }, - "minimum-stability": "stable", + "minimum-stability": "dev", "prefer-stable": true, "config": { + "discard-changes": true, + "sort-packages": true, "allow-plugins": { "composer/installers": true, + "cweagans/composer-patches": true, "drupal/core-composer-scaffold": true, - "drupal/core-project-message": true, - "drupal/core-vendor-hardening": true, - "phpstan/extension-installer": true, - "dealerdirect/phpcodesniffer-composer-installer": true - }, - "sort-packages": true + "dealerdirect/phpcodesniffer-composer-installer": true, + "phpstan/extension-installer": true + } + }, + "autoload": { + "classmap": [ + "scripts/composer/ScriptHandler.php" + ], + "files": ["load.environment.php"] + }, + "scripts": { + "pre-install-cmd": [ + "DrupalProject\\composer\\ScriptHandler::checkComposerVersion" + ], + "pre-update-cmd": [ + "DrupalProject\\composer\\ScriptHandler::checkComposerVersion" + ], + "post-install-cmd": [ + "DrupalProject\\composer\\ScriptHandler::createRequiredFiles" + ], + "post-update-cmd": [ + "DrupalProject\\composer\\ScriptHandler::createRequiredFiles" + ] }, "extra": { "drupal-scaffold": { @@ -44,54 +71,18 @@ } }, "installer-paths": { - "core": [ - "type:drupal-core" - ], - "libraries/{$name}": [ - "type:drupal-library" - ], - "modules/contrib/{$name}": [ - "type:drupal-module" - ], - "profiles/contrib/{$name}": [ - "type:drupal-profile" - ], - "themes/contrib/{$name}": [ - "type:drupal-theme" - ], - "drush/Commands/contrib/{$name}": [ - "type:drupal-drush" - ], - "modules/custom/{$name}": [ - "type:drupal-custom-module" - ], - "profiles/custom/{$name}": [ - "type:drupal-custom-profile" - ], - "themes/custom/{$name}": [ - "type:drupal-custom-theme" - ] + "web/core": ["type:drupal-core"], + "web/libraries/{$name}": ["type:drupal-library"], + "web/modules/contrib/{$name}": ["type:drupal-module"], + "web/profiles/contrib/{$name}": ["type:drupal-profile"], + "web/themes/contrib/{$name}": ["type:drupal-theme"], + "drush/Commands/contrib/{$name}": ["type:drupal-drush"] }, - "drupal-core-project-message": { - "include-keys": [ - "homepage", - "support" - ], - "post-create-project-cmd-message": [ - " ", - " Congratulations, you’ve installed the Drupal codebase ", - " from the drupal/legacy-project template! ", - " ", - "", - "Next steps:", - " * Install the site: https://www.drupal.org/docs/installing-drupal", - " * Read the user guide: https://www.drupal.org/docs/user_guide/en/index.html", - " * Get support: https://www.drupal.org/support", - " * Get involved with the Drupal community:", - " https://www.drupal.org/getting-involved", - " * Remove the plugin that prints this message:", - " composer remove drupal/core-project-message" - ] + "composer-exit-on-patch-failure": true, + "patchLevel": { + "drupal/core": "-p2" + }, + "patches": { } } -} \ No newline at end of file +} diff --git a/manifest.toml b/manifest.toml index f39024f..7ae6d0e 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Drupal" description.en = "Content management framework" description.fr = "Système de gestion de contenu" -version = "10.0.9~ynh1" +version = "10.0.0~ynh1" maintainers = ["yalh76"] @@ -59,13 +59,10 @@ ram.runtime = "50M" [resources] [resources.sources.main] - #url = "https://github.com/drupal-composer/drupal-project/archive/a1bb2c4dd1e54ce6b9170dc666e6d543474dd57b.tar.gz" - #sha256 = "992ae211565e8392910b58ddbd17aff7f9627430140d8c2134499a02a900cd57" - #autoupdate.upstream = "https://github.com/drupal-composer/drupal-project" - #autoupdate.strategy = "latest_github_commit" - - url = "https://ftp.drupal.org/files/projects/drupal-10.0.9.tar.gz" - sha256 = "fc456088ae680b99759eb1497c854f22f504b901a95e7510175b02b980fc1a7a" + url = "https://github.com/drupal-composer/drupal-project/archive/a1bb2c4dd1e54ce6b9170dc666e6d543474dd57b.tar.gz" + sha256 = "992ae211565e8392910b58ddbd17aff7f9627430140d8c2134499a02a900cd57" + autoupdate.upstream = "https://github.com/drupal-composer/drupal-project" + autoupdate.strategy = "latest_github_commit" [resources.system_user]