From 07913a61da5c135e2f2e7c59c0c69a01d1d41c01 Mon Sep 17 00:00:00 2001 From: Blesilda Ramirez Date: Mon, 12 Aug 2024 23:44:35 +0800 Subject: [PATCH] pkp/pkp-lib#9753 Update composer script when copying jqueryui and jquery validation --- classes/dev/ComposerScript.php | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/classes/dev/ComposerScript.php b/classes/dev/ComposerScript.php index daae34171de..c8097cc8388 100644 --- a/classes/dev/ComposerScript.php +++ b/classes/dev/ComposerScript.php @@ -19,9 +19,11 @@ class ComposerScript { /** * A post-install-cmd custom composer script that - * copies node_module dependencies + * copies composer installs from repositories + * to the correct/existing directories of the following dependencies: + * jquery-ui and jquery validation */ - public static function copyNodeModuleDeps(): void + public static function copyVendorAssets(): void { function copyDir($src, $dst) { $dir = opendir($src); @@ -39,22 +41,28 @@ function copyDir($src, $dst) { } try { - $baseDir = __DIR__ . '/../../../../node_modules'; - $jqueryDist = $baseDir . '/jquery/dist'; - $jqueryUiDist = $baseDir . '/jquery-ui/dist'; + $vendorBaseDir = __DIR__ . '/../../lib/vendor'; + $jsPluginsDir = __DIR__ . '/../../js/lib'; + $jqueryPluginsDir = $jsPluginsDir . '/jquery/plugins'; $vendorComponents = __DIR__ . '/../../lib/vendor/components'; - if (!file_exists($vendorComponents . '/jquery')) { - mkdir($vendorComponents . '/jquery', 0755, true); - } + $jqueryUiDist = $vendorBaseDir . '/jquery/ui/dist'; + $jqueryValidationDist = $vendorBaseDir . '/jquery/validation/dist'; + $chartjsDist = $vendorBaseDir . '/chart/js/dist'; + + // jQuery UI if (!file_exists($vendorComponents . '/jqueryui')) { mkdir($vendorComponents . '/jqueryui', 0755, true); } - - copyDir($jqueryDist, $vendorComponents . '/jquery'); copy($jqueryUiDist . '/jquery-ui.js', $vendorComponents . '/jqueryui/jquery-ui.js'); copy($jqueryUiDist . '/jquery-ui.min.js', $vendorComponents . '/jqueryui/jquery-ui.min.js'); + // jQuery Validation + if (!file_exists($jqueryPluginsDir . '/validate')) { + mkdir($jqueryPluginsDir . '/validate', 0755, true); + } + copyDir($jqueryValidationDist, $jqueryPluginsDir . '/validate'); + } catch (Exception $e) { error_log($e->getMessage()); }