Merge branch 'vue3-again' into vue3-no-compat

* vue3-again:
  fix importer

src/components/importer/importer.vue

@@ -20,26 +20,30 @@
     >
       {{ submitButtonLabel || $t('importer.submit') }}
     </button>
-    <button
+    <div v-if="success">
-      v-if="success"
+      <button
-      class="button-unstyled"
+        class="button-unstyled"
-      @click="dismiss"
+        @click="dismiss"
-    >
+      >
-      <FAIcon
+        <FAIcon
-        icon="times"
+          icon="times"
-      />
+        />
-      <p>{{ successMessage || $t('importer.success') }}</p>
+      </button>
-    </button>
+      {{ ' ' }}
-    <button
+      <span>{{ successMessage || $t('importer.success') }}</span>
-      v-else-if="error"
+    </div>
-      class="button-unstyled"
+    <div v-else-if="error">
-      @click="dismiss"
+      <button
-    >
+        class="button-unstyled"
-      <FAIcon
+        @click="dismiss"
-        icon="times"
+      >
-      />
+        <FAIcon
-      <p>{{ errorMessage || $t('importer.error') }}</p>
+          icon="times"
-    </button>
+        />
+      </button>
+      {{ ' ' }}
+      <span>{{ errorMessage || $t('importer.error') }}</span>
+    </div>
   </div>
 </template>