From: Jérôme Benoit <jerome.benoit@sap.com>
Date: Thu, 21 Jul 2022 18:01:37 +0000 (+0200)
Subject: Fix MikroORM CLI configuration template
X-Git-Tag: v1.1.64~8
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=f412fe241e02c715923bee7426e85a6725b78e21;p=e-mobility-charging-stations-simulator.git

Fix MikroORM CLI configuration template

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
---

diff --git a/mikro-orm.config-template.ts b/mikro-orm.config-template.ts
index 5f318c13..cd705071 100644
--- a/mikro-orm.config-template.ts
+++ b/mikro-orm.config-template.ts
@@ -1,16 +1,17 @@
-import Constants from './src/utils/Constants';
+import path from 'path';
+
+import { TsMorphMetadataProvider } from '@mikro-orm/reflection';
+
 import { PerformanceData } from './src/types/orm/entities/PerformanceData';
 import { PerformanceRecord } from './src/types/orm/entities/PerformanceRecord';
-import { TsMorphMetadataProvider } from '@mikro-orm/reflection';
-import { fileURLToPath } from 'url';
-import path from 'path';
+import Constants from './src/utils/Constants';
 
 export default {
   metadataProvider: TsMorphMetadataProvider,
   entities: [PerformanceRecord, PerformanceData],
   type: 'sqlite',
   clientUrl: `file://${path.join(
-    path.resolve(path.dirname(fileURLToPath(import.meta.url))),
+    path.resolve(__dirname),
     `${Constants.DEFAULT_PERFORMANCE_RECORDS_DB_NAME}.db`
   )}`,
 };
diff --git a/package-lock.json b/package-lock.json
index 9f928335..9535f446 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,7 +13,7 @@
         "@mikro-orm/mariadb": "^5.2.3",
         "@mikro-orm/reflection": "^5.2.3",
         "@mikro-orm/sqlite": "^5.2.3",
-        "basic-ftp": "^5.0.0",
+        "basic-ftp": "^5.0.1",
         "chalk": "^4.1.2",
         "express": "^4.18.1",
         "mnemonist": "^0.39.2",
@@ -3008,9 +3008,9 @@
       ]
     },
     "node_modules/basic-ftp": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.0.tgz",
-      "integrity": "sha512-LfrLRg+0ABgPscI2p+XacVoxrNuCC0SEXzdBDstR2ACHf72eLqyIU31yELAW5EnwfwL8IOW11nY7u2igxVd6oQ==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.1.tgz",
+      "integrity": "sha512-0NbZDftWLby3hCH7rVht7dlpp1Bc3Qp3uO99521/6gP9SYWQ6L/e6GBBvKdKZGCdF7bI6us8XhQtgxPefSo+yg==",
       "engines": {
         "node": ">=10.0.0"
       }
@@ -20076,9 +20076,9 @@
       "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
     },
     "basic-ftp": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.0.tgz",
-      "integrity": "sha512-LfrLRg+0ABgPscI2p+XacVoxrNuCC0SEXzdBDstR2ACHf72eLqyIU31yELAW5EnwfwL8IOW11nY7u2igxVd6oQ=="
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.1.tgz",
+      "integrity": "sha512-0NbZDftWLby3hCH7rVht7dlpp1Bc3Qp3uO99521/6gP9SYWQ6L/e6GBBvKdKZGCdF7bI6us8XhQtgxPefSo+yg=="
     },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
diff --git a/package.json b/package.json
index 6d033b14..cdc0c557 100644
--- a/package.json
+++ b/package.json
@@ -84,7 +84,7 @@
     "@mikro-orm/mariadb": "^5.2.3",
     "@mikro-orm/reflection": "^5.2.3",
     "@mikro-orm/sqlite": "^5.2.3",
-    "basic-ftp": "^5.0.0",
+    "basic-ftp": "^5.0.1",
     "chalk": "^4.1.2",
     "express": "^4.18.1",
     "mnemonist": "^0.39.2",
diff --git a/rollup.config.mjs b/rollup.config.mjs
index bdc96d66..1cb306ab 100644
--- a/rollup.config.mjs
+++ b/rollup.config.mjs
@@ -1,8 +1,8 @@
+import json from '@rollup/plugin-json';
 import analyze from 'rollup-plugin-analyzer';
 import copy from 'rollup-plugin-copy';
 import del from 'rollup-plugin-delete';
 import istanbul from 'rollup-plugin-istanbul';
-import json from '@rollup/plugin-json';
 import { terser } from 'rollup-plugin-terser';
 import ts from 'rollup-plugin-ts';