Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ui-patterns): tailwind styles not being integrated #1377

Merged
merged 4 commits into from
Apr 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,11 @@
"@nx/vite:test": {
"cache": true,
"inputs": ["default", "^production"]
},
"@nx/vite:build": {
"cache": true,
"dependsOn": ["^build"],
"inputs": ["production", "^production"]
}
},
"generators": {
Expand Down
19 changes: 18 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,20 +52,30 @@
"@types/css-font-loading-module": "^0.0.7",
"@types/fs-extra": "^9.0.13",
"@types/jest": "29.5.11",
"@types/node": "18.16.9",
"@types/react": "18.2.33",
"@types/react-dom": "18.2.14",
"@types/shelljs": "^0.8.15",
"@typescript-eslint/eslint-plugin": "6.13.2",
"@typescript-eslint/parser": "6.13.2",
"@vitejs/plugin-react": "^4.2.0",
"@vitest/ui": "^1.3.1",
"autoprefixer": "^10.4.16",
"camelcase": "^6.2.0",
"chalk": "^4.1.2",
"conventional-changelog-angular": "^7.0.0",
"conventional-recommended-bump": "^9.0.0",
"copy-webpack-plugin": "^11.0.0",
"eslint": "^8.51.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-import": "2.27.5",
"eslint-plugin-jsx-a11y": "6.7.1",
"eslint-plugin-no-null": "^1.0.2",
"eslint-plugin-playwright": "^0.15.3",
"eslint-plugin-prettier": "^5.0.1",
"eslint-plugin-react": "^7.32.1",
"eslint-plugin-react": "7.32.2",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.3",
"fs-extra": "^9.0.0",
"jest": "29.7.0",
"jest-cli": "29.7.0",
Expand All @@ -79,13 +89,20 @@
"postcss-url": "~10.1.3",
"prettier": "^2.6.2",
"prompts": "^2.4.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"sass": "^1.55.0",
"semver": "^7.5.4",
"shelljs": "^0.8.4",
"shx": "^0.3.2",
"svgo": "^2.8.0",
"tailwindcss": "^3.3.3",
"ts-node": "^10.9.1",
"typescript": "~5.3.2",
"vite": "~5.0.0",
"vite-plugin-dts": "^3.6.0",
"vite-plugin-static-copy": "^0.17.0",
"vitest": "^1.3.1",
"yalc": "^1.0.0-pre.32"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/storybook/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"extends": ["../../.eslintrc.json"],
"ignorePatterns": ["!**/*", "node_modules/*", "dist/*"],
"ignorePatterns": ["!**/*", "node_modules/*", "dist/*", "storybook-static"],
"overrides": [
{
"files": ["src/**/*.{ts,js,tsx,jsx}"],
Expand Down
19 changes: 1 addition & 18 deletions packages/ui-patterns-playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,6 @@
"type": "module",
"dependencies": {
"@inovex.de/elements-react": "^9.3.0",
"@inovex.de/ui-patterns": "^9.3.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.21.0"
},
"devDependencies": {
"@types/react": "^18.2.37",
"@types/react-dom": "^18.2.15",
"@typescript-eslint/eslint-plugin": "^6.10.0",
"@typescript-eslint/parser": "^6.10.0",
"@vitejs/plugin-react": "^4.2.0",
"autoprefixer": "^10.4.16",
"eslint": "^8.53.0",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.4",
"postcss": "^8.4.32",
"tailwindcss": "^3.3.6",
"vite": "^4.5.2"
"@inovex.de/ui-patterns": "^9.3.0"
}
}
10 changes: 9 additions & 1 deletion packages/ui-patterns-playground/postcss.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
import { dirname, join } from 'path';
import { fileURLToPath } from 'url';

const __filename = fileURLToPath(import.meta.url);
const __dirname = dirname(__filename);

export default {
plugins: {
tailwindcss: {},
tailwindcss: {
config: join(__dirname, 'tailwind.config.js'),
},
autoprefixer: {},
},
};
8 changes: 4 additions & 4 deletions packages/ui-patterns-playground/src/index.css
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
@import 'tailwindcss/base';
@import 'tailwindcss/components';
@import 'tailwindcss/utilities';

@import '@inovex.de/elements/dist/inovex-elements/inovex-elements.css';
@import '@inovex.de/ui-patterns/dist/style.css';

@tailwind base;
@tailwind components;
@tailwind utilities;

#root {
height: 100vh;
}
4 changes: 3 additions & 1 deletion packages/ui-patterns-playground/tailwind.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { join } from 'path';

/** @type {import('tailwindcss').Config} */
export default {
content: ['./index.html', './src/**/*.{js,ts,jsx,tsx}'],
content: [join(__dirname, 'src/**/*.{js,ts,jsx,tsx,html}')],
theme: {
extend: {
colors: {
Expand Down
17 changes: 1 addition & 16 deletions packages/ui-patterns/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,8 @@
"dist",
"package.json"
],
"devDependencies": {
"@types/react": "^18.2.15",
"@types/react-dom": "^18.2.7",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"@vitejs/plugin-react": "^4.0.3",
"autoprefixer": "^10.4.16",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.3",
"postcss": "^8.4.31",
"tailwindcss": "^3.3.3",
"vite": "^4.4.5",
"vite-plugin-dts": "^3.6.0",
"vite-plugin-static-copy": "^0.17.0"
},
"peerDependencies": {
"@inovex.de/elements-react": "^9.0.0",
"@inovex.de/elements-react": "^9.3.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
}
Expand Down
10 changes: 9 additions & 1 deletion packages/ui-patterns/postcss.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
import { dirname, join } from 'path';
import { fileURLToPath } from 'url';

const __filename = fileURLToPath(import.meta.url);
const __dirname = dirname(__filename);

export default {
plugins: {
tailwindcss: {},
tailwindcss: {
config: join(__dirname, 'tailwind.config.js'),
},
autoprefixer: {},
},
};
6 changes: 3 additions & 3 deletions packages/ui-patterns/src/index.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import 'tailwindcss/base';
@import 'tailwindcss/components';
@import 'tailwindcss/utilities';
@tailwind base;
@tailwind components;
@tailwind utilities;
4 changes: 3 additions & 1 deletion packages/ui-patterns/tailwind.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { join } from 'path';

/** @type {import('tailwindcss').Config} */
export default {
content: ['./index.html', './src/**/*.{js,ts,jsx,tsx,html}'],
content: [join(__dirname, 'src/**/*.{js,ts,jsx,tsx,html}')],
theme: {
extend: {
colors: {
Expand Down
Loading
Loading