From d724451a1e60c12c5611fe6921395a235dc3d764 Mon Sep 17 00:00:00 2001 From: "Jose A. Cabaneros" Date: Fri, 13 Feb 2026 14:01:09 +0100 Subject: [PATCH 1/7] feat(x-design-system): build and theme --- packages/x-design-system/demo/index.css | 8 +- packages/x-design-system/demo/index.html | 3 +- packages/x-design-system/demo/src/main.ts | 1 - packages/x-design-system/demo/tsconfig.json | 4 - packages/x-design-system/lib/build.js | 37 ++++++ packages/x-design-system/lib/index.css | 8 ++ packages/x-design-system/lib/theme.css | 122 ++++++++++++++++++++ packages/x-design-system/lib/variants.css | 2 + packages/x-design-system/package.json | 12 +- packages/x-design-system/src/base.css | 7 -- packages/x-design-system/src/index.ts | 0 packages/x-design-system/tsconfig.json | 4 +- packages/x-design-system/vite.config.ts | 11 -- pnpm-lock.yaml | 22 ++-- 14 files changed, 192 insertions(+), 49 deletions(-) delete mode 100644 packages/x-design-system/demo/src/main.ts delete mode 100644 packages/x-design-system/demo/tsconfig.json create mode 100644 packages/x-design-system/lib/build.js create mode 100644 packages/x-design-system/lib/index.css create mode 100644 packages/x-design-system/lib/theme.css create mode 100644 packages/x-design-system/lib/variants.css delete mode 100644 packages/x-design-system/src/base.css delete mode 100644 packages/x-design-system/src/index.ts delete mode 100644 packages/x-design-system/vite.config.ts diff --git a/packages/x-design-system/demo/index.css b/packages/x-design-system/demo/index.css index 8218e29041..de223845a9 100644 --- a/packages/x-design-system/demo/index.css +++ b/packages/x-design-system/demo/index.css @@ -1,7 +1,11 @@ -@import 'tailwindcss'; +@import '../lib/index.css'; @layer base { body { - @apply bg-gray-100; + @apply xds:bg-gray-100; } } + +@theme { + --color-fabada: #fabada; +} diff --git a/packages/x-design-system/demo/index.html b/packages/x-design-system/demo/index.html index adc86bdc78..09825437df 100644 --- a/packages/x-design-system/demo/index.html +++ b/packages/x-design-system/demo/index.html @@ -4,9 +4,10 @@ x-design-system demo +
+

DEMO TESTING

- diff --git a/packages/x-design-system/demo/src/main.ts b/packages/x-design-system/demo/src/main.ts deleted file mode 100644 index b174ea5a73..0000000000 --- a/packages/x-design-system/demo/src/main.ts +++ /dev/null @@ -1 +0,0 @@ -// Demo entry point creation diff --git a/packages/x-design-system/demo/tsconfig.json b/packages/x-design-system/demo/tsconfig.json deleted file mode 100644 index b0fef8affb..0000000000 --- a/packages/x-design-system/demo/tsconfig.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../tsconfig.json", - "include": ["./**/*.ts", "./**/*.vue", "vite.config.ts"] -} diff --git a/packages/x-design-system/lib/build.js b/packages/x-design-system/lib/build.js new file mode 100644 index 0000000000..3bc6d55519 --- /dev/null +++ b/packages/x-design-system/lib/build.js @@ -0,0 +1,37 @@ +import fs from 'node:fs' +import path from 'node:path' +import { fileURLToPath } from 'node:url' + +const __currentDirName = path.dirname(fileURLToPath(import.meta.url)) +const fileNames = ['index.css', 'theme.css', 'variants.css'] +const dirNames = ['components'] + +function createDist() { + const distDir = path.resolve(__currentDirName, '../dist') + if (fs.existsSync(distDir)) { + fs.rmSync(distDir, { recursive: true, force: true }) + } + fs.mkdirSync(distDir) +} + +function copyLibToDist() { + fileNames.forEach(fileName => { + const srcDir = path.resolve(__currentDirName, fileName) + const distDir = path.resolve(__currentDirName, '../dist', fileName) + fs.copyFileSync(srcDir, distDir) + }) + dirNames.forEach(dirName => { + const srcDir = path.resolve(__currentDirName, dirName) + const distDir = path.resolve(__currentDirName, '../dist', dirName) + fs.cpSync(srcDir, distDir, { recursive: true }) + }) +} + +try { + createDist() + copyLibToDist() + // eslint-disable-next-line no-console + console.log('✅ XDS build complete!') +} catch (e) { + console.error('❌ XDS build failed:', e) +} diff --git a/packages/x-design-system/lib/index.css b/packages/x-design-system/lib/index.css new file mode 100644 index 0000000000..9ef8890833 --- /dev/null +++ b/packages/x-design-system/lib/index.css @@ -0,0 +1,8 @@ +/* TODO - Will ensure your CSS is applied in the correct order for your components. Needed? */ +@layer utilities.components.base, utilities.components.modifier; +/* TODO - Thinking if prefix is finally added or not. */ +@import 'tailwindcss' prefix(xds); +@import './theme.css'; +@import './variants.css'; + +@source './**/*.{js,jsx,ts,tsx}'; diff --git a/packages/x-design-system/lib/theme.css b/packages/x-design-system/lib/theme.css new file mode 100644 index 0000000000..f07ffecfae --- /dev/null +++ b/packages/x-design-system/lib/theme.css @@ -0,0 +1,122 @@ +@theme { + --aspect-ratio-default: 3/4; + + --border-radius-none: 0; + --border-radius-xs: 2px; + --border-radius-sm: 4px; + --border-radius-md: 8px; + --border-radius-lg: 16px; + --border-radius-xl: 32px; + --border-radius-full: 99999px; + + --border-width-default: 1px; + --border-width-1: 1px; + --border-width-2: 2px; + --border-width-4: 4px; + + --color-current: currentColor; + --color-transparent: transparent; + --color-neutral-0: #ffffff; + --color-neutral-10: #eef1f2; + --color-neutral-25: #dbe2e5; + --color-neutral-50: #5f717b; + --color-neutral-75: #3c494f; + --color-neutral-90: #283034; + --color-neutral-100: #000000; + --color-lead-25: #bbc9cf; + --color-lead-50: #5e7782; + --color-lead-75: #243d48; + --color-auxiliary-25: #e3f0f5; + --color-auxiliary-50: #0086b2; + --color-auxiliary-75: #006485; + --color-accent-25: #f8ebef; + --color-accent-50: #d44a6f; + --color-accent-75: #a42748; + --color-highlight-25: #f1eef2; + --color-highlight-50: #8b6391; + --color-highlight-75: #684a6d; + --color-success-25: #ecfdf5; + --color-success-50: #10b981; + --color-success-75: #065f46; + --color-warning-25: #fffbeb; + --color-warning-50: #f59e0b; + --color-warning-75: #92400e; + --color-error-25: #fef2f2; + --color-error-50: #ef4444; + --color-error-75: #991b1b; + + --font-family-main: Inter, sans-serif; + --font-family-alternative: Lora, serif; + --font-family-extra: Poppins, sans-serif; + --font-family-special: Bree Serif, serif; + --font-family-icon: font-awesome; + + --font-size-xxs: 10px; + --font-size-xs: 12px; + --font-size-sm: 14px; + --font-size-md: 16px; + --font-size-lg: 20px; + --font-size-xl: 24px; + --font-size-2xl: 32px; + --font-size-3xl: 40px; + --font-size-4xl: 48px; + --font-size-5xl: 56px; + --font-size-6xl: 64px; + --font-size-7xl: 80px; + --font-size-8xl: 96px; + + --font-weight-light: 200; + --font-weight-regular: 400; + --font-weight-bold: 700; + + --layout-max-width-md: 1440px; + --layout-max-width-lg: 1920px; + --layout-max-width-full: 100vw; + + --letter-spacing-xs: -0.025em; + --letter-spacing-sm: -0.01em; + --letter-spacing-md: 0; + --letter-spacing-lg: 0.04em; + + --line-height-xs: 1.2; + --line-height-sm: 1.4; + --line-height-md: 1.6; + --line-height-lg: 1.8; + --line-height-default: auto; + + --screen-tablet: 744px; + --screen-desktop: 1280px; + --screen-large: 2560px; + + --spacing-0: 0px; + --spacing-1: 1px; + --spacing-2: 2px; + --spacing-4: 4px; + --spacing-8: 8px; + --spacing-12: 12px; + --spacing-16: 16px; + --spacing-20: 20px; + --spacing-24: 24px; + --spacing-28: 28px; + --spacing-32: 32px; + --spacing-40: 40px; + --spacing-48: 48px; + --spacing-56: 56px; + --spacing-64: 64px; + --spacing-80: 80px; + --spacing-96: 96px; + --spacing-128: 128px; + --spacing-160: 160px; + --spacing-192: 192px; + --spacing-224: 224px; + --spacing-256: 256px; + --spacing-320: 320px; + --spacing-384: 384px; + --spacing-448: 448px; + --spacing-512: 512px; + + --stroke-width-sm: 0.2; + --stroke-width-md: 0.4; + --stroke-width-lg: 0.8; + --stroke-width-xl: 1px; +} diff --git a/packages/x-design-system/lib/variants.css b/packages/x-design-system/lib/variants.css new file mode 100644 index 0000000000..6fbf709126 --- /dev/null +++ b/packages/x-design-system/lib/variants.css @@ -0,0 +1,2 @@ +/* TODO - Is this variant needed? */ +@custom-variant selected (&.selected); diff --git a/packages/x-design-system/package.json b/packages/x-design-system/package.json index 3fa33d67c9..e8c3d6624c 100644 --- a/packages/x-design-system/package.json +++ b/packages/x-design-system/package.json @@ -1,5 +1,6 @@ { "name": "@empathyco/x-design-system", + "type": "module", "version": "0.0.1", "description": "Empathy X Tailwind Design System", "author": "Empathy Systems Corporation S.L.", @@ -16,10 +17,7 @@ "empathy" ], "exports": { - ".": { - "types": "./dist/index.d.mts", - "import": "./dist/index.mjs" - } + ".": "./index.css" }, "files": [ "dist" @@ -29,9 +27,11 @@ }, "scripts": { "dev": "vite serve demo", - "dev:build": "vite build demo", - "build": "echo 'XDS build' && vite build demo", + "build:demo": "vite build demo", + "build:lib": "node ./lib/build.js", + "build": "npm run build:lib && npm run build:demo", "pack": "pnpm pack", + "typecheck": "tsc --noEmit", "lint": "eslint --fix", "lint:check": "eslint", "lint:inspect": "eslint --inspect-config .", diff --git a/packages/x-design-system/src/base.css b/packages/x-design-system/src/base.css deleted file mode 100644 index fa93340171..0000000000 --- a/packages/x-design-system/src/base.css +++ /dev/null @@ -1,7 +0,0 @@ -@import 'tailwindcss'; - -@layer base { - h1 { - font-size: var(--text-2xl); - } -} diff --git a/packages/x-design-system/src/index.ts b/packages/x-design-system/src/index.ts deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/x-design-system/tsconfig.json b/packages/x-design-system/tsconfig.json index 6ba04b7811..92f66d6ec6 100644 --- a/packages/x-design-system/tsconfig.json +++ b/packages/x-design-system/tsconfig.json @@ -12,6 +12,6 @@ "importHelpers": true, "sourceMap": true, "esModuleInterop": true - }, - "include": ["src/**/*.ts", "vite.config.ts"] + } + // "include": ["src/**/*.ts"] } diff --git a/packages/x-design-system/vite.config.ts b/packages/x-design-system/vite.config.ts deleted file mode 100644 index b9f24ac81f..0000000000 --- a/packages/x-design-system/vite.config.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { resolve } from 'node:path' -import tailwindcss from '@tailwindcss/vite' -import { defineConfig } from 'vite' - -export default defineConfig({ - build: { - outDir: resolve(__dirname, '../dist'), - emptyOutDir: true, - }, - plugins: [tailwindcss()], -}) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a7ee294b29..af3aa1aa6e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2020,9 +2020,6 @@ packages: '@jridgewell/sourcemap-codec@1.5.5': resolution: {integrity: sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==} - '@jridgewell/trace-mapping@0.3.30': - resolution: {integrity: sha512-GQ7Nw5G2lTu/BtHTKfXhKHok2WGetd4XYcVKGx00SjAk8GMwgJM3zr6zORiPGuOE+/vkc90KtTosSSvaCjKb2Q==} - '@jridgewell/trace-mapping@0.3.31': resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==} @@ -4975,8 +4972,8 @@ packages: resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==} engines: {node: '>=12'} - fs-extra@11.3.1: - resolution: {integrity: sha512-eXvGGwZ5CL17ZSwHWd3bbgk7UUpF6IFHtP57NYYakPvHOs8GDgDe5KJI36jIJzDkJ6eJjuzRA8eBQb6SkKue0g==} + fs-extra@11.3.3: + resolution: {integrity: sha512-VWSRii4t0AFm6ixFFmLLx1t7wS1gh+ckoa84aOeapGum0h+EZd1EhEumSB+ZdDLnEPuucsVB9oB7cxJHap6Afg==} engines: {node: '>=14.14'} fs-extra@8.1.0: @@ -10689,7 +10686,7 @@ snapshots: '@jest/test-result': 29.7.0 '@jest/transform': 29.7.0 '@jest/types': 29.6.3 - '@jridgewell/trace-mapping': 0.3.30 + '@jridgewell/trace-mapping': 0.3.31 '@types/node': 24.10.9 chalk: 4.1.2 collect-v8-coverage: 1.0.2 @@ -10739,7 +10736,7 @@ snapshots: dependencies: '@babel/core': 7.28.3 '@jest/types': 29.6.3 - '@jridgewell/trace-mapping': 0.3.30 + '@jridgewell/trace-mapping': 0.3.31 babel-plugin-istanbul: 6.1.1 chalk: 4.1.2 convert-source-map: 2.0.0 @@ -10778,11 +10775,6 @@ snapshots: '@jridgewell/sourcemap-codec@1.5.5': {} - '@jridgewell/trace-mapping@0.3.30': - dependencies: - '@jridgewell/resolve-uri': 3.1.2 - '@jridgewell/sourcemap-codec': 1.5.5 - '@jridgewell/trace-mapping@0.3.31': dependencies: '@jridgewell/resolve-uri': 3.1.2 @@ -11481,7 +11473,7 @@ snapshots: ajv: 8.13.0 ajv-draft-04: 1.0.0(ajv@8.13.0) ajv-formats: 3.0.1(ajv@8.13.0) - fs-extra: 11.3.1 + fs-extra: 11.3.3 import-lazy: 4.0.0 jju: 1.4.0 resolve: 1.22.11 @@ -14176,7 +14168,7 @@ snapshots: jsonfile: 6.2.0 universalify: 2.0.1 - fs-extra@11.3.1: + fs-extra@11.3.3: dependencies: graceful-fs: 4.2.11 jsonfile: 6.2.0 @@ -16509,7 +16501,7 @@ snapshots: fast-glob: 3.2.7 figures: 3.2.0 flat: 5.0.2 - fs-extra: 11.3.1 + fs-extra: 11.3.3 glob: 7.1.4 ignore: 5.3.2 js-yaml: 4.1.0 From 68ab3314c32b884fd94ca46b5df71410694ae4f5 Mon Sep 17 00:00:00 2001 From: "Jose A. Cabaneros" Date: Mon, 16 Feb 2026 13:22:42 +0100 Subject: [PATCH 2/7] feat(x-design-system): improve ts config --- packages/x-design-system/demo/tsconfig.json | 5 +++++ packages/x-design-system/lib/index.css | 2 -- packages/x-design-system/lib/index.ts | 1 + packages/x-design-system/tsconfig.json | 8 ++++---- 4 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 packages/x-design-system/demo/tsconfig.json create mode 100644 packages/x-design-system/lib/index.ts diff --git a/packages/x-design-system/demo/tsconfig.json b/packages/x-design-system/demo/tsconfig.json new file mode 100644 index 0000000000..381c99daa7 --- /dev/null +++ b/packages/x-design-system/demo/tsconfig.json @@ -0,0 +1,5 @@ +{ + "extends": "../tsconfig.json", + "rootDir": ".", + "include": ["vite.config.ts"] +} diff --git a/packages/x-design-system/lib/index.css b/packages/x-design-system/lib/index.css index 9ef8890833..36f64760f6 100644 --- a/packages/x-design-system/lib/index.css +++ b/packages/x-design-system/lib/index.css @@ -1,5 +1,3 @@ -/* TODO - Will ensure your CSS is applied in the correct order for your components. Needed? */ -@layer utilities.components.base, utilities.components.modifier; /* TODO - Thinking if prefix is finally added or not. */ @import 'tailwindcss' prefix(xds); @import './theme.css'; diff --git a/packages/x-design-system/lib/index.ts b/packages/x-design-system/lib/index.ts new file mode 100644 index 0000000000..9ff946ad05 --- /dev/null +++ b/packages/x-design-system/lib/index.ts @@ -0,0 +1 @@ +// TODO - Maybe this file can be avoided and also TS in the lib dir. Remaining only TS for the demo dir. diff --git a/packages/x-design-system/tsconfig.json b/packages/x-design-system/tsconfig.json index 92f66d6ec6..d9d5390848 100644 --- a/packages/x-design-system/tsconfig.json +++ b/packages/x-design-system/tsconfig.json @@ -3,8 +3,8 @@ "target": "es2019", "lib": ["esnext", "dom"], "baseUrl": ".", - "rootDir": "src", - "module": "esnext", + "rootDir": "lib", + "module": "node16", "moduleResolution": "node16", "types": [], "strict": true, @@ -12,6 +12,6 @@ "importHelpers": true, "sourceMap": true, "esModuleInterop": true - } - // "include": ["src/**/*.ts"] + }, + "include": ["lib/**/*.ts"] } From fede54d132cfcac867ecb398edf33b488becc4a6 Mon Sep 17 00:00:00 2001 From: "Jose A. Cabaneros" Date: Mon, 16 Feb 2026 18:37:17 +0100 Subject: [PATCH 3/7] feat(x-design-system): integrate xds with x-components --- packages/x-components/.postcssrc.js | 9 -- packages/x-components/eslint.config.mjs | 8 +- packages/x-components/package.json | 11 +-- packages/x-components/src/App.vue | 1 + packages/x-components/src/tailwind/index.css | 14 +++- .../src/tailwind/plugin-options.ts | 1 - packages/x-components/tailwind.config.ts | 23 ----- packages/x-components/tsconfig.json | 6 +- packages/x-components/vite.config.ts | 8 +- pnpm-lock.yaml | 84 +++++++------------ 10 files changed, 56 insertions(+), 109 deletions(-) delete mode 100644 packages/x-components/.postcssrc.js delete mode 100644 packages/x-components/src/tailwind/plugin-options.ts delete mode 100644 packages/x-components/tailwind.config.ts diff --git a/packages/x-components/.postcssrc.js b/packages/x-components/.postcssrc.js deleted file mode 100644 index b5c4eba7df..0000000000 --- a/packages/x-components/.postcssrc.js +++ /dev/null @@ -1,9 +0,0 @@ -module.exports = { - plugins: [ - require('tailwindcss'), - require('tailwindcss/nesting'), - require('autoprefixer'), - require('postcss-logical'), - require('postcss-dir-pseudo-class'), - ], -} diff --git a/packages/x-components/eslint.config.mjs b/packages/x-components/eslint.config.mjs index 0fc36a7438..489d9dd0fc 100644 --- a/packages/x-components/eslint.config.mjs +++ b/packages/x-components/eslint.config.mjs @@ -2,13 +2,7 @@ import { empathyco } from '@empathyco/eslint-config' export default empathyco( { - ignores: [ - '.loaded_actions', - 'vite.config.ts', - 'tailwind.config.ts', - 'jest.setup.ts', - 'cypress.config.ts', - ], + ignores: ['.loaded_actions', 'vite.config.ts', 'jest.setup.ts', 'cypress.config.ts'], }, { files: ['**/*.spec.{ts,tsx,js,jsx}'], diff --git a/packages/x-components/package.json b/packages/x-components/package.json index d3a2dbd9d6..6532a21f42 100644 --- a/packages/x-components/package.json +++ b/packages/x-components/package.json @@ -99,26 +99,23 @@ "@badeball/cypress-cucumber-preprocessor": "24.0.0", "@bahmutov/cypress-esbuild-preprocessor": "2.2.8", "@cucumber/messages": "32.0.1", - "@empathyco/x-tailwindcss": "2.0.0-alpha.22", + "@empathyco/x-design-system": "file://../x-design-system/empathyco-x-design-system-0.0.1.tgz", "@microsoft/api-documenter": "7.28.2", "@microsoft/api-extractor": "7.55.2", + "@tailwindcss/vite": "4.1.18", "@testing-library/jest-dom": "6.9.1", "@types/aria-query": "5.0.4", "@types/jest": "29.5.14", "@types/node": "24.10.9", - "@vitejs/plugin-vue": "5.2.4", + "@vitejs/plugin-vue": "6.0.4", "@vue/test-utils": "2.4.6", "@vue/vue3-jest": "29.2.6", - "autoprefixer": "10.4.23", "convert-source-map": "2.0.0", "cypress": "15.9.0", "esbuild": "0.27.2", "jest": "29.7.0", "jest-environment-jsdom": "29.7.0", "jest-scss-transform": "1.0.4", - "postcss": "8.5.6", - "postcss-dir-pseudo-class": "7.0.2", - "postcss-logical": "4.0.2", "rimraf": "3.0.2", "rollup": "4.56.0", "rollup-plugin-copy": "3.5.0", @@ -128,7 +125,7 @@ "rollup-plugin-vue": "6.0.0", "sass": "1.97.3", "start-server-and-test": "2.1.3", - "tailwindcss": "3.4.19", + "tailwindcss": "4.1.18", "ts-jest": "29.4.6", "ts-node": "10.9.2", "typescript": "5.9.3", diff --git a/packages/x-components/src/App.vue b/packages/x-components/src/App.vue index a40f410081..27fcfc350c 100644 --- a/packages/x-components/src/App.vue +++ b/packages/x-components/src/App.vue @@ -6,6 +6,7 @@ {{ route.name }} +

DEMO TESTING

diff --git a/packages/x-components/src/tailwind/index.css b/packages/x-components/src/tailwind/index.css index b5c61c9567..9b43b633e9 100644 --- a/packages/x-components/src/tailwind/index.css +++ b/packages/x-components/src/tailwind/index.css @@ -1,3 +1,11 @@ -@tailwind base; -@tailwind components; -@tailwind utilities; +@import '../../node_modules/@empathyco/x-design-system/dist/index.css'; + +@layer base { + body { + @apply xds:bg-gray-100; + } +} + +@theme { + --color-fabada: #fabada; +} diff --git a/packages/x-components/src/tailwind/plugin-options.ts b/packages/x-components/src/tailwind/plugin-options.ts deleted file mode 100644 index b1c6ea436a..0000000000 --- a/packages/x-components/src/tailwind/plugin-options.ts +++ /dev/null @@ -1 +0,0 @@ -export default {} diff --git a/packages/x-components/tailwind.config.ts b/packages/x-components/tailwind.config.ts deleted file mode 100644 index 07408410c2..0000000000 --- a/packages/x-components/tailwind.config.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { xTailwindPlugin, oldDsPlugin } from '@empathyco/x-tailwindcss' -import { Config } from 'tailwindcss' -import options from './src/tailwind/plugin-options' - -export default { - content: [ - './public/index.html', - './src/**/*.vue', - './node_modules/@empathyco/x-tailwindcss/showcase/**/*.js', - ], - prefix: 'x-', - theme: { - extend: { - fontFamily: ({ theme }) => theme('x.fontFamily'), - fontSize: ({ theme }) => theme('x.fontSize'), - spacing: ({ theme }) => theme('x.spacing'), - colors: ({ theme }) => theme('x.colors'), - screens: ({ theme }) => theme('x.screens'), - }, - }, - plugins: [xTailwindPlugin(options), oldDsPlugin], - important: true, -} as Config diff --git a/packages/x-components/tsconfig.json b/packages/x-components/tsconfig.json index 448e2234ce..530c3e790b 100644 --- a/packages/x-components/tsconfig.json +++ b/packages/x-components/tsconfig.json @@ -5,9 +5,9 @@ "lib": ["esnext", "dom", "dom.iterable", "scripthost"], "experimentalDecorators": true, "baseUrl": ".", - "rootDir": "src", + "rootDir": ".", "module": "esnext", - "moduleResolution": "node", + "moduleResolution": "nodenext", "types": ["jest", "node", "@testing-library/jest-dom"], "strict": true, "declaration": true, @@ -19,6 +19,6 @@ "esModuleInterop": true, "isolatedModules": true }, - "include": ["src/**/*.ts", "src/**/*.vue"], + "include": ["src/**/*.ts", "src/**/*.vue", "vite.config.ts"], "exclude": ["node_modules"] } diff --git a/packages/x-components/vite.config.ts b/packages/x-components/vite.config.ts index 05d5bcefe0..b867b2c524 100644 --- a/packages/x-components/vite.config.ts +++ b/packages/x-components/vite.config.ts @@ -2,16 +2,16 @@ import { resolve } from 'path' import vue from '@vitejs/plugin-vue' import { defineConfig } from 'vite' import Inspector from 'vite-plugin-vue-inspector' +import tailwindcss from '@tailwindcss/vite' export const vueDocsPlugin = { name: 'vue-docs', - transform(code: string, id: string) { - return !/vue&type=docs/.test(id) ? undefined : `export default ''` - }, + transform: (_: string, id: string) => + !/vue&type=docs/.test(id) ? undefined : `export default ''`, } export default defineConfig({ - plugins: [vue(), vueDocsPlugin, Inspector()], + plugins: [vue(), tailwindcss(), vueDocsPlugin, Inspector()], resolve: { alias: { vue: resolve(__dirname, 'node_modules/vue'), diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index af3aa1aa6e..ad13f4951d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -266,15 +266,18 @@ importers: '@cucumber/messages': specifier: 32.0.1 version: 32.0.1 - '@empathyco/x-tailwindcss': - specifier: 2.0.0-alpha.22 - version: link:../x-tailwindcss + '@empathyco/x-design-system': + specifier: file://../x-design-system/empathyco-x-design-system-0.0.1.tgz + version: file:packages/x-design-system/empathyco-x-design-system-0.0.1.tgz '@microsoft/api-documenter': specifier: 7.28.2 version: 7.28.2(@types/node@24.10.9) '@microsoft/api-extractor': specifier: 7.55.2 version: 7.55.2(@types/node@24.10.9) + '@tailwindcss/vite': + specifier: 4.1.18 + version: 4.1.18(vite@6.4.1(@types/node@24.10.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.3)(tsx@4.21.0)(yaml@2.8.2)) '@testing-library/jest-dom': specifier: 6.9.1 version: 6.9.1 @@ -288,17 +291,14 @@ importers: specifier: 24.10.9 version: 24.10.9 '@vitejs/plugin-vue': - specifier: 5.2.4 - version: 5.2.4(vite@6.4.1(@types/node@24.10.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.3)(tsx@4.21.0)(yaml@2.8.2))(vue@3.5.27(typescript@5.9.3)) + specifier: 6.0.4 + version: 6.0.4(vite@6.4.1(@types/node@24.10.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.3)(tsx@4.21.0)(yaml@2.8.2))(vue@3.5.27(typescript@5.9.3)) '@vue/test-utils': specifier: 2.4.6 version: 2.4.6 '@vue/vue3-jest': specifier: 29.2.6 version: 29.2.6(@babel/core@7.28.3)(babel-jest@29.7.0(@babel/core@7.28.3))(jest@29.7.0(@types/node@24.10.9)(ts-node@10.9.2(@types/node@24.10.9)(typescript@5.9.3)))(typescript@5.9.3)(vue@3.5.27(typescript@5.9.3)) - autoprefixer: - specifier: 10.4.23 - version: 10.4.23(postcss@8.5.6) convert-source-map: specifier: 2.0.0 version: 2.0.0 @@ -317,15 +317,6 @@ importers: jest-scss-transform: specifier: 1.0.4 version: 1.0.4(babel-jest@29.7.0(@babel/core@7.28.3)) - postcss: - specifier: 8.5.6 - version: 8.5.6 - postcss-dir-pseudo-class: - specifier: 7.0.2 - version: 7.0.2(postcss@8.5.6) - postcss-logical: - specifier: 4.0.2 - version: 4.0.2 rimraf: specifier: 3.0.2 version: 3.0.2 @@ -354,8 +345,8 @@ importers: specifier: 2.1.3 version: 2.1.3 tailwindcss: - specifier: 3.4.19 - version: 3.4.19(ts-node@10.9.2(@types/node@24.10.9)(typescript@5.9.3)) + specifier: 4.1.18 + version: 4.1.18 ts-jest: specifier: 29.4.6 version: 29.4.6(@babel/core@7.28.3)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.28.3))(esbuild@0.27.2)(jest-util@29.7.0)(jest@29.7.0(@types/node@24.10.9)(ts-node@10.9.2(@types/node@24.10.9)(typescript@5.9.3)))(typescript@5.9.3) @@ -1453,6 +1444,11 @@ packages: '@empathyco/eslint-config@1.8.0': resolution: {integrity: sha512-418kaBXnQnLjAXbY+dOvd7pF5DMeMYayAb4XvzzoMUIoVL8VSLabRFkwePvVgJbRGQhv1k5ww4YSGg16kFm4qA==} + '@empathyco/x-design-system@file:packages/x-design-system/empathyco-x-design-system-0.0.1.tgz': + resolution: {integrity: sha512-VlBJKF2YkvMumU5E/1HXRaoiJdLWTzX6S8ZxUr8zUVXt/jtQh3OlXzFeEwk/7IBWk1LMhXTe5BhnMVEgfFukFA==, tarball: file:packages/x-design-system/empathyco-x-design-system-0.0.1.tgz} + version: 0.0.1 + engines: {node: '>=22'} + '@empathyco/x-jest-utils@1.4.0-alpha.11': resolution: {integrity: sha512-yl68CngEeXGfHXZAzqypIeRTnaHkuoLLBNJt13chvl1d9VgYixN8CXBlzfghMHeWGNyQNqGjqwlJ8f+P4xxV9g==} engines: {node: '>=16'} @@ -6960,9 +6956,6 @@ packages: performance-now@2.1.0: resolution: {integrity: sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==} - picocolors@0.2.1: - resolution: {integrity: sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==} - picocolors@1.1.1: resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==} @@ -7032,12 +7025,6 @@ packages: peerDependencies: postcss: ^8.2.15 - postcss-dir-pseudo-class@7.0.2: - resolution: {integrity: sha512-cMnslilYxBf9k3qejnovrUONZx1rXeUZJw06fgIUBzABJe3D2LiLL5WAER7Imt3nrkaIgG05XZBztueLEf5P8w==} - engines: {node: ^14 || ^16 || >=18} - peerDependencies: - postcss: ^8.4 - postcss-discard-comments@5.1.2: resolution: {integrity: sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==} engines: {node: ^10 || ^12 || >=14.0} @@ -7092,10 +7079,6 @@ packages: ts-node: optional: true - postcss-logical@4.0.2: - resolution: {integrity: sha512-tlX1n19np6/JznvyymZM6SIe0FymD5Ngwcg2j825vNKhADu0p1PTgEmsCjakCbvn78kaIFzYTI32NpgOEwgifQ==} - engines: {node: '>=8.0.0'} - postcss-merge-longhand@5.1.7: resolution: {integrity: sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ==} engines: {node: ^10 || ^12 || >=14.0} @@ -7263,10 +7246,6 @@ packages: peerDependencies: postcss: ^8.2.9 - postcss@7.0.39: - resolution: {integrity: sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==} - engines: {node: '>=6.0.0'} - postcss@8.5.6: resolution: {integrity: sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==} engines: {node: ^10 || ^12 || >=14} @@ -10262,6 +10241,10 @@ snapshots: - typescript - vitest + '@empathyco/x-design-system@file:packages/x-design-system/empathyco-x-design-system-0.0.1.tgz': + dependencies: + tslib: 2.8.1 + '@empathyco/x-jest-utils@1.4.0-alpha.11': {} '@es-joy/jsdoccomment@0.50.2': @@ -11613,6 +11596,13 @@ snapshots: '@tailwindcss/oxide-win32-arm64-msvc': 4.1.18 '@tailwindcss/oxide-win32-x64-msvc': 4.1.18 + '@tailwindcss/vite@4.1.18(vite@6.4.1(@types/node@24.10.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.3)(tsx@4.21.0)(yaml@2.8.2))': + dependencies: + '@tailwindcss/node': 4.1.18 + '@tailwindcss/oxide': 4.1.18 + tailwindcss: 4.1.18 + vite: 6.4.1(@types/node@24.10.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.3)(tsx@4.21.0)(yaml@2.8.2) + '@tailwindcss/vite@4.1.18(vite@7.3.1(@types/node@24.10.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.3)(tsx@4.21.0)(yaml@2.8.2))': dependencies: '@tailwindcss/node': 4.1.18 @@ -11936,6 +11926,12 @@ snapshots: vite: 6.4.1(@types/node@24.10.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.3)(tsx@4.21.0)(yaml@2.8.2) vue: 3.5.27(typescript@5.9.3) + '@vitejs/plugin-vue@6.0.4(vite@6.4.1(@types/node@24.10.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.3)(tsx@4.21.0)(yaml@2.8.2))(vue@3.5.27(typescript@5.9.3))': + dependencies: + '@rolldown/pluginutils': 1.0.0-rc.2 + vite: 6.4.1(@types/node@24.10.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.3)(tsx@4.21.0)(yaml@2.8.2) + vue: 3.5.27(typescript@5.9.3) + '@vitejs/plugin-vue@6.0.4(vite@7.3.1(@types/node@24.10.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.3)(tsx@4.21.0)(yaml@2.8.2))(vue@3.5.28(typescript@5.9.3))': dependencies: '@rolldown/pluginutils': 1.0.0-rc.2 @@ -16791,8 +16787,6 @@ snapshots: performance-now@2.1.0: {} - picocolors@0.2.1: {} - picocolors@1.1.1: {} picomatch@2.3.1: {} @@ -16853,11 +16847,6 @@ snapshots: postcss: 8.5.6 postcss-value-parser: 4.2.0 - postcss-dir-pseudo-class@7.0.2(postcss@8.5.6): - dependencies: - postcss: 8.5.6 - postcss-selector-parser: 6.1.2 - postcss-discard-comments@5.1.2(postcss@8.5.6): dependencies: postcss: 8.5.6 @@ -16901,10 +16890,6 @@ snapshots: postcss: 8.5.6 ts-node: 10.9.2(@types/node@24.10.9)(typescript@5.9.3) - postcss-logical@4.0.2: - dependencies: - postcss: 7.0.39 - postcss-merge-longhand@5.1.7(postcss@8.5.6): dependencies: postcss: 8.5.6 @@ -17062,11 +17047,6 @@ snapshots: postcss: 8.5.6 quote-unquote: 1.0.0 - postcss@7.0.39: - dependencies: - picocolors: 0.2.1 - source-map: 0.6.1 - postcss@8.5.6: dependencies: nanoid: 3.3.11 From 6b7348b217e58aa65bdff8c249dca3dfd6468d1b Mon Sep 17 00:00:00 2001 From: "Jose A. Cabaneros" Date: Mon, 16 Feb 2026 18:44:35 +0100 Subject: [PATCH 4/7] fix: update tsconfig --- packages/x-design-system/tsconfig.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/x-design-system/tsconfig.json b/packages/x-design-system/tsconfig.json index d9d5390848..a1345a2586 100644 --- a/packages/x-design-system/tsconfig.json +++ b/packages/x-design-system/tsconfig.json @@ -4,8 +4,8 @@ "lib": ["esnext", "dom"], "baseUrl": ".", "rootDir": "lib", - "module": "node16", - "moduleResolution": "node16", + "module": "esnext", + "moduleResolution": "bundler", "types": [], "strict": true, "declaration": true, From a2e9ccfff38bafeea61fe069f2d80d99f4a4d2ea Mon Sep 17 00:00:00 2001 From: "Jose A. Cabaneros" Date: Tue, 17 Feb 2026 12:37:16 +0100 Subject: [PATCH 5/7] fix: fix deps and tsconfig --- packages/x-components/package.json | 2 +- packages/x-components/tsconfig.json | 6 +++--- packages/x-components/vite.config.ts | 6 ++++-- pnpm-lock.yaml | 32 +++++++++++++++------------- 4 files changed, 25 insertions(+), 21 deletions(-) diff --git a/packages/x-components/package.json b/packages/x-components/package.json index 6532a21f42..30c8d1d7e9 100644 --- a/packages/x-components/package.json +++ b/packages/x-components/package.json @@ -107,7 +107,7 @@ "@types/aria-query": "5.0.4", "@types/jest": "29.5.14", "@types/node": "24.10.9", - "@vitejs/plugin-vue": "6.0.4", + "@vitejs/plugin-vue": "5.2.4", "@vue/test-utils": "2.4.6", "@vue/vue3-jest": "29.2.6", "convert-source-map": "2.0.0", diff --git a/packages/x-components/tsconfig.json b/packages/x-components/tsconfig.json index 530c3e790b..448e2234ce 100644 --- a/packages/x-components/tsconfig.json +++ b/packages/x-components/tsconfig.json @@ -5,9 +5,9 @@ "lib": ["esnext", "dom", "dom.iterable", "scripthost"], "experimentalDecorators": true, "baseUrl": ".", - "rootDir": ".", + "rootDir": "src", "module": "esnext", - "moduleResolution": "nodenext", + "moduleResolution": "node", "types": ["jest", "node", "@testing-library/jest-dom"], "strict": true, "declaration": true, @@ -19,6 +19,6 @@ "esModuleInterop": true, "isolatedModules": true }, - "include": ["src/**/*.ts", "src/**/*.vue", "vite.config.ts"], + "include": ["src/**/*.ts", "src/**/*.vue"], "exclude": ["node_modules"] } diff --git a/packages/x-components/vite.config.ts b/packages/x-components/vite.config.ts index b867b2c524..7e825bb754 100644 --- a/packages/x-components/vite.config.ts +++ b/packages/x-components/vite.config.ts @@ -2,12 +2,14 @@ import { resolve } from 'path' import vue from '@vitejs/plugin-vue' import { defineConfig } from 'vite' import Inspector from 'vite-plugin-vue-inspector' +// @ts-ignore import tailwindcss from '@tailwindcss/vite' export const vueDocsPlugin = { name: 'vue-docs', - transform: (_: string, id: string) => - !/vue&type=docs/.test(id) ? undefined : `export default ''`, + transform(code: string, id: string) { + return !/vue&type=docs/.test(id) ? undefined : `export default ''` + }, } export default defineConfig({ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ad13f4951d..6ba04a351b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -291,8 +291,8 @@ importers: specifier: 24.10.9 version: 24.10.9 '@vitejs/plugin-vue': - specifier: 6.0.4 - version: 6.0.4(vite@6.4.1(@types/node@24.10.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.3)(tsx@4.21.0)(yaml@2.8.2))(vue@3.5.27(typescript@5.9.3)) + specifier: 5.2.4 + version: 5.2.4(vite@6.4.1(@types/node@24.10.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.3)(tsx@4.21.0)(yaml@2.8.2))(vue@3.5.27(typescript@5.9.3)) '@vue/test-utils': specifier: 2.4.6 version: 2.4.6 @@ -2016,6 +2016,9 @@ packages: '@jridgewell/sourcemap-codec@1.5.5': resolution: {integrity: sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==} + '@jridgewell/trace-mapping@0.3.30': + resolution: {integrity: sha512-GQ7Nw5G2lTu/BtHTKfXhKHok2WGetd4XYcVKGx00SjAk8GMwgJM3zr6zORiPGuOE+/vkc90KtTosSSvaCjKb2Q==} + '@jridgewell/trace-mapping@0.3.31': resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==} @@ -4968,8 +4971,8 @@ packages: resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==} engines: {node: '>=12'} - fs-extra@11.3.3: - resolution: {integrity: sha512-VWSRii4t0AFm6ixFFmLLx1t7wS1gh+ckoa84aOeapGum0h+EZd1EhEumSB+ZdDLnEPuucsVB9oB7cxJHap6Afg==} + fs-extra@11.3.1: + resolution: {integrity: sha512-eXvGGwZ5CL17ZSwHWd3bbgk7UUpF6IFHtP57NYYakPvHOs8GDgDe5KJI36jIJzDkJ6eJjuzRA8eBQb6SkKue0g==} engines: {node: '>=14.14'} fs-extra@8.1.0: @@ -10669,7 +10672,7 @@ snapshots: '@jest/test-result': 29.7.0 '@jest/transform': 29.7.0 '@jest/types': 29.6.3 - '@jridgewell/trace-mapping': 0.3.31 + '@jridgewell/trace-mapping': 0.3.30 '@types/node': 24.10.9 chalk: 4.1.2 collect-v8-coverage: 1.0.2 @@ -10719,7 +10722,7 @@ snapshots: dependencies: '@babel/core': 7.28.3 '@jest/types': 29.6.3 - '@jridgewell/trace-mapping': 0.3.31 + '@jridgewell/trace-mapping': 0.3.30 babel-plugin-istanbul: 6.1.1 chalk: 4.1.2 convert-source-map: 2.0.0 @@ -10758,6 +10761,11 @@ snapshots: '@jridgewell/sourcemap-codec@1.5.5': {} + '@jridgewell/trace-mapping@0.3.30': + dependencies: + '@jridgewell/resolve-uri': 3.1.2 + '@jridgewell/sourcemap-codec': 1.5.5 + '@jridgewell/trace-mapping@0.3.31': dependencies: '@jridgewell/resolve-uri': 3.1.2 @@ -11456,7 +11464,7 @@ snapshots: ajv: 8.13.0 ajv-draft-04: 1.0.0(ajv@8.13.0) ajv-formats: 3.0.1(ajv@8.13.0) - fs-extra: 11.3.3 + fs-extra: 11.3.1 import-lazy: 4.0.0 jju: 1.4.0 resolve: 1.22.11 @@ -11926,12 +11934,6 @@ snapshots: vite: 6.4.1(@types/node@24.10.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.3)(tsx@4.21.0)(yaml@2.8.2) vue: 3.5.27(typescript@5.9.3) - '@vitejs/plugin-vue@6.0.4(vite@6.4.1(@types/node@24.10.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.3)(tsx@4.21.0)(yaml@2.8.2))(vue@3.5.27(typescript@5.9.3))': - dependencies: - '@rolldown/pluginutils': 1.0.0-rc.2 - vite: 6.4.1(@types/node@24.10.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.3)(tsx@4.21.0)(yaml@2.8.2) - vue: 3.5.27(typescript@5.9.3) - '@vitejs/plugin-vue@6.0.4(vite@7.3.1(@types/node@24.10.9)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.97.3)(tsx@4.21.0)(yaml@2.8.2))(vue@3.5.28(typescript@5.9.3))': dependencies: '@rolldown/pluginutils': 1.0.0-rc.2 @@ -14164,7 +14166,7 @@ snapshots: jsonfile: 6.2.0 universalify: 2.0.1 - fs-extra@11.3.3: + fs-extra@11.3.1: dependencies: graceful-fs: 4.2.11 jsonfile: 6.2.0 @@ -16497,7 +16499,7 @@ snapshots: fast-glob: 3.2.7 figures: 3.2.0 flat: 5.0.2 - fs-extra: 11.3.3 + fs-extra: 11.3.1 glob: 7.1.4 ignore: 5.3.2 js-yaml: 4.1.0 From 67f4981ed4995d05c8ed458ea55ea6edce5f85d4 Mon Sep 17 00:00:00 2001 From: "Jose A. Cabaneros" Date: Thu, 19 Feb 2026 11:12:46 +0100 Subject: [PATCH 6/7] chore: upgrade x-design-system dept --- packages/x-components/package.json | 2 +- packages/x-design-system/demo/index.html | 3 +-- pnpm-lock.yaml | 13 ++----------- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/packages/x-components/package.json b/packages/x-components/package.json index 94112decae..91d1bc24f9 100644 --- a/packages/x-components/package.json +++ b/packages/x-components/package.json @@ -99,7 +99,7 @@ "@badeball/cypress-cucumber-preprocessor": "24.0.0", "@bahmutov/cypress-esbuild-preprocessor": "2.2.8", "@cucumber/messages": "32.0.1", - "@empathyco/x-design-system": "file://../x-design-system/empathyco-x-design-system-0.0.1.tgz", + "@empathyco/x-design-system": "0.0.2-alpha.1", "@microsoft/api-documenter": "7.28.2", "@microsoft/api-extractor": "7.55.2", "@tailwindcss/vite": "4.1.18", diff --git a/packages/x-design-system/demo/index.html b/packages/x-design-system/demo/index.html index 09825437df..adc86bdc78 100644 --- a/packages/x-design-system/demo/index.html +++ b/packages/x-design-system/demo/index.html @@ -4,10 +4,9 @@ x-design-system demo -
-

DEMO TESTING

+ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 169cb4b1b5..5c9595afd9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -267,8 +267,8 @@ importers: specifier: 32.0.1 version: 32.0.1 '@empathyco/x-design-system': - specifier: file://../x-design-system/empathyco-x-design-system-0.0.1.tgz - version: file:packages/x-design-system/empathyco-x-design-system-0.0.1.tgz + specifier: 0.0.2-alpha.1 + version: link:../x-design-system '@microsoft/api-documenter': specifier: 7.28.2 version: 7.28.2(@types/node@24.10.9) @@ -1444,11 +1444,6 @@ packages: '@empathyco/eslint-config@1.8.0': resolution: {integrity: sha512-418kaBXnQnLjAXbY+dOvd7pF5DMeMYayAb4XvzzoMUIoVL8VSLabRFkwePvVgJbRGQhv1k5ww4YSGg16kFm4qA==} - '@empathyco/x-design-system@file:packages/x-design-system/empathyco-x-design-system-0.0.1.tgz': - resolution: {integrity: sha512-VlBJKF2YkvMumU5E/1HXRaoiJdLWTzX6S8ZxUr8zUVXt/jtQh3OlXzFeEwk/7IBWk1LMhXTe5BhnMVEgfFukFA==, tarball: file:packages/x-design-system/empathyco-x-design-system-0.0.1.tgz} - version: 0.0.1 - engines: {node: '>=22'} - '@empathyco/x-jest-utils@1.4.0-alpha.11': resolution: {integrity: sha512-yl68CngEeXGfHXZAzqypIeRTnaHkuoLLBNJt13chvl1d9VgYixN8CXBlzfghMHeWGNyQNqGjqwlJ8f+P4xxV9g==} engines: {node: '>=16'} @@ -10241,10 +10236,6 @@ snapshots: - typescript - vitest - '@empathyco/x-design-system@file:packages/x-design-system/empathyco-x-design-system-0.0.1.tgz': - dependencies: - tslib: 2.8.1 - '@empathyco/x-jest-utils@1.4.0-alpha.11': {} '@es-joy/jsdoccomment@0.50.2': From f458563eb0b15a0bd9425523fc1afcdef22ede74 Mon Sep 17 00:00:00 2001 From: "Jose A. Cabaneros" Date: Thu, 19 Feb 2026 11:55:21 +0100 Subject: [PATCH 7/7] chore: clear tailwind setup --- packages/x-components/src/App.vue | 1 - packages/x-components/src/main.ts | 2 +- packages/x-components/src/tailwind/index.css | 11 --- packages/x-components/src/tailwind/xds.css | 1 + packages/x-components/src/views/home/Home.vue | 84 ++++++++++--------- 5 files changed, 47 insertions(+), 52 deletions(-) delete mode 100644 packages/x-components/src/tailwind/index.css create mode 100644 packages/x-components/src/tailwind/xds.css diff --git a/packages/x-components/src/App.vue b/packages/x-components/src/App.vue index 27fcfc350c..a40f410081 100644 --- a/packages/x-components/src/App.vue +++ b/packages/x-components/src/App.vue @@ -6,7 +6,6 @@ {{ route.name }} -

DEMO TESTING

diff --git a/packages/x-components/src/main.ts b/packages/x-components/src/main.ts index 60238cec04..97223a1b4c 100644 --- a/packages/x-components/src/main.ts +++ b/packages/x-components/src/main.ts @@ -8,7 +8,7 @@ import { XInstaller } from './x-installer/x-installer/x-installer' import { FilterEntityFactory } from './x-modules/facets/entities/filter-entity.factory' import { SingleSelectModifier } from './x-modules/facets/entities/single-select.modifier' import { StickyModifier } from './x-modules/facets/entities/sticky.modifier' -import './tailwind/index.css' +import './tailwind/xds.css' /* eslint-disable ts/no-unsafe-argument */ diff --git a/packages/x-components/src/tailwind/index.css b/packages/x-components/src/tailwind/index.css deleted file mode 100644 index 9b43b633e9..0000000000 --- a/packages/x-components/src/tailwind/index.css +++ /dev/null @@ -1,11 +0,0 @@ -@import '../../node_modules/@empathyco/x-design-system/dist/index.css'; - -@layer base { - body { - @apply xds:bg-gray-100; - } -} - -@theme { - --color-fabada: #fabada; -} diff --git a/packages/x-components/src/tailwind/xds.css b/packages/x-components/src/tailwind/xds.css new file mode 100644 index 0000000000..0f69f6af94 --- /dev/null +++ b/packages/x-components/src/tailwind/xds.css @@ -0,0 +1 @@ +@import '../../node_modules/@empathyco/x-design-system/dist/index.css'; diff --git a/packages/x-components/src/views/home/Home.vue b/packages/x-components/src/views/home/Home.vue index ccbaf5bd38..b8dc05cfee 100644 --- a/packages/x-components/src/views/home/Home.vue +++ b/packages/x-components/src/views/home/Home.vue @@ -1,5 +1,5 @@