fix(core): compile with module: 'Node16' to have real dynamic impor…

…ts (#3439)
mikro-orm · Aug 31, 2022 · 50347ef · 50347ef
1 parent 4870d58
commit 50347ef
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 12 deletions.
diff --git a/packages/cli/src/commands/GenerateEntitiesCommand.ts b/packages/cli/src/commands/GenerateEntitiesCommand.ts
@@ -1,4 +1,5 @@
 import type { ArgumentsCamelCase, Argv, CommandModule } from 'yargs';
+import { Utils } from '@mikro-orm/core';
 import type { EntityManager } from '@mikro-orm/knex';
 import { CLIHelper } from '../CLIHelper';
 
@@ -45,7 +46,7 @@ export class GenerateEntitiesCommand<U extends Options = Options> implements Com
     }
 
     const orm = await CLIHelper.getORM(false);
-    const { EntityGenerator } = await import('@mikro-orm/entity-generator');
+    const { EntityGenerator } = await Utils.dynamicImport('@mikro-orm/entity-generator');
     const generator = new EntityGenerator(orm.em as EntityManager);
     const dump = await generator.generate({ save: args.save, baseDir: args.path, schema: args.schema });
 

diff --git a/packages/core/src/utils/ConfigurationLoader.ts b/packages/core/src/utils/ConfigurationLoader.ts
@@ -50,7 +50,7 @@ export class ConfigurationLoader {
     if (await pathExists(`${basePath}/package.json`)) {
       /* istanbul ignore next */
       try {
-        return await import(`${basePath}/package.json`);
+        return await Utils.dynamicImport(`${basePath}/package.json`);
       } catch {
         return {};
       }

diff --git a/packages/core/src/utils/Utils.ts b/packages/core/src/utils/Utils.ts
@@ -860,16 +860,12 @@ export class Utils {
       }
     }
 
-    if (id.endsWith('.ts')) {
-      id.replace(/\.ts$/, '.js');
-    }
-
     if (process.env.TS_JEST) {
-      return import(id);
+      return require(id);
     }
 
     /* istanbul ignore next */
-    const ret = await Function(`return import('${id}')`)();
+    const ret = await import(id);
     return ret.default ?? ret;
   }
 

diff --git a/packages/migrations/src/Migrator.ts b/packages/migrations/src/Migrator.ts
@@ -233,7 +233,7 @@ export class Migrator implements IMigrator {
       return DatabaseSchema.create(this.driver.getConnection(), this.driver.getPlatform(), this.config);
     }
 
-    const data = await import(this.snapshotPath);
+    const data = await Utils.dynamicImport(this.snapshotPath);
     const schema = new DatabaseSchema(this.driver.getPlatform(), this.config.get('schema'));
     const { tables, namespaces, ...rest } = data;
     const tableInstances = tables.map((tbl: Dictionary) => {

diff --git a/tests/issues/GH1664.test.ts b/tests/issues/GH1664.test.ts
@@ -1,5 +1,5 @@
 import { Entity, MikroORM, PrimaryKey, Property } from '@mikro-orm/core';
-import type { PostgreSqlDriver } from '@mikro-orm/postgresql/src';
+import type { PostgreSqlDriver } from '@mikro-orm/postgresql';
 import { mockLogger } from '../helpers';
 
 @Entity()

diff --git a/tsconfig.build.json b/tsconfig.build.json
@@ -1,9 +1,9 @@
 {
   "compilerOptions": {
-    "module": "commonjs",
+    "module": "Node16",
     "target": "es2020",
     "lib": ["es2020"],
-    "moduleResolution": "node",
+    "moduleResolution": "Node16",
     "declaration": true,
     "sourceMap": false,
     "strict": true,