Merge branch '1.x' into 7.x

crynobone · crynobone · commit 86c20b0adda2 · 2024-03-13T13:57:28.000+08:00
Signed-off-by: Mior Muhammad Zaki &lt;crynobone@gmail.com&gt;
diff --git a/CHANGELOG-1.x.md b/CHANGELOG-1.x.md
@@ -4,7 +4,7 @@ This changelog references the relevant changes (bug and security fixes) done to
 
 ## 1.4.0
 
-Released: 2024-03-12
+Released: 2024-03-13
 
 ### Changes
 
diff --git a/composer.json b/composer.json
@@ -59,6 +59,7 @@
         "prepare": "@php vendor/bin/testbench package:discover --ansi",
         "build": "@php vendor/bin/testbench workbench:build --ansi",
         "serve": [
+            "Composer\\Config::disableProcessTimeout",
             "@build",
             "@php vendor/bin/testbench serve"
         ],
@@ -76,4 +77,4 @@
     },
     "prefer-stable": true,
     "minimum-stability": "dev"
-}
+}
diff --git a/src/Console/InstallCommand.php b/src/Console/InstallCommand.php
@@ -30,10 +30,14 @@ class InstallCommand extends Command
     public function handle(Filesystem $filesystem)
     {
         if (! $this->option('skip-devtool')) {
-            $this->call('workbench:devtool', [
-                '--force' => $this->option('force'),
-                '--skip-install' => true,
-            ]);
+            $devtool = $this->components->confirm('Install Workbench DevTool?', true);
+
+            if ($devtool === true) {
+                $this->call('workbench:devtool', [
+                    '--force' => $this->option('force'),
+                    '--skip-install' => true,
+                ]);
+            }
         }
 
         $workingPath = package_path();
diff --git a/workbench/resources/views/.gitkeep b/workbench/resources/views/.gitkeep
