Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions packages/@n8n/api-types/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,15 @@
"@n8n/vitest-config": "workspace:*",
"@vitest/coverage-v8": "catalog:",
"vitest": "catalog:",
"vitest-mock-extended": "catalog:"
"vitest-mock-extended": "catalog:",
"zod": "catalog:"
},
"dependencies": {
"n8n-workflow": "workspace:*",
"xss": "catalog:",
"zod": "catalog:",
"@n8n/permissions": "workspace:*"
},
"peerDependencies": {
"zod": "catalog:"
}
}
13 changes: 11 additions & 2 deletions packages/@n8n/backend-common/src/modules/module-registry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,20 @@ export class ModuleRegistry {
for (const moduleName of modules ?? this.eligibleModules) {
try {
await import(`${modulesDir}/${moduleName}/${moduleName}.module`);
} catch {
} catch (primaryError) {
try {
await import(`${modulesDir}/${moduleName}.ee/${moduleName}.module`);
} catch (error) {
throw new MissingModuleError(moduleName, error instanceof Error ? error.message : '');
const loggedError =
primaryError instanceof Error &&
'code' in primaryError &&
primaryError.code !== 'MODULE_NOT_FOUND'
? primaryError
: error;
throw new MissingModuleError(
moduleName,
loggedError instanceof Error ? loggedError.message : '',
);
}
Comment thread
lucamattiazzi marked this conversation as resolved.
}
}
Expand Down
9 changes: 6 additions & 3 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,11 @@
"@types/mime-types": "catalog:",
"@types/proxy-from-env": "^1.0.4",
"@types/uuid": "catalog:",
"@types/xml2js": "catalog:"
"@types/xml2js": "catalog:",
"zod": "catalog:"
},
"peerDependencies": {
"zod": "catalog:"
},
"dependencies": {
"@aws-sdk/client-s3": "3.808.0",
Expand Down Expand Up @@ -78,7 +82,6 @@
"ssh2": "1.15.0",
"uuid": "catalog:",
"winston": "3.14.2",
"xml2js": "catalog:",
"zod": "catalog:"
"xml2js": "catalog:"
}
}
7 changes: 5 additions & 2 deletions packages/workflow/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@
"@types/md5": "^2.3.5",
"@types/xml2js": "catalog:",
"vitest": "catalog:",
"vitest-mock-extended": "catalog:"
"vitest-mock-extended": "catalog:",
"zod": "catalog:"
},
"dependencies": {
"@n8n/errors": "workspace:*",
Expand All @@ -69,7 +70,9 @@
"transliteration": "2.3.5",
"uuid": "catalog:",
"xml2js": "catalog:",
"zod": "catalog:",
"jsonrepair": "catalog:"
},
"peerDependencies": {
"zod": "catalog:"
}
}
25 changes: 10 additions & 15 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading