Skip to content

Commit

Permalink
Update to Drupal 10.
Browse files Browse the repository at this point in the history
  • Loading branch information
@michaelsmithvmlyr
michaelsmithvmlyr committed Mar 16, 2023
1 parent c3ddb2f commit 164bedd
Show file tree
Hide file tree
Showing 9 changed files with 8,460 additions and 8,996 deletions.
11 changes: 5 additions & 6 deletions .lando.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Drupal-Kit
recipe: drupal9
recipe: drupal10
excludes:
- drush
- node_modules
Expand All @@ -18,7 +18,7 @@ services:
php: .lando.php.ini
overrides:
environment:
XDEBUG_MOPDE:
XDEBUG_MODE:
LANDO_HOST_IP: "172.17.0.1"
extra_hosts:
- ${LANDO_HOST_NAME_DEV:-host}:${LANDO_HOST_GATEWAY_DEV:-host-gateway}
Expand Down Expand Up @@ -87,7 +87,6 @@ tooling:
cmd:
- appserver: drush kit:theme
- node: cd /app/source && npm install && npm run gulp
events:
pre-start:
- appserver: composer install
- nodejs: npm install
grumphp:
service: appserver
cmd: php /app/vendor/bin/grumphp run
247 changes: 101 additions & 146 deletions composer.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vmlyr-drupal/kit",
"description": "Project template for VMLY&R Drupal 8 projects with composer.",
"description": "Project template for VMLY&R Drupal 10 projects with composer.",
"type": "project",
"license": "GPL-2.0-or-later",
"authors": [
Expand All @@ -9,139 +9,121 @@
"role": "Technology Specialist"
}
],
"homepage": "https://www.drupal.org/project/drupal",
"support": {
"docs": "https://www.drupal.org/docs/user_guide/en/index.html",
"chat": "https://www.drupal.org/node/314178"
},
"repositories": [
{
"type": "composer",
"url": "https://packages.drupal.org/8"
},
{
"type": "package",
"package": {
"name": "dinbror/blazy",
"version": "1.8.2",
"type": "drupal-library",
"dist": {
"url": "https://github.com/dinbror/blazy/archive/1.8.2.zip",
"type": "zip"
}
}
}
],
"require": {
"php": ">=8.1",
"composer/installers": "^1.9",
"composer/installers": "^2.0",
"cweagans/composer-patches": "^1.7",
"dinbror/blazy": "^1.8",
"drupal/address": "^1.3",
"drupal/admin_toolbar": "^3.0",
"drupal/advagg": "^4.0",
"drupal/allowed_formats": "^1.1",
"drupal/better_exposed_filters": "^5.0@beta",
"drupal/bg_image_formatter": "^1.2",
"drupal/blazy": "^2.2",
"drupal/block_class": "^1.1",
"drupal/block_field": "^1.0@alpha",
"drupal/classy_paragraphs": "^1.0@beta",
"drupal/config_export_ignore": "^1.1",
"drupal/config_ignore": "^2.0",
"drupal/config_split": "^1.0",
"drupal/config_update": "1.7",
"drupal/core": "9.3.2",
"drupal/core-composer-scaffold": "^9.0",
"drupal/core-dev": "9.3.2",
"drupal/core-project-message": "^9.0.0",
"drupal/core-recommended": "^9.3",
"drupal/core-vendor-hardening": "^9.0.0",
"drupal/current_page_crumb": "^1.2",
"drupal/devel": "^4.1",
"drupal/devel_entity_updates": "^3.0",
"drupal/devel_php": "^1.0",
"drupal/diff": "^1.0@RC",
"drupal/editor_file": "^1.0",
"drupal/email_registration": "^1.0@RC",
"drupal/entity_reference_revisions": "^1.9",
"drupal/address": "^1.11",
"drupal/admin_toolbar": "^3.3",
"drupal/advagg": "^6.0@alpha",
"drupal/allowed_formats": "^2.0",
"drupal/better_exposed_filters": "^6.0",
"drupal/bg_image_formatter": "^1.16",
"drupal/blazy": "^2.14",
"drupal/block_class": "^2.0",
"drupal/block_field": "^1.0@RC",
"drupal/classy_paragraphs": "^1.0@dev",
"drupal/color": "^1.0",
"drupal/config_ignore": "^2.4",
"drupal/config_split": "^1.9",
"drupal/config_update": "^2.0@alpha",
"drupal/core-composer-scaffold": "^10.0",
"drupal/core-project-message": "^10.0",
"drupal/core-recommended": "^10.0",
"drupal/core-vendor-hardening": "^10.0",
"drupal/current_page_crumb": "^1.4",
"drupal/devel": "^5.1",
"drupal/devel_entity_updates": "^4.1",
"drupal/devel_php": "^1.5",
"drupal/diff": "^1.1",
"drupal/editor_file": "^1.7",
"drupal/email_registration": "^1.2",
"drupal/entity_reference_revisions": "^1.10",
"drupal/environment_indicator": "^4.0",
"drupal/extlink": "^1.6",
"drupal/field_group": "^3.0",
"drupal/field_group_settings": "^3.0",
"drupal/field_label": "^1.0",
"drupal/field_states_ui": "^2.0",
"drupal/focal_point": "^1.5",
"drupal/google_tag": "^1.3",
"drupal/imageapi_optimize": "^4.0@beta",
"drupal/extlink": "^1.7",
"drupal/field_group": "^3.4",
"drupal/field_label": "^1.2",
"drupal/focal_point": "^2.0@alpha",
"drupal/google_tag": "^1.6",
"drupal/imageapi_optimize": "^4.0",
"drupal/imageapi_optimize_resmushit": "^2.0@beta",
"drupal/imageapi_optimize_webp": "^2.0@beta",
"drupal/layout_paragraphs": "^1.0@beta",
"drupal/limited_field_widgets": "^2.0",
"drupal/link_class": "^1.0",
"drupal/linkit": "^5.0@beta",
"drupal/login_emailusername": "^1.1",
"drupal/media_responsive_thumbnail": "^1.0",
"drupal/memcache": "^2.0@alpha",
"drupal/menu_link_attributes": "^1.0",
"drupal/menu_trail_by_path": "^1.0",
"drupal/metatag": "^1.0",
"drupal/metatag_async_widget": "^1.0@alpha",
"drupal/migrate_plus": "^5.1",
"drupal/migrate_tools": "^5.0",
"drupal/module_filter": "^3.1",
"drupal/paragraphs": "^1.12",
"drupal/paragraphs_ee": "1.x-dev@dev",
"drupal/pathauto": "^1.6",
"drupal/permissions_filter": "^1.0",
"drupal/recaptcha": "^3.0",
"drupal/redirect": "^1.0",
"drupal/robotstxt": "^1.3",
"drupal/schema_metatag": "^2.1",
"drupal/shield": "^1.0",
"drupal/simple_sitemap": "^3.3",
"drupal/smart_trim": "^1.1",
"drupal/stage_file_proxy": "^1.0@alpha",
"drupal/linkit": "^6.0@beta",
"drupal/login_emailusername": "^2.1",
"drupal/media_responsive_thumbnail": "^1.4",
"drupal/memcache": "^2.5",
"drupal/menu_link_attributes": "^1.3",
"drupal/menu_trail_by_path": "^2.0",
"drupal/metatag": "^1.22",
"drupal/metatag_async_widget": "^1.1",
"drupal/migrate_plus": "^6.0",
"drupal/migrate_tools": "^6.0",
"drupal/module_filter": "^4.0",
"drupal/paragraphs": "^1.15",
"drupal/paragraphs_ee": "^2.1@alpha",
"drupal/pathauto": "^1.11",
"drupal/permissions_filter": "^1.3",
"drupal/rdf": "^2.1",
"drupal/recaptcha": "^3.1",
"drupal/redirect": "^1.8",
"drupal/robotstxt": "^1.5",
"drupal/schema_metatag": "^2.4",
"drupal/shield": "^1.7",
"drupal/simple_sitemap": "^4.1",
"drupal/smart_trim": "^2.0",
"drupal/stage_file_proxy": "^2.0",
"drupal/structure_sync": "^2.0",
"drupal/svg_image": "^1.8",
"drupal/swiftmailer": "2.x-dev",
"drupal/telephone_formatter": "^1.0@beta",
"drupal/telephone_validation": "^2.1",
"drupal/theme_filter": "^1.0",
"drupal/token": "^1.1",
"drupal/video_embed_field": "^2.0",
"drupal/viewsreference": "^2.0@alpha",
"drupal/viewsreference_filter": "^1.0",
"drush/drush": "^10.3",
"egulias/email-validator": "3.1.2",
"drupal/svg_image": "^3.0",
"drupal/swiftmailer": "^2.4",
"drupal/token": "^1.11",
"drupal/video_embed_field": "^2.5",
"drupal/viewsreference": "^2.0@beta",
"drush/drush": "^11.5",
"egulias/email-validator": "^3.2",
"topfloor/composer-cleanup-vcs-dirs": "^1.1",
"vlucas/phpdotenv": "^5.3",
"vlucas/phpdotenv": "^5.5",
"vmlyr-drupal/bazo": "^8.0",
"vmlyr-drupal/biplane": "^9.0",
"vmlyr-drupal/blackbird": "^9.0",
"vmlyr-drupal/kit-docksal-commands": "dev-8.x-2.x",
"vmlyr-drupal/biplane": "^10.0",
"vmlyr-drupal/blackbird": "^10.0",
"vmlyr-drupal/kit-docksal-commands": "^8.2",
"webflo/drupal-finder": "^1.2"
},
"require-dev": {
"drupal/core-dev": "^10.0",
"nascom/grumphp-drupal": "^1.0"
},
"conflict": {
"drupal/drupal": "*"
},
"minimum-stability": "dev",
"prefer-stable": true,
"config": {
"COMPOSER_MIRROR_PATH_REPOS": true,
"discard-changes": true,
"sort-packages": true,
"platform": {
"php": "8.1"
},
"allow-plugins": {
"composer/installers": true,
"cweagans/composer-patches": true,
"oomphinc/composer-installers-extender": true,
"drupal/core-composer-scaffold": true,
"drupal/core-project-message": true,
"phpstan/extension-installer": true,
"dealerdirect/phpcodesniffer-composer-installer": true,
"drupal/core-vendor-hardening": true,
"topfloor/composer-cleanup-vcs-dirs": true,
"dealerdirect/phpcodesniffer-composer-installer": true,
"nascom/grumphp-drupal": true,
"phpro/grumphp-shim": true,
"phpro/grumphp": true
}
"oomphinc/composer-installers-extender": true,
"phpro/grumphp": true,
"nascom/grumphp-drupal": true
},
"discard-changes": true,
"sort-packages": true
},
"autoload": {
"classmap": [
Expand Down Expand Up @@ -198,7 +180,7 @@
"gitignore": false,
"locations": {
"web-root": "docroot/",
"config-root": "config/"
"config-root": "config/"
}
},
"installer-types": [
Expand All @@ -208,64 +190,37 @@
"installer-paths": {
".docksal/commands/kit": [
"vmlyr-drupal/kit-docksal-commands"
],
"docroot/core": [
"type:drupal-core"
],
],
"docroot/core": ["type:drupal-core"],
"docroot/libraries/{$name}": [
"type:drupal-library",
"type:bower-asset",
"type:npm-asset"
],
"docroot/modules/contrib/{$name}": [
"type:drupal-module"
],
"docroot/profiles/contrib/{$name}": [
"type:drupal-profile"
],
"docroot/themes/contrib/{$name}": [
"type:drupal-theme"
],
"drush/Commands/contrib/{$name}": [
"type:drupal-drush"
]
"docroot/modules/contrib/{$name}": ["type:drupal-module"],
"docroot/profiles/contrib/{$name}": ["type:drupal-profile"],
"docroot/themes/contrib/{$name}": ["type:drupal-theme"],
"drush/Commands/contrib/{$name}": ["type:drupal-drush"],
"docroot/modules/custom/{$name}": ["type:drupal-custom-module"],
"docroot/profiles/custom/{$name}": ["type:drupal-custom-profile"],
"docroot/themes/custom/{$name}": ["type:drupal-custom-theme"]
},
"patches": {
"drupal/classy_paragraphs": {
"https://www.drupal.org/node/2830403": "https://www.drupal.org/files/issues/2021-02-23/choose_and_order-2830403-44.patch"
},
"drupal/core": {
"https://www.drupal.org/node/1091852": "https://www.drupal.org/files/issues/2021-11-05/1091852-150.patch",
"https://www.drupal.org/node/2429699": "https://www.drupal.org/files/issues/2020-10-25/drupal-views-entity-reference-filter-2429699-369.patch",
"https://www.drupal.org/node/2516938": "https://www.drupal.org/files/issues/2020-06-09/core-toolbar-mobile-2516938-73.patch",
"https://www.drupal.org/node/2642122": "https://www.drupal.org/files/issues/2021-07-12/2642122-141.patch",
"https://www.drupal.org/node/2827921": "https://www.drupal.org/files/issues/2827921-remove-missing-responsive-image-width-exception.patch",
"https://www.drupal.org/project/drupal/issues/2663316": "https://www.drupal.org/files/issues/2019-10-21/2663316-76.drupal.Broken-title-in-modal-dialog-when-title-is-a-render-array.patch",
"https://www.drupal.org/node/3006729": "https://www.drupal.org/files/issues/2021-12-20/add-context-to-media-iframe-3006729-16.patch",
"https://www.drupal.org/node/3188588": "https://www.drupal.org/files/issues/2020-12-15/3188588-02.patch"
},
"drupal/field_group": {
"https://www.drupal.org/node/3059614": "https://www.drupal.org/files/issues/2020-06-15/3059614-37.patch"
},
"drupal/field_states_ui": {
"https://www.drupal.org/node/3166929": "https://www.drupal.org/files/issues/2020-08-24/3166929-0.patch",
"https://www.drupal.org/node/3212229": "https://www.drupal.org/files/issues/2021-05-04/3212229-04.patch"
"https://www.drupal.org/node/3006729": "https://www.drupal.org/files/issues/2022-12-23/30067291-23.patch"
},
"drupal/layout_paragraphs": {
"https://www.drupal.org/node/3199508": "https://www.drupal.org/files/issues/2021-03-11/3199508-2.patch"
},
"drupal/linkit": {
"https://www.drupal.org/node/2712951": "https://www.drupal.org/files/issues/2020-11-02/linkit-for-link-field-2712951-194.patch"
"https://www.drupal.org/project/linkit/issues/2712951": "https://www.drupal.org/files/issues/2023-03-07/2712951_329.6.x.diff"
},
"drupal/simple_gmap": {
"https://www.drupal.org/node/2863979": "https://www.drupal.org/files/issues/2018-11-21/simple_gmap-address-formatter-2863979-36.patch"
},
"drupal/stage_file_proxy": {
"https://www.drupal.org/node/2882986": "https://www.drupal.org/files/issues/stage_file_proxy-basic-auth-2882986-3-D8.patch"
},
"drupal/svg_image": {
"https://www.drupal.org/node/3023212": "https://www.drupal.org/files/issues/2018-12-31/missing_schema_field_formatter.patch"
},
"drupal/viewsreference": {
"https://www.drupal.org/node/3192468": "https://www.drupal.org/files/issues/2021-01-12/3192468-2.patch"
},
Expand All @@ -275,9 +230,9 @@
},
"patchLevel": {
"drupal/core": "-p2"
},
"drupal-core-project-message": {
"include-keys": ["homepage", "support"]
}
},
"require-dev": {
"nascom/grumphp-drupal": "^1.0"
}
}
Loading

0 comments on commit 164bedd

Please sign in to comment.