Merge branch 'next' into newarchitecture

# Conflicts:
#	.eslintrc.json
#	package.json
#	plugins/views/scripts/omitViewSegments.js

Author: Cookiezaurs

.codacy.yml

@@ -7,11 +7,9 @@ exclude_paths:
   - 'frontend/express/public/localization/**'
   - 'frontend/express/public/fonts/**'
   - 'frontend/express/public/images/**'
-  - 'frontend/express/public/stylesheets/amaranjs/**'
   - 'frontend/express/public/stylesheets/font-awesome/**'
   - 'frontend/express/public/stylesheets/ionicons/**'
   - 'frontend/express/public/stylesheets/material/**'
-  - 'frontend/express/public/stylesheets/selectize/**'
   - 'bin/backup/**'
   - 'bin/upgrade/**'
   - 'bin/**'

.eslintrc.json

@@ -1,7 +1,7 @@
 {
     "extends": "eslint:recommended",
     "rules": {
-//        "quotes": ["warn", "single", { "avoidEscape": true }],
+        //        "quotes": ["warn", "single", { "avoidEscape": true }],
         "require-atomic-updates": "off",
         "block-spacing": [
             "error",
@@ -377,28 +377,16 @@
         {
             "files": [
                 "plugins/content/frontend/content-blocks/**/*.js",
-                "plugins/journey_engine/frontend/builder/**/*.js",
-                "plugins/content/frontend/content-blocks/**/*.vue",
-                "plugins/journey_engine/frontend/builder/**/*.vue"
-            ],
-            "plugins": [
-                "vue",
-                "@stylistic"
+                "plugins/journey_engine/frontend/builder/**/*.js"
             ],
             "extends": [
-                "eslint:recommended",
-                "plugin:vue/vue3-essential",
-                "plugin:vue/vue3-strongly-recommended",
-                "plugin:vue/vue3-recommended"
+                "eslint:recommended"
             ],
             "rules": {
-                // override these post initial content release, to make them fit with countly convention
                 "no-console": ["error"],
-                "@stylistic/quotes": ["error", "single"],
-                "@stylistic/quote-props": ["error", "as-needed"],
-                "no-unused-vars": "off",
-                "vue/no-unused-vars": ["error", {
-                    "ignorePattern": "^_"
+                "no-unused-vars": ["error", {
+                    "argsIgnorePattern": "^_",   // unused function args
+                    "varsIgnorePattern": "^_"    // unused variables
                 }]
             },
             "parserOptions": {
@@ -511,7 +499,6 @@
         {
             "files": [
                 "api/**/*.js",
-                "jobServer/**/*.js",
                 "frontend/express/*.js",
                 "frontend/express/libs/*.js",
                 "plugins/pluginManager.js",