[TikiWiki-commits] [Git][tikiwiki/tiki][28.x] [BP][FIX] Repair tablesorter installation
"Joseph Lwanzo Kausi \(@Grandi0z\) via TikiWiki-cvs" <[email protected]>
| Newsgroups | gmane.comp.cms.tiki.cvs |
|---|---|
| Message-ID | <6906107894c5a_2cb966e54579c7@gitlab-sidekiq-low-urgency-cpu-bound-v2-66dbb487d8-6thgw.mail> |
Joseph Lwanzo Kausi pushed to branch 28.x at Tiki Wiki CMS Groupware / Tiki
Commits:
ebda17b5 by Joseph Lwanzo Kausi at 2025-11-01T15:45:14+02:00
[BP][FIX] Repair tablesorter installation
---
* [BP][FIX] Repair tablesorter installation
* Repair tablesorter
---
* [FIX] tablesorter: Update the minimum version for mottie/tablesorter to mathc the new file layout (if there is one).
Thanks @benoitg
* [FIX] tablesorter: Delete mottie/tablesorter package if the dist/js dir isn't there, so composer will re-install it
* [FIX] tablesorter: Seems the install of tablesorter in vendor_bundled is completely broken, not really sure why but this seems to fix it.
Different in master as it's been moved to the build process, so not a backport
See merge request tikiwiki/tiki!8846
See merge request tikiwiki/tiki!8916
- - - - -
5 changed files:
- lib/core/Tiki/Composer/CleanVendors.php
- lib/core/Tiki/Composer/RestoreVendors.php
- tiki-setup.php
- vendor_bundled/composer.json
- vendor_bundled/composer.lock
Changes:
=====================================
lib/core/Tiki/Composer/CleanVendors.php
=====================================
@@ -173,63 +173,62 @@ class CleanVendors
[
'addons',
'beta-testing',
- 'css',
- 'dist',
+ 'dist/css',
'bower.json',
'example.json',
'Gruntfile.js',
'package.json',
'tablesorter.jquery.json',
- 'js/extras',
- 'js/jquery.tablesorter.js',
- 'js/jquery.tablesorter.widgets.js',
- 'js/parsers/parser-date.js',
- 'js/parsers/parser-date-extract.js',
- 'js/parsers/parser-date-iso8601.js',
- 'js/parsers/parser-date-month.js',
- 'js/parsers/parser-date-range.js',
- 'js/parsers/parser-date-two-digit-year.js',
- 'js/parsers/parser-date-weekday.js',
- 'js/parsers/parser-duration.js',
- 'js/parsers/parser-feet-inch-fraction.js',
- 'js/parsers/parser-file-type.js',
- 'js/parsers/parser-globalize.js',
- 'js/parsers/parser-huge-numbers.js',
- 'js/parsers/parser-ignore-articles.js',
- 'js/parsers/parser-image.js',
- 'js/parsers/parser-leading-zeros.js',
- 'js/parsers/parser-metric.js',
- 'js/parsers/parser-named-numbers.js',
- 'js/parsers/parser-network.js',
- 'js/parsers/parser-roman.js',
- 'js/widgets/widget-alignChar.js',
- 'js/widgets/widget-build-table.js',
- 'js/widgets/widget-chart.js',
- 'js/widgets/widget-cssStickyHeaders.js',
- 'js/widgets/widget-columns.js', //in jquery.tablesorter.combined.js
- 'js/widgets/widget-editable.js',
- 'js/widgets/widget-filter.js', //in jquery.tablesorter.combined.js
- 'js/widgets/widget-filter-formatter-html5.js',
- 'js/widgets/widget-filter-formatter-select2.js',
- 'js/widgets/widget-filter-type-insideRange.js',
- 'js/widgets/widget-formatter.js',
- 'js/widgets/widget-headerTitles.js',
- 'js/widgets/widget-lazyload.js',
- 'js/widgets/widget-mark.js',
- 'js/widgets/widget-print.js',
- 'js/widgets/widget-reflow.js',
- 'js/widgets/widget-repeatheaders.js',
- 'js/widgets/widget-resizable.js', //in jquery.tablesorter.combined.js
- 'js/widgets/widget-saveSort.js', //in jquery.tablesorter.combined.js
- 'js/widgets/widget-scroller.js',
- 'js/widgets/widget-sortTbodies.js',
- 'js/widgets/widget-staticRow.js',
- 'js/widgets/widget-stickyHeaders.js', //in jquery.tablesorter.combined.js
- 'js/widgets/widget-storage.js', //in jquery.tablesorter.combined.js
- 'js/widgets/widget-toggle.js',
- 'js/widgets/widget-uitheme.js', //in jquery.tablesorter.combined.js
- 'js/widgets/widget-vertical-group.js',
- 'js/widgets/widget-view.js'
+ 'dist/js/extras',
+ 'dist/js/jquery.tablesorter.js',
+ 'dist/js/jquery.tablesorter.widgets.js',
+ 'dist/js/parsers/parser-date.js',
+ 'dist/js/parsers/parser-date-extract.js',
+ 'dist/js/parsers/parser-date-iso8601.js',
+ 'dist/js/parsers/parser-date-month.js',
+ 'dist/js/parsers/parser-date-range.js',
+ 'dist/js/parsers/parser-date-two-digit-year.js',
+ 'dist/js/parsers/parser-date-weekday.js',
+ 'dist/js/parsers/parser-duration.js',
+ 'dist/js/parsers/parser-feet-inch-fraction.js',
+ 'dist/js/parsers/parser-file-type.js',
+ 'dist/js/parsers/parser-globalize.js',
+ 'dist/js/parsers/parser-huge-numbers.js',
+ 'dist/js/parsers/parser-ignore-articles.js',
+ 'dist/js/parsers/parser-image.js',
+ 'dist/js/parsers/parser-leading-zeros.js',
+ 'dist/js/parsers/parser-metric.js',
+ 'dist/js/parsers/parser-named-numbers.js',
+ 'dist/js/parsers/parser-network.js',
+ 'dist/js/parsers/parser-roman.js',
+ 'dist/js/widgets/widget-alignChar.js',
+ 'dist/js/widgets/widget-build-table.js',
+ 'dist/js/widgets/widget-chart.js',
+ 'dist/js/widgets/widget-cssStickyHeaders.js',
+ 'dist/js/widgets/widget-columns.js', //in jquery.tablesorter.combined.js
+ 'dist/js/widgets/widget-editable.js',
+ 'dist/js/widgets/widget-filter.js', //in jquery.tablesorter.combined.js
+ 'dist/js/widgets/widget-filter-formatter-html5.js',
+ 'dist/js/widgets/widget-filter-formatter-select2.js',
+ 'dist/js/widgets/widget-filter-type-insideRange.js',
+ 'dist/js/widgets/widget-formatter.js',
+ 'dist/js/widgets/widget-headerTitles.js',
+ 'dist/js/widgets/widget-lazyload.js',
+ 'dist/js/widgets/widget-mark.js',
+ 'dist/js/widgets/widget-print.js',
+ 'dist/js/widgets/widget-reflow.js',
+ 'dist/js/widgets/widget-repeatheaders.js',
+ 'dist/js/widgets/widget-resizable.js', //in jquery.tablesorter.combined.js
+ 'dist/js/widgets/widget-saveSort.js', //in jquery.tablesorter.combined.js
+ 'dist/js/widgets/widget-scroller.js',
+ 'dist/js/widgets/widget-sortTbodies.js',
+ 'dist/js/widgets/widget-staticRow.js',
+ 'dist/js/widgets/widget-stickyHeaders.js', //in jquery.tablesorter.combined.js
+ 'dist/js/widgets/widget-storage.js', //in jquery.tablesorter.combined.js
+ 'dist/js/widgets/widget-toggle.js',
+ 'dist/js/widgets/widget-uitheme.js', //in jquery.tablesorter.combined.js
+ 'dist/js/widgets/widget-vertical-group.js',
+ 'dist/js/widgets/widget-view.js'
]
);
self::remove(
=====================================
lib/core/Tiki/Composer/RestoreVendors.php
=====================================
@@ -29,7 +29,8 @@ class RestoreVendors
// get back previously "cleaned" widget-output.js for tablesorter export
$package = $repoManager->findPackages('mottie/tablesorter');
- if (! file_exists($vendors . 'mottie/tablesorter/js/widgets/widget-output.js') && ! empty($package[0])) {
+ if (! file_exists($vendors . 'mottie/tablesorter/dist/js/jquery.tablesorter.combined.js') && ! empty($package[0])) {
+ // tablesorter moved from js to dist/js around v2.32 and tiki v27.4
$repoManager->removePackage($package[0]);
}
}
=====================================
tiki-setup.php
=====================================
@@ -633,16 +633,16 @@ if ($prefs['feature_jquery_reflection'] == 'y') {
$headerlib->add_jsfile('vendor_bundled/vendor/jquery-plugins/reflection-jquery/js/reflection.js');
}
if ($prefs['feature_jquery_tablesorter'] == 'y') {
- $headerlib->add_jsfile('vendor_bundled/vendor/mottie/tablesorter/js/jquery.tablesorter.combined.js');
- $headerlib->add_jsfile('vendor_bundled/vendor/mottie/tablesorter/js/parsers/parser-input-select.js');
- $headerlib->add_jsfile('vendor_bundled/vendor/mottie/tablesorter/js/widgets/widget-columnSelector.js');
- $headerlib->add_jsfile('vendor_bundled/vendor/mottie/tablesorter/js/widgets/widget-filter-formatter-jui.js');
- $headerlib->add_jsfile('vendor_bundled/vendor/mottie/tablesorter/js/widgets/widget-grouping.js');
- $headerlib->add_jsfile('vendor_bundled/vendor/mottie/tablesorter/js/widgets/widget-math.js');
- $headerlib->add_jsfile('vendor_bundled/vendor/mottie/tablesorter/js/widgets/widget-pager.js');
- $headerlib->add_jsfile('vendor_bundled/vendor/mottie/tablesorter/js/widgets/widget-output.js'); // APTITUDE NEEDS THIS
+ $headerlib->add_jsfile('vendor_bundled/vendor/mottie/tablesorter/dist/js/jquery.tablesorter.combined.js');
+ $headerlib->add_jsfile('vendor_bundled/vendor/mottie/tablesorter/dist/js/parsers/parser-input-select.min.js');
+ $headerlib->add_jsfile('vendor_bundled/vendor/mottie/tablesorter/dist/js/widgets/widget-columnSelector.min.js');
+ $headerlib->add_jsfile('vendor_bundled/vendor/mottie/tablesorter/dist/js/widgets/widget-filter-formatter-jui.min.js');
+ $headerlib->add_jsfile('vendor_bundled/vendor/mottie/tablesorter/dist/js/widgets/widget-grouping.min.js');
+ $headerlib->add_jsfile('vendor_bundled/vendor/mottie/tablesorter/dist/js/widgets/widget-math.min.js');
+ $headerlib->add_jsfile('vendor_bundled/vendor/mottie/tablesorter/dist/js/widgets/widget-pager.min.js');
+ $headerlib->add_jsfile('vendor_bundled/vendor/mottie/tablesorter/dist/js/widgets/widget-output.min.js'); // APTITUDE NEEDS THIS
//currently only working when ajax is not used
- $headerlib->add_jsfile('vendor_bundled/vendor/mottie/tablesorter/js/widgets/widget-sort2Hash.js');
+ $headerlib->add_jsfile('vendor_bundled/vendor/mottie/tablesorter/dist/js/widgets/widget-sort2Hash.min.js');
$headerlib->add_jsfile('lib/jquery_tiki/tablesorter.js');
}
=====================================
vendor_bundled/composer.json
=====================================
@@ -208,7 +208,7 @@
"meyfa/php-svg": "^0.16",
"michelf/php-smartypants": "^1.8.1",
"montefuscolo/xmpp": "~0.8",
- "mottie/tablesorter": "^2.28",
+ "mottie/tablesorter": "^2.32",
"mrrio/jspdf": "1.5.3",
"nicolaskruchten/pivottable": "^2.20.0",
"nlgen/nlgen": "^0.18",
=====================================
vendor_bundled/composer.lock
=====================================
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "3406edb58e1cb160afd9ab7900a17703",
+ "content-hash": "22522cab4498d8c81d3f1684b3724675",
"packages": [
{
"name": "Sam152/Javascript-Equal-Height-Responsive-Rows",
@@ -6679,25 +6679,25 @@
},
{
"name": "nette/schema",
- "version": "v1.3.2",
+ "version": "v1.3.3",
"source": {
"type": "git",
"url": "https://github.com/nette/schema.git",
- "reference": "da801d52f0354f70a638673c4a0f04e16529431d"
+ "reference": "2befc2f42d7c715fd9d95efc31b1081e5d765004"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nette/schema/zipball/da801d52f0354f70a638673c4a0f04e16529431d",
- "reference": "da801d52f0354f70a638673c4a0f04e16529431d",
+ "url": "https://api.github.com/repos/nette/schema/zipball/2befc2f42d7c715fd9d95efc31b1081e5d765004",
+ "reference": "2befc2f42d7c715fd9d95efc31b1081e5d765004",
"shasum": ""
},
"require": {
"nette/utils": "^4.0",
- "php": "8.1 - 8.4"
+ "php": "8.1 - 8.5"
},
"require-dev": {
"nette/tester": "^2.5.2",
- "phpstan/phpstan-nette": "^1.0",
+ "phpstan/phpstan-nette": "^2.0@stable",
"tracy/tracy": "^2.8"
},
"type": "library",
@@ -6707,6 +6707,9 @@
}
},
"autoload": {
+ "psr-4": {
+ "Nette\\": "src"
+ },
"classmap": [
"src/"
]
@@ -6735,9 +6738,9 @@
],
"support": {
"issues": "https://github.com/nette/schema/issues",
- "source": "https://github.com/nette/schema/tree/v1.3.2"
+ "source": "https://github.com/nette/schema/tree/v1.3.3"
},
- "time": "2024-10-06T23:10:23+00:00"
+ "time": "2025-10-30T22:57:59+00:00"
},
{
"name": "nette/utils",
@@ -9101,16 +9104,16 @@
},
{
"name": "phpxmlrpc/phpxmlrpc",
- "version": "4.11.3",
+ "version": "4.11.4",
"source": {
"type": "git",
"url": "https://github.com/gggeek/phpxmlrpc.git",
- "reference": "9b071e4aaf025678dde1ef2bf843030339086cf4"
+ "reference": "cb7629a4abf36e70c6f0cdd76c2861e5e4ddd023"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/gggeek/phpxmlrpc/zipball/9b071e4aaf025678dde1ef2bf843030339086cf4",
- "reference": "9b071e4aaf025678dde1ef2bf843030339086cf4",
+ "url": "https://api.github.com/repos/gggeek/phpxmlrpc/zipball/cb7629a4abf36e70c6f0cdd76c2861e5e4ddd023",
+ "reference": "cb7629a4abf36e70c6f0cdd76c2861e5e4ddd023",
"shasum": ""
},
"require": {
@@ -9156,9 +9159,9 @@
],
"support": {
"issues": "https://github.com/gggeek/phpxmlrpc/issues",
- "source": "https://github.com/gggeek/phpxmlrpc/tree/4.11.3"
+ "source": "https://github.com/gggeek/phpxmlrpc/tree/4.11.4"
},
- "time": "2025-10-03T18:15:38+00:00"
+ "time": "2025-10-30T13:19:16+00:00"
},
{
"name": "pimple/pimple",
@@ -14917,16 +14920,16 @@
},
{
"name": "webmozart/assert",
- "version": "1.12.0",
+ "version": "1.12.1",
"source": {
"type": "git",
"url": "https://github.com/webmozarts/assert.git",
- "reference": "541057574806f942c94662b817a50f63f7345360"
+ "reference": "9be6926d8b485f55b9229203f962b51ed377ba68"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/webmozarts/assert/zipball/541057574806f942c94662b817a50f63f7345360",
- "reference": "541057574806f942c94662b817a50f63f7345360",
+ "url": "https://api.github.com/repos/webmozarts/assert/zipball/9be6926d8b485f55b9229203f962b51ed377ba68",
+ "reference": "9be6926d8b485f55b9229203f962b51ed377ba68",
"shasum": ""
},
"require": {
@@ -14969,9 +14972,9 @@
],
"support": {
"issues": "https://github.com/webmozarts/assert/issues",
- "source": "https://github.com/webmozarts/assert/tree/1.12.0"
+ "source": "https://github.com/webmozarts/assert/tree/1.12.1"
},
- "time": "2025-10-20T12:43:39+00:00"
+ "time": "2025-10-29T15:56:20+00:00"
},
{
"name": "zbateson/mail-mime-parser",
@@ -16414,12 +16417,12 @@
"source": {
"type": "git",
"url": "https://github.com/PHPCompatibility/PHPCompatibility.git",
- "reference": "8215564d0e8c0496964ded16727b0abfc2445ef6"
+ "reference": "ff4efdd80e094a81fd6329b570c9a632f21d42b4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibility/zipball/8215564d0e8c0496964ded16727b0abfc2445ef6",
- "reference": "8215564d0e8c0496964ded16727b0abfc2445ef6",
+ "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibility/zipball/ff4efdd80e094a81fd6329b570c9a632f21d42b4",
+ "reference": "ff4efdd80e094a81fd6329b570c9a632f21d42b4",
"shasum": ""
},
"require": {
@@ -16500,7 +16503,7 @@
"type": "thanks_dev"
}
],
- "time": "2025-10-27T23:12:46+00:00"
+ "time": "2025-10-30T20:24:19+00:00"
},
{
"name": "phpcsstandards/phpcsutils",
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/ebda17b5e4deaec1f9837a6f337e2d1378cdc65a
--
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/ebda17b5e4deaec1f9837a6f337e2d1378cdc65a
You're receiving this email because of your account on gitlab.com.
_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs