Skip to content

Commit c73e1ed

Browse files
Merge pull request #60 from laravel/fix-unnecessary-escaped-slashes
Don't escape forward slashes in URI
2 parents 9dfa8ba + e407b25 commit c73e1ed

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

resources/method.blade.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
{!! $method !!}.definition = {
1111
methods: [@foreach ($verbs as $verb)@js($verb->actual){!! when(! $loop->last, ',') !!}@endforeach],
12-
url: @js($uri),
12+
url: {!! $uri !!},
1313
}
1414

1515
@include('wayfinder::docblock')

resources/multi-method.blade.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99

1010
{!! when(!$isInvokable, 'export ') !!}const {!! $method !!} = {
1111
@foreach ($routes as $route)
12-
@js($route['uri']): {!! $route['tempMethod'] !!},
12+
{!! $route['uri'] !!}: {!! $route['tempMethod'] !!},
1313
@endforeach
1414
}{{PHP_EOL}}

src/Route.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use Illuminate\Routing\Route as BaseRoute;
88
use Illuminate\Routing\RouteAction;
99
use Illuminate\Support\Collection;
10+
use Illuminate\Support\Js;
1011
use Illuminate\Support\Str;
1112
use Laravel\SerializableClosure\Support\ReflectionClosure;
1213
use ReflectionClass;
@@ -94,11 +95,13 @@ public function uri(): string
9495

9596
$scheme = $this->scheme() ?? '//';
9697

97-
return str($this->base->uri)
98+
$uri = str($this->base->uri)
9899
->start('/')
99100
->when($this->domain() !== null, fn ($uri) => $uri->prepend("{$scheme}{$this->domain()}"))
100101
->replace($defaultParams->keys()->toArray(), $defaultParams->values()->toArray())
101102
->toString();
103+
104+
return Js::from($uri, JSON_UNESCAPED_SLASHES)->toHtml();
102105
}
103106

104107
public function scheme(): ?string

0 commit comments

Comments
 (0)