Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '3.x' into dependabot/npm_and_yarn/express-4.21.1
Browse files Browse the repository at this point in the history
ifox authored Oct 14, 2024

Verified

This commit was signed with the committer’s verified signature.
infeo Armin Schrenk
2 parents 0cb4546 + 7ef492d commit 19529d5
Showing 2 changed files with 30 additions and 40 deletions.
35 changes: 12 additions & 23 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 18 additions & 17 deletions src/RouteServiceProvider.php
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
use A17\Twill\Http\Middleware\ValidateBackHistory;
use A17\Twill\Services\MediaLibrary\Glide;
use A17\Twill\Facades\TwillRoutes;
use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
use Illuminate\Support\ServiceProvider;
use Illuminate\Routing\Router;
use Illuminate\Support\Facades\Route;
use Illuminate\Support\Str;
@@ -29,26 +29,27 @@ public function boot(): void
$this->registerRouteMiddlewares();
$this->app->bind(TwillRoutes::class);
$this->registerRouteMacros();
parent::boot();
}

public function map(Router $router): void
public function register()
{
\A17\Twill\Facades\TwillRoutes::registerRoutePatterns();

$this->mapInternalRoutes(
$router,
\A17\Twill\Facades\TwillRoutes::getRouteGroupOptions(),
\A17\Twill\Facades\TwillRoutes::getRouteMiddleware(),
\A17\Twill\Facades\TwillRoutes::supportSubdomainRouting()
);
$this->callAfterResolving(Router::class, function (Router $router) {
\A17\Twill\Facades\TwillRoutes::registerRoutePatterns();

$this->mapInternalRoutes(
$router,
\A17\Twill\Facades\TwillRoutes::getRouteGroupOptions(),
\A17\Twill\Facades\TwillRoutes::getRouteMiddleware(),
\A17\Twill\Facades\TwillRoutes::supportSubdomainRouting()
);

$this->mapHostRoutes(
$router,
\A17\Twill\Facades\TwillRoutes::getRouteGroupOptions(),
\A17\Twill\Facades\TwillRoutes::getRouteMiddleware(),
\A17\Twill\Facades\TwillRoutes::supportSubdomainRouting()
);
$this->mapHostRoutes(
$router,
\A17\Twill\Facades\TwillRoutes::getRouteGroupOptions(),
\A17\Twill\Facades\TwillRoutes::getRouteMiddleware(),
\A17\Twill\Facades\TwillRoutes::supportSubdomainRouting()
);
});
}

private function mapHostRoutes(

0 comments on commit 19529d5

Please sign in to comment.