Fix order of preference in addons-registry for the theme (#5649)

plone · Jan 17, 2024 · 669824b · 669824b
1 parent a45a843
commit 669824b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/packages/registry/news/5649.bugfix b/packages/registry/news/5649.bugfix
@@ -0,0 +1 @@
+Fix order of preference in addons-registry for the theme definition (THEME, volto.config.js, package.json) @sneridagh
diff --git a/packages/registry/src/addon-registry.js b/packages/registry/src/addon-registry.js
@@ -128,10 +128,10 @@ class AddonConfigurationRegistry {
     this.packages = {};
     this.customizations = new Map();
 
-    // Theme from a package.json key, from volto.config.js or from an ENV VAR
-    // Programatically via volto.config.js wins or the ENV VAR if present
+    // Theme from an ENV VAR, from volto.config.js or from a package.json key
+    // in this order of preference
     this.theme =
-      packageJson.theme || this.voltoConfigJS.theme || process.env.THEME;
+      process.env.THEME || this.voltoConfigJS.theme || packageJson.theme;
 
     this.initDevelopmentPackages();
     this.initPublishedPackages();
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix order of preference in addons-registry for the theme definition (THEME, volto.config.js, package.json) @sneridagh