fix: cleanup asset build config

FriendsOfShopware · Dec 3, 2023 · ad16a85 · ad16a85
1 parent 3eb4abf
commit ad16a85
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 19 deletions.
diff --git a/cmd/extension/extension_build.go b/cmd/extension/extension_build.go
@@ -17,9 +17,7 @@ var extensionAssetBundleCmd = &cobra.Command{
 	Args:  cobra.MinimumNArgs(1),
 	RunE: func(cmd *cobra.Command, args []string) error {
 		assetCfg := extension.AssetBuildConfig{
-			EnableESBuildForAdmin:      false,
-			EnableESBuildForStorefront: false,
-			ShopwareRoot:               os.Getenv("SHOPWARE_PROJECT_ROOT"),
+			ShopwareRoot: os.Getenv("SHOPWARE_PROJECT_ROOT"),
 		}
 		validatedExtensions := make([]extension.Extension, 0)
 
@@ -37,13 +35,6 @@ var extensionAssetBundleCmd = &cobra.Command{
 			validatedExtensions = append(validatedExtensions, ext)
 		}
 
-		if len(args) == 1 {
-			extCfg := validatedExtensions[0].GetExtensionConfig()
-
-			assetCfg.EnableESBuildForAdmin = extCfg.Build.Zip.Assets.EnableESBuildForAdmin
-			assetCfg.EnableESBuildForStorefront = extCfg.Build.Zip.Assets.EnableESBuildForStorefront
-		}
-
 		constraint, err := validatedExtensions[0].GetShopwareVersionConstraint()
 		if err != nil {
 			return fmt.Errorf("cannot get shopware version constraint: %w", err)

diff --git a/cmd/extension/extension_zip.go b/cmd/extension/extension_zip.go
@@ -137,11 +137,9 @@ var extensionZipCmd = &cobra.Command{
 			}
 
 			assetBuildConfig := extension.AssetBuildConfig{
-				EnableESBuildForAdmin:      extCfg.Build.Zip.Assets.EnableESBuildForAdmin,
-				EnableESBuildForStorefront: extCfg.Build.Zip.Assets.EnableESBuildForStorefront,
-				CleanupNodeModules:         true,
-				ShopwareRoot:               os.Getenv("SHOPWARE_PROJECT_ROOT"),
-				ShopwareVersion:            shopwareConstraint,
+				CleanupNodeModules: true,
+				ShopwareRoot:       os.Getenv("SHOPWARE_PROJECT_ROOT"),
+				ShopwareVersion:    shopwareConstraint,
 			}
 
 			if err := extension.BuildAssetsForExtensions(cmd.Context(), extension.ConvertExtensionsToSources(cmd.Context(), []extension.Extension{tempExt}), assetBuildConfig); err != nil {

diff --git a/cmd/project/ci.go b/cmd/project/ci.go
@@ -74,8 +74,6 @@ var projectCI = &cobra.Command{
 		}
 
 		assetCfg := extension.AssetBuildConfig{
-			EnableESBuildForAdmin:        false,
-			EnableESBuildForStorefront:   false,
 			CleanupNodeModules:           true,
 			ShopwareRoot:                 args[0],
 			ShopwareVersion:              constraint,

diff --git a/extension/asset_platform.go b/extension/asset_platform.go
@@ -27,8 +27,6 @@ const (
 )
 
 type AssetBuildConfig struct {
-	EnableESBuildForAdmin        bool
-	EnableESBuildForStorefront   bool
 	CleanupNodeModules           bool
 	DisableAdminBuild            bool
 	DisableStorefrontBuild       bool