From beade9cf1a31994b6dfaf8019faa60c84afb36ef Mon Sep 17 00:00:00 2001 From: Mathias Elle Date: Thu, 4 Jun 2026 00:59:27 +0200 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20add=20optional=20Hyv=C3=A4=20theme?= =?UTF-8?q?=20installation=20with=20token=20input?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .ddev/commands/web/install-magento | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.ddev/commands/web/install-magento b/.ddev/commands/web/install-magento index 0e48243..4b761fc 100755 --- a/.ddev/commands/web/install-magento +++ b/.ddev/commands/web/install-magento @@ -78,6 +78,21 @@ bin/magento module:disable Magento_TwoFactorAuth Magento_AdminAdobeImsTwoFactorA # install sample data bin/magento sampledata:deploy +# optional: install Hyvä theme (open source since June 2025, requires free license key) +read -r -p "Install Hyvä theme? This requires a free license key from https://www.hyva.io. Install now? [y/N] " install_hyva +if [[ "$install_hyva" =~ ^[Yy]$ ]]; then + read -r -s -p "Enter your Hyvä token (hidden): " hyva_token + echo + if [[ -z "$hyva_token" ]]; then + echo "No token provided. Skipping Hyvä installation." + else + composer config repositories.private-packagist composer https://hyva-themes.repo.packagist.com/localhost-ddev-q19cy/ + composer config --global --auth http-basic.hyva-themes.repo.packagist.com token "$hyva_token" + composer require 'hyva-themes/magento2-default-theme' + echo "Hyvä theme installed successfully." + fi +fi + # add path repository pointing to the module at the repo root composer config --json repositories.mageforge '{"type":"path","url":"..","options":{"symlink":false}}' From 194869095d20ed2a9bd834a66bcb219ae77d35e0 Mon Sep 17 00:00:00 2001 From: Mathias Elle Date: Thu, 4 Jun 2026 01:12:46 +0200 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20update=20Hyv=C3=A4=20theme=20instal?= =?UTF-8?q?lation=20prompt=20to=20include=20repository=20URL=20and=20token?= =?UTF-8?q?=20input?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .ddev/commands/web/install-magento | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.ddev/commands/web/install-magento b/.ddev/commands/web/install-magento index 4b761fc..1bcfa79 100755 --- a/.ddev/commands/web/install-magento +++ b/.ddev/commands/web/install-magento @@ -79,14 +79,16 @@ bin/magento module:disable Magento_TwoFactorAuth Magento_AdminAdobeImsTwoFactorA bin/magento sampledata:deploy # optional: install Hyvä theme (open source since June 2025, requires free license key) -read -r -p "Install Hyvä theme? This requires a free license key from https://www.hyva.io. Install now? [y/N] " install_hyva +read -r -p "Install Hyvä theme? This requires a free license key from https://www.hyva.io/licenses/manage/shops/. Install now? [y/N] " install_hyva if [[ "$install_hyva" =~ ^[Yy]$ ]]; then - read -r -s -p "Enter your Hyvä token (hidden): " hyva_token + read -r -p "Enter your Hyvä https://hyva-themes.repo.packagist.com/repository-url (from https://www.hyva.io/licenses/manage/shops/): " hyva_repo_url echo - if [[ -z "$hyva_token" ]]; then - echo "No token provided. Skipping Hyvä installation." + read -r -s -p "Enter your Hyvä token: " hyva_token + echo + if [[ -z "$hyva_token" || -z "$hyva_repo_url" ]]; then + echo "Token or URL missing. Skipping Hyvä installation." else - composer config repositories.private-packagist composer https://hyva-themes.repo.packagist.com/localhost-ddev-q19cy/ + composer config repositories.private-packagist composer "$hyva_repo_url" composer config --global --auth http-basic.hyva-themes.repo.packagist.com token "$hyva_token" composer require 'hyva-themes/magento2-default-theme' echo "Hyvä theme installed successfully." From a07b05951f79a6598c5ea84d56f4fc4032cb3d1d Mon Sep 17 00:00:00 2001 From: Mathias Elle Date: Fri, 5 Jun 2026 10:03:33 +0200 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20add=20Hyv=C3=A4=20theme=20installat?= =?UTF-8?q?ion=20configuration=20and=20require=20statement?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .ddev/commands/web/install-magento | 33 +++++++++++++----------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/.ddev/commands/web/install-magento b/.ddev/commands/web/install-magento index 1bcfa79..edde46d 100755 --- a/.ddev/commands/web/install-magento +++ b/.ddev/commands/web/install-magento @@ -44,6 +44,18 @@ rm -rf magento-temp # change to magento directory cd "${MAGENTO_FOLDER}" || exit 1 +# configure Hyvä theme GitHub repositories +composer config repositories.hyva-themes/magento2-theme-module git https://github.com/hyva-themes/magento2-theme-module.git +composer config repositories.hyva-themes/magento2-default-theme git https://github.com/hyva-themes/magento2-default-theme.git +composer config repositories.hyva-themes/magento2-default-theme-csp git https://github.com/hyva-themes/magento2-default-theme-csp.git +composer config repositories.hyva-themes/magento2-base-layout-reset git https://github.com/hyva-themes/magento2-base-layout-reset.git +composer config repositories.hyva-themes/magento2-compat-module-fallback git https://github.com/hyva-themes/magento2-compat-module-fallback.git +composer config repositories.hyva-themes/magento2-mollie-theme-bundle git https://github.com/hyva-themes/magento2-mollie-theme-bundle.git +composer config repositories.hyva-themes/magento2-luma-checkout git https://github.com/hyva-themes/magento2-luma-checkout.git +composer config repositories.hyva-themes/magento2-theme-fallback git https://github.com/hyva-themes/magento2-theme-fallback.git +composer config repositories.hyva-themes/magento2-order-cancellation-webapi git https://github.com/hyva-themes/magento2-order-cancellation-webapi.git +composer config repositories.hyva-themes/magento2-email-module git https://github.com/hyva-themes/magento2-email-module.git + # Remove *.sample extension find . -name "*.sample" -type f -exec sh -c 'mv "$1" "${1%.sample}"' _ {} \; rm -f package-lock.json # remove basic package-lock.json to avoid conflicts @@ -78,28 +90,11 @@ bin/magento module:disable Magento_TwoFactorAuth Magento_AdminAdobeImsTwoFactorA # install sample data bin/magento sampledata:deploy -# optional: install Hyvä theme (open source since June 2025, requires free license key) -read -r -p "Install Hyvä theme? This requires a free license key from https://www.hyva.io/licenses/manage/shops/. Install now? [y/N] " install_hyva -if [[ "$install_hyva" =~ ^[Yy]$ ]]; then - read -r -p "Enter your Hyvä https://hyva-themes.repo.packagist.com/repository-url (from https://www.hyva.io/licenses/manage/shops/): " hyva_repo_url - echo - read -r -s -p "Enter your Hyvä token: " hyva_token - echo - if [[ -z "$hyva_token" || -z "$hyva_repo_url" ]]; then - echo "Token or URL missing. Skipping Hyvä installation." - else - composer config repositories.private-packagist composer "$hyva_repo_url" - composer config --global --auth http-basic.hyva-themes.repo.packagist.com token "$hyva_token" - composer require 'hyva-themes/magento2-default-theme' - echo "Hyvä theme installed successfully." - fi -fi - # add path repository pointing to the module at the repo root composer config --json repositories.mageforge '{"type":"path","url":"..","options":{"symlink":false}}' -# require module from path repo -composer require 'openforgeproject/mageforge:*' +# require Hyvä theme and mageforge module +composer require 'hyva-themes/magento2-default-theme' 'openforgeproject/mageforge:*' # enable module bin/magento setup:upgrade