Skip to content

Commit 456fcf1

Browse files
committed
Update controller to fetch namespace path
1 parent 02efcd8 commit 456fcf1

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

core/controllers/home.class.php

+13-2
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,32 @@
11
<?php
22

3+
use MODX\Revolution\modNamespace;
4+
35
class StercCspHomeManagerController extends \MODX\Revolution\modExtraManagerController
46
{
57
public function loadCustomCssJs(): void
68
{
9+
$nsKey = 'sterc-csp';
10+
711
$server = '127.0.0.1';
812
$port = getenv('NODE_DEV_PORT') ?: '9090';
913
$connection = @fsockopen($server, $port);
10-
$baseUrl = MODX_ASSETS_URL . 'components/sterc-csp/';
14+
// $baseUrl = MODX_ASSETS_URL . 'components/sterc-csp/';
15+
16+
$namespace = $this->modx->getObject(modNamespace::class, ['name' => $nsKey]);
17+
$assetsPath = $namespace ? $namespace->getAssetsPath() : MODX_ASSETS_PATH . 'components/' . $nsKey . '/';
18+
$baseUrl = str_replace(MODX_BASE_PATH, '/', $assetsPath) . 'dist/';
19+
1120
if (is_resource($connection)) {
1221
// Development mode
1322
$path = $server . ':' . $port . $baseUrl;
1423
$this->addHtml('<script type="module" src="//' . $path . '@vite/client"></script>');
1524
$this->addHtml('<script type="module" src="//' . $path . 'src/main.ts"></script>');
1625
} else {
1726
// Production mode
18-
$manifest = MODX_ASSETS_PATH . 'components/sterc-csp/manifest.json';
27+
// $manifest = MODX_ASSETS_PATH . 'components/sterc-csp/manifest.json';
28+
$manifest = $assetsPath . 'dist/manifest.json';
29+
1930
if (file_exists($manifest) && $files = json_decode(file_get_contents($manifest), true)) {
2031
foreach ($files as $file) {
2132
if (preg_match('#\.js$#', $file['file'])) {

0 commit comments

Comments
 (0)