feat: dev mode

cmd/extension/extension_admin_watch.go

@@ -76,7 +76,7 @@ var extensionAdminWatchCmd = &cobra.Command{
 			return fmt.Errorf("found nothing to compile")
 		}
 
-		if _, err := extension.InstallNodeModulesOfConfigs(cmd.Context(), cfgs, false); err != nil {
+		if _, err := extension.InstallNodeModulesOfConfigs(cmd.Context(), cfgs, extension.AssetBuildConfig{}); err != nil {
 			return err
 		}
 

cmd/project/ci.go

@@ -18,7 +18,6 @@ import (
 	"github.com/shopware/shopware-cli/internal/extension"
 	"github.com/shopware/shopware-cli/internal/mjml"
 	"github.com/shopware/shopware-cli/internal/packagist"
-	"github.com/shopware/shopware-cli/internal/phpexec"
 	"github.com/shopware/shopware-cli/internal/shop"
 	"github.com/shopware/shopware-cli/logging"
 )
@@ -62,6 +61,11 @@ var projectCI = &cobra.Command{
 		// Remove annoying cache invalidation errors while asset install
 		_ = os.Setenv("SHOPWARE_SKIP_ASSET_INSTALL_CACHE_INVALIDATION", "1")
 
+		cmdExecutor, err := resolveExecutor(cmd, args[0])
+		if err != nil {
+			return err
+		}
+
 		shopCfg, err := shop.ReadConfig(cmd.Context(), projectConfigPath, true)
 		if err != nil {
 			return err
@@ -99,8 +103,7 @@ var projectCI = &cobra.Command{
 
 			composerInstallSection := ci.Default.Section(cmd.Context(), "Composer Installation")
 
-			composer := phpexec.ComposerCommand(cmd.Context(), composerFlags...)
-			composer.Dir = args[0]
+			composer := cmdExecutor.ComposerCommand(cmd.Context(), composerFlags...)
 			composer.Stdin = os.Stdin
 			composer.Stdout = os.Stdout
 			composer.Stderr = os.Stderr
@@ -152,6 +155,7 @@ var projectCI = &cobra.Command{
 			ForceExtensionBuild:          convertForceExtensionBuild(shopCfg.Build.ForceExtensionBuild),
 			ForceAdminBuild:              shopCfg.Build.ForceAdminBuild,
 			KeepNodeModules:              shopCfg.Build.KeepNodeModules,
+			Executor:                     cmdExecutor,
 		}
 
 		if shopCfg.Build.Hooks != nil && len(shopCfg.Build.Hooks.PreAssets) > 0 {
@@ -215,7 +219,7 @@ var projectCI = &cobra.Command{
 
 		warumupSection := ci.Default.Section(cmd.Context(), "Warming up container cache")
 
-		if err := runTransparentCommand(phpexec.PHPCommand(cmd.Context(), path.Join(args[0], "bin", "ci"), "--version")); err != nil { //nolint: gosec
+		if err := runTransparentCommand(cmdExecutor.PHPCommand(cmd.Context(), path.Join(args[0], "bin", "ci"), "--version")); err != nil { //nolint: gosec
 			return fmt.Errorf("failed to warmup container cache (php bin/ci --version): %w", err)
 		}
 
@@ -230,7 +234,7 @@ var projectCI = &cobra.Command{
 				}
 			}
 
-			if err := runTransparentCommand(phpexec.PHPCommand(cmd.Context(), path.Join(args[0], "bin", "ci"), "asset:install")); err != nil { //nolint: gosec
+			if err := runTransparentCommand(cmdExecutor.PHPCommand(cmd.Context(), path.Join(args[0], "bin", "ci"), "asset:install")); err != nil { //nolint: gosec
 				return fmt.Errorf("failed to install assets (php bin/ci asset:install): %w", err)
 			}
 		}
@@ -344,12 +348,6 @@ func init() {
 	projectCI.PersistentFlags().Bool("with-dev-dependencies", false, "Install dev dependencies")
 }
 
-func commandWithRoot(cmd *exec.Cmd, root string) *exec.Cmd {
-	cmd.Dir = root
-
-	return cmd
-}
-
 func runTransparentCommand(cmd *exec.Cmd) error {
 	cmd.Stdin = os.Stdin
 	cmd.Stdout = os.Stdout

cmd/project/executor.go

@@ -0,0 +1,23 @@
+package project
+
+import (
+	"github.com/spf13/cobra"
+
+	"github.com/shopware/shopware-cli/internal/executor"
+	"github.com/shopware/shopware-cli/internal/shop"
+)
+
+// resolveExecutor returns the Executor for the current environment.
+func resolveExecutor(cmd *cobra.Command, projectRoot string) (executor.Executor, error) {
+	cfg, err := shop.ReadConfig(cmd.Context(), projectConfigPath, true)
+	if err != nil {
+		return nil, err
+	}
+
+	envCfg, err := cfg.ResolveEnvironment(environmentName)
+	if err != nil {
+		return nil, err
+	}
+
+	return executor.New(projectRoot, envCfg, cfg)
+}

cmd/project/platform.go

@@ -12,8 +12,8 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/shopware/shopware-cli/internal/asset"
+	"github.com/shopware/shopware-cli/internal/executor"
 	"github.com/shopware/shopware-cli/internal/extension"
-	"github.com/shopware/shopware-cli/internal/phpexec"
 	"github.com/shopware/shopware-cli/internal/shop"
 	"github.com/shopware/shopware-cli/logging"
 )
@@ -64,18 +64,33 @@ func findClosestShopwareProject() (string, error) {
 	return "", fmt.Errorf("cannot find Shopware project in current directory")
 }
 
-func filterAndWritePluginJson(cmd *cobra.Command, projectRoot string, shopCfg *shop.Config) error {
+func filterAndWritePluginJson(cmd *cobra.Command, projectRoot string, shopCfg *shop.Config, cmdExecutor executor.Executor) error {
 	sources, err := filterAndGetSources(cmd, projectRoot, shopCfg)
 	if err != nil {
 		return err
 	}
 
-	cfgs := extension.BuildAssetConfigFromExtensions(cmd.Context(), sources, extension.AssetBuildConfig{})
+	assetConfig := extension.AssetBuildConfig{
+		ShopwareRoot: projectRoot,
+		Executor:     cmdExecutor,
+	}
+
+	cfgs := extension.BuildAssetConfigFromExtensions(cmd.Context(), sources, assetConfig)
 
-	if _, err := extension.InstallNodeModulesOfConfigs(cmd.Context(), cfgs, false); err != nil {
+	if _, err := extension.InstallNodeModulesOfConfigs(cmd.Context(), cfgs, assetConfig); err != nil {
 		return err
 	}
 
+	// Normalize paths for the execution environment (e.g. Docker container).
+	for _, cfg := range cfgs {
+		cfg.BasePath = cmdExecutor.NormalizePath(cfg.BasePath)
+		for i, v := range cfg.Views {
+			cfg.Views[i] = cmdExecutor.NormalizePath(v)
+		}
+	}
+
+	fmt.Println(cfgs)
+
 	pluginJson, err := json.MarshalIndent(cfgs, "", "  ")
 	if err != nil {
 		return err
@@ -89,7 +104,12 @@ func filterAndWritePluginJson(cmd *cobra.Command, projectRoot string, shopCfg *s
 }
 
 func filterAndGetSources(cmd *cobra.Command, projectRoot string, shopCfg *shop.Config) ([]asset.Source, error) {
-	sources, err := extension.DumpAndLoadAssetSourcesOfProject(phpexec.AllowBinCI(cmd.Context()), projectRoot, shopCfg)
+	cmdExecutor, err := resolveExecutor(cmd, projectRoot)
+	if err != nil {
+		return nil, err
+	}
+
+	sources, err := extension.DumpAndLoadAssetSourcesOfProject(executor.AllowBinCI(cmd.Context()), projectRoot, shopCfg, cmdExecutor.ConsoleCommand)
 	if err != nil {
 		return nil, err
 	}

cmd/project/project.go

@@ -6,7 +6,10 @@ import (
 	"github.com/shopware/shopware-cli/internal/shop"
 )
 
-var projectConfigPath string
+var (
+	projectConfigPath string
+	environmentName   string
+)
 
 var projectRootCmd = &cobra.Command{
 	Use:   "project",
@@ -16,4 +19,5 @@ var projectRootCmd = &cobra.Command{
 func Register(rootCmd *cobra.Command) {
 	rootCmd.AddCommand(projectRootCmd)
 	projectRootCmd.PersistentFlags().StringVar(&projectConfigPath, "project-config", shop.DefaultConfigFileName(), "Path to config")
+	projectRootCmd.PersistentFlags().StringVarP(&environmentName, "env", "e", "", "Target environment name")
 }

cmd/project/project_admin_build.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/spf13/cobra"
 
+	"github.com/shopware/shopware-cli/internal/executor"
 	"github.com/shopware/shopware-cli/internal/extension"
-	"github.com/shopware/shopware-cli/internal/phpexec"
 	"github.com/shopware/shopware-cli/internal/shop"
 	"github.com/shopware/shopware-cli/logging"
 )
@@ -34,9 +34,14 @@ var projectAdminBuildCmd = &cobra.Command{
 			return err
 		}
 
+		cmdExecutor, err := resolveExecutor(cmd, projectRoot)
+		if err != nil {
+			return err
+		}
+
 		logging.FromContext(cmd.Context()).Infof("Looking for extensions to build assets in project")
 
-		if err := runTransparentCommand(commandWithRoot(phpexec.ConsoleCommand(phpexec.AllowBinCI(cmd.Context()), "feature:dump"), projectRoot)); err != nil {
+		if err := runTransparentCommand(cmdExecutor.ConsoleCommand(executor.AllowBinCI(cmd.Context()), "feature:dump")); err != nil {
 			return err
 		}
 
@@ -58,6 +63,7 @@ var projectAdminBuildCmd = &cobra.Command{
 			ShopwareVersion:        shopwareConstraint,
 			NPMForceInstall:        forceInstall,
 			ForceAdminBuild:        shopCfg.Build.ForceAdminBuild,
+			Executor:               cmdExecutor,
 		}
 
 		if err := extension.BuildAssetsForExtensions(cmd.Context(), sources, assetCfg); err != nil {
@@ -69,7 +75,7 @@ var projectAdminBuildCmd = &cobra.Command{
 			return nil
 		}
 
-		return runTransparentCommand(commandWithRoot(phpexec.ConsoleCommand(cmd.Context(), "assets:install"), projectRoot))
+		return runTransparentCommand(cmdExecutor.ConsoleCommand(cmd.Context(), "assets:install"))
 	},
 }
 

cmd/project/project_admin_watch.go

@@ -2,15 +2,13 @@ package project
 
 import (
 	"os"
-	"os/exec"
-	"path"
+	"path/filepath"
 
 	"github.com/spf13/cobra"
 
 	"github.com/shopware/shopware-cli/internal/envfile"
 	"github.com/shopware/shopware-cli/internal/extension"
 	"github.com/shopware/shopware-cli/internal/npm"
-	"github.com/shopware/shopware-cli/internal/phpexec"
 	"github.com/shopware/shopware-cli/internal/shop"
 )
 
@@ -37,26 +35,32 @@ var projectAdminWatchCmd = &cobra.Command{
 			return err
 		}
 
-		if err := filterAndWritePluginJson(cmd, projectRoot, shopCfg); err != nil {
+		cmdExecutor, err := resolveExecutor(cmd, projectRoot)
+		if err != nil {
 			return err
 		}
 
-		if err := runTransparentCommand(commandWithRoot(phpexec.ConsoleCommand(cmd.Context(), "feature:dump"), projectRoot)); err != nil {
+		if err := filterAndWritePluginJson(cmd, projectRoot, shopCfg, cmdExecutor); err != nil {
+			return err
+		}
+
+		if err := runTransparentCommand(cmdExecutor.ConsoleCommand(cmd.Context(), "feature:dump")); err != nil {
 			return err
 		}
 
 		if err := os.Setenv("PROJECT_ROOT", projectRoot); err != nil {
 			return err
 		}
 
+		adminRelPath := extension.PlatformRelPath(projectRoot, "Administration", "Resources/app/administration")
+		adminExecutor := cmdExecutor.WithRelDir(adminRelPath)
+
 		if _, err := os.Stat(extension.PlatformPath(projectRoot, "Administration", "Resources/app/administration/node_modules/webpack-dev-server")); os.IsNotExist(err) {
-			if err := npm.InstallDependencies(cmd.Context(), extension.PlatformPath(projectRoot, "Administration", "Resources/app/administration"), npm.NonEmptyPackage); err != nil {
+			if err := npm.InstallDependencies(cmd.Context(), adminExecutor, npm.NonEmptyPackage); err != nil {
 				return err
 			}
 		}
 
-		adminRoot := extension.PlatformPath(projectRoot, "Administration", "Resources/app/administration")
-
 		if err := os.Setenv("ADMIN_ROOT", extension.PlatformPath(projectRoot, "Administration", "")); err != nil {
 			return err
 		}
@@ -69,16 +73,22 @@ var projectAdminWatchCmd = &cobra.Command{
 				}
 			}
 
-			if err := runTransparentCommand(commandWithRoot(phpexec.ConsoleCommand(cmd.Context(), "framework:schema", "-s", "entity-schema", path.Join(mockDirectory, "entity-schema.json")), projectRoot)); err != nil {
+			relMockDir, err := filepath.Rel(projectRoot, mockDirectory)
+
+			if err != nil {
+				return err
+			}
+
+			if err := runTransparentCommand(cmdExecutor.ConsoleCommand(cmd.Context(), "framework:schema", "-s", "entity-schema", filepath.Join(relMockDir, "entity-schema.json"))); err != nil {
 				return err
 			}
 
-			if err := runTransparentCommand(commandWithRoot(exec.CommandContext(cmd.Context(), "npm", "run", "convert-entity-schema"), adminRoot)); err != nil {
+			if err := runTransparentCommand(adminExecutor.NPMCommand(cmd.Context(), "run", "convert-entity-schema")); err != nil {
 				return err
 			}
 		}
 
-		return runTransparentCommand(commandWithRoot(exec.CommandContext(cmd.Context(), "npm", "run", "dev"), adminRoot))
+		return runTransparentCommand(adminExecutor.NPMCommand(cmd.Context(), "run", "dev"))
 	},
 }
 

cmd/project/project_autofix_composer.go

@@ -54,7 +54,7 @@ var projectAutofixComposerCmd = &cobra.Command{
 			_ = spinner.New().Context(ctx).Title("Fetching packages").Run()
 		}()
 
-		packagistResponse, err := packagist.GetPackages(cmd.Context(), token)
+		packagistResponse, err := packagist.GetAvailablePackagesFromShopwareStore(cmd.Context(), token)
 
 		cancel()
 

cmd/project/project_config_init.go

@@ -2,11 +2,9 @@ package project
 
 import (
 	"fmt"
-	"os"
 
 	"charm.land/huh/v2"
 	"github.com/spf13/cobra"
-	"gopkg.in/yaml.v3"
 
 	"github.com/shopware/shopware-cli/internal/compatibility"
 	"github.com/shopware/shopware-cli/internal/shop"
@@ -30,12 +28,7 @@ var projectConfigInitCmd = &cobra.Command{
 			return err
 		}
 
-		content, err := yaml.Marshal(config)
-		if err != nil {
-			return err
-		}
-
-		if err := os.WriteFile(".shopware-project.yml", content, os.ModePerm); err != nil {
+		if err := shop.WriteConfig(config, "."); err != nil {
 			return err
 		}
 

cmd/project/project_console.go

@@ -6,7 +6,6 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/shopware/shopware-cli/internal/extension"
-	"github.com/shopware/shopware-cli/internal/phpexec"
 	"github.com/shopware/shopware-cli/internal/shop"
 )
 
@@ -26,7 +25,12 @@ var projectConsoleCmd = &cobra.Command{
 			return nil, cobra.ShellCompDirectiveDefault
 		}
 
-		parsedCommands, err := shop.GetConsoleCompletion(cmd.Context(), projectRoot)
+		exec, err := resolveExecutor(cmd, projectRoot)
+		if err != nil {
+			return nil, cobra.ShellCompDirectiveDefault
+		}
+
+		parsedCommands, err := shop.GetConsoleCompletion(cmd.Context(), projectRoot, exec.ConsoleCommand)
 		if err != nil {
 			return nil, cobra.ShellCompDirectiveDefault
 		}
@@ -79,8 +83,12 @@ var projectConsoleCmd = &cobra.Command{
 			return err
 		}
 
-		consoleCmd := phpexec.ConsoleCommand(cmd.Context(), args...)
-		consoleCmd.Dir = projectRoot
+		exec, err := resolveExecutor(cmd, projectRoot)
+		if err != nil {
+			return err
+		}
+
+		consoleCmd := exec.ConsoleCommand(cmd.Context(), args...)
 		consoleCmd.Stdin = cmd.InOrStdin()
 		consoleCmd.Stdout = cmd.OutOrStdout()
 		consoleCmd.Stderr = cmd.ErrOrStderr()