Reorganise workbench install scripts (#11)

* Reorganise workbench install scripts Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> --------- Signed-off-by: Mior Muhammad Zaki <[email protected]>
orchestral · Aug 18, 2023 · 865ac1f · 865ac1f
1 parent 3159ea6
commit 865ac1f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 21 deletions.
diff --git a/composer.json b/composer.json
@@ -44,8 +44,8 @@
     },
     "scripts": {
         "post-autoload-dump": [
-            "@composer run clear",
-            "@composer run prepare"
+            "@clear",
+            "@prepare"
         ],
         "ci": [
             "@composer audit",
@@ -55,12 +55,7 @@
         "clear": "@php vendor/bin/testbench package:purge-skeleton --ansi",
         "prepare": "@php vendor/bin/testbench package:discover --ansi",
         "build": "@php vendor/bin/testbench workbench:build",
-        "serve": [
-            "@composer run clear",
-            "@composer run prepare",
-            "@composer run build",
-            "@php vendor/bin/testbench serve"
-        ],
+        "serve": "@php vendor/bin/testbench serve",
         "lint": [
             "@composer run prepare",
             "@php vendor/bin/pint",

diff --git a/src/Console/InstallCommand.php b/src/Console/InstallCommand.php
@@ -89,19 +89,9 @@ protected function appendScriptsToComposer(array $content, Filesystem $filesyste
             $content['scripts'] = [];
         }
 
-        $content['scripts']['clear'] = '@php vendor/bin/testbench package:purge-skeleton --ansi';
-        $content['scripts']['prepare'] = '@php vendor/bin/testbench package:discover --ansi';
-        $content['scripts']['build'] = '@php vendor/bin/testbench workbench:build';
-        $content['scripts']['serve'] = [
-            '@composer run clear',
-            '@composer run prepare',
-            '@composer run build',
-            '@php vendor/bin/testbench serve',
-        ];
-
         $postAutoloadDumpScripts = [
-            '@composer run clear',
-            '@composer run prepare',
+            '@clear',
+            '@prepare',
         ];
 
         if (! \array_key_exists('post-autoload-dump', $content['scripts'])) {
@@ -113,6 +103,11 @@ protected function appendScriptsToComposer(array $content, Filesystem $filesyste
             ]);
         }
 
+        $content['scripts']['clear'] = '@php vendor/bin/testbench package:purge-skeleton --ansi';
+        $content['scripts']['prepare'] = '@php vendor/bin/testbench package:discover --ansi';
+        $content['scripts']['build'] = '@php vendor/bin/testbench workbench:build';
+        $content['scripts']['serve'] = '@php vendor/bin/testbench serve';
+
         if (! \array_key_exists('lint', $content['scripts'])) {
             $lintScripts = [];
 
@@ -128,7 +123,7 @@ protected function appendScriptsToComposer(array $content, Filesystem $filesyste
 
             if (\count($lintScripts) > 0) {
                 $content['scripts']['lint'] = [
-                    '@composer run prepare',
+                    '@prepare',
                     ...$lintScripts,
                 ];
             }