Skip to content
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
2 changes: 1 addition & 1 deletion web/.prettierrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"jsxSingleQuote": true,
"plugins": ["prettier-plugin-sort-json"],
"plugins": ["prettier-plugin-sort-json", "prettier-plugin-tailwindcss"],
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you don't need this but it makes life a lot better when dealing with tailwind classes

"semi": false,
"singleQuote": true
}
5 changes: 1 addition & 4 deletions web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,8 @@
"eslint-plugin-prettier": "^5.2.3",
"postcss": "^8",
"prettier": "^3.5.2",
"prettier-plugin-tailwindcss": "^0.6.14",
"tailwindcss": "^4.1.11",
"typescript": "^5"
},
"overrides": {
"@types/react": "19.1.6",
"@types/react-dom": "19.1.6"
Comment on lines -48 to -51
Copy link
Collaborator Author

@ryankshaw ryankshaw Aug 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you shouldn't need these anymore. not related to tailwind but something you could clean up

}
}
84 changes: 76 additions & 8 deletions web/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions web/src/app/globals.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@import 'tailwindcss/theme.css';
@import 'tailwindcss/utilities.css';
/* you might want to consider adding this preflight line here. it enables tailwind's preflight. we can't do it by default in our other apps because they are relying on their own css reset but if you can it will make your app look more like "standard" tailwind */
/* @import "tailwindcss/preflight.css" layer(base); */
Comment on lines +1 to +2
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if you can use tailwind's preflight, I would. we can't in our other apps but you should if you can

@import '@patterninc/react-ui/dist/pattern-themed-tailwind.css'

@theme {
--color-background: var(--background);
Expand Down
1 change: 0 additions & 1 deletion web/src/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import ClientLayout from '@/common/ClientLayout/ClientLayout'
import { NuqsAdapter } from 'nuqs/adapters/next/app'
import './globals.css'
import '../../node_modules/@patterninc/react-ui/dist/pattern-themed-tailwind.css'
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you don't want to pull in pattern-themed-tailwind.css as it's own css file. you want to pull it in where you were pulling in "tailwind" in your css file


export const metadata = {
title: 'Heimdall',
Expand Down
19 changes: 0 additions & 19 deletions web/tailwind.config.ts

This file was deleted.

2 changes: 1 addition & 1 deletion web/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"./src/*"
]
},
"target": "ES2017"
Copy link
Collaborator Author

@ryankshaw ryankshaw Aug 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't necessarily part of upgrading to tailwind, but I noticed this while playing with your pr. all the browsers we support support at lest es2022 so you can bump this so you can get access to more stuff like Array.at or whatever

"target": "ES2022"
},
"include": [
"next-env.d.ts",
Expand Down