Merge pull request #44 from craftcms/bugfix/fix-rebrand

Fix rebrand assets

src/web/AssetManager.php

@@ -7,6 +7,8 @@
 use craft\cloud\Helper;
 use craft\cloud\Module;
 use craft\helpers\FileHelper;
+use craft\helpers\StringHelper;
+use League\Uri\Components\HierarchicalPath;
 use League\Uri\Modifier;
 
 class AssetManager extends \craft\web\AssetManager
@@ -41,6 +43,16 @@ protected function preparePaths(): void
     protected function hash($path): string
     {
         $dir = is_file($path) ? dirname($path) : $path;
+        $rebrandPath = Craft::$app->getPath()->getRebrandPath();
+
+        // Account for rebrand, as it lives in @storage by default,
+        // which will be different in Cloud runtime vs. Cloud build.
+        if (str_starts_with($dir, $rebrandPath)) {
+            return HierarchicalPath::new(StringHelper::removeLeft($dir, $rebrandPath))
+                ->prepend('rebrand')
+                ->withoutTrailingSlash()
+                ->toString();
+        }
 
         // @phpstan-ignore-next-line
         $alias = Craft::alias($dir);

src/web/assets/rebrand/RebrandAsset.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace craft\cloud\web\assets\rebrand;
+
+use Craft;
+
+class RebrandAsset extends \craft\web\AssetBundle
+{
+    public function init()
+    {
+        $this->sourcePath = Craft::$app->getPath()->getRebrandPath();
+        parent::init();
+    }
+}