Merge branch 'main' of https://github.com/hotwax/threshold-management …

…into 224_channel_selection
hotwax · Jan 3, 2024 · bea7246 · bea7246
2 parents 62eb8e7 + dc138ad
commit bea7246
Show file tree

Hide file tree

Showing 11 changed files with 11,443 additions and 54,523 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -24,10 +24,7 @@ module.exports = {
       files: [
         '**/__tests__/*.{j,t}s?(x)',
         '**/tests/unit/**/*.spec.{j,t}s?(x)'
-      ],
-      env: {
-        jest: true
-      }
+      ]
     }
   ]
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
     "@casl/vue": "^2.2.0",
     "@hotwax/app-version-info": "^1.0.0",
     "@hotwax/apps-theme": "^1.1.0",
-    "@hotwax/dxp-components": "1.7.5",
+    "@hotwax/dxp-components": "1.11.0",
     "@hotwax/oms-api": "^1.10.0",
     "@ionic/core": "6.7.5",
     "@ionic/vue": "6.7.5",
@@ -41,27 +41,22 @@
   "devDependencies": {
     "@capacitor/cli": "^2.4.7",
     "@intlify/vue-i18n-loader": "^2.1.0",
-    "@types/jest": "^27.5.0",
     "@types/luxon": "^2.3.1",
     "@typescript-eslint/eslint-plugin": "~5.26.0",
     "@typescript-eslint/parser": "~5.26.0",
-    "@vue/cli-plugin-babel": "~4.5.0",
-    "@vue/cli-plugin-e2e-cypress": "~4.5.0",
+    "@vue/cli-plugin-babel": "~5.0.8",
+    "@vue/cli-plugin-e2e-cypress": "~5.0.8",
     "@vue/cli-plugin-eslint": "~5.0.8",
-    "@vue/cli-plugin-pwa": "^4.5.16",
-    "@vue/cli-plugin-router": "~4.5.0",
-    "@vue/cli-plugin-typescript": "~4.5.0",
-    "@vue/cli-plugin-unit-jest": "~4.5.0",
-    "@vue/cli-service": "~4.5.0",
+    "@vue/cli-plugin-pwa": "^5.0.8",
+    "@vue/cli-plugin-router": "~5.0.8",
+    "@vue/cli-plugin-typescript": "~5.0.8",
+    "@vue/cli-service": "~5.0.8",
     "@vue/compiler-sfc": "^3.0.0-0",
     "@vue/eslint-config-typescript": "^9.1.0",
     "@vue/test-utils": "^2.0.0-0",
-    "@vue/vue3-jest": "^28.0.0",
     "cypress": "^8.3.0",
     "eslint": "^7.32.0",
     "eslint-plugin-vue": "^8.0.3",
-    "jest": "^28.1.0",
-    "ts-jest": "^28.0.8",
     "typescript": "~4.7.4",
     "vue-cli-plugin-i18n": "^1.0.1"
   }

diff --git a/src/router/index.ts b/src/router/index.ts
@@ -14,7 +14,7 @@ import { showToast } from '@/utils'
 import { translate } from '@/i18n'
 
 import 'vue-router'
-import { Login, useAuthStore } from '@hotwax/dxp-components';
+import { DxpLogin, useAuthStore } from '@hotwax/dxp-components';
 import { loader } from '@/user-utils';
 
 // Defining types for the meta values
@@ -94,8 +94,8 @@ const routes: Array<RouteRecordRaw> = [
   },
   {
     path: '/login',
-    name: 'Login',
-    component: Login,
+    name: 'DxpLogin',
+    component: DxpLogin,
     beforeEnter: loginGuard
   },
   {

diff --git a/tests/e2e/.eslintrc.js b/tests/e2e/.eslintrc.js
diff --git a/tests/e2e/plugins/index.js b/tests/e2e/plugins/index.js
diff --git a/tests/e2e/specs/test.js b/tests/e2e/specs/test.js
diff --git a/tests/e2e/support/commands.js b/tests/e2e/support/commands.js
diff --git a/tests/e2e/support/index.js b/tests/e2e/support/index.js
diff --git a/tests/unit/example.spec.ts b/tests/unit/example.spec.ts
diff --git a/tsconfig.json b/tsconfig.json
@@ -12,8 +12,7 @@
     "sourceMap": true,
     "baseUrl": ".",
     "types": [
-      "webpack-env",
-      "jest"
+      "webpack-env"
     ],
     "paths": {
       "@/*": [