Skip to content

Commit

Permalink
fix: ee not being extended because no default export
Browse files Browse the repository at this point in the history
  • Loading branch information
alexandrebodin committed Apr 22, 2024
1 parent 0e2e3db commit bc85264
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion packages/core/admin/server/src/services/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import auth from './auth';
import user from './user';
import role from './role';
import passport from './passport';
import metrics from './metrics';
import * as token from './token';
import * as permission from './permission';
import * as metrics from './metrics';
import * as contentType from './content-type';
import * as constants from './constants';
import * as condition from './condition';
Expand Down
2 changes: 1 addition & 1 deletion packages/core/admin/server/src/services/metrics.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const startCron = (strapi: Strapi) => {
});
};

export {
export default {
sendDidInviteUser,
sendDidUpdateRolePermissions,
sendDidChangeInterfaceLanguage,
Expand Down
1 change: 1 addition & 0 deletions packages/core/admin/strapi-server.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ const mergeRoutes = (a, b, key) => {
if (strapi.EE) {
const eeAdmin = require('./dist/ee/server');
// module.exports = admin;
// TODO: change to avoid issue with lodash merging frozen objects
module.exports = _.mergeWith({}, admin, eeAdmin, mergeRoutes);
} else {
module.exports = admin;
Expand Down

0 comments on commit bc85264

Please sign in to comment.