Skip to content

Commit

Permalink
BNALD-67 Drupal 10.x upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
camilocodes committed Sep 26, 2024
1 parent 10574a2 commit 4757033
Show file tree
Hide file tree
Showing 41 changed files with 5,002 additions and 3,249 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ tests/behat/features/bootstrap
scripts/local
.idea
configuration/.htaccess
/build/vendor

# Einbaum
tests/einbaum/node_modules
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ghcr.io/unb-libraries/drupal:9.x-2.x-unblib
FROM ghcr.io/unb-libraries/drupal:10.x-1.x-unblib

# Install additional OS packages.
ENV ADDITIONAL_OS_PACKAGES="postfix php7-ldap php7-xmlreader php7-zip imagemagick php7-redis"
ENV ADDITIONAL_OS_PACKAGES="postfix php-ldap php-xmlreader php-zip imagemagick php81-pecl-redis"
ENV DRUPAL_SITE_ID="bnald"
ENV DRUPAL_SITE_URI="bnald.lib.unb.ca"
ENV DRUPAL_SITE_UUID="c8857708-03ab-4f57-beeb-a60bd827e72f"
Expand Down
94 changes: 49 additions & 45 deletions build/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@
"allow-plugins": {
"composer/installers": true,
"cweagans/composer-patches": true,
"dealerdirect/phpcodesniffer-composer-installer": true,
"drupal/core-composer-scaffold": true,
"php-http/discovery": true,
"dealerdirect/phpcodesniffer-composer-installer": true
},
"phpstan/extension-installer": true,
"php-http/discovery": true
},
"discard-changes": true,
"preferred-install": {
"*": "dist"
Expand All @@ -31,13 +32,15 @@
"description": "Drupal 8 component of bnald.lib.unb.ca",
"extra": {
"enable-patching": true,
"drupal-scaffold": {
"locations": {
"web-root": "./"
}
},
"installer-paths": {
"core": [
"type:drupal-core"
],
"drush/contrib/{$name}": [
"type:drupal-drush"
],
"libraries/{$name}": [
"type:drupal-library"
],
Expand All @@ -49,6 +52,18 @@
],
"themes/contrib/{$name}": [
"type:drupal-theme"
],
"Commands/contrib/{$name}": [
"type:drupal-drush"
],
"modules/custom/{$name}": [
"type:drupal-custom-module"
],
"profiles/custom/{$name}": [
"type:drupal-custom-profile"
],
"themes/custom/{$name}": [
"type:drupal-custom-theme"
]
},
"patches": {}
Expand All @@ -64,47 +79,36 @@
}
],
"require": {
"drupal/bootstrap": "3.26",
"drupal/config_update": "1.7",
"drupal/core": "9.5.11",
"drupal/externalauth": "1.4",
"drupal/file_mdm": "2.6",
"drupal/google_analytics": "^4.0",
"drupal/health_check": "1.3",
"drupal/migrate_plus": "^6.0",
"drupal/migrate_source_csv": "^3.2",
"drupal/noreqnewpass": "1.3",
"drupal/paragraphs": "1.12",
"drupal/pathauto": "1.11",
"drupal/pdfpreview": "1.1",
"drupal/redis": "1.7",
"drupal/samlauth": "3.9",
"drupal/search_api": "1.29",
"drupal/search_api_autocomplete": "1.7",
"drupal/search_api_solr": "4.2.12",
"drupal/simple_sitemap": "4.1.6",
"drupal/token": "1.12",
"drupal/tvi": "1.0-rc4",
"unb-libraries/drupal-builder": "^9",
"unb-libraries/saml_features": "dev-9.x-1.x"
"drupal/bootstrap": "3.32",
"drupal/ckeditor": "^1",
"drupal/core": "^10",
"drupal/core-composer-scaffold": "^10",
"drupal/core-recommended": "^10",
"drupal/externalauth": "^2",
"drupal/file_mdm": "^2",
"drupal/google_analytics": "^4",
"drupal/health_check": "^1",
"drupal/jquery_ui": "^1",
"drupal/jquery_ui_draggable": "^2",
"drupal/jquery_ui_resizable": "^2",
"drupal/noreqnewpass": "^1",
"drupal/pathauto": "^1",
"drupal/pdfpreview": "^1",
"drupal/quickedit": "^1",
"drupal/rdf": "^2",
"drupal/redis": "^1",
"drupal/samlauth": "^3",
"drupal/search_api": "^1",
"drupal/search_api_autocomplete": "^1",
"drupal/search_api_solr": "^4",
"drupal/simple_sitemap": "^4",
"drupal/token": "^1",
"drupal/tvi": "^2",
"unb-libraries/saml_features": "dev-10.x-1.x",
"unb-libraries/composer-drupal-scaffold": "^10"
},
"require-dev": {
"unb-libraries/drupal-development-libraries": "^9"
},
"scripts": {
"drupal-scaffold": "DrupalComposer\\DrupalScaffold\\Plugin::scaffold",
"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"
]
"unb-libraries/drupal-development-libraries": "^10"
},
"type": "project"
}
Loading

0 comments on commit 4757033

Please sign in to comment.