Merge remote-tracking branch 'origin/main' into v6

Author: WikiRik

package.json

@@ -21,27 +21,27 @@
     "yargs": "^16.2.0"
   },
   "devDependencies": {
-    "@babel/cli": "7.19.3",
-    "@babel/core": "7.19.6",
-    "@babel/preset-env": "7.19.4",
+    "@babel/cli": "7.20.7",
+    "@babel/core": "7.20.12",
+    "@babel/preset-env": "7.20.2",
     "@babel/register": "7.18.9",
-    "@commitlint/cli": "17.1.2",
-    "@commitlint/config-angular": "17.1.0",
+    "@commitlint/cli": "17.4.2",
+    "@commitlint/config-angular": "17.4.2",
     "bluebird": "3.7.2",
     "eslint": "7.32.0",
-    "eslint-config-prettier": "8.5.0",
+    "eslint-config-prettier": "8.6.0",
     "eslint-plugin-prettier": "4.2.1",
     "expect.js": "0.3.1",
     "gulp": "4.0.2",
-    "husky": "8.0.1",
-    "lint-staged": "13.0.3",
+    "husky": "8.0.3",
+    "lint-staged": "13.1.0",
     "mocha": "9.2.2",
     "mysql2": "latest",
     "pg": "latest",
     "pg-hstore": "latest",
-    "prettier": "2.7.1",
+    "prettier": "2.8.3",
     "semver": "7.3.8",
-    "sequelize": "6.25.3",
+    "sequelize": "6.28.0",
     "sqlite3": "latest",
     "through2": "4.0.2"
   },

src/assets/models/index.js

@@ -19,7 +19,12 @@ if (config.use_env_variable) {
 fs
   .readdirSync(__dirname)
   .filter(file => {
-    return (file.indexOf('.') !== 0) && (file !== basename) && (file.slice(-3) === '.js');
+    return (
+      file.indexOf('.') !== 0 &&
+      file !== basename &&
+      file.slice(-3) === '.js' &&
+      file.indexOf('.test.js') === -1
+    );
   })
   .forEach(file => {
     const model = require(path.join(__dirname, file))(sequelize, Sequelize.DataTypes);

src/helpers/view-helper.js

@@ -37,7 +37,7 @@ module.exports = {
 
     this.log();
     console.error(`${clc.red('ERROR:')} ${message}`);
-    if (error.original.detail) {
+    if (error.original && error.original.detail) {
       console.error(`${clc.red('ERROR DETAIL:')} ${error.original.detail}`);
     }