Add configurable WP_THEMES_DIR for non-Bedrock projects, bump setup to 1.0.3

Author: palicko

packages/webentor-setup/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Webentor Setup Changelog
 
+## 1.0.3
+
+- Add configurable `WP_THEMES_DIR` for non-Bedrock project support
+
 ## 1.0.2
 
 - Improve init UX

packages/webentor-setup/common.sh

@@ -25,6 +25,7 @@ fi
 : "${SETUP_DB_SYNC:=true}"
 : "${SETUP_SUBMODULES:=false}"
 : "${SETUP_TYPESENSE:=false}"
+: "${WP_THEMES_DIR:=web/app/themes}"
 
 run_hook "pre-env"
 

packages/webentor-setup/composer.json

@@ -1,6 +1,6 @@
 {
   "name": "webikon/webentor-setup",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Webentor setup runtime and upgrade CLI",
   "type": "library",
   "license": "MIT",

packages/webentor-setup/env-check.sh

@@ -26,7 +26,7 @@ done
 # Resolve representative theme package.json dynamically from WP_THEMES.
 THEME_NAME="$(first_theme)"
 if [ -n "$THEME_NAME" ]; then
-    PACKAGE_JSON="${WORKSPACE_FOLDER}/web/app/themes/${THEME_NAME}/package.json"
+    PACKAGE_JSON="${WORKSPACE_FOLDER}/${WP_THEMES_DIR:-web/app/themes}/${THEME_NAME}/package.json"
 else
     PACKAGE_JSON=""
 fi

packages/webentor-setup/helpers/helpers.sh

@@ -236,10 +236,11 @@ update_env_urls() {
 # Detect WordPress themes using WP_THEMES from scripts/.env.setup.
 discover_themes() {
     local themes="${WP_THEMES:-}"
+    local themes_dir="${WP_THEMES_DIR:-web/app/themes}"
 
-    if [ -z "$themes" ] && [ -d "${WORKSPACE_FOLDER}/web/app/themes" ]; then
+    if [ -z "$themes" ] && [ -d "${WORKSPACE_FOLDER}/${themes_dir}" ]; then
         # Fallback for first-run projects where WP_THEMES is not set yet.
-        themes=$(find "${WORKSPACE_FOLDER}/web/app/themes" -mindepth 1 -maxdepth 1 -type d -exec basename {} \; | tr '\n' ' ')
+        themes=$(find "${WORKSPACE_FOLDER}/${themes_dir}" -mindepth 1 -maxdepth 1 -type d -exec basename {} \; | tr '\n' ' ')
     fi
 
     echo "$themes"
@@ -323,15 +324,16 @@ setup_composer() {
 
 _setup_deps_core() {
     local theme
+    local themes_dir="${WP_THEMES_DIR:-web/app/themes}"
     for theme in $(discover_themes); do
-        if [ -f "${WORKSPACE_FOLDER}/web/app/themes/${theme}/composer.json" ]; then
-            composer --working-dir="${WORKSPACE_FOLDER}/web/app/themes/${theme}" install --optimize-autoloader
+        if [ -f "${WORKSPACE_FOLDER}/${themes_dir}/${theme}/composer.json" ]; then
+            composer --working-dir="${WORKSPACE_FOLDER}/${themes_dir}/${theme}" install --optimize-autoloader
         fi
 
-        if [ -f "${WORKSPACE_FOLDER}/web/app/themes/${theme}/package.json" ]; then
+        if [ -f "${WORKSPACE_FOLDER}/${themes_dir}/${theme}/package.json" ]; then
             info "Installing ${theme} dependencies via pnpm"
             (
-                cd "${WORKSPACE_FOLDER}/web/app/themes/${theme}"
+                cd "${WORKSPACE_FOLDER}/${themes_dir}/${theme}"
                 pnpm install
                 pnpm build
             )

packages/webentor-setup/src/webentor-setup.php

@@ -286,6 +286,10 @@ function generateEnvSetup(string $opVaultId, string $opItemId, array $toggles):
     $lines[] = '';
     $lines[] = 'WP_THEMES="webentor-theme-v2"';
     $lines[] = '';
+    $lines[] = '# Relative path from project root to the themes directory.';
+    $lines[] = '# Default: web/app/themes (Bedrock). Use wp-content/themes for traditional WP.';
+    $lines[] = 'WP_THEMES_DIR=web/app/themes';
+    $lines[] = '';
     $lines[] = '# Setup runtime feature toggles.';
     $lines[] = '# These values are project-owned and intentionally outside setup subtree updates.';
 
@@ -676,12 +680,40 @@ function detectConfigsVersion(string $cwd): ?string
 }
 
 /**
- * Iterate theme directories under web/app/themes and apply $extractor to parsed JSON.
+ * Read WP_THEMES_DIR from scripts/.env.setup with fallback to web/app/themes.
+ */
+function resolveThemesDir(string $cwd): string
+{
+    $envSetupPath = "{$cwd}/scripts/.env.setup";
+    if (file_exists($envSetupPath)) {
+        $lines = file($envSetupPath, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+        if ($lines !== false) {
+            foreach ($lines as $line) {
+                $line = trim($line);
+                if ($line === '' || str_starts_with($line, '#')) {
+                    continue;
+                }
+                if (str_starts_with($line, 'WP_THEMES_DIR=')) {
+                    $value = substr($line, strlen('WP_THEMES_DIR='));
+                    $value = trim($value, "\"' \t");
+                    if ($value !== '') {
+                        return $value;
+                    }
+                }
+            }
+        }
+    }
+
+    return 'web/app/themes';
+}
+
+/**
+ * Iterate theme directories and apply $extractor to parsed JSON.
  * Returns the first non-null result.
  */
 function scanThemeFiles(string $cwd, string $filename, callable $extractor): ?string
 {
-    $themesPath = "{$cwd}/web/app/themes";
+    $themesPath = "{$cwd}/" . resolveThemesDir($cwd);
     if (!is_dir($themesPath)) {
         return null;
     }

packages/webentor-setup/win/win-laragon.sh

@@ -432,7 +432,7 @@ ENV_OK=true
 # Set paths
 # Resolve the first configured theme from WP_THEMES to avoid hardcoding starter internals.
 PRIMARY_THEME="$(first_theme)"
-PACKAGE_JSON="$WORKSPACE_FOLDER/web/app/themes/${PRIMARY_THEME}/package.json"
+PACKAGE_JSON="$WORKSPACE_FOLDER/${WP_THEMES_DIR:-web/app/themes}/${PRIMARY_THEME}/package.json"
 COMPOSER_JSON="$WORKSPACE_FOLDER/composer.json"
 
 # Check Node version
@@ -562,7 +562,7 @@ else
     info "Next steps:"
     echo "1. Install Composer dependencies: composer install"
     if [ -n "$PRIMARY_THEME" ]; then
-        echo "2. Install theme dependencies: cd web/app/themes/${PRIMARY_THEME} && pnpm install"
+        echo "2. Install theme dependencies: cd ${WP_THEMES_DIR:-web/app/themes}/${PRIMARY_THEME} && pnpm install"
         echo "3. Build theme assets: pnpm build"
     else
         echo "2. Configure WP_THEMES in scripts/.env.setup, then install theme dependencies."