fix: make project admin-build working shopware/shopware

FriendsOfShopware · Feb 11, 2024 · a8f1283 · a8f1283
1 parent 9f80fe3
commit a8f1283
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/cmd/project/project_admin_build.go b/cmd/project/project_admin_build.go
@@ -37,6 +37,7 @@ var projectAdminBuildCmd = &cobra.Command{
 			DisableStorefrontBuild: true,
 			ShopwareRoot:           projectRoot,
 			NPMForceInstall:        forceInstall,
+			ContributeProject:      extension.IsContributeProject(projectRoot),
 		}
 
 		if err := extension.BuildAssetsForExtensions(cmd.Context(), sources, assetCfg); err != nil {

diff --git a/cmd/project/project_storefront_build.go b/cmd/project/project_storefront_build.go
@@ -37,6 +37,7 @@ var projectStorefrontBuildCmd = &cobra.Command{
 			DisableAdminBuild: true,
 			ShopwareRoot:      projectRoot,
 			NPMForceInstall:   forceInstall,
+			ContributeProject: extension.IsContributeProject(projectRoot),
 		}
 
 		if err := extension.BuildAssetsForExtensions(cmd.Context(), sources, assetCfg); err != nil {

diff --git a/extension/asset_platform.go b/extension/asset_platform.go
@@ -34,6 +34,7 @@ type AssetBuildConfig struct {
 	Browserslist                 string
 	SkipExtensionsWithBuildFiles bool
 	NPMForceInstall              bool
+	ContributeProject            bool
 }
 
 func BuildAssetsForExtensions(ctx context.Context, sources []asset.Source, assetConfig AssetBuildConfig) error { // nolint:gocyclo
@@ -107,10 +108,16 @@ func BuildAssetsForExtensions(ctx context.Context, sources []asset.Source, asset
 				}
 			}
 
+			envList := []string{fmt.Sprintf("PROJECT_ROOT=%s", shopwareRoot)}
+
+			if !assetConfig.ContributeProject {
+				envList = append(envList, "SHOPWARE_ADMIN_BUILD_ONLY_EXTENSIONS=1", "SHOPWARE_ADMIN_SKIP_SOURCEMAP_GENERATION=1")
+			}
+
 			err = npmRunBuild(
 				administrationRoot,
 				"build",
-				[]string{fmt.Sprintf("PROJECT_ROOT=%s", shopwareRoot), "SHOPWARE_ADMIN_BUILD_ONLY_EXTENSIONS=1", "SHOPWARE_ADMIN_SKIP_SOURCEMAP_GENERATION=1"},
+				envList,
 			)
 
 			if assetConfig.CleanupNodeModules {

diff --git a/extension/util.go b/extension/util.go
@@ -15,3 +15,12 @@ func PlatformPath(projectRoot, component, path string) string {
 
 	return filepath.Join(projectRoot, "vendor", "shopware", strings.ToLower(component), path)
 }
+
+// IsContributeProject checks if the project is a contribution project aka shopware/shopware
+func IsContributeProject(projectRoot string) bool {
+	if _, err := os.Stat(filepath.Join(projectRoot, "src", "Core", "composer.json")); err == nil {
+		return true
+	}
+
+	return false
+}