Skip to content

Commit dac979c

Browse files
committed
chore(deps): upgrade to Tailwind 4 (#1019)
fix: attempt tailwind build
1 parent 40c2769 commit dac979c

File tree

7 files changed

+28
-7
lines changed

7 files changed

+28
-7
lines changed

frontend/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,8 @@
114114
"@faker-js/faker": "9.8.0",
115115
"@histoire/plugin-screenshot": "1.0.0-alpha.2",
116116
"@histoire/plugin-vue": "1.0.0-alpha.2",
117+
"@tailwindcss/postcss": "4.1.8",
118+
"@tailwindcss/vite": "4.1.8",
117119
"@tsconfig/node22": "22.0.2",
118120
"@types/codemirror": "5.60.16",
119121
"@types/is-touch-device": "1.0.3",
@@ -125,7 +127,6 @@
125127
"@vue/eslint-config-typescript": "14.5.1",
126128
"@vue/test-utils": "2.4.6",
127129
"@vue/tsconfig": "0.7.0",
128-
"@tailwindcss/vite": "4.1.8",
129130
"browserslist": "4.25.0",
130131
"caniuse-lite": "1.0.30001724",
131132
"csstype": "3.1.3",

frontend/pnpm-lock.yaml

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/src/App.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,4 +92,3 @@ setLanguage(authStore.settings.language)
9292
useColorScheme()
9393
</script>
9494

95-
<style lang="scss" src="@/styles/global.scss" />

frontend/src/main.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ if (window.API_URL.endsWith('/')) {
3838
// directives
3939
import focus from '@/directives/focus'
4040
import {vTooltip} from 'floating-vue'
41+
42+
import './styles/global.scss'
4143
import 'floating-vue/dist/style.css'
4244
import shortcut from '@/directives/shortcut'
4345
import cypress from '@/directives/cypress'

frontend/src/styles/global.scss

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
@config "../../tailwind.config.js";
2-
@layer theme, base, components, utilities;
3-
@import "tailwindcss/theme.css" layer(theme);
4-
@import "tailwindcss/utilities.css" layer(utilities);
2+
@tailwind theme;
3+
@tailwind utilities;
54

65
@import "fonts";
76

frontend/tailwind.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/** @type {import('tailwindcss').Config} */
2-
module.exports = {
2+
export default {
33
prefix: 'tw-',
44
content: [
55
'./index.html',

frontend/vite.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ function getBuildConfig(env: Record<string, string>) {
111111
},
112112
},
113113
plugins: [
114-
tailwindcss(),
114+
tailwindcss({config: './tailwind.config.js'}),
115115
vue(),
116116
svgLoader({
117117
// Since the svgs are already manually optimized via https://jakearchibald.github.io/svgomg/

0 commit comments

Comments
 (0)