From 7e9beb0bb0169a7b79db98fc300ca049b9c6b236 Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Thu, 27 Aug 2026 22:00:44 +0000 Subject: [PATCH] Bug 43401: Send compiled js vue for the OPAC to the right dir The OPAC vue bundle (koha-tmpl/opac-tmpl/bootstrap/js/vue/dist) was not handled like its intranet counterpart in Makefile.PL: exclude it from the generic target map and copy it explicitly into blib in move_compiled_js. Test plan: 1. In a KTD shell, from the koha checkout: perl Makefile.PL (accept the defaults, 'standard' install mode is fine) 2. make -n move_compiled_js | grep 'js/vue/dist' => without this patch only the intranet cp line is printed; with it there is also a line copying koha-tmpl/opac-tmpl/bootstrap/js/vue/dist into blib/OPAC_TMPL_DIR/bootstrap/js/vue/ 3. make 4. ls blib/INTRANET_TMPL_DIR/prog/js/vue/dist blib/OPAC_TMPL_DIR/bootstrap/js/vue/dist => both directories exist and contain the compiled bundles (e.g. islands.esm.js); no vue/dist directory is left anywhere else under blib. 5. git clean -xdf blib pm_to_blib Makefile Makefile.old && git checkout -- . to clean up. Signed-off-by: Paul Derscheid Signed-off-by: David Cook Signed-off-by: Lucas Gass --- Makefile.PL | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/Makefile.PL b/Makefile.PL index 6ce7a9c09c..3e2365c75b 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -393,23 +393,24 @@ my $target_map = { './virtualshelves' => 'INTRANET_CGI_DIR', # ignore files and directories created by the install itself - './pm_to_blib' => 'NONE', - './blib' => 'NONE', - '.git-blame-ignore-revs' => 'NONE', - './.github' => 'NONE', - '.prettierrc.js' => 'NONE', - '.sass-lint.yml' => 'NONE', - '.scss-lint.yml' => 'NONE', - 'gulpfile.js' => 'NONE', - 'package.json' => 'NONE', - 'yarn.lock' => 'NONE', - 'cypress.config.ts' => 'NONE', - 'tsconfig.json' => 'NONE', - 'webpack.config.js' => 'NONE', - 'rspack.config.js' => 'NONE', - 'eslint.config.mjs' => 'NONE', - '.codespell-ignore' => 'NONE', - './koha-tmpl/intranet-tmpl/prog/js/vue/dist' => 'NONE', + './pm_to_blib' => 'NONE', + './blib' => 'NONE', + '.git-blame-ignore-revs' => 'NONE', + './.github' => 'NONE', + '.prettierrc.js' => 'NONE', + '.sass-lint.yml' => 'NONE', + '.scss-lint.yml' => 'NONE', + 'gulpfile.js' => 'NONE', + 'package.json' => 'NONE', + 'yarn.lock' => 'NONE', + 'cypress.config.ts' => 'NONE', + 'tsconfig.json' => 'NONE', + 'webpack.config.js' => 'NONE', + 'rspack.config.js' => 'NONE', + 'eslint.config.mjs' => 'NONE', + '.codespell-ignore' => 'NONE', + './koha-tmpl/intranet-tmpl/prog/js/vue/dist' => 'NONE', + './koha-tmpl/opac-tmpl/bootstrap/js/vue/dist' => 'NONE', }; =head1 CONFIGURATION OPTIONS @@ -1942,6 +1943,8 @@ sub top_targets { #NOTE: Copy the generated vue dist files into the relevant blib $compile_step .= "move_compiled_js: compile_css_js pm_to_blib\n"; $compile_step .= "\t" . 'cp -r koha-tmpl/intranet-tmpl/prog/js/vue/dist blib/INTRANET_TMPL_DIR/prog/js/vue/' . "\n"; + $compile_step .= + "\t" . 'cp -r koha-tmpl/opac-tmpl/bootstrap/js/vue/dist blib/OPAC_TMPL_DIR/bootstrap/js/vue/' . "\n"; $compile_step .= "\n"; my $top_targets = $compile_step . "\n" . $inherited;