@mikro-orm/core 7.0.0-dev.28 → 7.0.0-dev.29

package/MikroORM.js

@@ -35,7 +35,6 @@ export class MikroORM {
             }
         }
         options = Utils.mergeConfig(options, env);
-        ConfigurationLoader.commonJSCompat(options);
         if ('DRIVER' in this && !options.driver) {
             options.driver = this.DRIVER;
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mikro-orm/core",
   "type": "module",
-  "version": "7.0.0-dev.28",
+  "version": "7.0.0-dev.29",
   "description": "TypeScript ORM for Node.js based on Data Mapper, Unit of Work and Identity Map patterns. Supports MongoDB, MySQL, PostgreSQL and SQLite databases as well as usage with vanilla JavaScript.",
   "exports": {
     "./package.json": "./package.json",
@@ -54,7 +54,7 @@
     "dataloader": "2.2.3",
     "dotenv": "17.2.3",
     "esprima": "4.0.1",
-    "mikro-orm": "7.0.0-dev.28",
+    "mikro-orm": "7.0.0-dev.29",
     "reflect-metadata": "0.2.2",
     "tinyglobby": "0.2.13"
   }

package/utils/Configuration.d.ts

@@ -146,7 +146,6 @@ export declare class Configuration<D extends IDatabaseDriver = IDatabaseDriver,
             fileName: (className: string) => string;
         };
         preferReadReplicas: true;
-        dynamicImportProvider: (id: string) => Promise<any>;
     };
     private readonly options;
     private readonly logger;
@@ -414,6 +413,5 @@ export interface MikroORMOptions<D extends IDatabaseDriver = IDatabaseDriver, EM
     seeder: SeederOptions;
     preferReadReplicas: boolean;
     hashAlgorithm: 'md5' | 'sha256';
-    dynamicImportProvider: (id: string) => Promise<unknown>;
 }
 export type Options<D extends IDatabaseDriver = IDatabaseDriver, EM extends D[typeof EntityManagerType] & EntityManager = D[typeof EntityManagerType] & EntityManager> = Pick<MikroORMOptions<D, EM>, Exclude<keyof MikroORMOptions<D, EM>, keyof typeof Configuration.DEFAULTS>> & Partial<MikroORMOptions<D, EM>>;

package/utils/Configuration.js

@@ -134,7 +134,6 @@ export class Configuration {
             fileName: (className) => className,
         },
         preferReadReplicas: true,
-        dynamicImportProvider: /* v8 ignore next */ (id) => import(id),
     };
     options;
     logger;
@@ -143,9 +142,6 @@ export class Configuration {
     cache = new Map();
     extensions = new Map();
     constructor(options, validate = true) {
-        if (options.dynamicImportProvider) {
-            Utils.setDynamicImportProvider(options.dynamicImportProvider);
-        }
         this.options = Utils.mergeConfig({}, Configuration.DEFAULTS, options);
         this.options.baseDir = Utils.absolutePath(this.options.baseDir);
         this.options.preferTs ??= options.preferTs;

package/utils/ConfigurationLoader.d.ts

@@ -40,8 +40,6 @@ export declare class ConfigurationLoader {
     static loadEnvironmentVars<D extends IDatabaseDriver>(): Promise<Partial<Options<D>>>;
     static loadEnvironmentVarsSync<D extends IDatabaseDriver>(): Partial<Options<D>>;
     static getORMPackages(): Set<string>;
-    /** @internal */
-    static commonJSCompat(options: Partial<Options>): void;
     static getORMPackageVersion(name: string): string | undefined;
     static checkPackageVersion(): string;
 }

package/utils/ConfigurationLoader.js

@@ -1,7 +1,5 @@
 import dotenv from 'dotenv';
 import { realpathSync } from 'node:fs';
-import { platform } from 'node:os';
-import { fileURLToPath } from 'node:url';
 import { colors } from '../logging/colors.js';
 import { Configuration } from './Configuration.js';
 import { Utils } from './Utils.js';
@@ -12,7 +10,6 @@ export class ConfigurationLoader {
     static async getConfiguration(contextName = 'default', paths = ConfigurationLoader.getConfigPaths(), options = {}) {
         // Backwards compatibility layer
         if (typeof contextName === 'boolean' || !Array.isArray(paths)) {
-            this.commonJSCompat(options);
             this.registerDotenv(options);
             const configPathFromArg = ConfigurationLoader.configPathsFromArg();
             const configPaths = configPathFromArg ?? (Array.isArray(paths) ? paths : ConfigurationLoader.getConfigPaths());
@@ -300,25 +297,6 @@ export class ConfigurationLoader {
             ...Object.keys(pkg.devDependencies ?? {}),
         ]);
     }
-    /** @internal */
-    static commonJSCompat(options) {
-        if (this.isESM()) {
-            return;
-        }
-        /* v8 ignore next 11 */
-        options.dynamicImportProvider ??= id => {
-            if (platform() === 'win32') {
-                try {
-                    id = fileURLToPath(id);
-                }
-                catch {
-                    // ignore
-                }
-            }
-            return Utils.requireFrom(id);
-        };
-        Utils.setDynamicImportProvider(options.dynamicImportProvider);
-    }
     static getORMPackageVersion(name) {
         try {
             const pkg = Utils.requireFrom(`${name}/package.json`);

package/utils/Utils.d.ts

@@ -15,7 +15,6 @@ export declare function equals(a: any, b: any): boolean;
 export declare function parseJsonSafe<T = unknown>(value: unknown): T;
 export declare class Utils {
     static readonly PK_SEPARATOR = "~~~";
-    static dynamicImportProvider: (id: string) => Promise<any>;
     /**
      * Checks if the argument is not undefined
      */
@@ -237,7 +236,6 @@ export declare class Utils {
      */
     static resolveModulePath(id: string, from?: string): string;
     static dynamicImport<T = any>(id: string): Promise<T>;
-    static setDynamicImportProvider(provider: (id: string) => Promise<unknown>): void;
     static ensureDir(path: string): void;
     static pathExistsSync(path: string): boolean;
     static readJSONSync(path: string): Dictionary;

package/utils/Utils.js

@@ -1,7 +1,6 @@
 import { createRequire } from 'node:module';
 import { glob, isDynamicPattern } from 'tinyglobby';
 import { extname, isAbsolute, join, normalize, relative, resolve } from 'node:path';
-import { platform } from 'node:os';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import { existsSync, mkdirSync, readFileSync } from 'node:fs';
 import { createHash } from 'node:crypto';
@@ -132,8 +131,6 @@ export function parseJsonSafe(value) {
 }
 export class Utils {
     static PK_SEPARATOR = '~~~';
-    /* v8 ignore next */
-    static dynamicImportProvider = (id) => import(id);
     /**
      * Checks if the argument is not undefined
      */
@@ -908,21 +905,9 @@ export class Utils {
         return parts.join('/');
     }
     static async dynamicImport(id) {
-        /* v8 ignore next 7 */
-        if (platform() === 'win32') {
-            try {
-                id = pathToFileURL(id).toString();
-            }
-            catch {
-                // ignore
-            }
-        }
         /* v8 ignore next */
-        return this.dynamicImportProvider(id);
-    }
-    /* v8 ignore next 3 */
-    static setDynamicImportProvider(provider) {
-        this.dynamicImportProvider = provider;
+        const specifier = id.startsWith('file://') ? id : pathToFileURL(id).href;
+        return import(specifier);
     }
     static ensureDir(path) {
         if (!existsSync(path)) {