From 524a6ed175847ef508a76931633bb3f6cc2274d9 Mon Sep 17 00:00:00 2001 From: Deep Panchal Date: Thu, 14 Jul 2022 16:07:01 -0500 Subject: [PATCH 01/53] feat(deps): add deps to help with vue 3 migration --- package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 347a561fd..d227edd9b 100644 --- a/package.json +++ b/package.json @@ -59,6 +59,7 @@ "@vue/babel-helper-vue-jsx-merge-props": "^1.2.1", "@vue/babel-preset-jsx": "^1.2.4", "@vue/cli": "4.5.17", + "@vue/compat": "^3.1.0", "@vue/composition-api": "^1.2.1", "@vuex-orm/core": "^0.36.3", "@vuex-orm/plugin-axios": "^0.9.4", @@ -114,7 +115,7 @@ "unique-names-generator": "^4.3.0", "v-calendar": "^2.4.1", "v-tooltip": "^2.0.3", - "vue": "2.6.12", + "vue": "^3.1.0", "vue-autosuggest": "^2.2.0", "vue-axios": "^2.1.5", "vue-browser-acl": "^0.15.2", @@ -196,6 +197,7 @@ "@vue/cli-plugin-typescript": "~4.5.17", "@vue/cli-plugin-unit-jest": "^5.0.4", "@vue/cli-service": "^4.5.4", + "@vue/compiler-sfc": "^3.1.0", "@vue/eslint-config-typescript": "^7.0.0", "@vue/test-utils": "^1.1.0", "@vue/vue2-jest": "^28.0.0", @@ -269,7 +271,6 @@ "vue-cli-plugin-cypress-experimental": "~1.1.0", "vue-docgen-api": "^4.32.4", "vue-docgen-loader": "^1.5.0", - "vue-template-compiler": "2.6.12", "vue-undo-redo-stack": "^1.0.0", "vuex-mock-store": "0.0.8" }, From eba7fdfeafb21c865d4dd994a21bb1f0493214ed Mon Sep 17 00:00:00 2001 From: Deep Panchal Date: Thu, 14 Jul 2022 16:09:19 -0500 Subject: [PATCH 02/53] chore(deps): update yarn.lock --- yarn.lock | 124 ++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 111 insertions(+), 13 deletions(-) diff --git a/yarn.lock b/yarn.lock index 7396620a2..82ac399cb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7614,6 +7614,11 @@ vue-codemod "^0.0.5" yaml-front-matter "^3.4.1" +"@vue/compat@^3.1.0": + version "3.2.37" + resolved "https://registry.yarnpkg.com/@vue/compat/-/compat-3.2.37.tgz#bd2062a2be88d06046311d5c058aefb17a1d438a" + integrity sha512-MIYkFAz3Fur1mtZBqrNMYTymlohCQ0ol6vtNb58cqExLSCt63xZaXyiZZYPvS6WaMXfbNBDPXMvU9tO922eFCA== + "@vue/compiler-core@3.2.2": version "3.2.2" resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.2.tgz#8d3e29f129579ed9b14f48af735fd8d95f248504" @@ -7635,6 +7640,16 @@ estree-walker "^2.0.2" source-map "^0.6.1" +"@vue/compiler-core@3.2.37": + version "3.2.37" + resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.37.tgz#b3c42e04c0e0f2c496ff1784e543fbefe91e215a" + integrity sha512-81KhEjo7YAOh0vQJoSmAD68wLfYqJvoiD4ulyedzF+OEk/bk6/hx3fTNVfuzugIIaTrOx4PGx6pAiBRe5e9Zmg== + dependencies: + "@babel/parser" "^7.16.4" + "@vue/shared" "3.2.37" + estree-walker "^2.0.2" + source-map "^0.6.1" + "@vue/compiler-dom@3.2.2", "@vue/compiler-dom@^3.0.7": version "3.2.2" resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.2.tgz#26e198498746c53047c3744d26fc95e670692ab7" @@ -7643,6 +7658,14 @@ "@vue/compiler-core" "3.2.2" "@vue/shared" "3.2.2" +"@vue/compiler-dom@3.2.37": + version "3.2.37" + resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.37.tgz#10d2427a789e7c707c872da9d678c82a0c6582b5" + integrity sha512-yxJLH167fucHKxaqXpYk7x8z7mMEnXOw3G2q62FTkmsvNxu4FQSu5+3UMb+L7fjKa26DEzhrmCxAgFLLIzVfqQ== + dependencies: + "@vue/compiler-core" "3.2.37" + "@vue/shared" "3.2.37" + "@vue/compiler-dom@^3.0.5": version "3.2.33" resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.33.tgz#6db84296f949f18e5d3e7fd5e80f943dbed7d5ec" @@ -7651,6 +7674,22 @@ "@vue/compiler-core" "3.2.33" "@vue/shared" "3.2.33" +"@vue/compiler-sfc@3.2.37", "@vue/compiler-sfc@^3.1.0": + version "3.2.37" + resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.37.tgz#3103af3da2f40286edcd85ea495dcb35bc7f5ff4" + integrity sha512-+7i/2+9LYlpqDv+KTtWhOZH+pa8/HnX/905MdVmAcI/mPQOBwkHHIzrsEsucyOIZQYMkXUiTkmZq5am/NyXKkg== + dependencies: + "@babel/parser" "^7.16.4" + "@vue/compiler-core" "3.2.37" + "@vue/compiler-dom" "3.2.37" + "@vue/compiler-ssr" "3.2.37" + "@vue/reactivity-transform" "3.2.37" + "@vue/shared" "3.2.37" + estree-walker "^2.0.2" + magic-string "^0.25.7" + postcss "^8.1.10" + source-map "^0.6.1" + "@vue/compiler-sfc@^3.0.7": version "3.2.2" resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.2.tgz#5b7b13b07689be8e4880d856f72d1be500785be9" @@ -7682,6 +7721,14 @@ "@vue/compiler-dom" "3.2.2" "@vue/shared" "3.2.2" +"@vue/compiler-ssr@3.2.37": + version "3.2.37" + resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.37.tgz#4899d19f3a5fafd61524a9d1aee8eb0505313cff" + integrity sha512-7mQJD7HdXxQjktmsWp/J67lThEIcxLemz1Vb5I6rYJHR5vI+lON3nPGOH3ubmbvYGt8xEUaAr1j7/tIFWiEOqw== + dependencies: + "@vue/compiler-dom" "3.2.37" + "@vue/shared" "3.2.37" + "@vue/component-compiler-utils@^3.1.0", "@vue/component-compiler-utils@^3.1.2": version "3.2.2" resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-3.2.2.tgz#2f7ed5feed82ff7f0284acc11d525ee7eff22460" @@ -7722,6 +7769,49 @@ resolved "https://registry.yarnpkg.com/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.2.tgz#ceb924b4ecb3b9c43871c7a429a02f8423e621ab" integrity sha512-LIZMuJk38pk9U9Ur4YzHjlIyMuxPlACdBIHH9/nGYVTsaGKOSnSuELiE8vS9wa+dJpIYspYUOqk+L1Q4pgHQHQ== +"@vue/reactivity-transform@3.2.37": + version "3.2.37" + resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.2.37.tgz#0caa47c4344df4ae59f5a05dde2a8758829f8eca" + integrity sha512-IWopkKEb+8qpu/1eMKVeXrK0NLw9HicGviJzhJDEyfxTR9e1WtpnnbYkJWurX6WwoFP0sz10xQg8yL8lgskAZg== + dependencies: + "@babel/parser" "^7.16.4" + "@vue/compiler-core" "3.2.37" + "@vue/shared" "3.2.37" + estree-walker "^2.0.2" + magic-string "^0.25.7" + +"@vue/reactivity@3.2.37": + version "3.2.37" + resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.37.tgz#5bc3847ac58828e2b78526e08219e0a1089f8848" + integrity sha512-/7WRafBOshOc6m3F7plwzPeCu/RCVv9uMpOwa/5PiY1Zz+WLVRWiy0MYKwmg19KBdGtFWsmZ4cD+LOdVPcs52A== + dependencies: + "@vue/shared" "3.2.37" + +"@vue/runtime-core@3.2.37": + version "3.2.37" + resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.2.37.tgz#7ba7c54bb56e5d70edfc2f05766e1ca8519966e3" + integrity sha512-JPcd9kFyEdXLl/i0ClS7lwgcs0QpUAWj+SKX2ZC3ANKi1U4DOtiEr6cRqFXsPwY5u1L9fAjkinIdB8Rz3FoYNQ== + dependencies: + "@vue/reactivity" "3.2.37" + "@vue/shared" "3.2.37" + +"@vue/runtime-dom@3.2.37": + version "3.2.37" + resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.2.37.tgz#002bdc8228fa63949317756fb1e92cdd3f9f4bbd" + integrity sha512-HimKdh9BepShW6YozwRKAYjYQWg9mQn63RGEiSswMbW+ssIht1MILYlVGkAGGQbkhSh31PCdoUcfiu4apXJoPw== + dependencies: + "@vue/runtime-core" "3.2.37" + "@vue/shared" "3.2.37" + csstype "^2.6.8" + +"@vue/server-renderer@3.2.37": + version "3.2.37" + resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.2.37.tgz#840a29c8dcc29bddd9b5f5ffa22b95c0e72afdfc" + integrity sha512-kLITEJvaYgZQ2h47hIzPh2K3jG8c1zCVbp/o/bzQOyvzaKiCquKS7AaioPI28GNxIsE/zSx+EwWYsNxDCX95MA== + dependencies: + "@vue/compiler-ssr" "3.2.37" + "@vue/shared" "3.2.37" + "@vue/shared@3.2.2": version "3.2.2" resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.2.tgz#6104185ebd57af5a14ac51c1f491b2205fc24054" @@ -7732,6 +7822,11 @@ resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.33.tgz#69a8c99ceb37c1b031d5cc4aec2ff1dc77e1161e" integrity sha512-UBc1Pg1T3yZ97vsA2ueER0F6GbJebLHYlEi4ou1H5YL4KWvMOOWwpYo9/QpWq93wxKG6Wo13IY74Hcn/f7c7Bg== +"@vue/shared@3.2.37": + version "3.2.37" + resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.37.tgz#8e6adc3f2759af52f0e85863dfb0b711ecc5c702" + integrity sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw== + "@vue/test-utils@1.0.3": version "1.0.3" resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.0.3.tgz#587c4dd9b424b66022f188c19bc605da2ce91c6f" @@ -11519,6 +11614,11 @@ csstype@^2.5.7: resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.17.tgz#4cf30eb87e1d1a005d8b6510f95292413f6a1c0e" integrity sha512-u1wmTI1jJGzCJzWndZo8mk4wnPTZd1eOIYTYvuEyOQGfmDl3TrabCCfKnOC86FZwW/9djqTl933UF/cS425i9A== +csstype@^2.6.8: + version "2.6.20" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.20.tgz#9229c65ea0b260cf4d3d997cb06288e36a8d6dda" + integrity sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA== + csstype@^3.0.2: version "3.0.8" resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.8.tgz#d2266a792729fb227cd216fb572f43728e1ad340" @@ -27486,14 +27586,6 @@ vue-style-loader@^4.1.0, vue-style-loader@^4.1.2: hash-sum "^1.0.2" loader-utils "^1.0.2" -vue-template-compiler@2.6.12: - version "2.6.12" - resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.12.tgz#947ed7196744c8a5285ebe1233fe960437fcc57e" - integrity sha512-OzzZ52zS41YUbkCBfdXShQTe69j1gQDZ9HIX8miuC9C3rBCk9wIRjLiZZLrmX9V+Ftq/YEyv1JaVr5Y/hNtByg== - dependencies: - de-indent "^1.0.2" - he "^1.1.0" - vue-template-compiler@^2.0.0, vue-template-compiler@^2.5.13, vue-template-compiler@^2.5.16: version "2.6.14" resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.14.tgz#a2f0e7d985670d42c9c9ee0d044fed7690f4f763" @@ -27554,16 +27646,22 @@ vue2-google-maps@^0.10.2, vue2-google-maps@^0.10.7: babel-runtime "^6.26.0" marker-clusterer-plus "^2.1.4" -vue@2.6.12: - version "2.6.12" - resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.12.tgz#f5ebd4fa6bd2869403e29a896aed4904456c9123" - integrity sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg== - vue@^2.5.13, vue@^2.5.16, vue@^2.5.17, vue@^2.6.10, vue@^2.6.11, vue@^2.6.8, vue@^2.6.9: version "2.6.14" resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.14.tgz#e51aa5250250d569a3fbad3a8a5a687d6036e235" integrity sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ== +vue@^3.1.0: + version "3.2.37" + resolved "https://registry.yarnpkg.com/vue/-/vue-3.2.37.tgz#da220ccb618d78579d25b06c7c21498ca4e5452e" + integrity sha512-bOKEZxrm8Eh+fveCqS1/NkG/n6aMidsI6hahas7pa0w/l7jkbssJVsRhVDs07IdDq7h9KHswZOgItnwJAgtVtQ== + dependencies: + "@vue/compiler-dom" "3.2.37" + "@vue/compiler-sfc" "3.2.37" + "@vue/runtime-dom" "3.2.37" + "@vue/server-renderer" "3.2.37" + "@vue/shared" "3.2.37" + vuedraggable@^2.23.2, vuedraggable@^2.24.3: version "2.24.3" resolved "https://registry.yarnpkg.com/vuedraggable/-/vuedraggable-2.24.3.tgz#43c93849b746a24ce503e123d5b259c701ba0d19" From 75528edc19d1c4f809532d4141e2217b7343643a Mon Sep 17 00:00:00 2001 From: Deep Panchal Date: Thu, 14 Jul 2022 16:09:41 -0500 Subject: [PATCH 03/53] feat(build): add config for vue 2 compatibility with vue 3 --- vue.config.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/vue.config.js b/vue.config.js index d89837ce5..7957cd1ad 100644 --- a/vue.config.js +++ b/vue.config.js @@ -73,6 +73,22 @@ module.exports = { const vueRule = config.module.rule('vue'); const jsRule = config.module.rule('js'); + // for vue2 -> vue3 migration + config.resolve.alias.set('vue', '@vue/compat'); + config.module + .rule('vue') + .use('vue-loader') + .tap((options) => { + return { + ...options, + compilerOptions: { + compatConfig: { + MODE: 2, + }, + }, + }; + }); + const useBasicTPool = (rule, loader) => { rule.uses.clear(); rule From 52d07bf1d858b178f4bf7f8c40f5304e05e9fb53 Mon Sep 17 00:00:00 2001 From: Deep Panchal Date: Mon, 1 Aug 2022 15:15:13 -0500 Subject: [PATCH 04/53] feat(deps): bump vue-router to v4.1.3 for vue3 compatibility --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d227edd9b..c10ec9673 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,7 @@ "vue-picture-swipe": "^2.1.0", "vue-range-slider": "^0.6.0", "vue-responsive": "^1.1.0", - "vue-router": "^3.2.0", + "vue-router": "^4.1.3", "vue-router-multi-view": "^0.1.0", "vue-select": "^3.18.3", "vue-socket.io": "^3.0.10", From f21323062fe9057533dbb612585be8b1f4304a6f Mon Sep 17 00:00:00 2001 From: Deep Panchal Date: Mon, 1 Aug 2022 15:15:34 -0500 Subject: [PATCH 05/53] chore: add .git-blame-ignore-revs --- .git-blame-ignore-revs | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .git-blame-ignore-revs diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 000000000..e69de29bb From 8714dc6b927e81dfc1711cf448e20ee08009fcc8 Mon Sep 17 00:00:00 2001 From: Deep Panchal Date: Mon, 1 Aug 2022 15:19:42 -0500 Subject: [PATCH 06/53] feat(router): update router.js to use vue-router v4 api --- src/router.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/router.js b/src/router.js index 1c3becb31..efd751070 100644 --- a/src/router.js +++ b/src/router.js @@ -1,6 +1,5 @@ import Vue from 'vue'; -import VueCookies from 'vue-cookies'; -import VueRouter from 'vue-router'; +import { createRouter } from 'vue-router'; import * as moment from 'moment'; import CaseFlag from '@/pages/CaseFlag'; import CaseForm from '@/pages/CaseForm'; @@ -31,9 +30,6 @@ import Teams from '@/pages/organization/Teams'; import TeamDetail from '@/pages/organization/TeamDetail'; import * as UITypes from '@/store/modules/ui/types'; -Vue.use(VueRouter); -Vue.use(VueCookies); - const routes = [ { path: '/', @@ -201,7 +197,7 @@ const routes = [ }, ]; -const router = new VueRouter({ +const router = createRouter({ mode: 'history', routes, }); From 063efab6ce4551a5c5780072ef9a3074e4647a97 Mon Sep 17 00:00:00 2001 From: Deep Panchal Date: Mon, 1 Aug 2022 15:20:30 -0500 Subject: [PATCH 07/53] feat(deps): bump vuex to v4 for vue3 compatibility --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c10ec9673..0a13281f8 100644 --- a/package.json +++ b/package.json @@ -158,7 +158,7 @@ "vue2-google-maps": "^0.10.7", "vuedraggable": "^2.24.3", "vuejs-datepicker": "^1.6.2", - "vuex": "^3.6.2", + "vuex": "^4.0.2", "vuex-module-decorators": "^0.17.0", "vuex-persist": "^3.1.3" }, From 2cfb75b495f1187ae0bbb9b9fd79279847cf48e2 Mon Sep 17 00:00:00 2001 From: Deep Panchal Date: Mon, 1 Aug 2022 16:23:33 -0500 Subject: [PATCH 08/53] fix(comp): remove redundant options api watch obj --- src/components/AjaxTable.vue | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/components/AjaxTable.vue b/src/components/AjaxTable.vue index f30cd02d1..00a675420 100644 --- a/src/components/AjaxTable.vue +++ b/src/components/AjaxTable.vue @@ -167,13 +167,6 @@ export default defineComponent({ getData, }; }, - watch: { - query: { - handler() { - throttle(this.getData, 1000)(); - }, - }, - }, }); From 2e471bd2f1c03e1dac38ebd5a038b0d28ea85ab3 Mon Sep 17 00:00:00 2001 From: Deep Panchal Date: Mon, 1 Aug 2022 16:27:07 -0500 Subject: [PATCH 09/53] fix(build): disable thread pooling in vue.config.js --- vue.config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vue.config.js b/vue.config.js index 7957cd1ad..f6da103bc 100644 --- a/vue.config.js +++ b/vue.config.js @@ -106,8 +106,8 @@ module.exports = { jsRule.test(/\.js$/).exclude.add(/node_modules/); if (process.env.NODE_ENV !== 'storybook') { - useBasicTPool(jsRule, 'babel-loader'); - useBasicTPool(vueRule, 'vue-loader'); + // useBasicTPool(jsRule, 'babel-loader'); + // useBasicTPool(vueRule, 'vue-loader'); } // config.plugin('lodash').use(LodashPlugin); if ( From 9d226341022238d22ee736416b8ad335c559db8a Mon Sep 17 00:00:00 2001 From: Deep Panchal Date: Mon, 1 Aug 2022 16:27:37 -0500 Subject: [PATCH 10/53] feat(store): update store.js to use vuex v4 api --- src/store/index.js | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/store/index.js b/src/store/index.js index e5dcb39d1..a8c7c6d82 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -1,9 +1,7 @@ -import VueLog from '@dreipol/vue-log'; import VuexORM from '@vuex-orm/core'; import VuexORMAxios from '@vuex-orm/plugin-axios'; import axios from 'axios'; -import Vue from 'vue'; -import Vuex from 'vuex'; +import { createStore } from 'vuex'; import database from './database'; import auth from './modules/auth'; import events from './modules/events'; @@ -27,12 +25,9 @@ VuexORM.use(VuexORMAxios, { baseURL: `${process.env.VUE_APP_API_BASE_URL}`, }); -Vue.use(Vuex); -Vue.use(VueLog); - const debug = process.env.NODE_ENV !== 'production'; -export default new Vuex.Store({ +export default createStore({ modules: { auth, events, From a931b124d36aab1679906b5a7e8305fd8107a43d Mon Sep 17 00:00:00 2001 From: Deep Panchal Date: Mon, 1 Aug 2022 18:12:13 -0500 Subject: [PATCH 11/53] fix(router): add regex for matchAll + use createWebHistory --- src/router.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/router.js b/src/router.js index efd751070..e60ff4b42 100644 --- a/src/router.js +++ b/src/router.js @@ -1,5 +1,5 @@ import Vue from 'vue'; -import { createRouter } from 'vue-router'; +import { createRouter, createWebHistory } from 'vue-router'; import * as moment from 'moment'; import CaseFlag from '@/pages/CaseFlag'; import CaseForm from '@/pages/CaseForm'; @@ -190,7 +190,7 @@ const routes = [ ...HomeRoutes, ...unAuthedRoutes, { - path: '*', + path: '/:pathMatch(.*)*', name: 'NotFound', component: NotFound, meta: { layout: 'unauthenticated', noAuth: true }, @@ -200,6 +200,7 @@ const routes = [ const router = createRouter({ mode: 'history', routes, + history: createWebHistory(), }); router.beforeEach((to, from, next) => { From bf7969d84a324ca321e10c4c113ac81a27c2695f Mon Sep 17 00:00:00 2001 From: Deep Panchal Date: Mon, 1 Aug 2022 19:15:57 -0500 Subject: [PATCH 12/53] fix(comp): move v-for with key prop from template to div in ItemEditor --- src/components/ItemEditor.vue | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/components/ItemEditor.vue b/src/components/ItemEditor.vue index dbc036195..29b52422b 100644 --- a/src/components/ItemEditor.vue +++ b/src/components/ItemEditor.vue @@ -1,16 +1,14 @@ From 88c508340937e8b872af7b7f421c7252e702018c Mon Sep 17 00:00:00 2001 From: Deep Panchal Date: Mon, 1 Aug 2022 19:16:36 -0500 Subject: [PATCH 13/53] feat(deps): bump vue-i18n to v9 compatible with vue3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0a13281f8..fb27d16fc 100644 --- a/package.json +++ b/package.json @@ -132,7 +132,7 @@ "vue-highlight-words": "^1.2.0", "vue-histogram-slider": "^0.3.8", "vue-hotjar": "^1.2.0", - "vue-i18n": "^8.22.0", + "vue-i18n": "^9.2.0", "vue-js-popover": "^1.2.1", "vue-js-toggle-button": "^1.3.3", "vue-json-edit": "^1.4.3", From 4fda0cf452256da89dc5461c1b6b74a7724eaff0 Mon Sep 17 00:00:00 2001 From: Deep Panchal Date: Mon, 1 Aug 2022 19:41:28 -0500 Subject: [PATCH 14/53] fix(comp): update all @vue/composition-api imports with vue + fix issues --- src/components/AdminEventStream.vue | 2 +- src/components/AjaxTable.vue | 2 +- src/components/ArcGisUploader.vue | 2 +- src/components/AssessmentTree.vue | 2 +- src/components/Autocomplete.vue | 2 +- src/components/Avatar.vue | 2 +- src/components/Badge.vue | 2 +- src/components/BaseButton.vue | 2 +- src/components/BaseCheckbox.vue | 2 +- src/components/BaseIcon.vue | 2 +- src/components/BaseInput.vue | 2 +- src/components/BaseLink.vue | 2 +- src/components/BaseRadio.vue | 2 +- src/components/BaseText.vue | 2 +- src/components/CardStack.vue | 2 +- src/components/CaseHeader.vue | 2 +- src/components/ChangeOrganizationModal.vue | 2 +- src/components/CmsViewer.vue | 2 +- src/components/CompletedTransferModal.vue | 2 +- src/components/DatabaseAccess.vue | 2 +- src/components/DisasterIcon.vue | 2 +- src/components/DragDrop.vue | 2 +- src/components/Editor.vue | 2 +- src/components/EventTimeline.vue | 2 +- src/components/FileUpload.vue | 2 +- src/components/admin/events/EventForm.vue | 2 +- src/components/admin/events/EventPreview.vue | 2 +- src/components/admin/events/EventSearchTable.vue | 2 +- src/components/buttons/ProgressButton.vue | 2 +- src/components/cards/TabbedCard.vue | 2 +- src/components/forms/ModelSelectInput.vue | 2 +- src/components/header/PhoneStatus.vue | 2 +- src/components/notifications/BetaBanner.vue | 2 +- src/components/phone/AgentBoard/CallInfo.vue | 2 +- src/components/phone/AgentBoard/Status.vue | 2 +- src/components/phone/AgentCard.vue | 2 +- src/components/phone/Cards/StatsCard.vue | 2 +- src/components/phone/Popup.vue | 2 +- src/components/phone/Widgets/GeneralStatistics.vue | 13 +++---------- src/components/phone/Widgets/Leaderboard.vue | 2 +- src/components/phone/Widgets/PhoneDebugger.vue | 2 +- src/layouts/Authenticated.vue | 2 +- src/layouts/page/PageTabBar.vue | 2 +- src/pages/admin/AdminEvents.vue | 2 +- src/pages/admin/Index.vue | 2 +- src/pages/unauthenticated/DownForMaintenance.vue | 2 +- src/use/events/useEventPreview.ts | 2 +- src/use/events/useSearchEvents.ts | 2 +- src/use/phone/useAgent.ts | 2 +- src/use/phone/useAgentState.ts | 2 +- src/use/phone/useContact.ts | 2 +- src/use/phone/usePhoneMetrics.ts | 2 +- src/use/phone/useScripts.ts | 2 +- src/use/useCapabilities.ts | 2 +- src/use/useIntervalFn.ts | 2 +- src/use/useSearch.ts | 2 +- src/use/useSelectForm.ts | 2 +- src/use/useTabs.ts | 2 +- src/use/useToggle.ts | 2 +- src/use/user/useTraining.ts | 2 +- src/use/user/useUser.ts | 2 +- src/use/worksites/useCaseCards.ts | 2 +- src/use/worksites/useIncident.ts | 2 +- src/utils/wrap.ts | 2 +- 64 files changed, 66 insertions(+), 73 deletions(-) diff --git a/src/components/AdminEventStream.vue b/src/components/AdminEventStream.vue index b7ba34e38..f58463b3e 100644 --- a/src/components/AdminEventStream.vue +++ b/src/components/AdminEventStream.vue @@ -80,7 +80,7 @@ + - -