Skip to content

Commit ff1b12e

Browse files
bmulhollandsetchy
andauthored
chore(deps): upgrade Tailwind v4 (#1770)
* chore: Fix Tailwind v3 installation * chore(deps): update tailwindcss to v4 (#1771) * chore(deps): update tailwindcss to v4 * consolidate into App.css Signed-off-by: Adam Setch <[email protected]> --------- Signed-off-by: Adam Setch <[email protected]> Co-authored-by: Adam Setch <[email protected]> * pin dep Signed-off-by: Adam Setch <[email protected]> --------- Signed-off-by: Adam Setch <[email protected]> Co-authored-by: Adam Setch <[email protected]>
1 parent 3c5caf2 commit ff1b12e

18 files changed

+345
-369
lines changed

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@
142142
"@primer/octicons-react": "19.14.0",
143143
"@primer/primitives": "10.3.4",
144144
"@primer/react": "36.27.0",
145+
"@tailwindcss/postcss": "4.0.0",
145146
"@testing-library/react": "16.2.0",
146147
"@types/jest": "29.5.14",
147148
"@types/node": "22.10.9",
@@ -150,7 +151,6 @@
150151
"@types/react-dom": "19.0.3",
151152
"@types/react-router-dom": "5.3.3",
152153
"@types/semver": "7.5.8",
153-
"autoprefixer": "10.4.20",
154154
"axios": "1.7.9",
155155
"clsx": "2.1.1",
156156
"concurrently": "9.1.2",
@@ -176,7 +176,7 @@
176176
"semver": "7.6.3",
177177
"styled-components": "6.1.14",
178178
"tailwind-merge": "2.6.0",
179-
"tailwindcss": "3.4.17",
179+
"tailwindcss": "4.0.0",
180180
"terser-webpack-plugin": "5.3.11",
181181
"ts-jest": "29.2.5",
182182
"ts-loader": "9.5.2",

pnpm-lock.yaml

+275-301
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

postcss.config.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
module.exports = {
22
plugins: {
3-
tailwindcss: {},
4-
autoprefixer: {},
3+
'@tailwindcss/postcss': {},
54
},
65
};

src/renderer/App.css

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
/** Tailwind CSS */
2+
@import "tailwindcss";
3+
14
/** GitHub Primer Design System */
25
/* Size & Typography */
36
@import "@primer/primitives/dist/css/base/size/size.css";
@@ -19,6 +22,9 @@
1922
@import "@primer/primitives/dist/css/functional/themes/dark-high-contrast.css";
2023
@import "@primer/primitives/dist/css/functional/themes/dark-tritanopia.css";
2124

25+
/** Tailwind CSS Configuration */
26+
@config '../../tailwind.config.ts';
27+
2228
html,
2329
body,
2430
#root {

src/renderer/components/fields/Checkbox.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export const Checkbox: FC<ICheckbox> = (props: ICheckbox) => {
1818
<input
1919
type="checkbox"
2020
id={props.name}
21-
className="size-4 rounded cursor-pointer"
21+
className="size-4 rounded-sm cursor-pointer"
2222
checked={props.checked}
2323
onChange={props.onChange}
2424
disabled={props.disabled}

src/renderer/components/fields/FieldInput.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export const FieldInput: FC<IFieldInput> = ({
3434
type={type}
3535
className={cn(
3636
'text-sm mb-2 px-4 py-1.5 block w-full appearance-none',
37-
'rounded border bg-gitify-input-rest focus:bg-gitify-input-focus focus:outline-none',
37+
'rounded-sm border bg-gitify-input-rest focus:bg-gitify-input-focus focus:outline-hidden',
3838
error ? 'border-red-500' : 'border-gray-500',
3939
)}
4040
id={input.name}

src/renderer/components/fields/Tooltip.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export const Tooltip: FC<ITooltip> = (props: ITooltip) => {
1919
>
2020
<QuestionIcon className="ml-1 text-gitify-tooltip-icon" />
2121
{showTooltip && (
22-
<div className="absolute left-[-80px] z-10 w-60 rounded border border-gray-300 p-2 shadow bg-gitify-tooltip-popout">
22+
<div className="absolute left-[-80px] z-10 w-60 rounded-sm border border-gray-300 p-2 shadow-sm bg-gitify-tooltip-popout">
2323
<div className="text-left text-xs text-gitify-font">
2424
{props.tooltip}
2525
</div>

src/renderer/components/fields/__snapshots__/Checkbox.test.tsx.snap

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/renderer/components/fields/__snapshots__/FieldInput.test.tsx.snap

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/renderer/components/fields/__snapshots__/Tooltip.test.tsx.snap

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/renderer/components/layout/Contents.tsx

+1-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,5 @@ interface IContents {
55
}
66

77
export const Contents: FC<IContents> = (props: IContents) => {
8-
return (
9-
<div className="flex-grow overflow-x-auto px-8 pb-4">{props.children}</div>
10-
);
8+
return <div className="grow overflow-x-auto px-8 pb-4">{props.children}</div>;
119
};

src/renderer/components/layout/__snapshots__/Contents.test.tsx.snap

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/renderer/index.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { createRoot } from 'react-dom/client';
22

33
import 'nprogress/nprogress.css';
4-
import 'tailwindcss/tailwind.css';
54
import { App } from './App';
65

76
const container = document.getElementById('root');

src/renderer/routes/__snapshots__/Accounts.test.tsx.snap

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/renderer/routes/__snapshots__/Filters.test.tsx.snap

+21-21
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)