Avoid usage of global "Vue"

statamic · Jan 8, 2025 · 6ac9750 · 6ac9750
1 parent 9d1cef3
commit 6ac9750
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 17 deletions.
diff --git a/resources/js/bootstrap/App.vue b/resources/js/bootstrap/App.vue
@@ -214,8 +214,7 @@ export default {
         setupMoment() {
             const locale = Statamic.$config.get('locale');
             window.moment.locale(locale);
-            Vue.moment.locale(locale);
-            Vue.prototype.$moment.locale(locale);
+            this.$moment.locale(locale);
 
             const spec = {
                 relativeTime: {
@@ -236,8 +235,7 @@ export default {
                 }
             };
             window.moment.updateLocale(locale, spec);
-            Vue.moment.updateLocale(locale, spec);
-            Vue.prototype.$moment.updateLocale(locale, spec);
+            this.$moment.updateLocale(locale, spec);
         }
     }
 

diff --git a/resources/js/components/SessionExpiry.vue b/resources/js/components/SessionExpiry.vue
@@ -71,7 +71,7 @@ export default {
             errors: {},
             password: null,
             pinging: false,
-            lastCount: Vue.moment(),
+            lastCount: moment(),
             isPageHidden: false,
         }
     },
@@ -113,14 +113,14 @@ export default {
             // Javascript is being executed, but the count will have stopped if the computer
             // has been put to sleep. If it's been a while since the last count, we'll
             // also perform a timeout check. This will let things recalibrate.
-            const secondsSinceLastCount = Vue.moment().diff(this.lastCount, 'seconds');
+            const secondsSinceLastCount = moment().diff(this.lastCount, 'seconds');
             const itsBeenAWhile = secondsSinceLastCount > 10;
 
             if (withinWarningPeriod || itsBeenAWhile) {
                 this.ping().catch(e => {});
             }
 
-            this.lastCount = Vue.moment();
+            this.lastCount = moment();
         },
 
         isShowingLogin(showing, wasShowing) {

diff --git a/resources/js/components/blueprints/RegularField.vue b/resources/js/components/blueprints/RegularField.vue
@@ -103,7 +103,7 @@ export default {
 
         labelText() {
             return this.field.config.display
-                || Vue.options.filters.titleize(Vue.options.filters.deslugify(this.field.handle));
+                || this.$filters.titleize(this.$filters.deslugify(this.field.handle));
         },
 
         width: {

diff --git a/resources/js/components/data-list/HasFilters.js b/resources/js/components/data-list/HasFilters.js
@@ -70,9 +70,9 @@ export default {
 
         filterChanged({ handle, values }, unselectAll = true) {
             if (values && this.hasFields(values)) {
-                Vue.set(this.activeFilters, handle, values);
+                this.activeFilters[handle] = values;
             } else {
-                Vue.delete(this.activeFilters, handle);
+                delete this.activeFilters[handle];
             }
             if (unselectAll) this.unselectAllItems();
         },

diff --git a/resources/js/components/login/LoginModal.vue b/resources/js/components/login/LoginModal.vue
@@ -38,7 +38,7 @@ export default {
 
     mounted() {
         this.$http.get(cp_url('auth/token')).success(response => {
-            Vue.http.headers.common['X-CSRF-TOKEN'] = response;
+            this.$http.headers.common['X-CSRF-TOKEN'] = response;
         });
 
         this.$refs.password.focus();

diff --git a/resources/js/components/nav/Builder.vue b/resources/js/components/nav/Builder.vue
@@ -553,7 +553,7 @@ export default {
             if (currentAction === '@create' || value !== data_get(item.original, key)) {
                 item.manipulations[key] = value;
             } else {
-                Vue.delete(item.manipulations, key);
+                delete item.manipulations[key];
             }
         },
 
@@ -567,7 +567,7 @@ export default {
             if (detectedAction) {
                 item.manipulations.action = detectedAction;
             } else {
-                Vue.delete(item.manipulations, 'action');
+                delete item.manipulations['action'];
             }
 
             if (this.isChildItemNode(item)) {
@@ -749,15 +749,15 @@ export default {
         },
 
         hideItem(item) {
-            Vue.set(item.manipulations, 'action', '@hide');
+            item.manipulations['action'] = '@hide';
 
             this.updateItemAction(item);
 
             this.changed = true;
         },
 
         showItem(item) {
-            Vue.delete(item.manipulations, 'action');
+            delete item.manipulations['action'];
 
             this.updateItemAction(item);
 

diff --git a/resources/js/components/publish/Field.vue b/resources/js/components/publish/Field.vue
@@ -132,7 +132,11 @@ export default {
         },
 
         fieldtypeComponentExists() {
-            return Vue.options.components[this.fieldtypeComponent] !== undefined;
+            if (! Statamic.$app.component(this.fieldtypeComponent)) {
+                console.warn('unsupported fieldtype: ' + this.fieldtypeComponent);
+            }
+
+            return Statamic.$app.component(this.fieldtypeComponent) !== undefined;
         },
 
         instructions() {
@@ -214,7 +218,7 @@ export default {
 
         labelText() {
              return this.config.display
-                 || Vue.$options.filters.titleize(Vue.$options.filters.deslugify(this.config.handle));
+                 || this.$filters.titleize(this.$filters.deslugify(this.config.handle));
          },
 
         showLabelText() {