Skip to content
Open
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 .github/workflows/build-and-push-docker-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
submodules: recursive

Expand Down
19 changes: 11 additions & 8 deletions .github/workflows/status_checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ jobs:
name: Prettier Check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- uses: pnpm/action-setup@v4
with:
version: 10
- uses: actions/setup-node@v4
- uses: actions/setup-node@v6
with:
node-version: "22"
cache: pnpm
Expand All @@ -28,11 +28,11 @@ jobs:
name: Lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- uses: pnpm/action-setup@v4
with:
version: 9
- uses: actions/setup-node@v4
version: 10
- uses: actions/setup-node@v6
with:
node-version: "22"
cache: pnpm
Expand All @@ -45,15 +45,18 @@ jobs:
name: Build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- uses: pnpm/action-setup@v4
with:
version: 9
- uses: actions/setup-node@v4
version: 10
- uses: actions/setup-node@v6
with:
node-version: "22"
cache: pnpm
- name: Install dependencies
run: pnpm install
- name: Build
run: pnpm build
env:
# dummy values to pass build
FUSIONAUTH_CLIENT_ID: '123a575b-8803-457f-ab74-4ed8880cac20'
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
# next.js
/.next/
/out/
next-env.d.ts

# production
/build
Expand Down
9 changes: 2 additions & 7 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ import { importX } from "eslint-plugin-import-x";
import jsxA11y from "eslint-plugin-jsx-a11y";
import noRelativeImportPathsPlugin from "eslint-plugin-no-relative-import-paths";
import reactPlugin from "eslint-plugin-react";
import reactCompiler from "eslint-plugin-react-compiler";
// eslint-disable-next-line import-x/default
import hooksPlugin from "eslint-plugin-react-hooks";
import reactHooks from "eslint-plugin-react-hooks";
import tseslint from "typescript-eslint";

