Skip to content

Commit 8e2d1ac

Browse files
chore(deps): update dependency tailwindcss to v4 (#4002)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Stephan Köninger <[email protected]>
1 parent c8f5a30 commit 8e2d1ac

File tree

97 files changed

+1538
-1617
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+1538
-1617
lines changed

spring-boot-admin-server-ui/.storybook/main.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
const vueJsx = require('@vitejs/plugin-vue-jsx').default;
12
const { mergeConfig } = require('vite');
3+
24
const path = require('path');
35
const frontend = path.resolve(__dirname, '../src/main/frontend/');
46
module.exports = {
@@ -18,6 +20,7 @@ module.exports = {
1820
},
1921
async viteFinal(config) {
2022
config.plugins = config.plugins.filter((p) => p.name !== 'vue-docgen');
23+
config.plugins.push(vueJsx());
2124
return mergeConfig(config, {
2225
resolve: {
2326
alias: {

spring-boot-admin-server-ui/package-lock.json

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

spring-boot-admin-server-ui/package.json

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@
7474
"@storybook/addon-mdx-gfm": "^8.0.0",
7575
"@storybook/vue3": "8.5.8",
7676
"@storybook/vue3-vite": "^8.0.0",
77+
"@tailwindcss/postcss": "^4.0.7",
78+
"@tailwindcss/vite": "^4.0.7",
7779
"@testing-library/jest-dom": "6.6.3",
7880
"@testing-library/user-event": "14.6.1",
7981
"@testing-library/vue": "8.1.0",
@@ -83,6 +85,7 @@
8385
"@typescript-eslint/eslint-plugin": "^8.0.0",
8486
"@typescript-eslint/parser": "^8.0.0",
8587
"@vitejs/plugin-vue": "5.2.1",
88+
"@vitejs/plugin-vue-jsx": "^4.1.1",
8689
"@vue/eslint-config-typescript": "^14.0.0",
8790
"@vue/test-utils": "2.4.6",
8891
"autoprefixer": "10.4.20",
@@ -92,16 +95,16 @@
9295
"eslint-plugin-prettier": "^5.0.0",
9396
"eslint-plugin-storybook": "0.11.3",
9497
"eslint-plugin-vue": "^9.10.0",
95-
"happy-dom": "^14.12.3",
98+
"happy-dom": "^17.1.1",
9699
"jsdom": "^26.0.0",
97100
"msw": "2.7.1",
98101
"msw-storybook-addon": "2.0.4",
99-
"postcss": "8.5.3",
100102
"prettier": "^3.0.3",
101103
"rollup-plugin-visualizer": "5.14.0",
102104
"sass": "^1.57.1",
103105
"storybook": "8.5.8",
104-
"tailwindcss": "3.4.17",
106+
"storybook-vue3-router": "^5.0.0",
107+
"tailwindcss": "4.0.7",
105108
"ts-node-dev": "^2.0.0",
106109
"typescript": "^5.0.3",
107110
"vite": "6.1.1",
@@ -116,8 +119,7 @@
116119
"not ie <= 8"
117120
],
118121
"engines": {
119-
"node": "22.14.0",
120-
"npm": "11.1.0"
122+
"node": "22.14.0"
121123
},
122124
"msw": {
123125
"workerDirectory": [
@@ -127,5 +129,6 @@
127129
},
128130
"overrides": {
129131
"esbuild": "0.25.0"
130-
}
132+
},
133+
"packageManager": "[email protected]+sha512.b2dc20e2fc72b3e18848459b37359a32064663e5627a51e4c74b2c29dd8e8e0491483c3abb40789cfd578bf362fb6ba8261b05f0387d76792ed6e23ea3b1b6a0"
131134
}

spring-boot-admin-server-ui/postcss.config.js

Lines changed: 0 additions & 8 deletions
This file was deleted.

spring-boot-admin-server-ui/src/main/frontend/components/sba-alert.stories.ts renamed to spring-boot-admin-server-ui/src/main/frontend/components/sba-alert.stories.tsx

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,7 @@ export default {
2020
title: 'Components/Alert',
2121
};
2222

23-
const Template = (args) => ({
24-
components: { SbaAlert },
25-
setup() {
26-
return { args };
27-
},
28-
template: '<sba-alert v-bind="args" />',
29-
});
23+
const Template = (args) => <sba-alert {...args} />;
3024

3125
export const AlertError = {
3226
render: Template,

spring-boot-admin-server-ui/src/main/frontend/components/sba-alert.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<div
1919
v-if="hasError"
2020
:class="classNames(alertClass, borderClassNames)"
21-
class="rounded-b px-4 py-3 shadow-sm backdrop-filter backdrop-blur-xs bg-opacity-80 my-3"
21+
class="rounded-b px-4 py-3 shadow backdrop-filter backdrop-blur-xs my-3"
2222
role="alert"
2323
>
2424
<div class="flex">
@@ -70,13 +70,13 @@ export default defineComponent({
7070
return {
7171
classNames,
7272
alertClass: {
73-
'bg-red-100 border-red-400 text-red-700':
73+
'bg-red-100/80 border-red-400 text-red-700':
7474
this.severity.toUpperCase() === Severity.ERROR,
75-
'bg-orange-100 border-orange-500 text-orange-700':
75+
'bg-orange-100/80 border-orange-500 text-orange-700':
7676
this.severity.toUpperCase() === Severity.WARN,
77-
'bg-blue-100 border-blue-500 text-blue-900':
77+
'bg-blue-100/80 border-blue-500 text-blue-900':
7878
this.severity.toUpperCase() === Severity.INFO,
79-
'bg-teal-100 border-teal-500 text-teal-900':
79+
'bg-teal-100/80 border-teal-500 text-teal-900':
8080
this.severity.toUpperCase() === Severity.SUCCESS,
8181
},
8282
textColor: {

spring-boot-admin-server-ui/src/main/frontend/components/sba-button-group.vue

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
</div>
55
</template>
66

7-
<style type="text/css">
7+
<style>
8+
@reference "@/index.css";
9+
810
.btn-group {
911
@apply inline-flex z-0 relative -space-x-px;
1012
}
@@ -15,14 +17,14 @@
1517
}
1618
1719
.btn-group button:first-child:not(:last-child) {
18-
@apply rounded-r-none !important;
20+
@apply rounded-r-none!;
1921
}
2022
2123
.btn-group button:not(:first-child):not(:last-child) {
22-
@apply rounded-none !important;
24+
@apply rounded-none!;
2325
}
2426
2527
.btn-group button:last-child:not(:first-child) {
26-
@apply rounded-l-none !important;
28+
@apply rounded-l-none!;
2729
}
2830
</style>

spring-boot-admin-server-ui/src/main/frontend/components/sba-button.stories.ts

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -64,18 +64,3 @@ export const SuccessButton = {
6464
class: 'is-success',
6565
},
6666
};
67-
68-
const SizeTemplate = () => {
69-
return {
70-
components: { SbaButton },
71-
template: `
72-
<sba-button size="xs">button xs</sba-button>
73-
<sba-button size="sm">button sm</sba-button>
74-
<sba-button size="base">button base</sba-button>
75-
`,
76-
};
77-
};
78-
79-
export const ButtonSizes = {
80-
render: SizeTemplate,
81-
};

spring-boot-admin-server-ui/src/main/frontend/components/sba-button.vue

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ export default {
5151
</script>
5252

5353
<style scoped>
54+
@reference "@/index.css";
55+
5456
.btn {
5557
@apply rounded-l rounded-r font-medium text-sm text-center text-black border-gray-300 border border-gray-300 bg-white;
5658
@apply focus:ring-2 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500;
@@ -100,10 +102,4 @@ export default {
100102
.btn.is-primary {
101103
@apply text-white bg-blue-600 hover:bg-blue-700 focus:ring-blue-300;
102104
}
103-
104-
@supports (-moz-appearance: none) {
105-
.backdrop-filter.bg-opacity-40 {
106-
--tw-bg-opacity: 1 !important;
107-
}
108-
}
109105
</style>

spring-boot-admin-server-ui/src/main/frontend/components/sba-checkbox.stories.ts renamed to spring-boot-admin-server-ui/src/main/frontend/components/sba-checkbox.stories.tsx

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,10 @@ export default {
2121
};
2222

2323
const Template = (args) => {
24-
return {
25-
components: { SbaCheckbox },
26-
setup() {
27-
return { args };
28-
},
29-
template: '<sba-checkbox v-bind="args" />{{args}}',
30-
};
24+
return <sba-checkbox {...args} />;
3125
};
3226

33-
export const OneButton = {
27+
export const WithLabel = {
3428
render: Template,
3529

3630
args: {

0 commit comments

Comments
 (0)