Skip to content

Add all accepted ILIAS 12 NPM dependency PRs into package.json #11262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lscharmer wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

Add all accepted ILIAS 12 NPM dependency PRs into package.json #11262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
569 changes: 277 additions & 292 deletions components/ILIAS/Chatroom/chat/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

37 changes: 18 additions & 19 deletions components/ILIAS/Chatroom/chat/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,65 +1,64 @@
{
"name": "ILIAS-Chat",
"description": "ILIAS CHAT",
"version": "11.0.0",
"version": "12.0.0",
"dependencies": {
"express": "^5.2.1",
"express": "^5.1.0",
"mariadb": "^3.4.0",
"node-schedule": "^2.1.0",
"socket.io": "^4.8.1",
"socket.io-client": "^4.8.1",
"uuid": "^11.0.3",
"winston": "^3.17.0"
"uuid": "^13.0.0",
"winston": "^3.18.0"
},
"extra": {
"express": {
"introduction-date": null,
"approved-by": "Jour Fix",
"developer": "lscharmer",
"developer": "mjansen",
"purpose": "Web application framework for nodejs",
"last-update-for-ilias": "11.0"
"last-update-for-ilias": "12.0"
},
"mariadb": {
"introduction-date": "20-02-2025",
"approved-by": "Jour Fix",
"developer": "lscharmer",
"developer": "mjansen",
"purpose": "Mysql driver for nodejs",
"last-update-for-ilias": "11.0"
"last-update-for-ilias": "12.0"
},
"node-schedule": {
"introduction-date": null,
"approved-by": "Jour Fix",
"developer": "lscharmer",
"developer": "mjansen",
"purpose": "Flexible cron-like (and not-cron-like) job scheduler for nodejs",
"last-update-for-ilias": "11.0"
"last-update-for-ilias": "12.0"
},
"socket.io": {
"introduction-date": null,
"approved-by": "Jour Fix",
"developer": "lscharmer",
"developer": "mjansen",
"purpose": "WebSocket library, Server part",
"last-update-for-ilias": "11.0"
"last-update-for-ilias": "12.0"
},
"socket.io-client": {
"introduction-date": null,
"approved-by": "Jour Fix",
"developer": "lscharmer",
"developer": "mjansen",
"purpose": "WebSocket library, Client part",
"last-update-for-ilias": "11.0"
"last-update-for-ilias": "12.0"
},
"uuid": {
"introduction-date": "20-02-2025",
"approved-by": "Jour Fix",
"developer": "lscharmer",
"developer": "mjansen",
"purpose": "Used to retrieve RFC9562 conforming UUID values for nodejs",
"last-update-for-ilias": "11.0"
"last-update-for-ilias": "12.0"
},
"winston": {
"introduction-date": null,
"approved-by": "Jour Fix",
"developer": "lscharmer",
"developer": "mjansen",
"purpose": "Logging library for nodejs",
"last-update-for-ilias": "11.0"
"last-update-for-ilias": "12.0"
}
}
}
6 changes: 3 additions & 3 deletions components/ILIAS/UI/UI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@ public function init(
new Component\Resource\ComponentJS($this, "js/Dropdown/dist/dropdown.js");

$contribute[Component\Resource\PublicAsset::class] = static fn() =>
new Component\Resource\NodeModule("dropzone/dist/min/dropzone.min.js");
new Component\Resource\NodeModule("dropzone/dist/dropzone-min.js");
$contribute[Component\Resource\PublicAsset::class] = fn() =>
new Component\Resource\ComponentJS($this, "js/Dropzone/File/dropzone.js");

Expand Down Expand Up @@ -620,8 +620,8 @@ public function init(
new Component\Resource\NodeModule("@yaireo/tagify/dist/tagify.js");
$contribute[Component\Resource\PublicAsset::class] = static fn() =>
new Component\Resource\NodeModule("@yaireo/tagify/dist/tagify.css");
$contribute[Component\Resource\PublicAsset::class] = static fn() =>
new Component\Resource\NodeModule("chart.js/dist/chart.umd.js");
// $contribute[Component\Resource\PublicAsset::class] = static fn() =>
// new Component\Resource\NodeModule("chart.js/dist/chart.umd.js");
$contribute[Component\Resource\PublicAsset::class] = fn() =>
new Component\Resource\ComponentJS($this, "js/Progress/dist/progress.min.js");
$contribute[Component\Resource\PublicAsset::class] = fn() =>
Expand Down
2 changes: 1 addition & 1 deletion components/ILIAS/UI/src/Implementation/Component/Chart/Bar/Renderer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ protected function getUserData(Bar\Bar $component): array
public function registerResources(ResourceRegistry $registry): void
{
parent::registerResources($registry);
$registry->register('assets/js/chart.umd.js');
// $registry->register('assets/js/chart.umd.js');
$registry->register('assets/js/bar.js');
}
}
2 changes: 1 addition & 1 deletion components/ILIAS/UI/src/Implementation/Component/Input/Field/Renderer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -947,7 +947,7 @@ public function registerResources(ResourceRegistry $registry): void
$registry->register('assets/css/tagify.css');
$registry->register('assets/js/tagInput.js');

$registry->register('assets/js/dropzone.min.js');
$registry->register('assets/js/dropzone-min.js');
$registry->register('assets/js/dropzone.js');
$registry->register('assets/js/input.js');
$registry->register('assets/js/core.js');
Expand Down
1 change: 0 additions & 1 deletion components/ILIAS/UI/tests/Client/Table/Presentation/presentation.table.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ describe('Presentation Table', () => {
beforeEach(() => {
const domString = fs.readFileSync('./components/ILIAS/UI/tests/Client/Table/Presentation/PresentationTest.html').toString();
const dom = new JSDOM(domString);
dom.window.document.getElementById = (id) => document.querySelector(`#${id}`);
global.window = dom.window;
global.document = dom.window.document;
});
Expand Down
1 change: 1 addition & 0 deletions components/ILIAS/UIComponent/Explorer2/classes/class.ilExplorerBaseGUI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ abstract class ilExplorerBaseGUI
protected ilCtrl $ctrl;
protected ?ilGlobalTemplateInterface $tpl;

// jstree is not included anymore, this won't work.
protected static string $js_tree_path = "./node_modules/jstree/dist/jstree.js";
protected static string $js_tree_path_css = "./node_modules/jstree/dist/themes/default/style.min.css";

Expand Down
20 changes: 10 additions & 10 deletions components/ILIAS/UIComponent/UIComponent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,16 @@ public function init(
$contribute[Component\Resource\PublicAsset::class] = fn() =>
new Component\Resource\ComponentJS($this, "ilTextHighlighter.js");

$contribute[Component\Resource\PublicAsset::class] = static fn() => new class () implements Component\Resource\PublicAsset {
public function getSource(): string
{
return "node_modules/jstree";
}
public function getTarget(): string
{
return "node_modules/jstree";
}
};
// $contribute[Component\Resource\PublicAsset::class] = static fn() => new class () implements Component\Resource\PublicAsset {
// public function getSource(): string
// {
// return "node_modules/jstree";
// }
// public function getTarget(): string
// {
// return "node_modules/jstree";
// }
// };

/* This library was missing after discussing dependencies for ILIAS 10
$contribute[Component\Resource\PublicAsset::class] = static fn() =>
Expand Down
Loading
Loading