Merge branch 'main' into feat/EMP-4163-migrate-query-suggestions-modu…

…le-to-composition-api # Conflicts: # packages/_vue3-migration-test/src/router.ts
empathyco · May 30, 2024 · 53e6a69 · 53e6a69
2 parents 6aee133 + 624fb45
commit 53e6a69
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 14 deletions.
diff --git a/packages/_vue3-migration-test/CHANGELOG.md b/packages/_vue3-migration-test/CHANGELOG.md
@@ -3,6 +3,15 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.0.0-alpha.19](https://github.com/empathyco/x/compare/[email protected]@1.0.0-alpha.19) (2024-05-30)
+
+
+### Features
+
+* **highlight:** migrate highlight component to composition API (#1486) ([10dd541](https://github.com/empathyco/x/commit/10dd5417f861d6e1152483abbd510059d2917f48))
+
+
+
 ## [1.0.0-alpha.18](https://github.com/empathyco/x/compare/[email protected]@1.0.0-alpha.18) (2024-05-29)
 
 

diff --git a/packages/_vue3-migration-test/package.json b/packages/_vue3-migration-test/package.json
@@ -1,7 +1,7 @@
 {
   "name": "vue3-migration-test",
   "private": "true",
-  "version": "1.0.0-alpha.18",
+  "version": "1.0.0-alpha.19",
   "scripts": {
     "dev": "vite",
     "preview": "vite preview",

diff --git a/packages/_vue3-migration-test/src/components/index.ts b/packages/_vue3-migration-test/src/components/index.ts
@@ -9,3 +9,4 @@ export { default as TestSlidingPanel } from './test-sliding-panel.vue';
 export { default as TestUseLayouts } from './test-use-layouts.vue';
 export { default as TestBaseSuggestions } from './suggestions/test-base-suggestions.vue';
 export { default as TestHighlight } from './test-highlight.vue';
+export { default as TestBaseResultImages } from './result/test-base-result-images.vue';
diff --git a/packages/_vue3-migration-test/src/components/result/test-base-result-images.vue b/packages/_vue3-migration-test/src/components/result/test-base-result-images.vue
@@ -0,0 +1,21 @@
+<template>
+  <h1>BasePlaceholderImage</h1>
+  <BasePlaceholderImage class="staticClass" :class="{ class: true }" />
+  <h1>BaseFallbackImage</h1>
+  <BaseFallbackImage class="staticClass" :class="{ class: true }" />
+</template>
+
+<script setup lang="ts">
+  import BasePlaceholderImage from '../../../../x-components/src/components/result/base-result-placeholder-image.vue';
+  import BaseFallbackImage from '../../../../x-components/src/components/result/base-result-fallback-image.vue';
+</script>
+
+<style scoped>
+  .staticClass {
+    height: 300px;
+    width: 300px;
+  }
+  .class {
+    border: 1px solid green;
+  }
+</style>
diff --git a/packages/_vue3-migration-test/src/router.ts b/packages/_vue3-migration-test/src/router.ts
@@ -24,6 +24,7 @@ import {
   TestSlidingPanel,
   TestBaseSuggestions,
   TestHighlight,
+  TestBaseResultImages,
   TestQuerySuggestions
 } from './';
 
@@ -148,6 +149,11 @@ const routes = [
     name: 'Highlight',
     component: TestHighlight
   },
+  {
+    path: '/base-result-images',
+    name: 'BaseResultImages',
+    component: TestBaseResultImages
+  },
   {
     path: '/query-suggestions',
     name: 'QuerySuggestions',

diff --git a/packages/x-components/CHANGELOG.md b/packages/x-components/CHANGELOG.md
@@ -3,6 +3,15 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.0.0-alpha.27](https://github.com/empathyco/x/compare/@empathyco/[email protected]...@empathyco/[email protected]) (2024-05-30)
+
+
+### Features
+
+* **highlight:** migrate highlight component to composition API (#1486) ([10dd541](https://github.com/empathyco/x/commit/10dd5417f861d6e1152483abbd510059d2917f48))
+
+
+
 ## [5.0.0-alpha.26](https://github.com/empathyco/x/compare/@empathyco/[email protected]...@empathyco/[email protected]) (2024-05-30)
 
 

diff --git a/packages/x-components/package.json b/packages/x-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@empathyco/x-components",
-  "version": "5.0.0-alpha.26",
+  "version": "5.0.0-alpha.27",
   "description": "Empathy X Components",
   "author": "Empathy Systems Corporation S.L.",
   "license": "Apache-2.0",

diff --git a/packages/x-components/src/components/result/base-result-fallback-image.vue b/packages/x-components/src/components/result/base-result-fallback-image.vue
@@ -1,6 +1,5 @@
-<template functional>
+<template>
   <svg
-    :class="[].concat(data.staticClass, data.class)"
     version="1.1"
     viewBox="0 0 256 371"
     xmlns="http://www.w3.org/2000/svg"
@@ -34,7 +33,3 @@
     ></path>
   </svg>
 </template>
-
-<script lang="ts">
-  export default {};
-</script>
diff --git a/packages/x-components/src/components/result/base-result-placeholder-image.vue b/packages/x-components/src/components/result/base-result-placeholder-image.vue
@@ -1,6 +1,5 @@
-<template functional>
+<template>
   <svg
-    :class="[].concat(data.staticClass, data.class)"
     version="1.1"
     viewBox="0 0 256 371"
     xmlns="http://www.w3.org/2000/svg"
@@ -47,7 +46,3 @@
     ></path>
   </svg>
 </template>
-
-<script lang="ts">
-  export default {};
-</script>