Update Woodoo version to 1.6.3

CHANGELOG.md

@@ -6,6 +6,10 @@ All notable changes to this project will be documented in this file.
 
 ## Latest Release
 
+### 1.6.3
+
+-   add fallback if no composer.json was found in theme. Use Magento default in project root instead.
+
 ### 1.6.2
 
 -   improve build process with shorter CLI ouputs

README.md

@@ -32,7 +32,7 @@ Special thanks to e3n GmbH for your Support!
 ##### Latest stable version (recommended)
 
 ```shell
-ddev get https://github.com/dermatz/ddev-woodoo-buildtools-magento/archive/refs/tags/1.6.2.tar.gz
+ddev get https://github.com/dermatz/ddev-woodoo-buildtools-magento/archive/refs/tags/1.6.3.tar.gz
 ```
 
 ##### Latest Developer-version (Main-Branch) - can be instable!
@@ -107,5 +107,3 @@ Feel free to send your improvements as Pull-Request.
 ## License
 
 [MIT License](./MIT-LICENSES.md) | by [Mathias Elle](https://www.linkedin.com/in/mathias-elle-842783102/)
-
-

commands/web/woodoo_components/build

@@ -74,11 +74,21 @@ function buildHyva() {
     HYVA_PATH=$1
     HYVA_NAME=$2
 
-    cd "${HYVA_PATH}" || exit
-    # trunk-ignore(shellcheck/SC2046)
-    hyva_version=$(echo $(grep -oP '(?<="hyva-themes/magento2-default-theme": ").*' composer.json) | cut -d ' ' -f 1 | sed 's/"//g')
-    # trunk-ignore(shellcheck/SC2312)
-    hyva_version=$(echo "${hyva_version}" | sed 's/\^//g' | sed 's/,//g' | sed 's/\*//g')
+    if [[ ! -f ${HYVA_PATH}composer.json ]]; then
+        echo -e "${txtred}${ICON_ERROR} Could not find composer.json in Theme (${HYVA_PATH})"
+        echo -e "${txtylw}${ICON_ARROW_RIGHT} Use composer.josn from Magento-Root instead${txtrst}"
+        cd "${DDEV_COMPOSER_ROOT}" || exit
+        # trunk-ignore(shellcheck/SC2312)
+        hyva_version=$(grep -oP '(?<="hyva-themes/magento2-default-theme": ").*' composer.json | cut -d ' ' -f 1 | sed 's/"//g')
+    else
+        # trunk-ignore(shellcheck/SC2046)
+        # trunk-ignore(shellcheck/SC2005)
+        # trunk-ignore(shellcheck/SC2312)
+        hyva_version=$(echo $(grep -oP '(?<="hyva-themes/magento2-default-theme": ").*' composer.json) | cut -d ' ' -f 1 | sed 's/"//g')
+    fi
+
+    # trunk-ignore(shellcheck/SC2001)
+    hyva_version=$(echo "${hyva_version}" | sed 's/,//g')
 
     cd - >/dev/null || exit
 
@@ -96,7 +106,6 @@ function buildHyva() {
         echo -e "\n${txtylw}Install missing node_modules ... ${txtrst}"
         cd "${HYVA_PATH}"/web/tailwind || exit
         npm ci
-
         if [[ -d "./node_modules" ]]; then
             echo -e "${txtgrn}${ICON_SUCCESS} Done. ${txtrst}"
             cd - >/dev/null || exit
@@ -196,12 +205,3 @@ if [[ $1 == "build" && $2 != "" && $2 != "-f" || $1 == "b" && $2 != "" && $2 !=
 
     fi
 fi
-
-
-
-
-
-
-
-
-

commands/web/woodoo_components/variables

@@ -1,6 +1,6 @@
 #!/bin/bash
 #ddev-generated - Do not modify this file; your modifications will be overwritten.
-WOODOO_VERSION="1.6.2"
+WOODOO_VERSION="1.6.3"
 LATEST_WOODOO_VERSION=$(curl -s https://api.github.com/repos/dermatz/ddev-woodoo-buildtools-magento/releases/latest | grep tag_name | cut -d '"' -f 4)
 
 PROJECT_CONFIG_FILE=".ddev/config-themes.yaml"
@@ -9,6 +9,7 @@ OLD_CONFIG_FILE=".ddev/config.yaml"
 ICON_SUCCESS="✔"
 ICON_ERROR="✖"
 ICON_WARNING="!"
+ICON_ARROW_RIGHT="↳"
 
 PROJECT_ROOT=${DDEV_APPROOT}
 PROJECT_ARCH=${GOARCH}