Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drupal 11 #159

Open
wants to merge 15 commits into
base: develop
Choose a base branch
from
Open

Drupal 11 #159

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
04bf524
update composer dependencies for d11
byrond Aug 16, 2024
53df6d9
set minimum-stability to dev until a release of drupal-driver support…
byrond Aug 16, 2024
1d44a84
update DDEV mysql and maria_db version required for D11
byrond Aug 16, 2024
1122b86
add workbench tabs
byrond Aug 19, 2024
41d4441
add workbench
byrond Aug 19, 2024
21d194d
Merge remote-tracking branch 'origin/develop' into drupal11
byrond Aug 20, 2024
b6d1ed9
update to mysql 8.0 on circleci
byrond Aug 20, 2024
b68d912
test the skeleton with drupal11 branch
byrond Aug 20, 2024
0b19529
add packages required for eslint when core yarn is not run
byrond Aug 22, 2024
db04ad0
Merge branch 'DEV-70-update-install-node-dependencies-task-in-the-bui…
byrond Aug 23, 2024
6030316
update project node dependencies
byrond Aug 23, 2024
94217af
remove eslint dependencies not requried to test custom code
byrond Aug 23, 2024
7518d5d
use drupal11 for type in ddev config
byrond Jan 15, 2025
d34a546
add tbachert/spi to allow-plugins list as disabled
byrond Jan 22, 2025
2887615
switch minimum-stability back to 'stable'
byrond Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .ddev/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@byrond The only question I have is how this is set. In another project I ran ddev debug migrate-database mysql:8.0 and I got the database setup like

database:
    type: mysql
    version: "8.0"

This as is worked and I build a D11 site so I guess this is fine. Just wanted to note the difference I saw.

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.3"
Expand Down Expand Up @@ -46,7 +46,7 @@ hooks:
# This allows ddev to manage its own settings.ddev.php file.
disable_settings_management: false

type: drupal10
type: drupal11
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change will require DDEV >=1.24.0

router_http_port: "80"
router_https_port: "443"
provider: default
Expand Down
26 changes: 13 additions & 13 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,21 @@
"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"
"drupal/workbench": "^1.5",
"drupal/workbench_tabs": "^1.8",
"drush/drush": "^13"
},
"require-dev": {
"behat/behat": "^3.12",
"behat/mink-goutte-driver": "^2.0",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It sounds like we don't need this anymore. Is this correct?
https://packagist.org/packages/behat/mink-goutte-driver

Drupal already has https://packagist.org/packages/behat/mink-browserkit-driver as a requirement.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm. Maybe there's more to do here:

In GoutteFactory.php line 66:

Install MinkGoutteDriver in order to use goutte driver.
https://circleci.com/gh/palantirnet/drupal-skeleton/708

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed by updating palantirnet/the-build@02cd8ee

"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": "dev-drupal11"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TODO: Change this back to a stable version constraint after the drupal11 branch is merged into the-build, and there is a new release.

},
"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 .",
Expand All @@ -47,7 +46,7 @@
"conflict": {
"drupal/drupal": "*"
},
"minimum-stability": "stable",
"minimum-stability": "dev",
"prefer-stable": true,
"config": {
"allow-plugins": {
Expand All @@ -56,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"
Expand Down
12 changes: 9 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
{
"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-config-drupal": "5.0.2"
"eslint": "^8.39.0",
"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-prettier": "^5.2.1",
"eslint-plugin-yml": "^1.14.0",
"prettier": "^3.3.3"
}
}