Skip to content

Commit c485ff6

Browse files
bugsounetrejas
andauthored
path resolve and sub/sub folder module (#3653)
Fix: - use `path.resolve` for `moduleFolder` and `defaultModuleFolder` path - Fix module path in case of sub/sub folder is used (sample `module/test/test`) --- case of module installation on `module/test/test`: config will be: ```js { module: "test/test", ... } ``` module core will be: ```js Module.register("test", { ... ``` `test.js` is used for module core (no change) --- case of module installation on `module/test` (no change): config will be: ```js { module: "test", ... } ``` module core will be: ```js Module.register("test", { ... ``` so `test.js` is used for module core --- In reality, with this patch, `module` config feature have 2 functionalites: - determinate module path with more precision - allow to use sub/sub folder in modules folder --------- Co-authored-by: Veeck <[email protected]>
1 parent b910c60 commit c485ff6

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
@@ -54,6 +54,7 @@ _This release is scheduled to be released on 2025-01-01._
5454
- [core] Fix missing `basePath` where `location.host` is used (#3613)
5555
- [compliments] croner library changed filenames used in latest version (#3624)
5656
- [linter] Fix ESLint ignore pattern which caused that default modules not to be linted (#3632)
57+
- [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)
5758
- [calendar] Update to resolve issues #3098 #3144 #3351 #3422 #3443 #3467 #3537 related to timezone changes
5859
- [calendar] Fix #3267 (styles array), also fixes event with both exdate AND recurrence(and testcase)
5960
- [calendar] Fix showEndsOnlyWithDuration not working, #3598, applies ONLY to full day events

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)