Merge pull request #13225 from craftcms/move-set-vendor-path

Share setVendorPath with cli
craftcms · May 26, 2023 · fa130b5 · fa130b5
2 parents 57556c7 + 3ba046a
commit fa130b5
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 26 deletions.
diff --git a/src/base/ApplicationTrait.php b/src/base/ApplicationTrait.php
@@ -283,6 +283,32 @@ trait ApplicationTrait
      */
     private bool $_waitingToSaveInfo = false;
 
+    /**
+     * @inheritdoc
+     */
+    public function setVendorPath($path): void
+    {
+        parent::setVendorPath($path);
+
+        // Override the @bower and @npm aliases if using asset-packagist.org
+        // todo: remove this whenever Yii is updated with support for asset-packagist.org
+        $altBowerPath = $this->getVendorPath() . DIRECTORY_SEPARATOR . 'bower-asset';
+        $altNpmPath = $this->getVendorPath() . DIRECTORY_SEPARATOR . 'npm-asset';
+        if (is_dir($altBowerPath)) {
+            Craft::setAlias('@bower', $altBowerPath);
+        }
+        if (is_dir($altNpmPath)) {
+            Craft::setAlias('@npm', $altNpmPath);
+        }
+
+        // Override where Yii should find its asset deps
+        $assetsPath = Craft::getAlias('@craft') . '/web/assets';
+        Craft::setAlias('@bower/jquery/dist', $assetsPath . '/jquery/dist');
+        Craft::setAlias('@bower/inputmask/dist', $assetsPath . '/inputmask/dist');
+        Craft::setAlias('@bower/punycode', $assetsPath . '/punycode/dist');
+        Craft::setAlias('@bower/yii2-pjax', $assetsPath . '/yii2pjax/dist');
+    }
+
     /**
      * Sets the target application language.
      *

diff --git a/src/web/Application.php b/src/web/Application.php
@@ -312,32 +312,6 @@ public function runAction($route, $params = []): ?BaseResponse
         return $response;
     }
 
-    /**
-     * @inheritdoc
-     */
-    public function setVendorPath($path): void
-    {
-        parent::setVendorPath($path);
-
-        // Override the @bower and @npm aliases if using asset-packagist.org
-        // todo: remove this whenever Yii is updated with support for asset-packagist.org
-        $altBowerPath = $this->getVendorPath() . DIRECTORY_SEPARATOR . 'bower-asset';
-        $altNpmPath = $this->getVendorPath() . DIRECTORY_SEPARATOR . 'npm-asset';
-        if (is_dir($altBowerPath)) {
-            Craft::setAlias('@bower', $altBowerPath);
-        }
-        if (is_dir($altNpmPath)) {
-            Craft::setAlias('@npm', $altNpmPath);
-        }
-
-        // Override where Yii should find its asset deps
-        $assetsPath = Craft::getAlias('@craft') . '/web/assets';
-        Craft::setAlias('@bower/jquery/dist', $assetsPath . '/jquery/dist');
-        Craft::setAlias('@bower/inputmask/dist', $assetsPath . '/inputmask/dist');
-        Craft::setAlias('@bower/punycode', $assetsPath . '/punycode/dist');
-        Craft::setAlias('@bower/yii2-pjax', $assetsPath . '/yii2pjax/dist');
-    }
-
     /**
      * @inheritdoc
      */