From 893c88fb2d84e38c3f7dbd0dc39682b68e20bb46 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Wed, 24 Jul 2024 17:18:50 +0530 Subject: [PATCH] feat: remove Vuelidate usage --- .storybook/preview.js | 4 +--- app/javascript/packs/application.js | 2 -- app/javascript/packs/survey.js | 2 -- app/javascript/packs/v3app.js | 3 +-- app/javascript/packs/widget.js | 3 +-- app/javascript/shared/mixins/specs/automationMixin.spec.js | 2 -- .../mixins/specs/whatsappTemplates/whatsappTemplates.spec.js | 2 -- 7 files changed, 3 insertions(+), 15 deletions(-) diff --git a/.storybook/preview.js b/.storybook/preview.js index 3f98c2cd8..7c046d51a 100644 --- a/.storybook/preview.js +++ b/.storybook/preview.js @@ -2,7 +2,6 @@ import { addDecorator } from '@storybook/vue'; import Vue from 'vue'; import Vuex from 'vuex'; import VueI18n from 'vue-i18n'; -import Vuelidate from 'vuelidate'; import Multiselect from 'vue-multiselect'; import VueDOMPurifyHTML from 'vue-dompurify-html'; import FluentIcon from 'shared/components/FluentIcon/DashboardIcon'; @@ -14,7 +13,6 @@ import { domPurifyConfig } from 'shared/helpers/HTMLSanitizer'; import '../app/javascript/dashboard/assets/scss/storybook.scss'; Vue.use(VueI18n); -Vue.use(Vuelidate); Vue.use(WootUiKit); Vue.use(Vuex); Vue.use(VueDOMPurifyHTML, domPurifyConfig); @@ -32,7 +30,7 @@ addDecorator(() => ({ template: '', i18n: i18nConfig, store, - beforeCreate: function() { + beforeCreate: function () { this.$root._i18n = this.$i18n; }, })); diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js index bbf36fa9a..81e62b950 100644 --- a/app/javascript/packs/application.js +++ b/app/javascript/packs/application.js @@ -9,7 +9,6 @@ import VueFormulate from '@braid/vue-formulate'; import WootSwitch from 'components/ui/Switch'; import WootWizard from 'components/ui/Wizard'; import { sync } from 'vuex-router-sync'; -import Vuelidate from 'vuelidate'; import VTooltip from 'v-tooltip'; import WootUiKit from '../dashboard/components'; import App from '../dashboard/App'; @@ -65,7 +64,6 @@ Vue.use(VueDOMPurifyHTML, domPurifyConfig); Vue.use(VueRouter); Vue.use(VueI18n); Vue.use(WootUiKit); -Vue.use(Vuelidate); Vue.use(VueFormulate, { rules: { JSON: ({ value }) => isJSONValid(value), diff --git a/app/javascript/packs/survey.js b/app/javascript/packs/survey.js index 031767052..fdcaec106 100644 --- a/app/javascript/packs/survey.js +++ b/app/javascript/packs/survey.js @@ -1,5 +1,4 @@ import Vue from 'vue'; -import Vuelidate from 'vuelidate'; import VueI18n from 'vue-i18n'; import App from '../survey/App.vue'; import i18n from '../survey/i18n'; @@ -7,7 +6,6 @@ import store from '../survey/store'; import { emitter } from 'shared/helpers/mitt'; Vue.use(VueI18n); -Vue.use(Vuelidate); const i18nConfig = new VueI18n({ locale: 'en', diff --git a/app/javascript/packs/v3app.js b/app/javascript/packs/v3app.js index 5807ff60f..d5180675c 100644 --- a/app/javascript/packs/v3app.js +++ b/app/javascript/packs/v3app.js @@ -1,7 +1,6 @@ import Vue from 'vue'; import VueI18n from 'vue-i18n'; import VueRouter from 'vue-router'; -import Vuelidate from 'vuelidate'; import i18n from 'dashboard/i18n'; import * as Sentry from '@sentry/vue'; import { Integrations } from '@sentry/tracing'; @@ -44,7 +43,7 @@ if (window.errorLoggingConfig) { Vue.use(VueRouter); Vue.use(VueI18n); -Vue.use(Vuelidate); + Vue.use(AnalyticsPlugin); Vue.prototype.$emitter = emitter; Vue.component('fluent-icon', FluentIcon); diff --git a/app/javascript/packs/widget.js b/app/javascript/packs/widget.js index ea3bb8200..a6c873c55 100644 --- a/app/javascript/packs/widget.js +++ b/app/javascript/packs/widget.js @@ -1,5 +1,4 @@ import Vue from 'vue'; -import Vuelidate from 'vuelidate'; import VueI18n from 'vue-i18n'; import VueDOMPurifyHTML from 'vue-dompurify-html'; import VueFormulate from '@braid/vue-formulate'; @@ -18,7 +17,7 @@ import { domPurifyConfig } from '../shared/helpers/HTMLSanitizer'; const PhoneInput = () => import('../widget/components/Form/PhoneInput'); Vue.use(VueI18n); -Vue.use(Vuelidate); + Vue.use(VueDOMPurifyHTML, domPurifyConfig); Vue.directive('on-clickaway', onClickaway); diff --git a/app/javascript/shared/mixins/specs/automationMixin.spec.js b/app/javascript/shared/mixins/specs/automationMixin.spec.js index 465e6e9b4..d2cd27ce7 100644 --- a/app/javascript/shared/mixins/specs/automationMixin.spec.js +++ b/app/javascript/shared/mixins/specs/automationMixin.spec.js @@ -30,8 +30,6 @@ const localVue = createLocalVue(); localVue.use(Vuex); // Vuelidate required to test submit method -import Vuelidate from 'vuelidate'; -Vue.use(Vuelidate); const createComponent = ( mixins, diff --git a/app/javascript/shared/mixins/specs/whatsappTemplates/whatsappTemplates.spec.js b/app/javascript/shared/mixins/specs/whatsappTemplates/whatsappTemplates.spec.js index 29b652bc5..0521f7e65 100644 --- a/app/javascript/shared/mixins/specs/whatsappTemplates/whatsappTemplates.spec.js +++ b/app/javascript/shared/mixins/specs/whatsappTemplates/whatsappTemplates.spec.js @@ -3,11 +3,9 @@ import { shallowMount, createLocalVue } from '@vue/test-utils'; import { templates } from './fixtures'; const localVue = createLocalVue(); import VueI18n from 'vue-i18n'; -import Vuelidate from 'vuelidate'; import i18n from 'dashboard/i18n'; localVue.use(VueI18n); -localVue.use(Vuelidate); const i18nConfig = new VueI18n({ locale: 'en', messages: i18n }); const config = {