Merge pull request #528 from itk-dev/feature/drupal-composer-cleanup

Aligned composer.json with https://github.com/drupal-composer/drupal-project/tree/10.x

Author: rimi-itk

.markdownlintignore

@@ -10,3 +10,6 @@ web/*.md
 web/core/
 web/libraries/
 web/*/contrib/
+
+# Drupal specific
+drush

CHANGELOG.md

@@ -8,6 +8,8 @@ Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [4.11.0] - 2025-07-01
 
+* [PR-528](https://github.com/itk-dev/deltag.aarhus.dk/pull/528)
+  Aligned `composer.json` with <https://github.com/drupal-composer/drupal-project/blob/10.x/composer.json>
 * [PR-526](https://github.com/itk-dev/deltag.aarhus.dk/pull/526)
   * Updated docker compose setup
   * Linted YAML

composer.json

@@ -104,7 +104,7 @@
         },
         "asset-packagist": {
             "type": "composer",
-            "url": "https://asset-packagist.org/"
+            "url": "https://asset-packagist.org"
         },
         "drupal/hoeringsportal_data": {
             "type": "path",
@@ -200,6 +200,14 @@
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
+    "autoload": {
+        "classmap": [
+            "scripts/composer/ScriptHandler.php"
+        ],
+        "files": [
+            "load.environment.php"
+        ]
+    },
     "config": {
         "allow-plugins": {
             "chx/drupal-issue-fork": true,
@@ -215,11 +223,17 @@
             "phpstan/extension-installer": true,
             "tbachert/spi": true
         },
+        "discard-changes": true,
         "sort-packages": true
     },
     "extra": {
         "composer-exit-on-patch-failure": true,
         "drupal-scaffold": {
+            "file-mapping": {
+                "[project-root]/.gitignore": false,
+                "[web-root]/INSTALL.txt": false,
+                "[web-root]/README.txt": false
+            },
             "locations": {
                 "web-root": "web/"
             }
@@ -231,8 +245,8 @@
             ],
             "web/libraries/{$name}": [
                 "type:drupal-library",
-                "type:npm-asset",
-                "type:bower-asset"
+                "type:bower-asset",
+                "type:npm-asset"
             ],
             "web/modules/contrib/{$name}": [
                 "type:drupal-module"
@@ -249,6 +263,9 @@
             "web/modules/custom/{$name}": [
                 "type:drupal-custom-module"
             ],
+            "web/profiles/custom/{$name}": [
+                "type:drupal-custom-profile"
+            ],
             "web/themes/custom/{$name}": [
                 "type:drupal-custom-theme"
             ]
@@ -257,6 +274,9 @@
             "npm-asset",
             "bower-asset"
         ],
+        "patchLevel": {
+            "drupal/core": "-p2"
+        },
         "patches": {
             "drupal/better_exposed_filters": {
                 "Add option to hide exposed filter field labels (https://www.drupal.org/project/better_exposed_filters/issues/3282228)": "https://www.drupal.org/files/issues/2022-09-08/bef-visually_hidden.3282228.8.patch",
@@ -265,6 +285,20 @@
             "drupal/core": {
                 "Text format wrapper does not take description_display into account (https://www.drupal.org/project/drupal/issues/2421445#comment-14328645)": "https://www.drupal.org/files/issues/2021-12-03/2421445-18_0.patch"
             }
+        },
+        "scripts": {
+            "post-install-cmd": [
+                "DrupalProject\\composer\\ScriptHandler::createRequiredFiles"
+            ],
+            "post-update-cmd": [
+                "DrupalProject\\composer\\ScriptHandler::createRequiredFiles"
+            ],
+            "pre-install-cmd": [
+                "DrupalProject\\composer\\ScriptHandler::checkComposerVersion"
+            ],
+            "pre-update-cmd": [
+                "DrupalProject\\composer\\ScriptHandler::checkComposerVersion"
+            ]
         }
     }
 }

composer.lock

@@ -0,0 +1,40 @@
+<?php
+
+namespace Drush\Commands;
+
+use Consolidation\AnnotatedCommand\CommandData;
+use Consolidation\AnnotatedCommand\Hooks\HookManager;
+use Drush\Attributes\Hook;
+use Drush\Commands\core\RsyncCommands;
+use Drush\Commands\sql\SqlSyncCommands;
+
+/**
+ * Edit this file to reflect your organization's needs.
+ */
+class PolicyCommands extends DrushCommands {
+
+  /**
+   * Prevent catastrophic braino. Note that this file has to be local to the
+   * machine that initiates the sql:sync command.
+   *
+   * @throws \Exception
+   */
+  #[Hook(type: HookManager::ARGUMENT_VALIDATOR, target: SqlSyncCommands::SYNC)]
+  public function sqlSyncValidate(CommandData $commandData) {
+    if ($commandData->input()->getArgument('target') == '@prod') {
+      throw new \Exception(dt('Per !file, you may never overwrite the production database.', ['!file' => __FILE__]));
+    }
+  }
+
+  /**
+   * Limit rsync operations to production site.
+   *
+   * @throws \Exception
+   */
+  #[Hook(type: HookManager::ARGUMENT_VALIDATOR, target: RsyncCommands::RSYNC)]
+  public function rsyncValidate(CommandData $commandData) {
+    if (preg_match("/^@prod/", $commandData->input()->getArgument('target'))) {
+      throw new \Exception(dt('Per !file, you may never rsync to the production site.', ['!file' => __FILE__]));
+    }
+  }
+}

drush/Commands/PolicyCommands.php

@@ -0,0 +1 @@
+This directory contains commands, configuration and site aliases for Drush. See https://packagist.org/search/?type=drupal-drush for a directory of Drush commands installable via Composer.

drush/README.md

@@ -0,0 +1,6 @@
+#
+# A Drush configuration file
+#
+# Docs at https://github.com/drush-ops/drush/blob/master/examples/example.drush.yml
+#
+# Edit or remove this file as needed.