Skip to content

Commit 40a2f34

Browse files
committed
Only get headers if a web request
1 parent 76cf7e0 commit 40a2f34

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "putyourlightson/craft-datastar-module",
33
"description": "A template-driven, reactive hypermedia framework for Craft.",
4-
"version": "1.0.0-RC.10",
4+
"version": "1.0.0-RC.11",
55
"type": "yii-module",
66
"license": "mit",
77
"require": {

src/Datastar.php

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ public function init(): void
6767

6868
$this->registerComponents();
6969
$this->registerTwigExtension();
70-
$this->registerSseDumper();
7170
$this->registerScript();
71+
$this->registerSseDumper();
7272
}
7373

7474
public function getSettings(): Settings
@@ -92,15 +92,6 @@ private function registerTwigExtension(): void
9292
Craft::$app->getView()->registerTwigExtension(new DatastarTwigExtension());
9393
}
9494

95-
private function registerSseDumper(): void
96-
{
97-
if (empty(Craft::$app->getRequest()->getHeaders()->get('Datastar-Request'))) {
98-
return;
99-
}
100-
101-
Craft::$app->set('dumper', new SseDumper());
102-
}
103-
10495
private function registerScript(): void
10596
{
10697
if (!$this->settings->registerScript) {
@@ -118,4 +109,14 @@ private function registerScript(): void
118109
Craft::$app->getView()->registerJsFile($url, $bundle->jsOptions);
119110
});
120111
}
112+
113+
private function registerSseDumper(): void
114+
{
115+
$request = Craft::$app->getRequest();
116+
if ($request->getIsConsoleRequest() || empty($request->getHeaders()->get('Datastar-Request'))) {
117+
return;
118+
}
119+
120+
Craft::$app->set('dumper', new SseDumper());
121+
}
121122
}

0 commit comments

Comments
 (0)