Brendon/gameyfin
1
0
Fork 0
mirror of https://github.com/BrenBroZAYT/gameyfin.git synced 2026-06-16 16:20:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Migrate from NextUI to HerUI

Browse Source 
Update dependencies
This commit is contained in:
grimsi
2025-03-17 15:42:28 +01:00
parent d7258892fd
commit 84a90d41ea
47 changed files with 12506 additions and 3499 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gameyfin/gradlew
Vendored Regular → Executable
View File
gameyfin/nextui.ts
+1 -1
View File
@@ -1,4 +1,4 @@
import {NextUIPluginConfig} from "@nextui-org/react"; import {NextUIPluginConfig} from "@heroui/react";
import {compileThemes, themes} from "./src/main/frontend/theming/themes" import {compileThemes, themes} from "./src/main/frontend/theming/themes"
export const NextUIConfig: NextUIPluginConfig = { export const NextUIConfig: NextUIPluginConfig = {
gameyfin/package-lock.json
Generated
+12338 -3311
View File
File diff suppressed because it is too large Load Diff
gameyfin/package.json
+66 -66
View File
@@ -3,26 +3,26 @@
"version": "2.0.0-ALPHA", "version": "2.0.0-ALPHA",
"type": "module", "type": "module",
"dependencies": { "dependencies": {
"@material-tailwind/react": "^2.1.9", "@material-tailwind/react": "^2.1.10",
"@nextui-org/react": "^2.6.8", "@heroui/react": "2.7.5",
"@phosphor-icons/react": "^2.1.7", "@phosphor-icons/react": "^2.1.7",
"@polymer/polymer": "3.5.2", "@polymer/polymer": "3.5.2",
"@vaadin/bundles": "24.6.1", "@vaadin/bundles": "24.6.6",
"@vaadin/common-frontend": "0.0.19", "@vaadin/common-frontend": "0.0.19",
"@vaadin/hilla-file-router": "24.6.1", "@vaadin/hilla-file-router": "24.6.6",
"@vaadin/hilla-frontend": "24.6.1", "@vaadin/hilla-frontend": "24.6.6",
"@vaadin/hilla-lit-form": "24.6.1", "@vaadin/hilla-lit-form": "24.6.6",
"@vaadin/hilla-react-auth": "24.6.1", "@vaadin/hilla-react-auth": "24.6.6",
"@vaadin/hilla-react-crud": "24.6.1", "@vaadin/hilla-react-crud": "24.6.6",
"@vaadin/hilla-react-form": "24.6.1", "@vaadin/hilla-react-form": "24.6.6",
"@vaadin/hilla-react-i18n": "24.6.1", "@vaadin/hilla-react-i18n": "24.6.6",
"@vaadin/hilla-react-signals": "24.6.1", "@vaadin/hilla-react-signals": "24.6.6",
"@vaadin/polymer-legacy-adapter": "24.6.1", "@vaadin/polymer-legacy-adapter": "24.6.6",
"@vaadin/react-components": "24.6.1", "@vaadin/react-components": "24.6.6",
"@vaadin/vaadin-development-mode-detector": "2.0.7", "@vaadin/vaadin-development-mode-detector": "2.0.7",
"@vaadin/vaadin-lumo-styles": "24.6.1", "@vaadin/vaadin-lumo-styles": "24.6.6",
"@vaadin/vaadin-material-styles": "24.6.1", "@vaadin/vaadin-material-styles": "24.6.6",
"@vaadin/vaadin-themable-mixin": "24.6.1", "@vaadin/vaadin-themable-mixin": "24.6.6",
"@vaadin/vaadin-usage-statistics": "2.1.3", "@vaadin/vaadin-usage-statistics": "2.1.3",
"class-variance-authority": "^0.7.0", "class-variance-authority": "^0.7.0",
"classnames": "^2.5.1", "classnames": "^2.5.1",
@@ -31,16 +31,16 @@
"cron-validator": "^1.3.1", "cron-validator": "^1.3.1",
"date-fns": "2.29.3", "date-fns": "2.29.3",
"formik": "^2.4.6", "formik": "^2.4.6",
"framer-motion": "^11.15.0", "framer-motion": "^12.5.0",
"http-status-codes": "^2.3.0", "http-status-codes": "^2.3.0",
"lit": "3.2.1", "lit": "3.2.1",
"moment": "^2.30.1", "moment": "^2.30.1",
"moment-timezone": "^0.5.45", "moment-timezone": "^0.5.47",
"next-themes": "^0.4.4", "next-themes": "^0.4.6",
"react": "18.3.1", "react": "18.3.1",
"react-confetti-boom": "^1.0.0", "react-confetti-boom": "^1.0.0",
"react-dom": "18.3.1", "react-dom": "18.3.1",
"react-router-dom": "6.28.0", "react-router-dom": "6.29.0",
"sonner": "^1.7.1", "sonner": "^1.7.1",
"tailwind-merge": "^2.5.2", "tailwind-merge": "^2.5.2",
"yup": "^1.6.1" "yup": "^1.6.1"
@@ -48,22 +48,22 @@
"devDependencies": { "devDependencies": {
"@babel/preset-react": "7.26.3", "@babel/preset-react": "7.26.3",
"@lit-labs/react": "^2.1.3", "@lit-labs/react": "^2.1.3",
"@preact/signals-react-transform": "0.5.0", "@preact/signals-react-transform": "0.5.1",
"@rollup/plugin-replace": "6.0.2", "@rollup/plugin-replace": "6.0.2",
"@rollup/pluginutils": "5.1.4", "@rollup/pluginutils": "5.1.4",
"@types/node": "^22.4.0", "@types/node": "^22.4.0",
"@types/react": "18.3.18", "@types/react": "18.3.18",
"@types/react-dom": "18.3.5", "@types/react-dom": "18.3.5",
"@vaadin/hilla-generator-cli": "24.6.1", "@vaadin/hilla-generator-cli": "24.6.6",
"@vaadin/hilla-generator-core": "24.6.1", "@vaadin/hilla-generator-core": "24.6.6",
"@vaadin/hilla-generator-plugin-backbone": "24.6.1", "@vaadin/hilla-generator-plugin-backbone": "24.6.6",
"@vaadin/hilla-generator-plugin-barrel": "24.6.1", "@vaadin/hilla-generator-plugin-barrel": "24.6.6",
"@vaadin/hilla-generator-plugin-client": "24.6.1", "@vaadin/hilla-generator-plugin-client": "24.6.6",
"@vaadin/hilla-generator-plugin-model": "24.6.1", "@vaadin/hilla-generator-plugin-model": "24.6.6",
"@vaadin/hilla-generator-plugin-push": "24.6.1", "@vaadin/hilla-generator-plugin-push": "24.6.6",
"@vaadin/hilla-generator-plugin-signals": "24.6.1", "@vaadin/hilla-generator-plugin-signals": "24.6.6",
"@vaadin/hilla-generator-plugin-subtypes": "24.6.1", "@vaadin/hilla-generator-plugin-subtypes": "24.6.6",
"@vaadin/hilla-generator-utils": "24.6.1", "@vaadin/hilla-generator-utils": "24.6.6",
"@vitejs/plugin-react": "4.3.4", "@vitejs/plugin-react": "4.3.4",
"@vitejs/plugin-react-swc": "^3.7.0", "@vitejs/plugin-react-swc": "^3.7.0",
"async": "3.2.6", "async": "3.2.6",
@@ -72,12 +72,12 @@
"postcss": "^8.4.41", "postcss": "^8.4.41",
"postcss-import": "^16.1.0", "postcss-import": "^16.1.0",
"rollup-plugin-brotli": "3.1.0", "rollup-plugin-brotli": "3.1.0",
"rollup-plugin-visualizer": "5.13.1", "rollup-plugin-visualizer": "5.14.0",
"strip-css-comments": "5.0.0", "strip-css-comments": "5.0.0",
"tailwindcss": "^3.4.13", "tailwindcss": "^3.4.13",
"transform-ast": "2.4.4", "transform-ast": "2.4.4",
"typescript": "5.7.2", "typescript": "5.7.3",
"vite": "6.0.6", "vite": "6.0.11",
"vite-plugin-checker": "0.8.0", "vite-plugin-checker": "0.8.0",
"workbox-build": "7.3.0", "workbox-build": "7.3.0",
"workbox-core": "7.3.0", "workbox-core": "7.3.0",
@@ -86,7 +86,7 @@
"overrides": { "overrides": {
"classnames": "$classnames", "classnames": "$classnames",
"react": "$react", "react": "$react",
"react-dom": "18.3.1", "react-dom": "$react-dom",
"react-router-dom": "$react-router-dom", "react-router-dom": "$react-router-dom",
"@vaadin/bundles": "$@vaadin/bundles", "@vaadin/bundles": "$@vaadin/bundles",
"@vaadin/common-frontend": "$@vaadin/common-frontend", "@vaadin/common-frontend": "$@vaadin/common-frontend",
@@ -100,7 +100,7 @@
"clsx": "$clsx", "clsx": "$clsx",
"next-themes": "$next-themes", "next-themes": "$next-themes",
"tailwind-merge": "$tailwind-merge", "tailwind-merge": "$tailwind-merge",
"@nextui-org/react": "$@nextui-org/react", "@heroui/react": "$@heroui/react",
"framer-motion": "$framer-motion", "framer-motion": "$framer-motion",
"@material-tailwind/react": "$@material-tailwind/react", "@material-tailwind/react": "$@material-tailwind/react",
"sonner": "$sonner", "sonner": "$sonner",
@@ -129,61 +129,61 @@
"vaadin": { "vaadin": {
"dependencies": { "dependencies": {
"@polymer/polymer": "3.5.2", "@polymer/polymer": "3.5.2",
"@vaadin/bundles": "24.6.1", "@vaadin/bundles": "24.6.6",
"@vaadin/common-frontend": "0.0.19", "@vaadin/common-frontend": "0.0.19",
"@vaadin/hilla-file-router": "24.6.1", "@vaadin/hilla-file-router": "24.6.6",
"@vaadin/hilla-frontend": "24.6.1", "@vaadin/hilla-frontend": "24.6.6",
"@vaadin/hilla-lit-form": "24.6.1", "@vaadin/hilla-lit-form": "24.6.6",
"@vaadin/hilla-react-auth": "24.6.1", "@vaadin/hilla-react-auth": "24.6.6",
"@vaadin/hilla-react-crud": "24.6.1", "@vaadin/hilla-react-crud": "24.6.6",
"@vaadin/hilla-react-form": "24.6.1", "@vaadin/hilla-react-form": "24.6.6",
"@vaadin/hilla-react-i18n": "24.6.1", "@vaadin/hilla-react-i18n": "24.6.6",
"@vaadin/hilla-react-signals": "24.6.1", "@vaadin/hilla-react-signals": "24.6.6",
"@vaadin/polymer-legacy-adapter": "24.6.1", "@vaadin/polymer-legacy-adapter": "24.6.6",
"@vaadin/react-components": "24.6.1", "@vaadin/react-components": "24.6.6",
"@vaadin/vaadin-development-mode-detector": "2.0.7", "@vaadin/vaadin-development-mode-detector": "2.0.7",
"@vaadin/vaadin-lumo-styles": "24.6.1", "@vaadin/vaadin-lumo-styles": "24.6.6",
"@vaadin/vaadin-material-styles": "24.6.1", "@vaadin/vaadin-material-styles": "24.6.6",
"@vaadin/vaadin-themable-mixin": "24.6.1", "@vaadin/vaadin-themable-mixin": "24.6.6",
"@vaadin/vaadin-usage-statistics": "2.1.3", "@vaadin/vaadin-usage-statistics": "2.1.3",
"construct-style-sheets-polyfill": "3.1.0", "construct-style-sheets-polyfill": "3.1.0",
"date-fns": "2.29.3", "date-fns": "2.29.3",
"lit": "3.2.1", "lit": "3.2.1",
"react": "18.3.1", "react": "18.3.1",
"react-dom": "18.3.1", "react-dom": "18.3.1",
"react-router-dom": "6.28.0" "react-router-dom": "6.29.0"
}, },
"devDependencies": { "devDependencies": {
"@babel/preset-react": "7.26.3", "@babel/preset-react": "7.26.3",
"@preact/signals-react-transform": "0.5.0", "@preact/signals-react-transform": "0.5.1",
"@rollup/plugin-replace": "6.0.2", "@rollup/plugin-replace": "6.0.2",
"@rollup/pluginutils": "5.1.4", "@rollup/pluginutils": "5.1.4",
"@types/react": "18.3.18", "@types/react": "18.3.18",
"@types/react-dom": "18.3.5", "@types/react-dom": "18.3.5",
"@vaadin/hilla-generator-cli": "24.6.1", "@vaadin/hilla-generator-cli": "24.6.6",
"@vaadin/hilla-generator-core": "24.6.1", "@vaadin/hilla-generator-core": "24.6.6",
"@vaadin/hilla-generator-plugin-backbone": "24.6.1", "@vaadin/hilla-generator-plugin-backbone": "24.6.6",
"@vaadin/hilla-generator-plugin-barrel": "24.6.1", "@vaadin/hilla-generator-plugin-barrel": "24.6.6",
"@vaadin/hilla-generator-plugin-client": "24.6.1", "@vaadin/hilla-generator-plugin-client": "24.6.6",
"@vaadin/hilla-generator-plugin-model": "24.6.1", "@vaadin/hilla-generator-plugin-model": "24.6.6",
"@vaadin/hilla-generator-plugin-push": "24.6.1", "@vaadin/hilla-generator-plugin-push": "24.6.6",
"@vaadin/hilla-generator-plugin-signals": "24.6.1", "@vaadin/hilla-generator-plugin-signals": "24.6.6",
"@vaadin/hilla-generator-plugin-subtypes": "24.6.1", "@vaadin/hilla-generator-plugin-subtypes": "24.6.6",
"@vaadin/hilla-generator-utils": "24.6.1", "@vaadin/hilla-generator-utils": "24.6.6",
"@vitejs/plugin-react": "4.3.4", "@vitejs/plugin-react": "4.3.4",
"async": "3.2.6", "async": "3.2.6",
"glob": "10.4.5", "glob": "10.4.5",
"rollup-plugin-brotli": "3.1.0", "rollup-plugin-brotli": "3.1.0",
"rollup-plugin-visualizer": "5.13.1", "rollup-plugin-visualizer": "5.14.0",
"strip-css-comments": "5.0.0", "strip-css-comments": "5.0.0",
"transform-ast": "2.4.4", "transform-ast": "2.4.4",
"typescript": "5.7.2", "typescript": "5.7.3",
"vite": "6.0.6", "vite": "6.0.11",
"vite-plugin-checker": "0.8.0", "vite-plugin-checker": "0.8.0",
"workbox-build": "7.3.0", "workbox-build": "7.3.0",
"workbox-core": "7.3.0", "workbox-core": "7.3.0",
"workbox-precaching": "7.3.0" "workbox-precaching": "7.3.0"
}, },
"hash": "8386ec0a264430ae74351314903f3a2bec7a94b06a38df5de6417ab03bedb4b9" "hash": "4cb8eb38282e90ab28af32f01ad7d2f7a15758837309655a753bbc1989258d6f"
} }
} }
gameyfin/src/main/frontend/App.tsx
+3 -3
View File
@@ -1,7 +1,7 @@
import {Outlet, useHref, useNavigate} from 'react-router-dom'; import {Outlet, useHref, useNavigate} from 'react-router-dom';
import "./main.css"; import "./main.css";
import "Frontend/util/custom-validators"; import "Frontend/util/custom-validators";
import {NextUIProvider} from "@nextui-org/react"; import {HeroUIProvider} from "@heroui/react";
import {ThemeProvider as NextThemesProvider} from "next-themes"; import {ThemeProvider as NextThemesProvider} from "next-themes";
import {themeNames} from "Frontend/theming/themes"; import {themeNames} from "Frontend/theming/themes";
import {AuthProvider} from "Frontend/util/auth"; import {AuthProvider} from "Frontend/util/auth";
@@ -16,7 +16,7 @@ export default function App() {
client.middlewares = [ErrorHandlingMiddleware]; client.middlewares = [ErrorHandlingMiddleware];
return ( return (
<NextUIProvider className="size-full" navigate={navigate} useHref={useHref}> <HeroUIProvider className="size-full" navigate={navigate} useHref={useHref}>
<NextThemesProvider attribute="class" themes={themeNames()} defaultTheme="gameyfin-violet-dark"> <NextThemesProvider attribute="class" themes={themeNames()} defaultTheme="gameyfin-violet-dark">
<AuthProvider> <AuthProvider>
<IconContext.Provider value={{size: 20}}> <IconContext.Provider value={{size: 20}}>
@@ -25,6 +25,6 @@ export default function App() {
</IconContext.Provider> </IconContext.Provider>
</AuthProvider> </AuthProvider>
</NextThemesProvider> </NextThemesProvider>
</NextUIProvider> </HeroUIProvider>
); );
} }
gameyfin/src/main/frontend/components/ProfileMenu.tsx
+2 -2
View File
@@ -1,6 +1,6 @@
import {useAuth} from "Frontend/util/auth"; import {useAuth} from "Frontend/util/auth";
import {GearFine, Question, SignOut, User} from "@phosphor-icons/react"; import {GearFine, Question, SignOut, User} from "@phosphor-icons/react";
import {Dropdown, DropdownItem, DropdownMenu, DropdownTrigger} from "@nextui-org/react"; import {Dropdown, DropdownItem, DropdownMenu, DropdownTrigger} from "@heroui/react";
import {useNavigate} from "react-router-dom"; import {useNavigate} from "react-router-dom";
import {ConfigEndpoint} from "Frontend/generated/endpoints"; import {ConfigEndpoint} from "Frontend/generated/endpoints";
import Avatar from "Frontend/components/general/Avatar"; import Avatar from "Frontend/components/general/Avatar";
@@ -12,7 +12,7 @@ export default function ProfileMenu() {
async function logout() { async function logout() {
if (auth.state.user?.managedBySso) { if (auth.state.user?.managedBySso) {
window.location.href = await ConfigEndpoint.getLogoutUrl() || "/"; window.location.href = (await ConfigEndpoint.getLogoutUrl()) || "/";
} else { } else {
await auth.logout(); await auth.logout();
} }
gameyfin/src/main/frontend/components/administration/LogManagement.tsx
+1 -1
View File
@@ -4,7 +4,7 @@ import withConfigPage from "Frontend/components/administration/withConfigPage";
import * as Yup from 'yup'; import * as Yup from 'yup';
import ConfigFormField from "Frontend/components/administration/ConfigFormField"; import ConfigFormField from "Frontend/components/administration/ConfigFormField";
import {toast} from "sonner"; import {toast} from "sonner";
import {Button, Code, Divider, Tooltip} from "@nextui-org/react"; import {Button, Code, Divider, Tooltip} from "@heroui/react";
import {ArrowUDownLeft, SortAscending} from "@phosphor-icons/react"; import {ArrowUDownLeft, SortAscending} from "@phosphor-icons/react";
function LogManagementLayout({getConfig, formik}: any) { function LogManagementLayout({getConfig, formik}: any) {
gameyfin/src/main/frontend/components/administration/MessageManagement.tsx
+1 -1
View File
@@ -2,7 +2,7 @@ import React, {useEffect, useState} from "react";
import withConfigPage from "Frontend/components/administration/withConfigPage"; import withConfigPage from "Frontend/components/administration/withConfigPage";
import ConfigFormField from "Frontend/components/administration/ConfigFormField"; import ConfigFormField from "Frontend/components/administration/ConfigFormField";
import Section from "Frontend/components/general/Section"; import Section from "Frontend/components/general/Section";
import {Button, Card, Tooltip, useDisclosure} from "@nextui-org/react"; import {Button, Card, Tooltip, useDisclosure} from "@heroui/react";
import {MessageEndpoint, MessageTemplateEndpoint} from "Frontend/generated/endpoints"; import {MessageEndpoint, MessageTemplateEndpoint} from "Frontend/generated/endpoints";
import {toast} from "sonner"; import {toast} from "sonner";
import {PaperPlaneRight, Pencil} from "@phosphor-icons/react"; import {PaperPlaneRight, Pencil} from "@phosphor-icons/react";
gameyfin/src/main/frontend/components/administration/PluginManagement.tsx
+1 -1
View File
@@ -2,7 +2,7 @@ import React, {useEffect, useState} from "react";
import {PluginManagementEndpoint} from "Frontend/generated/endpoints"; import {PluginManagementEndpoint} from "Frontend/generated/endpoints";
import PluginDto from "Frontend/generated/de/grimsi/gameyfin/core/plugins/management/PluginDto"; import PluginDto from "Frontend/generated/de/grimsi/gameyfin/core/plugins/management/PluginDto";
import {PluginManagementCard} from "Frontend/components/general/PluginManagementCard"; import {PluginManagementCard} from "Frontend/components/general/PluginManagementCard";
import {Divider} from "@nextui-org/react"; import {Divider} from "@heroui/react";
export default function PluginManagement() { export default function PluginManagement() {
const [plugins, setPlugins] = useState<PluginDto[]>([]); const [plugins, setPlugins] = useState<PluginDto[]>([]);
gameyfin/src/main/frontend/components/administration/ProfileManagement.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
import Section from "Frontend/components/general/Section"; import Section from "Frontend/components/general/Section";
import Input from "Frontend/components/general/Input"; import Input from "Frontend/components/general/Input";
import {Button, Input as NextUiInput, Tooltip} from "@nextui-org/react"; import {Button, Input as NextUiInput, Tooltip} from "@heroui/react";
import {Form, Formik} from "formik"; import {Form, Formik} from "formik";
import {ArrowCounterClockwise, Check, Info, Trash} from "@phosphor-icons/react"; import {ArrowCounterClockwise, Check, Info, Trash} from "@phosphor-icons/react";
import React, {useEffect, useState} from "react"; import React, {useEffect, useState} from "react";
gameyfin/src/main/frontend/components/administration/SsoManagement.tsx
+1 -1
View File
@@ -3,7 +3,7 @@ import withConfigPage from "Frontend/components/administration/withConfigPage";
import * as Yup from 'yup'; import * as Yup from 'yup';
import ConfigFormField from "Frontend/components/administration/ConfigFormField"; import ConfigFormField from "Frontend/components/administration/ConfigFormField";
import Section from "Frontend/components/general/Section"; import Section from "Frontend/components/general/Section";
import {Button} from "@nextui-org/react"; import {Button} from "@heroui/react";
import {MagicWand} from "@phosphor-icons/react"; import {MagicWand} from "@phosphor-icons/react";
import {toast} from "sonner"; import {toast} from "sonner";
gameyfin/src/main/frontend/components/administration/UserManagement.tsx
+1 -1
View File
@@ -7,7 +7,7 @@ import UserInfoDto from "Frontend/generated/de/grimsi/gameyfin/users/dto/UserInf
import {UserManagementCard} from "Frontend/components/general/UserManagementCard"; import {UserManagementCard} from "Frontend/components/general/UserManagementCard";
import {SmallInfoField} from "Frontend/components/general/SmallInfoField"; import {SmallInfoField} from "Frontend/components/general/SmallInfoField";
import {Info, UserPlus} from "@phosphor-icons/react"; import {Info, UserPlus} from "@phosphor-icons/react";
import {Button, Divider, Tooltip, useDisclosure} from "@nextui-org/react"; import {Button, Divider, Tooltip, useDisclosure} from "@heroui/react";
import InviteUserModal from "Frontend/components/general/InviteUserModal"; import InviteUserModal from "Frontend/components/general/InviteUserModal";
function UserManagementLayout({getConfig, formik}: any) { function UserManagementLayout({getConfig, formik}: any) {
gameyfin/src/main/frontend/components/administration/messages/EditTemplateModel.tsx
+1 -1
View File
@@ -9,7 +9,7 @@ import {
ModalFooter, ModalFooter,
ModalHeader, ModalHeader,
Textarea Textarea
} from "@nextui-org/react"; } from "@heroui/react";
import {toast} from "sonner"; import {toast} from "sonner";
import {MessageTemplateEndpoint} from "Frontend/generated/endpoints"; import {MessageTemplateEndpoint} from "Frontend/generated/endpoints";
import MessageTemplateDto from "Frontend/generated/de/grimsi/gameyfin/messages/templates/MessageTemplateDto"; import MessageTemplateDto from "Frontend/generated/de/grimsi/gameyfin/messages/templates/MessageTemplateDto";
gameyfin/src/main/frontend/components/administration/messages/SendTestNotificationModal.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
import React from "react"; import React from "react";
import {Form, Formik} from "formik"; import {Form, Formik} from "formik";
import {Button, Modal, ModalBody, ModalContent, ModalFooter, ModalHeader} from "@nextui-org/react"; import {Button, Modal, ModalBody, ModalContent, ModalFooter, ModalHeader} from "@heroui/react";
import {toast} from "sonner"; import {toast} from "sonner";
import Input from "Frontend/components/general/Input"; import Input from "Frontend/components/general/Input";
import {MessageEndpoint} from "Frontend/generated/endpoints"; import {MessageEndpoint} from "Frontend/generated/endpoints";
gameyfin/src/main/frontend/components/administration/withConfigPage.tsx
+1 -1
View File
@@ -2,7 +2,7 @@ import React, {useEffect, useRef, useState} from "react";
import {ConfigEndpoint} from "Frontend/generated/endpoints"; import {ConfigEndpoint} from "Frontend/generated/endpoints";
import ConfigEntryDto from "Frontend/generated/de/grimsi/gameyfin/config/dto/ConfigEntryDto"; import ConfigEntryDto from "Frontend/generated/de/grimsi/gameyfin/config/dto/ConfigEntryDto";
import {Form, Formik} from "formik"; import {Form, Formik} from "formik";
import {Button, Skeleton} from "@nextui-org/react"; import {Button, Skeleton} from "@heroui/react";
import {Check, Info} from "@phosphor-icons/react"; import {Check, Info} from "@phosphor-icons/react";
import ConfigValuePairDto from "Frontend/generated/de/grimsi/gameyfin/config/dto/ConfigValuePairDto"; import ConfigValuePairDto from "Frontend/generated/de/grimsi/gameyfin/config/dto/ConfigValuePairDto";
import {SmallInfoField} from "Frontend/components/general/SmallInfoField"; import {SmallInfoField} from "Frontend/components/general/SmallInfoField";
gameyfin/src/main/frontend/components/games/GameOverviewCard.tsx
+1 -1
View File
@@ -1,5 +1,5 @@
import GameDto from "Frontend/generated/de/grimsi/gameyfin/games/dto/GameDto"; import GameDto from "Frontend/generated/de/grimsi/gameyfin/games/dto/GameDto";
import {Card, Image} from "@nextui-org/react"; import {Card, Image} from "@heroui/react";
export function GameOverviewCard({game}: { game: GameDto }) { export function GameOverviewCard({game}: { game: GameDto }) {
return ( return (
gameyfin/src/main/frontend/components/general/AssignRolesModal.tsx
+1 -1
View File
@@ -10,7 +10,7 @@ import {
SelectedItems, SelectedItems,
Selection, Selection,
SelectItem SelectItem
} from "@nextui-org/react"; } from "@heroui/react";
import {UserEndpoint} from "Frontend/generated/endpoints"; import {UserEndpoint} from "Frontend/generated/endpoints";
import UserInfoDto from "Frontend/generated/de/grimsi/gameyfin/users/dto/UserInfoDto"; import UserInfoDto from "Frontend/generated/de/grimsi/gameyfin/users/dto/UserInfoDto";
import RoleChip from "Frontend/components/general/RoleChip"; import RoleChip from "Frontend/components/general/RoleChip";
gameyfin/src/main/frontend/components/general/Avatar.tsx
+1 -1
View File
@@ -1,5 +1,5 @@
import {useAuth} from "Frontend/util/auth"; import {useAuth} from "Frontend/util/auth";
import {Avatar as NextUiAvatar} from "@nextui-org/react"; import {Avatar as NextUiAvatar} from "@heroui/react";
// @ts-ignore // @ts-ignore
const Avatar = ({...props}) => { const Avatar = ({...props}) => {
gameyfin/src/main/frontend/components/general/CheckboxInput.tsx
+1 -1
View File
@@ -1,5 +1,5 @@
import {useField} from "formik"; import {useField} from "formik";
import {Checkbox} from "@nextui-org/react"; import {Checkbox} from "@heroui/react";
// @ts-ignore // @ts-ignore
const CheckboxInput = ({label, ...props}) => { const CheckboxInput = ({label, ...props}) => {
gameyfin/src/main/frontend/components/general/ConfirmUserDeletionModal.tsx
+1 -1
View File
@@ -1,5 +1,5 @@
import React, {useEffect, useState} from "react"; import React, {useEffect, useState} from "react";
import {Button, Code, Input, Modal, ModalBody, ModalContent, ModalFooter, ModalHeader} from "@nextui-org/react"; import {Button, Code, Input, Modal, ModalBody, ModalContent, ModalFooter, ModalHeader} from "@heroui/react";
import {UserEndpoint} from "Frontend/generated/endpoints"; import {UserEndpoint} from "Frontend/generated/endpoints";
import UserInfoDto from "Frontend/generated/de/grimsi/gameyfin/users/dto/UserInfoDto"; import UserInfoDto from "Frontend/generated/de/grimsi/gameyfin/users/dto/UserInfoDto";
gameyfin/src/main/frontend/components/general/Input.tsx
+1 -1
View File
@@ -1,5 +1,5 @@
import {useField} from "formik"; import {useField} from "formik";
import {Input as NextUiInput} from "@nextui-org/react"; import {Input as NextUiInput} from "@heroui/react";
import {SmallInfoField} from "Frontend/components/general/SmallInfoField"; import {SmallInfoField} from "Frontend/components/general/SmallInfoField";
import {XCircle} from "@phosphor-icons/react"; import {XCircle} from "@phosphor-icons/react";
gameyfin/src/main/frontend/components/general/InviteUserModal.tsx
+1 -1
View File
@@ -1,5 +1,5 @@
import React, {useEffect, useState} from "react"; import React, {useEffect, useState} from "react";
import {Button, Input, Modal, ModalBody, ModalContent, ModalFooter, ModalHeader} from "@nextui-org/react"; import {Button, Input, Modal, ModalBody, ModalContent, ModalFooter, ModalHeader} from "@heroui/react";
import {RegistrationEndpoint, UserEndpoint} from "Frontend/generated/endpoints"; import {RegistrationEndpoint, UserEndpoint} from "Frontend/generated/endpoints";
import {toast} from "sonner"; import {toast} from "sonner";
gameyfin/src/main/frontend/components/general/PasswordResetModal.tsx
+2 -2
View File
@@ -1,6 +1,6 @@
import React, {useEffect, useState} from "react"; import React, {useEffect, useState} from "react";
import {Button, Modal, ModalBody, ModalContent, ModalFooter, ModalHeader} from "@nextui-org/react"; import {Button, Modal, ModalBody, ModalContent, ModalFooter, ModalHeader} from "@heroui/react";
import {Input as NextInput} from "@nextui-org/input"; import {Input as NextInput} from "@heroui/input";
import {WarningCircle} from "@phosphor-icons/react"; import {WarningCircle} from "@phosphor-icons/react";
import {MessageEndpoint, PasswordResetEndpoint} from "Frontend/generated/endpoints"; import {MessageEndpoint, PasswordResetEndpoint} from "Frontend/generated/endpoints";
import {toast} from "sonner"; import {toast} from "sonner";
gameyfin/src/main/frontend/components/general/PasswortResetTokenModal.tsx
+1 -1
View File
@@ -1,5 +1,5 @@
import React, {useEffect, useState} from "react"; import React, {useEffect, useState} from "react";
import {Button, Modal, ModalBody, ModalContent, ModalFooter, ModalHeader, Snippet} from "@nextui-org/react"; import {Button, Modal, ModalBody, ModalContent, ModalFooter, ModalHeader, Snippet} from "@heroui/react";
import TokenDto from "Frontend/generated/de/grimsi/gameyfin/shared/token/TokenDto"; import TokenDto from "Frontend/generated/de/grimsi/gameyfin/shared/token/TokenDto";
import {timeUntil} from "Frontend/util/utils"; import {timeUntil} from "Frontend/util/utils";
gameyfin/src/main/frontend/components/general/PluginDetailsModal.tsx
+1 -1
View File
@@ -1,5 +1,5 @@
import React, {useEffect, useState} from "react"; import React, {useEffect, useState} from "react";
import {Button, Modal, ModalBody, ModalContent, ModalFooter, ModalHeader} from "@nextui-org/react"; import {Button, Modal, ModalBody, ModalContent, ModalFooter, ModalHeader} from "@heroui/react";
import {toast} from "sonner"; import {toast} from "sonner";
import {Form, Formik} from "formik"; import {Form, Formik} from "formik";
import {PluginConfigEndpoint, PluginManagementEndpoint} from "Frontend/generated/endpoints"; import {PluginConfigEndpoint, PluginManagementEndpoint} from "Frontend/generated/endpoints";
gameyfin/src/main/frontend/components/general/PluginManagementCard.tsx
+1 -1
View File
@@ -1,4 +1,4 @@
import {Button, Card, Chip, Skeleton, Tooltip, useDisclosure} from "@nextui-org/react"; import {Button, Card, Chip, Skeleton, Tooltip, useDisclosure} from "@heroui/react";
import {Plug, Power, SlidersHorizontal} from "@phosphor-icons/react"; import {Plug, Power, SlidersHorizontal} from "@phosphor-icons/react";
import {PluginManagementEndpoint} from "Frontend/generated/endpoints"; import {PluginManagementEndpoint} from "Frontend/generated/endpoints";
import PluginDto from "Frontend/generated/de/grimsi/gameyfin/core/plugins/management/PluginDto"; import PluginDto from "Frontend/generated/de/grimsi/gameyfin/core/plugins/management/PluginDto";
gameyfin/src/main/frontend/components/general/RoleChip.tsx
+1 -1
View File
@@ -1,4 +1,4 @@
import {Chip} from "@nextui-org/react"; import {Chip} from "@heroui/react";
import {roleToColor, roleToRoleName} from "Frontend/util/utils"; import {roleToColor, roleToRoleName} from "Frontend/util/utils";
export default function RoleChip({role}: { role: string }) { export default function RoleChip({role}: { role: string }) {
gameyfin/src/main/frontend/components/general/Section.tsx
+1 -1
View File
@@ -1,4 +1,4 @@
import {Divider} from "@nextui-org/react"; import {Divider} from "@heroui/react";
export default function Section({title}: { title: string }) { export default function Section({title}: { title: string }) {
return ( return (
gameyfin/src/main/frontend/components/general/SelectInput.tsx
+1 -1
View File
@@ -1,5 +1,5 @@
import {useField} from "formik"; import {useField} from "formik";
import {Select, SelectItem} from "@nextui-org/react"; import {Select, SelectItem} from "@heroui/react";
// @ts-ignore // @ts-ignore
const SelectInput = ({label, values, ...props}) => { const SelectInput = ({label, values, ...props}) => {
gameyfin/src/main/frontend/components/general/SignUpModal.tsx
+1 -1
View File
@@ -1,5 +1,5 @@
import React from "react"; import React from "react";
import {Button, Modal, ModalBody, ModalContent, ModalFooter, ModalHeader} from "@nextui-org/react"; import {Button, Modal, ModalBody, ModalContent, ModalFooter, ModalHeader} from "@heroui/react";
import {RegistrationEndpoint} from "Frontend/generated/endpoints"; import {RegistrationEndpoint} from "Frontend/generated/endpoints";
import UserRegistrationDto from "Frontend/generated/de/grimsi/gameyfin/users/dto/UserRegistrationDto"; import UserRegistrationDto from "Frontend/generated/de/grimsi/gameyfin/users/dto/UserRegistrationDto";
import {Form, Formik} from "formik"; import {Form, Formik} from "formik";
gameyfin/src/main/frontend/components/general/UserManagementCard.tsx
+1 -1
View File
@@ -1,4 +1,4 @@
import {Card, Dropdown, DropdownItem, DropdownMenu, DropdownTrigger, useDisclosure} from "@nextui-org/react"; import {Card, Dropdown, DropdownItem, DropdownMenu, DropdownTrigger, useDisclosure} from "@heroui/react";
import {DotsThreeVertical} from "@phosphor-icons/react"; import {DotsThreeVertical} from "@phosphor-icons/react";
import {useAuth} from "Frontend/util/auth"; import {useAuth} from "Frontend/util/auth";
import {useEffect, useState} from "react"; import {useEffect, useState} from "react";
gameyfin/src/main/frontend/components/general/withSideMenu.tsx
+3 -3
View File
@@ -1,6 +1,6 @@
import {Outlet} from "react-router-dom"; import {Outlet} from "react-router-dom";
import {Icon} from "@phosphor-icons/react"; import {Icon} from "@phosphor-icons/react";
import {Listbox, ListboxItem} from "@nextui-org/react"; import {Listbox, ListboxItem} from "@heroui/react";
import {ReactElement, useState} from "react"; import {ReactElement, useState} from "react";
export type MenuItem = { export type MenuItem = {
@@ -17,7 +17,7 @@ export default function withSideMenu(menuItems: MenuItem[]) {
* Remove a "/" at the start if it exists * Remove a "/" at the start if it exists
*/ */
function key(k: string): string { function key(k: string): string {
return k.replace(/^(\/)/, "") return k.replace(/^(\/)/, "");
} }
/** /**
@@ -56,5 +56,5 @@ export default function withSideMenu(menuItems: MenuItem[]) {
</div> </div>
</div> </div>
); );
} };
} }
gameyfin/src/main/frontend/components/theming/ThemePreview.tsx
+1 -1
View File
@@ -1,5 +1,5 @@
import {Theme} from "Frontend/theming/theme"; import {Theme} from "Frontend/theming/theme";
import {Tooltip} from "@nextui-org/react"; import {Tooltip} from "@heroui/react";
export default function ThemePreview({theme, isSelected}: { export default function ThemePreview({theme, isSelected}: {
theme: Theme, theme: Theme,
gameyfin/src/main/frontend/components/theming/ThemeSelector.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
import {useTheme} from "next-themes"; import {useTheme} from "next-themes";
import React, {useEffect, useState} from "react"; import React, {useEffect, useState} from "react";
import {Button, Card, Divider, Select, Selection, SelectItem} from "@nextui-org/react"; import {Button, Card, Divider, Select, Selection, SelectItem} from "@heroui/react";
import {themes} from "Frontend/theming/themes"; import {themes} from "Frontend/theming/themes";
import {Theme} from "Frontend/theming/theme"; import {Theme} from "Frontend/theming/theme";
import ThemePreview from "Frontend/components/theming/ThemePreview"; import ThemePreview from "Frontend/components/theming/ThemePreview";
gameyfin/src/main/frontend/components/wizard/Wizard.tsx
+1 -1
View File
@@ -1,7 +1,7 @@
import React, {ReactNode, useState} from "react"; import React, {ReactNode, useState} from "react";
import {Form, Formik, FormikBag, FormikHelpers} from "formik"; import {Form, Formik, FormikBag, FormikHelpers} from "formik";
import {ArrowLeft, ArrowRight, Check} from "@phosphor-icons/react"; import {ArrowLeft, ArrowRight, Check} from "@phosphor-icons/react";
import {Button} from "@nextui-org/react"; import {Button} from "@heroui/react";
import {Step, Stepper} from "@material-tailwind/react"; import {Step, Stepper} from "@material-tailwind/react";
const Wizard = ({children, initialValues, onSubmit}: { const Wizard = ({children, initialValues, onSubmit}: {
gameyfin/src/main/frontend/theming/themes.ts
+1 -1
View File
@@ -12,7 +12,7 @@ import {Violet} from "./themes/violet";
import {Orange} from "./themes/orange"; import {Orange} from "./themes/orange";
import {Colorblind} from "./themes/colorblind"; import {Colorblind} from "./themes/colorblind";
import {Theme} from "./theme"; import {Theme} from "./theme";
import {ConfigTheme, ConfigThemes} from "@nextui-org/react"; import {ConfigTheme, ConfigThemes} from "@heroui/react";
function light(c: Theme): ConfigTheme { function light(c: Theme): ConfigTheme {
gameyfin/src/main/frontend/views/EmailConfirmationView.tsx
+1 -1
View File
@@ -1,4 +1,4 @@
import {Card, CardBody, CardHeader} from "@nextui-org/react"; import {Card, CardBody, CardHeader} from "@heroui/react";
import {useNavigate, useSearchParams} from "react-router-dom"; import {useNavigate, useSearchParams} from "react-router-dom";
import React, {useEffect, useState} from "react"; import React, {useEffect, useState} from "react";
import {CheckCircle, Warning, WarningCircle} from "@phosphor-icons/react"; import {CheckCircle, Warning, WarningCircle} from "@phosphor-icons/react";
gameyfin/src/main/frontend/views/InvitationRegistrationView.tsx
+1 -1
View File
@@ -1,4 +1,4 @@
import {Button, Card, CardBody, CardHeader} from "@nextui-org/react"; import {Button, Card, CardBody, CardHeader} from "@heroui/react";
import {useNavigate, useSearchParams} from "react-router-dom"; import {useNavigate, useSearchParams} from "react-router-dom";
import {Form, Formik} from "formik"; import {Form, Formik} from "formik";
import Input from "Frontend/components/general/Input"; import Input from "Frontend/components/general/Input";
gameyfin/src/main/frontend/views/LoginView.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
import {useAuth} from "Frontend/util/auth"; import {useAuth} from "Frontend/util/auth";
import {useEffect, useState} from "react"; import {useEffect, useState} from "react";
import {Button, Card, CardBody, CardHeader, Link, useDisclosure} from "@nextui-org/react"; import {Button, Card, CardBody, CardHeader, Link, useDisclosure} from "@heroui/react";
import {useNavigate} from "react-router-dom"; import {useNavigate} from "react-router-dom";
import {Form, Formik} from "formik"; import {Form, Formik} from "formik";
import Input from "Frontend/components/general/Input"; import Input from "Frontend/components/general/Input";
gameyfin/src/main/frontend/views/MainLayout.tsx
+1 -1
View File
@@ -1,7 +1,7 @@
import {useRouteMetadata} from 'Frontend/util/routing.js'; import {useRouteMetadata} from 'Frontend/util/routing.js';
import {useEffect, useState} from 'react'; import {useEffect, useState} from 'react';
import ProfileMenu from "Frontend/components/ProfileMenu"; import ProfileMenu from "Frontend/components/ProfileMenu";
import {Divider, Link, Navbar, NavbarBrand, NavbarContent, NavbarItem} from "@nextui-org/react"; import {Divider, Link, Navbar, NavbarBrand, NavbarContent, NavbarItem} from "@heroui/react";
import GameyfinLogo from "Frontend/components/theming/GameyfinLogo"; import GameyfinLogo from "Frontend/components/theming/GameyfinLogo";
import * as PackageJson from "../../../../package.json"; import * as PackageJson from "../../../../package.json";
import {Outlet, useNavigate} from "react-router-dom"; import {Outlet, useNavigate} from "react-router-dom";
gameyfin/src/main/frontend/views/PasswordResetView.tsx
+1 -1
View File
@@ -1,4 +1,4 @@
import {Button, Card, CardBody, CardHeader} from "@nextui-org/react"; import {Button, Card, CardBody, CardHeader} from "@heroui/react";
import {useNavigate, useSearchParams} from "react-router-dom"; import {useNavigate, useSearchParams} from "react-router-dom";
import {Form, Formik} from "formik"; import {Form, Formik} from "formik";
import Input from "Frontend/components/general/Input"; import Input from "Frontend/components/general/Input";
gameyfin/src/main/frontend/views/SetupView.tsx
+1 -1
View File
@@ -4,7 +4,7 @@ import Wizard from "Frontend/components/wizard/Wizard";
import WizardStep from "Frontend/components/wizard/WizardStep"; import WizardStep from "Frontend/components/wizard/WizardStep";
import Input from "Frontend/components/general/Input"; import Input from "Frontend/components/general/Input";
import {HandWaving, Palette, User} from "@phosphor-icons/react"; import {HandWaving, Palette, User} from "@phosphor-icons/react";
import {Card} from "@nextui-org/react"; import {Card} from "@heroui/react";
import {SetupEndpoint} from "Frontend/generated/endpoints"; import {SetupEndpoint} from "Frontend/generated/endpoints";
import {ThemeSelector} from "Frontend/components/theming/ThemeSelector"; import {ThemeSelector} from "Frontend/components/theming/ThemeSelector";
import {useNavigate} from "react-router-dom"; import {useNavigate} from "react-router-dom";
gameyfin/src/main/frontend/views/TestView.tsx
+1 -1
View File
@@ -1,5 +1,5 @@
import {Link} from "react-router-dom"; import {Link} from "react-router-dom";
import {Button, Input} from "@nextui-org/react"; import {Button, Input} from "@heroui/react";
import {toast} from "sonner"; import {toast} from "sonner";
import {LibraryEndpoint, SystemEndpoint} from "Frontend/generated/endpoints"; import {LibraryEndpoint, SystemEndpoint} from "Frontend/generated/endpoints";
import {useState} from "react"; import {useState} from "react";
gameyfin/tailwind.config.ts
+3 -3
View File
@@ -1,5 +1,5 @@
import {Config} from "tailwindcss/types/config"; import {Config} from "tailwindcss/types/config";
import {nextui} from "@nextui-org/react"; import {heroui} from "@heroui/react";
import {NextUIConfig} from "./nextui"; import {NextUIConfig} from "./nextui";
import withMT from "@material-tailwind/react/utils/withMT"; import withMT from "@material-tailwind/react/utils/withMT";
@@ -8,7 +8,7 @@ export default withMT({
content: [ content: [
'./src/main/frontend/index.html', './src/main/frontend/index.html',
'./src/main/frontend/**/*.{js,ts,jsx,tsx}', './src/main/frontend/**/*.{js,ts,jsx,tsx}',
'./node_modules/@nextui-org/theme/dist/**/*.{js,ts,jsx,tsx}' "./node_modules/@heroui/theme/dist/**/*.{js,ts,jsx,tsx}"
], ],
theme: { theme: {
extend: { extend: {
@@ -22,6 +22,6 @@ export default withMT({
} }
}, },
plugins: [ plugins: [
nextui(NextUIConfig) heroui(NextUIConfig)
], ],
} satisfies Config); } satisfies Config);
gameyfin/vite.generated.ts
+40 -66
View File
@@ -16,18 +16,18 @@ import settings from './build/vaadin-dev-server-settings.json';
import { import {
AssetInfo, AssetInfo,
ChunkInfo, ChunkInfo,
build,
defineConfig, defineConfig,
mergeConfig, mergeConfig,
OutputOptions, OutputOptions,
PluginOption, PluginOption,
ResolvedConfig, InlineConfig,
UserConfigFn UserConfigFn
} from 'vite'; } from 'vite';
import { getManifest, type ManifestTransform } from 'workbox-build'; import { getManifest, type ManifestTransform } from 'workbox-build';
import * as rollup from 'rollup'; import * as rollup from 'rollup';
import brotli from 'rollup-plugin-brotli'; import brotli from 'rollup-plugin-brotli';
import replace from '@rollup/plugin-replace';
import checker from 'vite-plugin-checker'; import checker from 'vite-plugin-checker';
import postcssLit from './build/plugins/rollup-plugin-postcss-lit-custom/rollup-plugin-postcss-lit.js'; import postcssLit from './build/plugins/rollup-plugin-postcss-lit-custom/rollup-plugin-postcss-lit.js';
@@ -118,87 +118,61 @@ function injectManifestToSWPlugin(): rollup.Plugin {
} }
function buildSWPlugin(opts: { devMode: boolean }): PluginOption { function buildSWPlugin(opts: { devMode: boolean }): PluginOption {
let config: ResolvedConfig; let buildConfig: InlineConfig;
let buildOutput: rollup.RollupOutput;
const devMode = opts.devMode; const devMode = opts.devMode;
const swObj: { code?: string, map?: rollup.SourceMap | null } = {};
async function build(action: 'generate' | 'write', additionalPlugins: rollup.Plugin[] = []) {
const includedPluginNames = [
'vite:esbuild',
'rollup-plugin-dynamic-import-variables',
'vite:esbuild-transpile',
'vite:terser'
];
const plugins: rollup.Plugin[] = config.plugins.filter((p) => {
return includedPluginNames.includes(p.name);
});
const resolver = config.createResolver();
const resolvePlugin: rollup.Plugin = {
name: 'resolver',
resolveId(source, importer, _options) {
return resolver(source, importer);
}
};
plugins.unshift(resolvePlugin); // Put resolve first
plugins.push(
replace({
values: {
'process.env.NODE_ENV': JSON.stringify(config.mode),
...config.define
},
preventAssignment: true
})
);
if (additionalPlugins) {
plugins.push(...additionalPlugins);
}
const bundle = await rollup.rollup({
input: path.resolve(settings.clientServiceWorkerSource),
plugins
});
try {
return await bundle[action]({
file: path.resolve(buildOutputFolder, 'sw.js'),
format: 'es',
exports: 'none',
sourcemap: config.command === 'serve' || config.build.sourcemap,
inlineDynamicImports: true
});
} finally {
await bundle.close();
}
}
return { return {
name: 'vaadin:build-sw', name: 'vaadin:build-sw',
enforce: 'post', enforce: 'post',
async configResolved(resolvedConfig) { async configResolved(viteConfig) {
config = resolvedConfig; buildConfig = {
base: viteConfig.base,
root: viteConfig.root,
mode: viteConfig.mode,
resolve: viteConfig.resolve,
define: {
...viteConfig.define,
'process.env.NODE_ENV': JSON.stringify(viteConfig.mode),
},
build: {
write: !devMode,
minify: viteConfig.build.minify,
outDir: viteConfig.build.outDir,
sourcemap: viteConfig.command === 'serve' || viteConfig.build.sourcemap,
emptyOutDir: false,
modulePreload: false,
rollupOptions: {
input: {
sw: settings.clientServiceWorkerSource
},
output: {
exports: 'none',
entryFileNames: 'sw.js',
inlineDynamicImports: true,
},
},
},
};
}, },
async buildStart() { async buildStart() {
if (devMode) { if (devMode) {
const { output } = await build('generate'); buildOutput = await build(buildConfig) as rollup.RollupOutput;
swObj.code = output[0].code;
swObj.map = output[0].map;
} }
}, },
async load(id) { async load(id) {
if (id.endsWith('sw.js')) { if (id.endsWith('sw.js')) {
return ''; return buildOutput.output[0].code;
}
},
async transform(_code, id) {
if (id.endsWith('sw.js')) {
return swObj;
} }
}, },
async closeBundle() { async closeBundle() {
if (!devMode) { if (!devMode) {
await build('write', [injectManifestToSWPlugin(), brotli()]); await build({
} ...buildConfig,
plugins: [injectManifestToSWPlugin(), brotli()]
});
} }
},
}; };
} }
gradle.properties
+6 -6
View File
@@ -1,13 +1,13 @@
# Plugin versions # Plugin versions
kotlinVersion=2.1.0 kotlinVersion=2.1.10
kspVersion=2.1.0-1.0.29 kspVersion=2.1.10-1.0.31
vaadinVersion=24.6.1 vaadinVersion=24.6.6
springBootVersion=3.4.1 springBootVersion=3.4.3
springCloudVersion=2024.0.0 springCloudVersion=2024.0.0
springDependencyManagementVersion=1.1.6 springDependencyManagementVersion=1.1.7
# Dependency versions # Dependency versions
pf4jVersion=3.13.0 pf4jVersion=3.13.0
pf4jKspVersion=2.1.0-1.0.2 pf4jKspVersion=2.1.10-1.0.2
# Annotation processor settings # Annotation processor settings
kapt.use.k2=true kapt.use.k2=true
ksp.useKSP2=true ksp.useKSP2=true
package-lock.json
Generated
+6
View File
@@ -0,0 +1,6 @@
{
"name": "gameyfin",
"lockfileVersion": 3,
"requires": true,
"packages": {}
}