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 91fa0ff40d..91d1bc24f9 100644 --- a/packages/x-components/package.json +++ b/packages/x-components/package.json @@ -99,9 +99,10 @@ "@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": "0.0.2-alpha.1", "@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", @@ -109,16 +110,12 @@ "@vitejs/plugin-vue": "5.2.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/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 b5c61c9567..0000000000 --- a/packages/x-components/src/tailwind/index.css +++ /dev/null @@ -1,3 +0,0 @@ -@tailwind base; -@tailwind components; -@tailwind utilities; 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/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 @@