Determine Best AssetUrl is in easy mode with the new build system

apostrophecms · Nov 23, 2024 · 8b37052 · 8b37052
1 parent d3fd291
commit 8b37052
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/modules/@apostrophecms/module/index.js b/modules/@apostrophecms/module/index.js
@@ -818,7 +818,8 @@ module.exports = {
         let urlOption = self.options[`${name}Url`];
         const imageOption = self.options[`${name}Image`];
         if (!urlOption) {
-          if (imageOption) {
+          // Webpack and the legacy asset pipeline
+          if (imageOption && !self.apos.asset.hasBuildModule()) {
             const chain = [ ...self.__meta.chain ].reverse();
             for (const entry of chain) {
               const path = `${entry.dirname}/public/${name}.${imageOption}`;
@@ -828,6 +829,10 @@ module.exports = {
               }
             }
           }
+          // The new external module asset pipeline
+          if (imageOption && self.apos.asset.hasBuildModule()) {
+            urlOption = `/modules/${self.__meta.name}/${name}.${imageOption}`;
+          }
         }
         if (urlOption && urlOption.startsWith('/modules')) {
           urlOption = self.apos.asset.url(urlOption);