From 2da2f13d09c678226c3c004d5a6f448e5ceb1904 Mon Sep 17 00:00:00 2001
From: bugsounet <github@bugsounet.fr>
Date: Fri, 13 Dec 2024 12:12:09 +0100
Subject: [PATCH 1/2] path resolve -- sub/sub folder

---
 CHANGELOG.md | 1 +
 js/app.js    | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18e8f9ebd9..fb3c165586 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -57,6 +57,7 @@ _This release is scheduled to be released on 2025-01-01._
 - [calendar] - fix showEnd for Full Day events #3602
 - [tests] Suppress "module is not defined" in e2e tests
 - [calendar] - fixes #3267 (styles array, really this time!)
+- [core] Fix module path in case of sub/sub folder is used and use path.resolve for resolve `moduleFolder` and `defaultModuleFolder` in app.js (#3xxx)
 
 ## [2.29.0] - 2024-10-01
 
diff --git a/js/app.js b/js/app.js
index 9d111c7eb9..0c2586af18 100644
--- a/js/app.js
+++ b/js/app.js
@@ -164,10 +164,10 @@ function App () {
 		const elements = module.split("/");
 		const moduleName = elements[elements.length - 1];
 		const env = getEnvVarsAsObj();
-		let moduleFolder = `${__dirname}/../${env.modulesDir}/${module}`;
+		let moduleFolder = path.resolve(`${__dirname}/../${env.modulesDir}`, module);
 
 		if (defaultModules.includes(moduleName)) {
-			const defaultModuleFolder = `${__dirname}/../modules/default/${module}`;
+			const defaultModuleFolder = path.resolve(`${__dirname}/../modules/default/`, module);
 			if (process.env.JEST_WORKER_ID === undefined) {
 				moduleFolder = defaultModuleFolder;
 			} else {
@@ -178,7 +178,7 @@ function App () {
 			}
 		}
 
-		const moduleFile = `${moduleFolder}/${module}.js`;
+		const moduleFile = `${moduleFolder}/${moduleName}.js`;
 
 		try {
 			fs.accessSync(moduleFile, fs.R_OK);

From 5ebeb5683c5c281b1ab37b6cb1fb634404668861 Mon Sep 17 00:00:00 2001
From: bugsounet <github@bugsounet.fr>
Date: Fri, 13 Dec 2024 12:35:17 +0100
Subject: [PATCH 2/2] add PR number

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb3c165586..9f1d357fc3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -57,7 +57,7 @@ _This release is scheduled to be released on 2025-01-01._
 - [calendar] - fix showEnd for Full Day events #3602
 - [tests] Suppress "module is not defined" in e2e tests
 - [calendar] - fixes #3267 (styles array, really this time!)
-- [core] Fix module path in case of sub/sub folder is used and use path.resolve for resolve `moduleFolder` and `defaultModuleFolder` in app.js (#3xxx)
+- [core] Fix module path in case of sub/sub folder is used and use path.resolve for resolve `moduleFolder` and `defaultModuleFolder` in app.js (#3653)
 
 ## [2.29.0] - 2024-10-01