Merge branch 'dev' into next

Author: hunterliu1003

dist/VueFinalModal.esm.js

@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@nuxt/content-theme-docs": "^0.6.1",
-    "nuxt": "^2.14.1",
+    "nuxt": "^2.14.8",
     "vue-final-modal": "^0.20.1"
   },
   "devDependencies": {

dist/VueFinalModal.esm.js.map

@@ -2,7 +2,20 @@
   <div class="pb-8">
     <v-modal
       v-model="showModal"
-      v-bind="props"
+      :ssr="ssr"
+      :lockScroll="lockScroll"
+      :hideOverlay="hideOverlay"
+      :clickToClose="clickToClose"
+      :escToClose="escToClose"
+      :preventClick="preventClick"
+      :transition="transition ? 'vfm' : ''"
+      :overlay-transition="overlayTransition ? 'vfm' : ''"
+      :z-index-auto="zIndexAuto"
+      :z-index-base="zIndexBase"
+      :z-index="allowZIndex ? zIndexBase : false"
+      :attach="attach ? '#attach' : false"
+      :focus-retain="focusRetain"
+      :focus-trap="focusTrap"
       @confirm="showModal = false"
       @cancel="showModal = false"
     >
@@ -136,26 +149,6 @@ const initData = () => ({
 
 export default {
   data: initData,
-  computed: {
-    props() {
-      return {
-        ssr: this.ssr,
-        lockScroll: this.lockScroll,
-        hideOverlay: this.hideOverlay,
-        clickToClose: this.clickToClose,
-        escToClose: this.escToClose,
-        preventClick: this.preventClick,
-        transition: this.transition ? 'vfm' : '',
-        overlayTransition: this.overlayTransition ? 'vfm' : '',
-        zIndexAuto: this.zIndexAuto,
-        zIndexBase: this.zIndexBase,
-        ...(this.allowZIndex && { zIndex: this.zIndex }),
-        attach: this.attach ? '#attach' : false,
-        focusRetain: this.focusRetain,
-        focusTrap: this.focusTrap
-      }
-    }
-  },
   methods: {
     openAttach() {
       this.attach = '#attach'

dist/VueFinalModal.umd.js

@@ -15,7 +15,9 @@ const Plugin = () => ({
     const isDuplicateComponent = app._context.components[_options.componentName]
 
     if (isDuplicateComponent) {
-      console.warn(isDuplicateKey ? DUPLICATE_PLUGIN_COMPONENT : DUPLICATE_COMPONENT)
+      if (typeof window !== 'undefined') {
+        console.warn(isDuplicateKey ? DUPLICATE_PLUGIN_COMPONENT : DUPLICATE_COMPONENT)
+      }
     } else {
       if (!isDuplicateKey) {
         bindPrototype(app, _options)