Merge branch '1.x' into 2.x

Author: timkelty

src/fs/AssetsFs.php

@@ -13,8 +13,12 @@ class AssetsFs extends Fs
 
     public function init(): void
     {
-        $this->useLocalFs = !Module::getInstance()->getConfig()->useAssetCdn;
         parent::init();
+        $this->useLocalFs = !Module::getInstance()->getConfig()->useAssetCdn;
+
+        if ($this->useLocalFs) {
+            $this->baseUrl = $this->getLocalFs()->getRootUrl();
+        }
     }
 
     /**

src/fs/BuildArtifactsFs.php

@@ -2,17 +2,25 @@
 
 namespace craft\cloud\fs;
 
+use craft\cloud\Helper;
 use craft\cloud\Module;
 use League\Uri\Contracts\SegmentedPathInterface;
 
 class BuildArtifactsFs extends BuildsFs
 {
     public bool $hasUrls = true;
+    public ?string $localFsPath = '@webroot';
+    public ?string $localFsUrl = '@web';
 
     public function init(): void
     {
-        $this->baseUrl = Module::getInstance()->getConfig()->artifactBaseUrl;
         parent::init();
+        $this->useLocalFs = !Helper::isCraftCloud();
+        $this->baseUrl = Module::getInstance()->getConfig()->artifactBaseUrl;
+
+        if ($this->useLocalFs && !$this->baseUrl) {
+            $this->baseUrl = $this->getLocalFs()->getRootUrl();
+        }
     }
 
     public function createBucketPrefix(): SegmentedPathInterface

src/fs/Fs.php

@@ -70,7 +70,7 @@ protected function getLocalFs(): Local
         $this->localFs = $this->localFs ?? Craft::createObject([
             'class' => Local::class,
             'hasUrls' => $this->hasUrls,
-            'path' => $path->toString(),
+            'path' => $path?->toString(),
             'url' => $this->localFsUrl,
         ]);
 
@@ -91,10 +91,8 @@ public function getRootUrl(): ?string
 
     public function createUrl(string $path = ''): UriInterface
     {
-        $baseUrl = $this->useLocalFs ? $this->getLocalFs()->getRootUrl() : $this->baseUrl;
-
-        if ($baseUrl) {
-            return Modifier::from($baseUrl)
+        if ($this->baseUrl) {
+            return Modifier::from($this->baseUrl)
                 ->appendSegment($this->createPath($path))
                 ->getUri();
         }