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 diff --git a/.ddev/config.yaml b/.ddev/config.yaml index aac52e0..c146592 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.3" @@ -46,7 +46,7 @@ hooks: # This allows ddev to manage its own settings.ddev.php file. disable_settings_management: false -type: drupal10 +type: drupal11 router_http_port: "80" router_https_port: "443" provider: default diff --git a/composer.json b/composer.json index 0384a88..fc598d2 100644 --- a/composer.json +++ b/composer.json @@ -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", "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" }, "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 .", @@ -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" diff --git a/package.json b/package.json index c9359c3..282ee13 100644 --- a/package.json +++ b/package.json @@ -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" } }