export default tseslint.config(
Expand All @@ -18,16 +16,15 @@ export default tseslint.config(
tseslint.configs.stylistic,
reactPlugin.configs.flat.recommended,
reactPlugin.configs.flat["jsx-runtime"],
reactHooks.configs.flat.recommended,
jsxA11y.flatConfigs.recommended,
importX.flatConfigs.recommended,
importX.flatConfigs.typescript,
{
files: ["**/*.{js,jsx,mjs,cjs,ts,tsx}"],
plugins: {
"@next/next": nextPlugin,
"react-hooks": hooksPlugin,
"no-relative-import-paths": noRelativeImportPathsPlugin,
"react-compiler": reactCompiler,
},
settings: {
react: {
Expand All @@ -42,9 +39,7 @@ export default tseslint.config(
rules: {
...nextPlugin.configs.recommended.rules,
...nextPlugin.configs["core-web-vitals"].rules,
...hooksPlugin.configs.recommended.rules,
"no-relative-import-paths/no-relative-import-paths": "error",
"react-compiler/react-compiler": "error",
"import-x/no-named-as-default-member": "off",
/** @see https://medium.com/weekly-webtips/how-to-sort-imports-like-a-pro-in-typescript-4ee8afd7258a */
"import-x/order": [
Expand Down
6 changes: 0 additions & 6 deletions next-env.d.ts

This file was deleted.

11 changes: 11 additions & 0 deletions next.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,14 @@ const withSerwist = withSerwistInit({

export default withSerwist({
typedRoutes: true,
reactCompiler: true,
cacheComponents: true,
staticPageGenerationTimeout: 120,
turbopack: {
resolveAlias: {
"@/*": "./src/*",
},
},
...(global.process.env["BUILD_STANDALONE"] === "true" ? { output: "standalone" } : {}),
async redirects() {
return [
Expand Down Expand Up @@ -51,6 +58,10 @@ export default withSerwist({
protocol: "https",
hostname: "images.ctfassets.net",
},
{
protocol: "http",
hostname: "localhost",
},
],
},
});
61 changes: 30 additions & 31 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
{
"name": "rezervo-web",
"version": "0.1.0",
"private": true,
"scripts": {
"preinstall": "npx only-allow pnpm",
"dev": "next dev --turbopack",
"build": "next build",
"dev": "next dev",
"build": "next build --webpack",
"start": "next start",
"prod": "run-s build start",
"prettier": "prettier --write '**/*.{js,mjs,ts,tsx,md,json,yaml,css}' --ignore-path=.gitignore",
Expand All @@ -22,49 +21,49 @@
"@emotion/react": "^11.14.0",
"@emotion/styled": "^11.14.1",
"@khmyznikov/pwa-install": "^0.5.8",
"@mui/icons-material": "^6.4.2",
"@mui/material": "^6.4.2",
"@mui/material-nextjs": "^6.4.2",
"@mui/x-date-pickers": "^7.28.3",
"@serwist/next": "^9.1.1",
"@mui/icons-material": "^6.5.0",
"@mui/material": "^6.5.0",
"@mui/material-nextjs": "^6.5.0",
"@mui/x-date-pickers": "^7.29.4",
"@serwist/next": "^9.2.3",
"js-cookie": "^3.0.5",
"jwt-decode": "^4.0.0",
"luxon": "^3.7.1",
"next": "15.5.7",
"react": "^19.1.1",
"luxon": "^3.7.2",
"next": "16.0.7",
"react": "^19.2.1",
"react-device-detect": "^2.2.3",
"react-dom": "^19.1.1",
"react-dom": "^19.2.1",
"react-dropzone": "^14.3.8",
"react-oauth2-code-pkce": "^1.23.1",
"react-snowfall": "^2.3.0",
"sharp": "^0.34.3",
"swr": "^2.3.6",
"zustand": "^5.0.8"
"react-oauth2-code-pkce": "^1.23.4",
"react-snowfall": "^2.4.0",
"sharp": "^0.34.5",
"swr": "^2.3.7",
"zustand": "^5.0.9"
},
"devDependencies": {
"@eslint/js": "^9.34.0",
"@next/eslint-plugin-next": "^15.5.2",
"@tsconfig/next": "^2.0.3",
"@tsconfig/strictest": "^2.0.5",
"@eslint/js": "^9.39.1",
"@next/eslint-plugin-next": "^16.0.7",
"@tsconfig/next": "^2.0.4",
"@tsconfig/strictest": "^2.0.8",
"@types/js-cookie": "^3.0.6",
"@types/luxon": "^3.7.1",
"@types/node": "^24.3.0",
"@types/react": "^19.1.12",
"@types/react-dom": "^19.1.9",
"@types/node": "^24.10.1",
"@types/react": "^19.2.7",
"@types/react-dom": "^19.2.3",
"@types/react-swipeable-views": "^0.13.6",
"eslint": "^9.34.0",
"babel-plugin-react-compiler": "^1.0.0",
"eslint": "^9.39.1",
"eslint-config-prettier": "^10.1.8",
"eslint-import-resolver-typescript": "^4.4.4",
"eslint-plugin-import-x": "^4.16.1",
"eslint-plugin-jsx-a11y": "^6.10.2",
"eslint-plugin-no-relative-import-paths": "^1.6.1",
"eslint-plugin-react": "^7.37.5",
"eslint-plugin-react-compiler": "19.1.0-rc.2",
"eslint-plugin-react-hooks": "^5.2.0",
"eslint-plugin-react-hooks": "^7.0.1",
"npm-run-all": "^4.1.5",
"prettier": "^3.6.2",
"serwist": "^9.1.1",
"typescript": "^5.9.2",
"typescript-eslint": "^8.41.0"
"prettier": "^3.7.4",
"serwist": "^9.2.3",
"typescript": "^5.9.3",
"typescript-eslint": "^8.48.1"
}
}
Loading
Loading