Merge pull request #2 from wireui/feature/separate-components

Feature/separate-components

Author: ph7jack

README.md

@@ -37,7 +37,13 @@
         "test": "./vendor/bin/pest --coverage --min=100",
         "phpstan": "./vendor/bin/phpstan analyse src --level max",
         "phpcs:fix": "./vendor/bin/php-cs-fixer fix",
-        "phpcs:check": "./vendor/bin/php-cs-fixer fix --dry-run --using-cache=no"
+        "phpcs:check": "./vendor/bin/php-cs-fixer fix --dry-run --using-cache=no",
+        "generate-icons": "./generate-icons.sh",
+        "verify": [
+            "@phpcs:check",
+            "@phpstan",
+            "@test"
+        ]
     },
     "autoload": {
         "psr-4": {

composer.json

@@ -7,8 +7,8 @@
 
 # make a clean state
 rm -rf .tmp
-rm -rf src/views/icons/{thin,light,fill,regular,duotone,bold}
-mkdir -p src/views/icons/{thin,light,fill,regular,duotone,bold}
+rm -rf src/views/components/{thin,light,fill,regular,duotone,bold}
+mkdir -p src/views/components/{thin,light,fill,regular,duotone,bold}
 
 # prepare icons
 curl https://phosphoricons.com/assets/phosphor-icons.zip --create-dirs -o .tmp/icons.zip
@@ -23,10 +23,10 @@ for FILE in .tmp/icons/SVGs/{Thin,Light,Fill,Regular,Duotone,Bold}/*.svg; do
     echo $NEW_FILE
 done
 
-mv .tmp/icons/SVGs/Thin/* src/views/icons/thin
-mv .tmp/icons/SVGs/Light/* src/views/icons/light
-mv .tmp/icons/SVGs/Fill/* src/views/icons/fill
-mv .tmp/icons/SVGs/Regular/* src/views/icons/regular
-mv .tmp/icons/SVGs/Duotone/* src/views/icons/duotone
-mv .tmp/icons/SVGs/Bold/* src/views/icons/bold
+mv .tmp/icons/SVGs/Thin/* src/views/components/thin
+mv .tmp/icons/SVGs/Light/* src/views/components/light
+mv .tmp/icons/SVGs/Fill/* src/views/components/fill
+mv .tmp/icons/SVGs/Regular/* src/views/components/regular
+mv .tmp/icons/SVGs/Duotone/* src/views/components/duotone
+mv .tmp/icons/SVGs/Bold/* src/views/components/bold
 rm -rf .tmp

generate-icons.sh

@@ -22,7 +22,7 @@ public function __construct(
 
     public function render(): View|Factory
     {
-        return view("wireui.phosphor::icons.{$this->variant}.{$this->name}");
+        return view("phosphor.icons::components.{$this->variant}.{$this->name}");
     }
 
     private function getVariant(): string

src/Icon.php

@@ -17,7 +17,7 @@ protected function registerConfig(): void
     {
         $rootDir = __DIR__;
 
-        $this->loadViewsFrom("{$rootDir}/views", 'wireui.phosphor');
+        $this->loadViewsFrom("{$rootDir}/views", 'phosphor.icons');
         $this->mergeConfigFrom("{$rootDir}/config.php", 'wireui.phosphoricons');
         $this->publishes(
             ["{$rootDir}/config.php" => config_path('wireui/phosphoricons.php')],

src/PhosphorIconsServiceProvider.php

@@ -13,7 +13,7 @@
         | <x-icon variant="thin" />
         |
     */
-    'variant' => env('WIREUI_PHOSPHOR_ICONS_VARIANT', 'regular'),
+    'variant' => 'regular',
 
     /*
         |--------------------------------------------------------------------------
@@ -25,5 +25,5 @@
         | <x-icon ... />
         |
     */
-    'alias' => env('WIREUI_PHOSPHOR_ICONS_ALIAS', 'icon'),
+    'alias' => 'icon',
 ];