refactor: keep plain require() for entities and config

Using createRequire() for local files broke the ts-node, ending up with import issues Related: #685
mikro-orm · Aug 9, 2020 · 668363f · 668363f
1 parent 379b289
commit 668363f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/packages/core/src/metadata/MetadataDiscovery.ts b/packages/core/src/metadata/MetadataDiscovery.ts
@@ -695,7 +695,8 @@ export class MetadataDiscovery {
 
   private initEnumValues(prop: EntityProperty, path: string): void {
     path = Utils.normalizePath(this.config.get('baseDir'), path);
-    const exports = Utils.requireFrom(path, process.cwd());
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    const exports = require(path);
     const target = exports[prop.type] || exports.default;
 
     if (target) {
@@ -745,7 +746,8 @@ export class MetadataDiscovery {
   }
 
   private getEntityClassOrSchema(path: string, name: string) {
-    const exports = Utils.requireFrom(path, process.cwd());
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    const exports = require(path);
     const target = exports.default || exports[name];
     const schema = Object.values(exports).find(item => item instanceof EntitySchema);
 

diff --git a/packages/core/src/utils/ConfigurationLoader.ts b/packages/core/src/utils/ConfigurationLoader.ts
@@ -15,7 +15,8 @@ export class ConfigurationLoader {
       path = Utils.normalizePath(path);
 
       if (await pathExists(path)) {
-        const config = Utils.requireFrom(path, process.cwd());
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
+        const config = require(path);
         return new Configuration({ ...(config.default || config), ...options }, validate);
       }
     }