Skip to content

Commit d48f521

Browse files
Upgrade Ranger + tap into Ranger cache (#309)
* Update composer.json * upgrade ranger and ranger cache
1 parent d8b8856 commit d48f521

2 files changed

Lines changed: 11 additions & 2 deletions

File tree

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"illuminate/filesystem": "^12.0|^13.0",
2626
"illuminate/routing": "^12.0|^13.0",
2727
"illuminate/support": "^12.0|^13.0",
28-
"laravel/ranger": "^0.3.0",
28+
"laravel/ranger": "^0.4.0",
2929
"laravel/surveyor": "^0.2.7",
3030
"phpstan/phpdoc-parser": "^2.3"
3131
},

src/Console/GenerateCommand.php

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use Illuminate\Support\Facades\File;
99
use Laravel\Ranger\Ranger;
1010
use Laravel\Ranger\Support\Config as RangerConfig;
11+
use Laravel\Ranger\Support\Inventory;
1112
use Laravel\Surveyor\Analyzer\AnalyzedCache;
1213
use Laravel\Wayfinder\Converters\BroadcastChannels;
1314
use Laravel\Wayfinder\Converters\BroadcastEvents;
@@ -59,17 +60,25 @@ public function handle(
5960
Enums $enumConverter,
6061
Routes $routesConverter,
6162
) {
63+
$cacheDirectory = $this->config->get('wayfinder.cache.directory');
64+
6265
AnalyzedCache::freezeFileTimes();
63-
AnalyzedCache::setCacheDirectory($this->config->get('wayfinder.cache.directory'));
66+
AnalyzedCache::setCacheDirectory($cacheDirectory);
67+
RangerConfig::set('cache.directory', $cacheDirectory);
6468

6569
$cacheEnabled = $this->config->get('wayfinder.cache.enabled');
6670

6771
if ($this->option('fresh') || ! $cacheEnabled) {
6872
AnalyzedCache::clear();
73+
Inventory::clear();
6974
}
7075

7176
if ($cacheEnabled) {
7277
AnalyzedCache::enable();
78+
} else {
79+
// Ranger keeps its index whenever it has somewhere to put it, so
80+
// the directory is taken away rather than a stale index left behind.
81+
RangerConfig::set('cache.directory', null);
7382
}
7483

7584
ResultConverter::register(TypeScriptConverter::class);

0 commit comments

Comments
 (0)