Merge branch '1.x' into 8.x

Signed-off-by: Mior Muhammad Zaki <[email protected]>
orchestral · Dec 6, 2023 · fc02999 · fc02999
2 parents 8782ebb + 35789e0
commit fc02999
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/CHANGELOG-1.x.md b/CHANGELOG-1.x.md
@@ -2,6 +2,14 @@
 
 This changelog references the relevant changes (bug and security fixes) done to `orchestra/workbench`.
 
+## 1.2.0
+
+Released: 2023-12-06
+
+### Added
+
+* Supports Workbench `discovers.components` configuration.
+
 ## 1.1.0
 
 Released: 2023-12-04

diff --git a/composer.json b/composer.json
@@ -30,7 +30,7 @@
         "laravel/framework": "^10.26",
         "laravel/tinker": "^2.8.2",
         "orchestra/canvas": "^8.11.4",
-        "orchestra/testbench-core": "^8.16",
+        "orchestra/testbench-core": "^8.17",
         "spatie/laravel-ray": "^1.32.4",
         "symfony/polyfill-php83": "^1.28",
         "symfony/yaml": "^6.2"

diff --git a/src/Console/stubs/testbench.yaml b/src/Console/stubs/testbench.yaml
@@ -14,6 +14,7 @@ workbench:
     web: true
     api: false
     commands: false
+    components: false
     views: false
   build: []
   assets: []

diff --git a/tests/WorkbenchTest.php b/tests/WorkbenchTest.php
@@ -72,6 +72,7 @@ public function it_can_resolve_workbench_config()
             'web' => true,
             'api' => true,
             'commands' => true,
+            'components' => false,
             'views' => false,
         ], Workbench::config('discovers'));
     }