Merge branch 'main' into feature/EMP-3243-emit-events-when-component-…

…is-visible # Conflicts: # packages/x-adapter-platform/src/mappers/responses/__tests__/__snapshots__/search-response.mapper.spec.ts.snap
empathyco · Jan 19, 2024 · 6ae369f · 6ae369f
2 parents dadaf8f + 491b9d5
commit 6ae369f
Show file tree

Hide file tree

Showing 23 changed files with 894 additions and 835 deletions.
diff --git a/README.md b/README.md
@@ -130,7 +130,7 @@ We are working on many key features to consolidate Interface X, including these
   Recommendations
   [![Release Docs](https://img.shields.io/badge/Released-October%202023-brightgreen)](https://docs.empathy.co/explore-empathy-platform/experience-search-and-discovery/history-queries.html)
 - **Experience Controls**: Add capability of loading configurations from an external service
-  [![Release Docs](https://img.shields.io/badge/In%20Progress-yellow)](https://vuejs.org/)
+  [![Release Docs](https://img.shields.io/badge/Released-November%202023-brightgreen)](https://vuejs.org/)
 - **Vue 3 Migration**.
   [![Release Docs](https://img.shields.io/badge/In%20Progress-yellow)](https://vuejs.org/)
 - **Network Request failure transparency**.

diff --git a/packages/x-adapter-platform/CHANGELOG.md b/packages/x-adapter-platform/CHANGELOG.md
@@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.1.0-alpha.0](https://github.com/empathyco/x/compare/@empathyco/[email protected]...@empathyco/[email protected]) (2024-01-12)
+
+
+### Features
+
+* **search:** handle display tagging from search response (#1388) ([b6b5d86](https://github.com/empathyco/x/commit/b6b5d8657947b8510f9d23530d709e757e5e3ecf))
+
+
+
+## [1.0.3-alpha.2](https://github.com/empathyco/x/compare/@empathyco/[email protected]...@empathyco/[email protected]) (2024-01-11)
+
+**Note:** Version bump only for package @empathyco/x-adapter-platform
+
+
+
+
+
 ## [1.0.3-alpha.1](https://github.com/empathyco/x/compare/@empathyco/[email protected]...@empathyco/[email protected]) (2023-12-27)
 
 **Note:** Version bump only for package @empathyco/x-adapter-platform

diff --git a/packages/x-adapter-platform/package.json b/packages/x-adapter-platform/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@empathyco/x-adapter-platform",
-  "version": "1.0.3-alpha.1",
+  "version": "1.1.0-alpha.0",
   "description": "A search client for the Empathy Platform API",
   "author": "Empathy Systems Corporation S.L.",
   "license": "Apache-2.0",
@@ -42,7 +42,7 @@
   },
   "dependencies": {
     "@empathyco/x-adapter": "^8.0.3-alpha.0",
-    "@empathyco/x-types": "^10.0.3-alpha.1",
+    "@empathyco/x-types": "^10.1.0-alpha.1",
     "@empathyco/x-utils": "^1.0.3-alpha.0",
     "tslib": "~2.6.0"
   },

diff --git a/...latform/src/mappers/responses/__tests__/__snapshots__/search-response.mapper.spec.ts.snap b/...latform/src/mappers/responses/__tests__/__snapshots__/search-response.mapper.spec.ts.snap
@@ -32,12 +32,12 @@ Object {
   ],
   "displayTagging": Object {
     "params": Object {
+      "displayId": "jeans",
       "filtered": "true",
       "follow": false,
       "lang": "en",
       "origin": "url:external",
       "page": "1",
-      "q": "jeans",
       "scope": "desktop",
       "spellcheck": "false",
       "totalHits": "686",

diff --git a/packages/x-archetype-utils/CHANGELOG.md b/packages/x-archetype-utils/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.1.0-alpha.0](https://github.com/empathyco/x/compare/@empathyco/[email protected]...@empathyco/[email protected]) (2024-01-11)
+
+
+### Features
+
+* update to rollup 4 (#1370) ([a5c471b](https://github.com/empathyco/x/commit/a5c471b7d139393b7c2c0dffd88973029f2ced31))
+
+
+
 ## [1.0.3-alpha.1](https://github.com/empathyco/x/compare/@empathyco/[email protected]...@empathyco/[email protected]) (2023-12-27)
 
 **Note:** Version bump only for package @empathyco/x-archetype-utils

diff --git a/packages/x-archetype-utils/package.json b/packages/x-archetype-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@empathyco/x-archetype-utils",
-  "version": "1.0.3-alpha.1",
+  "version": "1.1.0-alpha.0",
   "description": "Utilities for x-archetype",
   "author": "Empathy Systems Corporation S.L.",
   "license": "Apache-2.0",
@@ -37,17 +37,17 @@
   },
   "dependencies": {
     "@empathyco/x-deep-merge": "^2.0.3-alpha.0",
+    "@empathyco/x-utils": "workspace:^1.0.3-alpha.0",
     "tslib": "~2.6.0",
     "vue-i18n": "~8.28.2"
   },
   "devDependencies": {
-    "@empathyco/x-utils": "^1.0.3-alpha.0",
     "@types/jest": "~27.5.0",
     "@types/node": "~18.19.0",
     "@vue/test-utils": "~1.0.3",
     "jest": "~27.5.0",
     "rimraf": "~3.0.2",
-    "rollup": "~2.79.1",
+    "rollup": "~4.9.1",
     "rollup-plugin-copy": "~3.5.0",
     "rollup-plugin-delete": "~2.0.0",
     "rollup-plugin-typescript2": "~0.36.0",

diff --git a/packages/x-archetype-utils/rollup.config.js → packages/x-archetype-utils/rollup.config.mjs b/packages/x-archetype-utils/rollup.config.js → packages/x-archetype-utils/rollup.config.mjs
@@ -4,17 +4,19 @@ import typescript from 'rollup-plugin-typescript2';
 
 export default {
   input: 'src/index.ts',
-  preserveModules: true,
   output: [
     {
       format: 'cjs',
-      dir: 'dist/cjs'
+      dir: 'dist/cjs',
+      preserveModules: true
     },
     {
       format: 'esm',
-      dir: 'dist/esm'
+      dir: 'dist/esm',
+      preserveModules: true
     }
   ],
+  external: ['@empathyco/x-deep-merge', '@empathyco/x-utils', 'vue-i18n'],
   plugins: [
     del({ targets: 'dist' }),
     copy({

diff --git a/packages/x-components/CHANGELOG.md b/packages/x-components/CHANGELOG.md
@@ -3,6 +3,58 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.1.0-alpha.10](https://github.com/empathyco/x/compare/@empathyco/[email protected]...@empathyco/[email protected]) (2024-01-17)
+
+**Note:** Version bump only for package @empathyco/x-components
+
+
+
+
+
+## [4.1.0-alpha.9](https://github.com/empathyco/x/compare/@empathyco/[email protected]...@empathyco/[email protected]) (2024-01-17)
+
+**Note:** Version bump only for package @empathyco/x-components
+
+
+
+
+
+## [4.1.0-alpha.8](https://github.com/empathyco/x/compare/@empathyco/[email protected]...@empathyco/[email protected]) (2024-01-15)
+
+
+### Features
+
+* **queries-preview:** display tagging from QP request accessible in QP component (#1389) ([27dfec8](https://github.com/empathyco/x/commit/27dfec8dc2725a7c2300e306d82617a2d1de130f))
+
+
+
+## [4.1.0-alpha.7](https://github.com/empathyco/x/compare/@empathyco/[email protected]...@empathyco/[email protected]) (2024-01-12)
+
+
+### Features
+
+* **search:** handle display tagging from search response (#1388) ([b6b5d86](https://github.com/empathyco/x/commit/b6b5d8657947b8510f9d23530d709e757e5e3ecf))
+
+
+
+## [4.1.0-alpha.6](https://github.com/empathyco/x/compare/@empathyco/[email protected]...@empathyco/[email protected]) (2024-01-11)
+
+
+### Features
+
+* update to rollup 4 (#1370) ([a5c471b](https://github.com/empathyco/x/commit/a5c471b7d139393b7c2c0dffd88973029f2ced31))
+
+
+
+## [4.1.0-alpha.5](https://github.com/empathyco/x/compare/@empathyco/[email protected]...@empathyco/[email protected]) (2024-01-03)
+
+
+### Documentation
+
+* **integration:** add getSnippetConfig info (#1387) ([622286b](https://github.com/empathyco/x/commit/622286be7b9e552f3dd1e5563a295c7bd267cc49))
+
+
+
 ## [4.1.0-alpha.4](https://github.com/empathyco/x/compare/@empathyco/[email protected]...@empathyco/[email protected]) (2023-12-29)
 
 

diff --git a/packages/x-components/build/build.ts b/packages/x-components/build/build.ts
@@ -31,5 +31,5 @@ async function build(): Promise<any> {
  * Function for deleting useless folders.
  */
 function removeTempFiles(): void {
-  fs.rmdirSync(path.join(rootDir, 'temp'), { recursive: true });
+  fs.rmSync(path.join(rootDir, 'temp'), { recursive: true });
 }
diff --git a/packages/x-components/build/rollup-plugins/design-system.rollup-plugin.ts b/packages/x-components/build/rollup-plugins/design-system.rollup-plugin.ts
@@ -56,7 +56,7 @@ export function importTokens(): Plugin {
  * This function returns a {@link Plugin | RollupJS Plugin} to omit the `.js` files from the
  * output generation. This is necessary because the `rollup-plugin-styles` plugin outputs `.js`
  * files together with the `.css`, to import them as module. It has a mode to only "emit" CSS,
- * but it needs another plugin (lintcss) and is failing right now.
+ * but it needs another plugin (litcss) and is failing right now.
  *
  * @returns The plugin object to use in the Rollup config.
  * @internal

diff --git a/packages/x-components/build/rollup.config.ts b/packages/x-components/build/rollup.config.ts
@@ -36,7 +36,7 @@ export const rollupConfig = createRollupOptions({
      * Because of that, when rollup detects a circular dependency (it emits a warning), we stop
      * the build with an error */
     if (warning.code === 'CIRCULAR_DEPENDENCY') {
-      throw Error(`Circular dependency found: ${warning.cycle?.join(' ') as string}`);
+      throw Error(`Circular dependency found: ${warning.ids?.join(' ') as string}`);
     }
   },
   external(id) {
@@ -119,7 +119,7 @@ export const rollupConfig = createRollupOptions({
     copy({
       targets: [
         {
-          src: ['build-helpers', 'CHANGELOG.md', 'package.json', 'README.md', 'docs'],
+          src: ['CHANGELOG.md', 'package.json', 'README.md', 'docs'],
           dest: buildPath
         }
       ],
@@ -136,9 +136,9 @@ export const rollupConfig = createRollupOptions({
 const commonCssOptions = createRollupOptions({
   output: {
     dir: cssOutputDirectory,
-    assetFileNames: '[name][extname]'
-  },
-  preserveModules: true
+    assetFileNames: '[name][extname]',
+    preserveModules: true
+  }
 });
 
 /**

diff --git a/packages/x-components/package.json b/packages/x-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@empathyco/x-components",
-  "version": "4.1.0-alpha.4",
+  "version": "4.1.0-alpha.10",
   "description": "Empathy X Components",
   "author": "Empathy Systems Corporation S.L.",
   "license": "Apache-2.0",
@@ -30,7 +30,7 @@
     "./tests/**/*",
     "**/*.scss",
     "**/*.scss.js",
-    "**/*vue_styles.*.vue.js",
+    "**/*vue[0-9].js",
     "**/*.css",
     "**/*.vue"
   ],
@@ -70,12 +70,12 @@
   },
   "dependencies": {
     "@empathyco/x-adapter": "^8.0.3-alpha.0",
-    "@empathyco/x-adapter-platform": "^1.0.3-alpha.1",
+    "@empathyco/x-adapter-platform": "^1.1.0-alpha.0",
     "@empathyco/x-bus": "^1.0.3-alpha.0",
     "@empathyco/x-deep-merge": "^2.0.3-alpha.0",
     "@empathyco/x-logger": "^1.2.0-alpha.11",
     "@empathyco/x-storage-service": "^2.0.3-alpha.0",
-    "@empathyco/x-types": "^10.0.3-alpha.1",
+    "@empathyco/x-types": "^10.1.0-alpha.1",
     "@empathyco/x-utils": "^1.0.3-alpha.0",
     "@vue/devtools-api": "~6.5.0",
     "@vueuse/core": "~10.7.1",
@@ -91,13 +91,13 @@
     "vuex": "^3.0.0"
   },
   "devDependencies": {
-    "@badeball/cypress-cucumber-preprocessor": "~17.2.0",
+    "@badeball/cypress-cucumber-preprocessor": "~20.0.0",
     "@bahmutov/cypress-esbuild-preprocessor": "~2.2.0",
     "@cypress/vue2": "~2.0.1",
-    "@empathyco/x-tailwindcss": "^1.1.2-alpha.1",
+    "@empathyco/x-tailwindcss": "^1.2.0-alpha.1",
     "@microsoft/api-documenter": "~7.23.0",
     "@microsoft/api-extractor": "~7.39.0",
-    "@rollup/plugin-commonjs": "~25.0.0",
+    "@rollup/plugin-commonjs": "~25.0.7",
     "@testing-library/jest-dom": "~5.17.0",
     "@types/autoprefixer": "~10.2.0",
     "@types/glob": "^8.0.1",
@@ -110,19 +110,17 @@
     "autoprefixer": "~10.4.4",
     "convert-source-map": "~2.0.0",
     "cypress": "~13.6.0",
-    "esbuild": "0.19.10",
+    "esbuild": "0.19.11",
     "glob": "~10.3.0",
     "jest": "~27.5.0",
     "jest-scss-transform": "~1.0.1",
     "postcss": "~8.4.12",
     "postcss-dir-pseudo-class": "~7.0.0",
     "postcss-logical": "~4.0.2",
     "rimraf": "~3.0.2",
-    "rollup": "~2.79.1",
+    "rollup": "~4.9.1",
     "rollup-plugin-copy": "~3.5.0",
     "rollup-plugin-delete": "~2.0.0",
-    "rollup-plugin-rename": "~1.0.1",
-    "rollup-plugin-sourcemaps": "~0.6.3",
     "rollup-plugin-styles": "~4.0.0",
     "rollup-plugin-typescript2": "~0.36.0",
     "rollup-plugin-vue": "~5.1.9",

diff --git a/packages/x-components/src/x-modules/queries-preview/store/__tests__/actions.spec.ts b/packages/x-components/src/x-modules/queries-preview/store/__tests__/actions.spec.ts
@@ -70,6 +70,15 @@ describe('testing queries preview module actions', () => {
           },
           query: 'tshirt',
           rows: 3
+        },
+        displayTagging: {
+          params: {
+            follow: false,
+            lang: 'es',
+            q: 'lego',
+            totalHits: '789'
+          },
+          url: 'https://api.empathybroker.com/tagging/v1/track/query'
         }
       };