feat: Add only-custom-static-extensions (#528)

* feat: Add only-custom-static-extensions

closes #524

* chore: cleanup code

---------

Co-authored-by: Soner Sayakci <[email protected]>

Author: amenk

cmd/project/platform.go

@@ -112,12 +112,57 @@ func filterAndGetSources(cmd *cobra.Command, projectRoot string, shopCfg *shop.C
 
 	onlyExtensions, _ := cmd.PersistentFlags().GetString("only-extensions")
 	skipExtensions, _ := cmd.PersistentFlags().GetString("skip-extensions")
+	onlyCustomStatic, _ := cmd.PersistentFlags().GetBool("only-custom-static-extensions")
 
 	if onlyExtensions != "" && skipExtensions != "" {
 		return nil, fmt.Errorf("only-extensions and skip-extensions cannot be used together")
 	}
 
-	if onlyExtensions == "" && skipExtensions == "" {
+	if onlyCustomStatic {
+		logging.FromContext(cmd.Context()).Infof("Only including extensions from custom/static-plugins directory")
+		logging.FromContext(cmd.Context()).Debugf("Found %d total extensions before filtering", len(sources))
+		for _, s := range sources {
+			logging.FromContext(cmd.Context()).Debugf("Extension: %s, Path: %s", s.Name, s.Path)
+		}
+
+		sources = slices.DeleteFunc(sources, func(s asset.Source) bool {
+			// First try to resolve any symlinks
+			resolvedPath, err := filepath.EvalSymlinks(s.Path)
+			if err != nil {
+				logging.FromContext(cmd.Context()).Errorf("Failed to resolve symlink for %s: %v", s.Path, err)
+				return true
+			}
+
+			absPath, err := filepath.Abs(resolvedPath)
+			if err != nil {
+				logging.FromContext(cmd.Context()).Errorf("Failed to get absolute path for %s: %v", resolvedPath, err)
+				return true
+			}
+
+			logging.FromContext(cmd.Context()).Debugf("Extension %s: Original path: %s, Resolved absolute path: %s", s.Name, s.Path, absPath)
+
+			customStaticDir := filepath.Join("custom", "static-plugins")
+
+			isCustomStatic := strings.Contains(absPath, customStaticDir) || strings.HasSuffix(absPath, customStaticDir)
+
+			if !isCustomStatic {
+				logging.FromContext(cmd.Context()).Debugf("Excluding %s as it's not in custom/static-plugins", s.Name)
+			}
+			return !isCustomStatic
+		})
+
+		logging.FromContext(cmd.Context()).Debugf("Found %d custom/static extensions after filtering", len(sources))
+		for _, s := range sources {
+			logging.FromContext(cmd.Context()).Debugf("Included extension: %s, Path: %s", s.Name, s.Path)
+		}
+
+		logging.FromContext(cmd.Context()).Debugf("Included extensions:")
+		for _, s := range sources {
+			logging.FromContext(cmd.Context()).Debugf("  - %s", s.Name)
+		}
+	}
+
+	if onlyExtensions == "" && skipExtensions == "" && !onlyCustomStatic {
 		logging.FromContext(cmd.Context()).Infof("Excluding extensions based on project config: %s", strings.Join(shopCfg.Build.ExcludeExtensions, ", "))
 		sources = slices.DeleteFunc(sources, func(s asset.Source) bool {
 			return slices.Contains(shopCfg.Build.ExcludeExtensions, s.Name)

cmd/project/project_admin_build.go

@@ -78,4 +78,5 @@ func init() {
 	projectAdminBuildCmd.PersistentFlags().Bool("force-install-dependencies", false, "Force install NPM dependencies")
 	projectAdminBuildCmd.PersistentFlags().String("only-extensions", "", "Only watch the given extensions (comma separated)")
 	projectAdminBuildCmd.PersistentFlags().String("skip-extensions", "", "Skips the given extensions (comma separated)")
+	projectAdminBuildCmd.PersistentFlags().Bool("only-custom-static-extensions", false, "Only build extensions from custom/static-plugins directory")
 }

cmd/project/project_storefront_build.go

@@ -78,4 +78,5 @@ func init() {
 	projectStorefrontBuildCmd.PersistentFlags().Bool("force-install-dependencies", false, "Force install NPM dependencies")
 	projectStorefrontBuildCmd.PersistentFlags().String("only-extensions", "", "Only watch the given extensions (comma separated)")
 	projectStorefrontBuildCmd.PersistentFlags().String("skip-extensions", "", "Skips the given extensions (comma separated)")
+	projectStorefrontBuildCmd.PersistentFlags().Bool("only-custom-static-extensions", false, "Only build extensions from custom/static-plugins directory")
 }

cmd/root.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"context"
 	"os"
+	"slices"
 
 	"github.com/spf13/cobra"
 
@@ -27,13 +28,7 @@ var rootCmd = &cobra.Command{
 }
 
 func Execute(ctx context.Context) {
-	verbose := false
-
-	if err := rootCmd.ParseFlags(os.Args); err == nil {
-		verbose, _ = rootCmd.PersistentFlags().GetBool("verbose")
-	}
-
-	ctx = logging.WithLogger(ctx, logging.NewLogger(verbose))
+	ctx = logging.WithLogger(ctx, logging.NewLogger(slices.Contains(os.Args, "--verbose")))
 	accountApi.SetUserAgent("shopware-cli/" + version)
 
 	if err := rootCmd.ExecuteContext(ctx); err != nil {