Skip to content

Commit 2da2f13

Browse files
committed
path resolve -- sub/sub folder
1 parent 5232f46 commit 2da2f13

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ _This release is scheduled to be released on 2025-01-01._
5757
- [calendar] - fix showEnd for Full Day events #3602
5858
- [tests] Suppress "module is not defined" in e2e tests
5959
- [calendar] - fixes #3267 (styles array, really this time!)
60+
- [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)
6061

6162
## [2.29.0] - 2024-10-01
6263

js/app.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,10 +164,10 @@ function App () {
164164
const elements = module.split("/");
165165
const moduleName = elements[elements.length - 1];
166166
const env = getEnvVarsAsObj();
167-
let moduleFolder = `${__dirname}/../${env.modulesDir}/${module}`;
167+
let moduleFolder = path.resolve(`${__dirname}/../${env.modulesDir}`, module);
168168

169169
if (defaultModules.includes(moduleName)) {
170-
const defaultModuleFolder = `${__dirname}/../modules/default/${module}`;
170+
const defaultModuleFolder = path.resolve(`${__dirname}/../modules/default/`, module);
171171
if (process.env.JEST_WORKER_ID === undefined) {
172172
moduleFolder = defaultModuleFolder;
173173
} else {
@@ -178,7 +178,7 @@ function App () {
178178
}
179179
}
180180

181-
const moduleFile = `${moduleFolder}/${module}.js`;
181+
const moduleFile = `${moduleFolder}/${moduleName}.js`;
182182

183183
try {
184184
fs.accessSync(moduleFile, fs.R_OK);

0 commit comments

Comments
 (0)