From b0eacafc0be952bdcba7ffb18bcbf08ea93735ee Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen.haas@lakedrops.com>
Date: Sun, 27 Dec 2020 17:30:36 +0100
Subject: [PATCH] docker/l3d#58 Move project settings out of composer.json
---
.gitignore | 1 +
composer.json | 14 ++------------
2 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/.gitignore b/.gitignore
index 96603e2..e048bb9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ files/
passwords/
settings/
wiki/
+.env
# Ignore directories generated by Composer
drush/cache/
diff --git a/composer.json b/composer.json
index 550e079..ede7d02 100644
--- a/composer.json
+++ b/composer.json
@@ -36,10 +36,10 @@
],
"require": {
"php": ">=7.3",
- "lakedrops/d9-project-scaffold": "^1.1"
+ "lakedrops/d9-project-scaffold": "^1.2||dev-master"
},
"require-dev": {
- "lakedrops/drupal-development-environment": "^2.1"
+ "lakedrops/drupal-development-environment": "^3.0||dev-master"
},
"conflict": {
"drupal/drupal": "*"
@@ -54,21 +54,11 @@
"discard-changes": true
},
"extra": {
- "dorgflow": {
- "projects": {
- "drupal/drd": "4.0.x"
- }
- },
"patches": {
"drupal/coffee": {
"D9": "https://www.drupal.org/files/issues/2020-06-09/3147664-5.patch"
}
},
- "composer-drupal-optimizations": {
- "require": {
- "symfony/symfony": ">=4.4"
- }
- },
"drupal-scaffold": {
"allowed-packages": [
"drupal/core"
--
GitLab