From 04bf524ce6b34a7639f91152b01458b460ad036d Mon Sep 17 00:00:00 2001 From: Byron Duvall Date: Fri, 16 Aug 2024 13:17:20 -0400 Subject: [PATCH 01/13] update composer dependencies for d11 --- composer.json | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/composer.json b/composer.json index d8327fe..9e7fb54 100644 --- a/composer.json +++ b/composer.json @@ -18,22 +18,19 @@ "require": { "composer/installers": "^2.0", "drupal/admin_toolbar": "^3", - "drupal/config_ignore": "2.x-dev", - "drupal/config_split": "^1", - "drupal/core-composer-scaffold": "^10", - "drupal/core-recommended": "^10", + "drupal/config_ignore": "^3", + "drupal/config_split": "^2", + "drupal/core-composer-scaffold": "^11", + "drupal/core-recommended": "^11", "drupal/devel": "^5", - "drupal/workbench": "^1", - "drupal/workbench_tabs": "^1", - "drush/drush": ">=11" + "drush/drush": "^13" }, "require-dev": { "behat/behat": "^3.12", - "behat/mink-goutte-driver": "^2.0", "dmore/behat-chrome-extension": "^1.4", - "drupal/core-dev": "^10", - "drupal/drupal-extension": "^5@alpha", - "palantirnet/the-build": "^4@beta" + "drupal/core-dev": "^11", + "drupal/drupal-extension": "^5", + "palantirnet/the-build": "^4" }, "suggest": { "acquia/memcache-settings": "If your acquia project uses Cloud Platform (and not Cloud Next), add this package and update acquia settings file based on: https://docs.acquia.com/cloud-platform/performance/memcached/enable/#configuration-for-drupal-9-or-later .", From 53df6d99592b79d7014d33457224c21dce29cc3f Mon Sep 17 00:00:00 2001 From: Byron Duvall Date: Fri, 16 Aug 2024 13:35:58 -0400 Subject: [PATCH 02/13] set minimum-stability to dev until a release of drupal-driver supports Symfony 7 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 9e7fb54..aefcd31 100644 --- a/composer.json +++ b/composer.json @@ -44,7 +44,7 @@ "conflict": { "drupal/drupal": "*" }, - "minimum-stability": "stable", + "minimum-stability": "dev", "prefer-stable": true, "config": { "allow-plugins": { From 1d44a8403e2b59017376545562649b23bdc7478d Mon Sep 17 00:00:00 2001 From: byrond Date: Fri, 16 Aug 2024 15:27:59 -0400 Subject: [PATCH 03/13] update DDEV mysql and maria_db version required for D11 --- .ddev/config.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.ddev/config.yaml b/.ddev/config.yaml index cbeeae1..bb44bcd 100644 --- a/.ddev/config.yaml +++ b/.ddev/config.yaml @@ -7,14 +7,14 @@ name: drupal-skeleton # TODO: If the project uses Acquia hosting, use these settings. docroot: docroot -mysql_version: "5.7" +mysql_version: "8.0" webserver_type: apache-fpm # TODO: If the project uses Pantheon or Platform.sh hosting, remove the Acquia settings # and use these settings instead. #docroot: web #webserver_type: nginx-fpm -#mariadb_version: "10.3" +#mariadb_version: "10.6" # TODO: Make sure this PHP version matches the project's hosting environment. php_version: "8.2" @@ -46,6 +46,7 @@ hooks: # This allows ddev to manage its own settings.ddev.php file. disable_settings_management: false +# TODO: Update to drupal11 when the option is available. type: drupal10 router_http_port: "80" router_https_port: "443" From 1122b860d943420761cdb77489bd86be1d5a3876 Mon Sep 17 00:00:00 2001 From: Byron Duvall Date: Mon, 19 Aug 2024 11:29:29 -0400 Subject: [PATCH 04/13] add workbench tabs --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index aefcd31..04df77d 100644 --- a/composer.json +++ b/composer.json @@ -23,6 +23,7 @@ "drupal/core-composer-scaffold": "^11", "drupal/core-recommended": "^11", "drupal/devel": "^5", + "drupal/workbench_tabs": "^1.8", "drush/drush": "^13" }, "require-dev": { From 41d4441aaeb27e30a5f43708254efc766a1a29f9 Mon Sep 17 00:00:00 2001 From: Byron Duvall Date: Mon, 19 Aug 2024 11:56:48 -0400 Subject: [PATCH 05/13] add workbench --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 04df77d..194ca62 100644 --- a/composer.json +++ b/composer.json @@ -23,6 +23,7 @@ "drupal/core-composer-scaffold": "^11", "drupal/core-recommended": "^11", "drupal/devel": "^5", + "drupal/workbench": "^1.5", "drupal/workbench_tabs": "^1.8", "drush/drush": "^13" }, From b6d1ed97104176cacee2eec5fb9342026ef8fe4e Mon Sep 17 00:00:00 2001 From: Byron Duvall Date: Tue, 20 Aug 2024 10:30:02 -0400 Subject: [PATCH 06/13] update to mysql 8.0 on circleci --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ce7ec3c..257cba6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,7 @@ jobs: working_directory: ~/drupal-skeleton docker: - image: cimg/php:8.3-browsers - - image: cimg/mysql:5.7 + - image: cimg/mysql:8.0 command: --max_allowed_packet=16M environment: MYSQL_ALLOW_EMPTY_PASSWORD: yes From b68d912fd0648605f2a046323997b9b6179e493f Mon Sep 17 00:00:00 2001 From: Byron Duvall Date: Tue, 20 Aug 2024 10:35:38 -0400 Subject: [PATCH 07/13] test the skeleton with drupal11 branch --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7805910..5a51f49 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ "dmore/behat-chrome-extension": "^1.4", "drupal/core-dev": "^11", "drupal/drupal-extension": "^5", - "palantirnet/the-build": "^4" + "palantirnet/the-build": "dev-drupal11" }, "suggest": { "acquia/memcache-settings": "If your acquia project uses Cloud Platform (and not Cloud Next), add this package and update acquia settings file based on: https://docs.acquia.com/cloud-platform/performance/memcached/enable/#configuration-for-drupal-9-or-later .", From 0b1952930391e3c7781d49570160bea3cff71f4a Mon Sep 17 00:00:00 2001 From: Byron Duvall Date: Thu, 22 Aug 2024 15:51:31 -0400 Subject: [PATCH 08/13] add packages required for eslint when core yarn is not run --- package.json | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index c9359c3..1fe0822 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,16 @@ "version": "0.0.0", "devDependencies": { "eslint": "8.39.0", - "eslint-config-drupal": "5.0.2" + "eslint-config-airbnb-base": "^15.0.0", + "eslint-config-drupal": "5.0.2", + "eslint-config-prettier": "^9.1.0", + "eslint-plugin-import": "^2.29.1", + "eslint-plugin-jsx-a11y": "^6.9.0", + "eslint-plugin-prettier": "^5.2.1", + "eslint-plugin-react": "^7.35.0", + "eslint-plugin-storybook": "^0.8.0", + "eslint-plugin-yml": "^1.14.0", + "prettier": "^3.3.3", + "typescript": "^5.5.4" } } From 60303162ecb3ad9599ee11441187b9569224d35a Mon Sep 17 00:00:00 2001 From: Byron Duvall Date: Fri, 23 Aug 2024 10:17:46 -0400 Subject: [PATCH 09/13] update project node dependencies --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 1fe0822..75992eb 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,11 @@ { "name": "palantirnet--drupal-skeleton", - "description": "A Drupal 8 project template.", + "description": "A Drupal 11 project template.", "version": "0.0.0", "devDependencies": { - "eslint": "8.39.0", + "eslint": "^8.39.0", "eslint-config-airbnb-base": "^15.0.0", - "eslint-config-drupal": "5.0.2", + "eslint-config-drupal": "^5.0.2", "eslint-config-prettier": "^9.1.0", "eslint-plugin-import": "^2.29.1", "eslint-plugin-jsx-a11y": "^6.9.0", From 94217af9e378e725592b25b7fb30a976f2aa6a90 Mon Sep 17 00:00:00 2001 From: Byron Duvall Date: Fri, 23 Aug 2024 10:49:40 -0400 Subject: [PATCH 10/13] remove eslint dependencies not requried to test custom code --- package.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/package.json b/package.json index 75992eb..282ee13 100644 --- a/package.json +++ b/package.json @@ -8,12 +8,8 @@ "eslint-config-drupal": "^5.0.2", "eslint-config-prettier": "^9.1.0", "eslint-plugin-import": "^2.29.1", - "eslint-plugin-jsx-a11y": "^6.9.0", "eslint-plugin-prettier": "^5.2.1", - "eslint-plugin-react": "^7.35.0", - "eslint-plugin-storybook": "^0.8.0", "eslint-plugin-yml": "^1.14.0", - "prettier": "^3.3.3", - "typescript": "^5.5.4" + "prettier": "^3.3.3" } } From 7518d5d7b6ddc24bcd9ebf3611231076332de412 Mon Sep 17 00:00:00 2001 From: byrond Date: Wed, 15 Jan 2025 15:58:27 -0500 Subject: [PATCH 11/13] use drupal11 for type in ddev config --- .ddev/config.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.ddev/config.yaml b/.ddev/config.yaml index dccea9d..c146592 100644 --- a/.ddev/config.yaml +++ b/.ddev/config.yaml @@ -46,8 +46,7 @@ hooks: # This allows ddev to manage its own settings.ddev.php file. disable_settings_management: false -# TODO: Update to drupal11 when the option is available. -type: drupal10 +type: drupal11 router_http_port: "80" router_https_port: "443" provider: default From d34a546d942793dc05335f683f5e41ae5ae81986 Mon Sep 17 00:00:00 2001 From: byrond Date: Wed, 22 Jan 2025 11:40:08 -0500 Subject: [PATCH 12/13] add tbachert/spi to allow-plugins list as disabled See https://www.drupal.org/project/drupal/issues/3478895 --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 5a51f49..210cac4 100644 --- a/composer.json +++ b/composer.json @@ -55,7 +55,8 @@ "cweagans/composer-patches": true, "dealerdirect/phpcodesniffer-composer-installer": true, "phpstan/extension-installer": true, - "php-http/discovery": true + "php-http/discovery": true, + "tbachert/spi": false }, "platform": { "php": "8.3" From 2887615b002d4f9a9c62317b369ecb4e4127a1b7 Mon Sep 17 00:00:00 2001 From: byrond Date: Thu, 23 Jan 2025 15:48:53 -0500 Subject: [PATCH 13/13] switch minimum-stability back to 'stable' --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 210cac4..fc598d2 100644 --- a/composer.json +++ b/composer.json @@ -46,7 +46,7 @@ "conflict": { "drupal/drupal": "*" }, - "minimum-stability": "dev", + "minimum-stability": "stable", "prefer-stable": true, "config": { "allow-plugins": {