integrate bundled version with fhcbuildversion in url path, making duplicate fhcbuildversion in rollup.fhcbuildconfig.js obsolete, update apps bundles

application/helpers/hlp_header_helper.php

@@ -191,9 +191,9 @@ function generateJSModulesInclude($JSModules)
 			$item = $tmpJSs[$tmpJSsCounter];
 			if($use_bundled_javascript)
 			{
-				$item = str_replace('/public/', '/public/dist/', $item);
+				$item = preg_replace('#^public/#', 'public/dist/', $item);
 			}
-
+			echo "<!--{$item}-->".PHP_EOL;
 			if($ci->config->item('use_fhcomplete_build_version_in_path'))
 			{
 				$relurl = preg_replace('#public/#', 'public/' . $ci->config->item('fhcomplete_build_version') . '/', $item);

package.json

@@ -8,12 +8,6 @@
     "watch": "rollup --watch -c"
   },
   "dependencies": {
-    "@vuepic/vue-datepicker": "^7.2.0",
-    "axios": "^1.6.8",
-    "primevue": "^3.29.1",
-    "tabulator-tables": "^5.5.2",
-    "vue": "^3.3.8",
-    "vue-router": "^4.1.3"
   },
   "devDependencies": {
     "@rollup/plugin-alias": "^5.1.0",
@@ -24,7 +18,7 @@
     "@rollup/plugin-replace": "^5.0.5",
     "@rollup/plugin-terser": "^0.4.4",
     "babel-plugin-transform-class-properties": "^6.24.1",
-    "glob": "^11.0.3",
+    "glob": "^13.0.6",
     "node-sass": "^9.0.0",
     "rollup": "^4.52.4",
     "rollup-plugin-postcss": "^4.0.2",

rollup.config.js

@@ -1,4 +1,3 @@
-import fhcBuildConfig from './rollup.fhcbuildconfig.js';
 import babel from '@rollup/plugin-babel';
 import { globSync } from 'glob';
 import path from 'node:path';
@@ -10,7 +9,6 @@ import json from '@rollup/plugin-json';
 
 const debug = (process.env.DEBUG !== undefined) && (process.env.DEBUG === "true");
 
-const buildversion = fhcBuildConfig.fhcBuildVersion;
 const fhcbasepath = import.meta.dirname;
 
 let apps = {};
@@ -43,7 +41,7 @@ function FhcResolver () {
 
       if( source.includes('index.ci.php') ) {
 	let source_abs = fhcbasepath + '/' + source.replace(/(\.\.\/)+/, '');
-	let source_rel = path.relative(path.dirname(curapp), source_abs) + '?' + buildversion;
+	let source_rel = path.relative(path.dirname(curapp), source_abs);
 
 	debug && console.log('SOURCE_ABS:' + source_abs + 'APP: ' + curapp + 'SOURCE_REL: ' + source_rel);
 
@@ -55,7 +53,7 @@ function FhcResolver () {
 	if(source_abs.match(/\/FHC-Core-[^\/]+\/public\//)) {
 	  source_abs = fhcbasepath + source_abs.replace(/^.+?\/(FHC-Core-[^\/]+)\/public\//, '/public/extensions/$1/');
 	}
-	let source_rel = path.relative(path.dirname(curapp), source_abs) + '?' + buildversion;
+	let source_rel = path.relative(path.dirname(curapp), source_abs);
 
 	debug && console.log('SOURCE_ABS:' + source_abs + 'APP: ' + curapp + 'SOURCE_REL: ' + source_rel);
 

rollup.fhcbuildconfig.js

@@ -1,5 +0,0 @@
-const fhcBuildConfig = {
-  fhcBuildVersion: '2025121701'
-}
-
-export default fhcBuildConfig;