@mikro-orm/cli 7.1.0-dev.20 → 7.1.0-dev.22
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CLIHelper.js +3 -2
- package/package.json +3 -3
package/CLIHelper.js
CHANGED
|
@@ -24,7 +24,6 @@ export class CLIHelper {
|
|
|
24
24
|
}
|
|
25
25
|
contextName ??= process.env.MIKRO_ORM_CONTEXT_NAME ?? 'default';
|
|
26
26
|
const env = await this.loadEnvironmentVars();
|
|
27
|
-
await loadOptionalDependencies(options);
|
|
28
27
|
// oxfmt-ignore
|
|
29
28
|
const configFinder = (cfg) => {
|
|
30
29
|
return typeof cfg === 'object' && cfg !== null && ('contextName' in cfg ? cfg.contextName === contextName : contextName === 'default');
|
|
@@ -35,7 +34,9 @@ export class CLIHelper {
|
|
|
35
34
|
const result = await this.getConfigFile(paths);
|
|
36
35
|
if (!result[0]) {
|
|
37
36
|
if (Utils.hasObjectKeys(env)) {
|
|
38
|
-
|
|
37
|
+
const merged = Utils.mergeConfig({ contextName }, options.preferEnvVars ? options : env, options.preferEnvVars ? env : options);
|
|
38
|
+
await loadOptionalDependencies(merged);
|
|
39
|
+
return new Configuration(merged);
|
|
39
40
|
}
|
|
40
41
|
throw new Error(`MikroORM config file not found in ['${paths.join(`', '`)}']`);
|
|
41
42
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mikro-orm/cli",
|
|
3
|
-
"version": "7.1.0-dev.
|
|
3
|
+
"version": "7.1.0-dev.22",
|
|
4
4
|
"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.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"data-mapper",
|
|
@@ -50,8 +50,8 @@
|
|
|
50
50
|
"copy": "node ../../scripts/copy.mjs"
|
|
51
51
|
},
|
|
52
52
|
"dependencies": {
|
|
53
|
-
"@mikro-orm/core": "7.1.0-dev.
|
|
54
|
-
"mikro-orm": "7.1.0-dev.
|
|
53
|
+
"@mikro-orm/core": "7.1.0-dev.22",
|
|
54
|
+
"mikro-orm": "7.1.0-dev.22",
|
|
55
55
|
"yargs": "17.7.2"
|
|
56
56
|
},
|
|
57
57
|
"engines": {
|