Diagram CJS module returns empty object

[codylindley]

Same issue as:

#2162

and

#2176