diff --git a/composer.lock b/composer.lock index 4c40c04df..fc572a49b 100644 --- a/composer.lock +++ b/composer.lock @@ -3505,23 +3505,21 @@ }, { "name": "drupal/focal_point", - "version": "2.0.2", + "version": "2.0.3", "source": { "type": "git", "url": "https://git.drupalcode.org/project/focal_point.git", - "reference": "2.0.2" + "reference": "2.0.3" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/focal_point-2.0.2.zip", - "reference": "2.0.2", - "shasum": "8e809795ec6a68a0bc3740b0b0a41bfa53d4d6d5" + "url": "https://ftp.drupal.org/files/projects/focal_point-2.0.3.zip", + "reference": "2.0.3", + "shasum": "5067b249e39c2f93799a4cadfcc3d3dc981f3ef5" }, "require": { "drupal/core": "^9.3 || ^10", - "drupal/crop": "^2.3", - "drupal/jquery_ui": "^1.6", - "drupal/jquery_ui_draggable": "^2.0" + "drupal/crop": "^2.3" }, "require-dev": { "drupal/crop": "*" @@ -3529,8 +3527,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.2", - "datestamp": "1690451892", + "version": "2.0.3", + "datestamp": "1710483189", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3855,16 +3853,16 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.6.4", + "version": "2.6.5", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "778b6431d341db6f280aeb343d1bc673a378b5a0" + "reference": "6eaf1f2f4c92620efa786029719d34edd6d6b094" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/778b6431d341db6f280aeb343d1bc673a378b5a0", - "reference": "778b6431d341db6f280aeb343d1bc673a378b5a0", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/6eaf1f2f4c92620efa786029719d34edd6d6b094", + "reference": "6eaf1f2f4c92620efa786029719d34edd6d6b094", "shasum": "" }, "require": { @@ -3893,10 +3891,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.6.4", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.6.5", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2024-03-06T08:32:04+00:00" + "time": "2024-03-15T06:41:46+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -4509,155 +4507,6 @@ "source": "https://git.drupalcode.org/project/imagemagick" } }, - { - "name": "drupal/jquery_ui", - "version": "1.6.0", - "source": { - "type": "git", - "url": "https://git.drupalcode.org/project/jquery_ui.git", - "reference": "8.x-1.6" - }, - "dist": { - "type": "zip", - "url": "https://ftp.drupal.org/files/projects/jquery_ui-8.x-1.6.zip", - "reference": "8.x-1.6", - "shasum": "0ddccdcf35a066de1843e1d9670677ee1a2faac0" - }, - "require": { - "drupal/core": "^9.2 || ^10" - }, - "type": "drupal-module", - "extra": { - "drupal": { - "version": "8.x-1.6", - "datestamp": "1668521197", - "security-coverage": { - "status": "covered", - "message": "Covered by Drupal's security advisory policy" - } - } - }, - "notification-url": "https://packages.drupal.org/8/downloads", - "license": [ - "GPL-2.0-or-later" - ], - "authors": [ - { - "name": "bnjmnm", - "homepage": "https://www.drupal.org/user/2369194" - }, - { - "name": "jjeff", - "homepage": "https://www.drupal.org/user/17190" - }, - { - "name": "lauriii", - "homepage": "https://www.drupal.org/user/1078742" - }, - { - "name": "litwol", - "homepage": "https://www.drupal.org/user/78134" - }, - { - "name": "mfb", - "homepage": "https://www.drupal.org/user/12302" - }, - { - "name": "mfer", - "homepage": "https://www.drupal.org/user/25701" - }, - { - "name": "mikelutz", - "homepage": "https://www.drupal.org/user/2972409" - }, - { - "name": "nod_", - "homepage": "https://www.drupal.org/user/598310" - }, - { - "name": "phenaproxima", - "homepage": "https://www.drupal.org/user/205645" - }, - { - "name": "RobLoach", - "homepage": "https://www.drupal.org/user/61114" - }, - { - "name": "sun", - "homepage": "https://www.drupal.org/user/54136" - }, - { - "name": "webchick", - "homepage": "https://www.drupal.org/user/24967" - }, - { - "name": "Wim Leers", - "homepage": "https://www.drupal.org/user/99777" - }, - { - "name": "zrpnr", - "homepage": "https://www.drupal.org/user/1448368" - } - ], - "description": "Provides jQuery UI library.", - "homepage": "https://www.drupal.org/project/jquery_ui", - "support": { - "source": "https://git.drupalcode.org/project/jquery_ui" - } - }, - { - "name": "drupal/jquery_ui_draggable", - "version": "2.0.0", - "source": { - "type": "git", - "url": "https://git.drupalcode.org/project/jquery_ui_draggable.git", - "reference": "2.0.0" - }, - "dist": { - "type": "zip", - "url": "https://ftp.drupal.org/files/projects/jquery_ui_draggable-2.0.0.zip", - "reference": "2.0.0", - "shasum": "13a8f4bf037449cd176ddb967fc9cba9a466a705" - }, - "require": { - "drupal/core": "^9.2 || ^10", - "drupal/jquery_ui": "^1.6" - }, - "type": "drupal-module", - "extra": { - "drupal": { - "version": "2.0.0", - "datestamp": "1670871516", - "security-coverage": { - "status": "covered", - "message": "Covered by Drupal's security advisory policy" - } - } - }, - "notification-url": "https://packages.drupal.org/8/downloads", - "license": [ - "GPL-2.0-or-later" - ], - "authors": [ - { - "name": "bnjmnm", - "homepage": "https://www.drupal.org/user/2369194" - }, - { - "name": "lauriii", - "homepage": "https://www.drupal.org/user/1078742" - }, - { - "name": "zrpnr", - "homepage": "https://www.drupal.org/user/1448368" - } - ], - "description": "Provides jQuery UI Draggable library.", - "homepage": "https://www.drupal.org/project/jquery_ui_draggable", - "support": { - "source": "https://git.drupalcode.org/project/jquery_ui_draggable" - } - }, { "name": "drupal/linkit", "version": "6.1.2", @@ -9945,16 +9794,16 @@ }, { "name": "psy/psysh", - "version": "v0.12.0", + "version": "v0.12.1", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "750bf031a48fd07c673dbe3f11f72362ea306d0d" + "reference": "39621c73e0754328252f032c6997b983afc50431" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/750bf031a48fd07c673dbe3f11f72362ea306d0d", - "reference": "750bf031a48fd07c673dbe3f11f72362ea306d0d", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/39621c73e0754328252f032c6997b983afc50431", + "reference": "39621c73e0754328252f032c6997b983afc50431", "shasum": "" }, "require": { @@ -10018,9 +9867,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.12.0" + "source": "https://github.com/bobthecow/psysh/tree/v0.12.1" }, - "time": "2023-12-20T15:28:09+00:00" + "time": "2024-03-15T03:22:57+00:00" }, { "name": "ralouphie/getallheaders", diff --git a/docker-compose.yml b/docker-compose.yml index 14960c7fc..218211a86 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,7 +14,7 @@ services: STAGE_FILE_PROXY_ORIGIN_DIR: "${STAGE_FILE_PROXY_ORIGIN_DIR}" APP_ENV: "${APP_ENV:-local}" ELASTIC_PROXY_URL: ${ELASTIC_PROXY_URL:-""} - DRUPAL_ROUTES: "https://varnish-${DRUPAL_HOSTNAME},https://helfi-proxy.docker.so,http://${COMPOSE_PROJECT_NAME}-varnish" + DRUPAL_ROUTES: "https://varnish-${DRUPAL_HOSTNAME},https://helfi-proxy.docker.so,http://${COMPOSE_PROJECT_NAME}-varnish,http://${COMPOSE_PROJECT_NAME}" DRUPAL_REVERSE_PROXY_ADDRESS: helfi-proxy.docker.so DRUSH_OPTIONS_URI: "https://${DRUPAL_HOSTNAME}" # To enable xdebug, run `export XDEBUG_ENABLE=true` before (re)starting your project.