Skip to content

Commit d9c093c

Browse files
committed
Move datatables to yarn
We couldn't do this before as datatables-bs5 depends on the composer bootstrap install.
1 parent 20b2fe6 commit d9c093c

File tree

5 files changed

+5
-49
lines changed

5 files changed

+5
-49
lines changed

webapp/composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
"ext-zip": "*",
5757
"apalfrey/select2-bootstrap-5-theme": "^1.3",
5858
"components/jquery": "^3.6",
59-
"datatables.net/datatables.net": "dev-master",
6059
"doctrine/doctrine-bundle": "^2.8",
6160
"doctrine/doctrine-fixtures-bundle": "^4.0",
6261
"doctrine/doctrine-migrations-bundle": "^3.2",

webapp/composer.lock

Lines changed: 2 additions & 46 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

webapp/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"bootstrap": "^5.3.8",
77
"bootstrap-toggle": "^2.2.2",
88
"d3": "3.5.17",
9+
"datatables.net": "^2.3.4",
910
"datatables.net-bs5": "^2.3.4",
1011
"file-saver": "^2.0.5",
1112
"flag-icons": "^7.5.0",

webapp/public/js/dataTables.min.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../../vendor/datatables.net/datatables.net/js/dataTables.min.js
1+
../../node_modules/datatables.net/js/dataTables.min.js

webapp/yarn.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ datatables.net-bs5@^2.3.4:
4040
datatables.net "2.3.4"
4141
jquery ">=1.7"
4242

43-
datatables.net@2.3.4:
43+
datatables.net@2.3.4, datatables.net@^2.3.4:
4444
version "2.3.4"
4545
resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-2.3.4.tgz#8cf69f2e6cb8d271be3d5c4f75a479684d20f253"
4646
integrity sha512-fKuRlrBIdpAl2uIFgl9enKecHB41QmFd/2nN9LBbOvItV/JalAxLcyqdZXex7wX4ZXjnJQEnv6xeS9veOpKzSw==

0 commit comments

Comments
 (0)