From 61c7bc2d540a15faecfc1b06786a6135fc100300 Mon Sep 17 00:00:00 2001 From: Florent Benoit Date: Fri, 31 Jan 2025 14:36:05 +0100 Subject: [PATCH] chore: update to Tailwind CSS v4 related to https://github.com/podman-desktop/podman-desktop/issues/10795 Signed-off-by: Florent Benoit --- packages/frontend/package.json | 5 +- packages/frontend/postcss.config.cjs | 25 - packages/frontend/src/app.css | 5 +- packages/frontend/src/lib/Navigation.svelte | 2 +- packages/frontend/src/lib/RangeInput.svelte | 2 +- packages/frontend/src/lib/RecipeCard.svelte | 5 +- packages/frontend/src/lib/RecipeStatus.svelte | 2 +- .../conversation/SystemPromptBanner.svelte | 2 +- .../src/lib/icons/PlaygroundWhite.svelte | 2 +- .../src/lib/images/DashboardBanner.svelte | 4 +- .../src/lib/notification/GPUPromotion.svelte | 2 +- .../frontend/src/lib/progress/TaskItem.svelte | 6 +- .../frontend/src/lib/select/Select.svelte | 2 +- .../frontend/src/pages/ImportModel.svelte | 4 +- packages/frontend/src/pages/Model.svelte | 2 +- packages/frontend/src/pages/Playground.svelte | 2 +- packages/frontend/svelte.config.js | 33 - packages/frontend/vite.config.js | 9 +- pnpm-lock.yaml | 852 +++++++++--------- 19 files changed, 454 insertions(+), 512 deletions(-) delete mode 100644 packages/frontend/postcss.config.cjs delete mode 100644 packages/frontend/svelte.config.js diff --git a/packages/frontend/package.json b/packages/frontend/package.json index 33eb9fd96..be44185a0 100644 --- a/packages/frontend/package.json +++ b/packages/frontend/package.json @@ -25,6 +25,7 @@ "devDependencies": { "@sveltejs/vite-plugin-svelte": "4.0.2", "@tailwindcss/typography": "^0.5.16", + "@tailwindcss/vite": "^4.0.1", "@testing-library/dom": "^10.4.0", "@testing-library/jest-dom": "^6.6.3", "@testing-library/svelte": "^5.2.6", @@ -33,14 +34,12 @@ "@types/humanize-duration": "^3.27.4", "@typescript-eslint/eslint-plugin": "8.22.0", "jsdom": "^26.0.0", - "postcss": "^8.5.1", - "postcss-load-config": "^6.0.1", "svelte": "5.19.4", "svelte-fa": "^4.0.3", "svelte-select": "^5.8.3", "svelte-markdown": "^0.4.1", "svelte-preprocess": "^6.0.3", - "tailwindcss": "^3.4.17", + "tailwindcss": "^4.0.0", "vitest": "^2.1.8" } } diff --git a/packages/frontend/postcss.config.cjs b/packages/frontend/postcss.config.cjs deleted file mode 100644 index 2b2cfd0ba..000000000 --- a/packages/frontend/postcss.config.cjs +++ /dev/null @@ -1,25 +0,0 @@ -/********************************************************************** - * Copyright (C) 2022 Red Hat, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * SPDX-License-Identifier: Apache-2.0 - ***********************************************************************/ - -module.exports = { - plugins: { - tailwindcss: {}, - 'postcss-import': {}, - autoprefixer: {}, - }, -}; diff --git a/packages/frontend/src/app.css b/packages/frontend/src/app.css index b5c61c956..ec10ab6f8 100644 --- a/packages/frontend/src/app.css +++ b/packages/frontend/src/app.css @@ -1,3 +1,2 @@ -@tailwind base; -@tailwind components; -@tailwind utilities; +@import 'tailwindcss'; +@config '../tailwind.config.cjs'; diff --git a/packages/frontend/src/lib/Navigation.svelte b/packages/frontend/src/lib/Navigation.svelte index 0d6ba9cd6..37be8278b 100644 --- a/packages/frontend/src/lib/Navigation.svelte +++ b/packages/frontend/src/lib/Navigation.svelte @@ -42,7 +42,7 @@ onDestroy(() => {