Skip to content

Commit 7910c7a

Browse files
committed
[ADD] sMultisite versions for css and js.
1 parent fc7e726 commit 7910c7a

4 files changed

Lines changed: 11 additions & 10 deletions

File tree

config/sMultisiteCheck.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<?php return ['check_sMultisite' => true];
1+
<?php return ['check_sMultisite' => true, 'sMultisiteVer' => 'dev-master'];

src/Console/PublishAssets.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,21 @@ public function handle(Filesystem $fs): int
3131
// File::delete() is safe even if file does not exist
3232
$fs->delete($path);
3333
}
34-
$this->info('Pruned old assets (if existed).');
3534
}
3635

3736
// 2) Publish (force overwrite)
3837
$this->call('vendor:publish', [
3938
'--provider' => 'Seiger\sMultisite\sMultisiteServiceProvider',
40-
'--force' => true,
4139
]);
4240

4341
// 3) (Optional) drop VERSION file for debugging
4442
try {
4543
$ver = \Composer\InstalledVersions::getVersion('seiger/smultisite');
4644
$fs->ensureDirectoryExists(public_path('assets/site'));
47-
$fs->put(public_path('assets/site/VERSION'), (string)$ver);
45+
$fs->put(
46+
public_path('core/vendor/seiger/smultisite/config/sMultisiteCheck.php'),
47+
"<?php return ['check_sMultisite' => true, 'sMultisiteVer' => '" . $ver . "'];"
48+
);
4849
} catch (\Throwable) {
4950
// ignore if class not available
5051
}

src/sMultisiteServiceProvider.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,10 @@ public function register()
6464
*/
6565
protected function publishResources()
6666
{
67+
if ($this->app->runningInConsole()) {
68+
$this->commands([PublishAssets::class]);
69+
}
70+
6771
$this->publishes([
6872
dirname(__DIR__) . '/config/sMultisiteSettings.php' => config_path('seiger/settings/sMultisite.php', true),
6973
dirname(__DIR__) . '/images/seigerit.svg' => public_path('assets/site/seigerit.svg'),
@@ -72,9 +76,5 @@ protected function publishResources()
7276
dirname(__DIR__) . '/js/main.js' => public_path('assets/site/smultisite.js'),
7377
dirname(__DIR__) . '/js/tooltip.js' => public_path('assets/site/seigerit.tooltip.js'),
7478
]);
75-
76-
if ($this->app->runningInConsole()) {
77-
$this->commands([PublishAssets::class]);
78-
}
7979
}
8080
}

views/index.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
1010
<link rel="icon" type="image/svg+xml" href="{{asset('site/smultisite.svg')}}" />
1111
<style>[x-cloak]{display:none!important}</style>
12-
<link rel="stylesheet" href="{{asset('site/smultisite.min.css')}}">
12+
<link rel="stylesheet" href="{{asset('site/smultisite.min.css')}}?{{evo()->getConfig('sMultisiteVer')}}">
1313
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/alertifyjs@latest/build/css/alertify.min.css"/>
1414
@if(class_exists(Tracy\Debugger::class) && config('tracy.active')){!!Tracy\Debugger::renderLoader()!!}@endif
1515
{!!ManagerTheme::getMainFrameHeaderHTMLBlock()!!}
@@ -37,7 +37,7 @@
3737
))!!};
3838
</script>
3939
<script src="media/script/main.js"></script>
40-
<script src="{{asset('site/smultisite.js.main.js')}}"></script>
40+
<script src="{{asset('site/smultisite.js')}}?{{evo()->getConfig('sMultisiteVer')}}"></script>
4141
@stack('scripts.top')
4242
{!!EvolutionCMS()->getRegisteredClientStartupScripts()!!}
4343
</head>

0 commit comments

Comments
 (0)