upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-19 16:39:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

fix: Correctly add module content type to script tags when scripts with versions are used

Browse source 
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
This commit is contained in:
Ferdinand Thiessen 2023-07-18 13:09:30 +02:00
parent 446b2d283f
commit ad2727aef8
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/private/legacy/template/functions.php
View file

@ -101,7 +101,8 @@ function emit_script_tag(string $src, string $script_content = '', string $conte
*/
function emit_script_loading_tags($obj) {
foreach ($obj['jsfiles'] as $jsfile) {
$type = str_ends_with($jsfile, '.mjs') ? 'module' : '';
$fileName = explode('?', $jsfile, 2)[0];
$type = str_ends_with($fileName, '.mjs') ? 'module' : '';
emit_script_tag($jsfile, '', $type);
}
if (!empty($obj['inline_ocjs'])) {

12
tests/lib/TemplateFunctionsTest.php
View file

@ -86,6 +86,18 @@ class TemplateFunctionsTest extends \Test\TestCase {
]);
}
public function testEmitScriptLoadingTagsWithVersion() {
// Test mjs js and inline content
$pattern = '/src="some\.mjs\?v=ab123cd"[^>]+type="module"[^>]*>.+\n'; // some.mjs with type = module
$pattern .= '<script[^>]+src="other\.js\?v=12abc34"[^>]*>.+\n'; // other.js as plain javascript
$pattern .= '/'; // no flags
$this->expectOutputRegex($pattern);
emit_script_loading_tags([
'jsfiles' => ['some.mjs?v=ab123cd', 'other.js?v=12abc34'],
]);
}
// ---------------------------------------------------------------------------
// Test relative_modified_date with dates only
// ---------------------------------------------------------------------------