Skip to content

Chore/20251104 #326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SvenVw merged 8 commits into from
Nov 4, 2025
Merged

Chore/20251104 #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b9b6b18
chore: update root dependencies
SvenVw Nov 4, 2025
65a9b30
chore: update pnpm
SvenVw Nov 4, 2025
3ad101d
chore: update fdm-core dependencies
SvenVw Nov 4, 2025
ef3331b
chore: major update for fdm-core dependencies
SvenVw Nov 4, 2025
40e2a4d
chore: update fdm-docs dependencies
SvenVw Nov 4, 2025
c6592e1
chore: update fdm-app dependencies
SvenVw Nov 4, 2025
e0a3368
Merge branch 'development' into chore/20251104
SvenVw Nov 4, 2025
141a93d
refactor: replace deprecated tailwind classes flex-grow, flex-shrink …
SvenVw Nov 4, 2025
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/deploy-docs-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 10.18.3
version: 10.20.0
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 10.18.3
version: 10.20.0
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Setup pnpm
uses: pnpm/action-setup@v4
with:
version: 10.18.3
version: 10.20.0

- name: Setup Node.js
uses: actions/setup-node@v4
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
- name: Setup pnpm 10
uses: pnpm/action-setup@v4
with:
version: 10.18.3
version: 10.20.0

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
Expand Down Expand Up @@ -146,7 +146,7 @@ jobs:
- name: Setup pnpm 10
uses: pnpm/action-setup@v4
with:
version: 10.18.3
version: 10.20.0

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
Expand Down Expand Up @@ -226,7 +226,7 @@ jobs:
- name: Setup pnpm 10
uses: pnpm/action-setup@v4
with:
version: 10.18.3
version: 10.20.0

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
Expand Down
2 changes: 1 addition & 1 deletion fdm-app/app/components/blocks/atlas-fields/cultivation-history.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export function CultivationHistoryCard({
key={cultivation.year}
className="flex items-start space-x-4 pb-6"
>
<div className="relative flex h-10 w-10 flex-shrink-0 items-center justify-center rounded-full">
<div className="relative flex h-10 w-10 shrink-0 items-center justify-center rounded-full">
<span
className="absolute h-full w-full rounded-full"
style={{
Expand Down
2 changes: 1 addition & 1 deletion fdm-app/app/components/custom/changelog-notification.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export function ChangelogNotification() {
<div className="flex items-center justify-between gap-2 rounded-md border border-muted-foreground/20 bg-background p-2 text-sm shadow-sm transition-colors hover:border-primary">
<NavLink
to="/about/whats-new"
className="flex flex-grow items-center gap-2"
className="flex grow items-center gap-2"
>
<Circle className="h-4 w-4 text-blue-400 fill-blue-400" />
<span className="font-medium text-shadow-muted-foregroundforeground">
Expand Down
2 changes: 1 addition & 1 deletion fdm-app/app/components/ui/button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import type * as React from "react"
import { cn } from "~/lib/utils"

const buttonVariants = cva(
"inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive",
"inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-hidden focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive",
{
variants: {
variant: {
Expand Down
2 changes: 1 addition & 1 deletion fdm-app/app/components/ui/item.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ function ItemSeparator({
}

const itemVariants = cva(
"group/item [a]:hover:bg-accent/50 focus-visible:border-ring focus-visible:ring-ring/50 [a]:transition-colors flex flex-wrap items-center rounded-md border border-transparent text-sm outline-none transition-colors duration-100 focus-visible:ring-[3px]",
"group/item [a]:hover:bg-accent/50 focus-visible:border-ring focus-visible:ring-ring/50 [a]:transition-colors flex flex-wrap items-center rounded-md border border-transparent text-sm outline-hidden transition-colors duration-100 focus-visible:ring-[3px]",
{
variants: {
variant: {
Expand Down
2 changes: 1 addition & 1 deletion fdm-app/app/components/ui/radio-group.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ function RadioGroupItem({
<RadioGroupPrimitive.Item
data-slot="radio-group-item"
className={cn(
"border-input text-primary focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 aspect-square size-4 shrink-0 rounded-full border shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50",
"border-input text-primary focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 aspect-square size-4 shrink-0 rounded-full border shadow-xs transition-[color,box-shadow] outline-hidden focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50",
className,
)}
{...props}
Expand Down
2 changes: 1 addition & 1 deletion fdm-app/app/components/ui/switch.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ function Switch({
<SwitchPrimitive.Root
data-slot="switch"
className={cn(
"peer data-[state=checked]:bg-primary data-[state=unchecked]:bg-input focus-visible:border-ring focus-visible:ring-ring/50 dark:data-[state=unchecked]:bg-input/80 inline-flex h-[1.15rem] w-8 shrink-0 items-center rounded-full border border-transparent shadow-xs transition-all outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50",
"peer data-[state=checked]:bg-primary data-[state=unchecked]:bg-input focus-visible:border-ring focus-visible:ring-ring/50 dark:data-[state=unchecked]:bg-input/80 inline-flex h-[1.15rem] w-8 shrink-0 items-center rounded-full border border-transparent shadow-xs transition-all outline-hidden focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50",
className,
)}
{...props}
Expand Down
26 changes: 13 additions & 13 deletions fdm-app/app/routes/farm._index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ export default function AppIndex() {
title={`Welkom, ${loaderData.username}! 👋`}
description="Kies een van de onderstaande opties om verder te gaan."
/>
<div className="grid flex-1 grid-cols-1 gap-6 p-10 lg:grid-cols-2">
<div className="grid grow grid-cols-1 gap-6 p-10 lg:grid-cols-2">
<Card className="flex flex-col">
<CardHeader>
<CardTitle className="flex items-center gap-2">
Expand All @@ -119,14 +119,14 @@ export default function AppIndex() {
voeg je percelen toe.
</CardDescription>
</CardHeader>
<CardContent className="flex-grow space-y-4 text-muted-foreground">
<CardContent className="grow space-y-4 text-muted-foreground">
<p>
Een bedrijf vormt de basis voor al je
analyses en adviezen. Krijg toegang tot:
</p>
<ul className="space-y-2">
<li className="flex items-start gap-2">
<CheckIcon className="mt-1 h-5 w-5 flex-shrink-0 text-primary" />
<CheckIcon className="mt-1 h-5 w-5 shrink-0 text-primary" />
<span>
Toegang tot de{" "}
<b>Stikstofbalans</b>,{" "}
Expand All @@ -135,22 +135,22 @@ export default function AppIndex() {
</span>
</li>
<li className="flex items-start gap-2">
<CheckIcon className="mt-1 h-5 w-5 flex-shrink-0 text-primary" />
<CheckIcon className="mt-1 h-5 w-5 shrink-0 text-primary" />
<span>
Beheer van meerdere jaren voor
een compleet overzicht.
</span>
</li>
<li className="flex items-start gap-2">
<CheckIcon className="mt-1 h-5 w-5 flex-shrink-0 text-primary" />
<CheckIcon className="mt-1 h-5 w-5 shrink-0 text-primary" />
<span>
Een uitgebreide lijst van
meststoffen die je zelf kunt
aanpassen en uitbreiden.
</span>
</li>
<li className="flex items-start gap-2">
<CheckIcon className="mt-1 h-5 w-5 flex-shrink-0 text-primary" />
<CheckIcon className="mt-1 h-5 w-5 shrink-0 text-primary" />
<span>
De mogelijkheid om je adviseur
toegang te geven tot je
Expand Down Expand Up @@ -180,30 +180,30 @@ export default function AppIndex() {
gedetailleerde informatie.
</CardDescription>
</CardHeader>
<CardContent className="flex-grow space-y-4 text-muted-foreground">
<CardContent className="grow space-y-4 text-muted-foreground">
<p>
De Atlas is een handige tool om percelen
te analyseren, zelfs zonder een eigen
bedrijf. Ontdek bijvoorbeeld:
</p>
<ul className="space-y-2">
<li className="flex items-start gap-2">
<CheckIcon className="mt-1 h-5 w-5 flex-shrink-0 text-primary" />
<CheckIcon className="mt-1 h-5 w-5 shrink-0 text-primary" />
<span>
De volledige teelthistorie van
percelen tot 2009.
</span>
</li>
<li className="flex items-start gap-2">
<CheckIcon className="mt-1 h-5 w-5 flex-shrink-0 text-primary" />
<CheckIcon className="mt-1 h-5 w-5 shrink-0 text-primary" />
<span>
Of een perceel in een gebied met
beperkingen voor de
gebruiksruimte valt.
</span>
</li>
<li className="flex items-start gap-2">
<CheckIcon className="mt-1 h-5 w-5 flex-shrink-0 text-primary" />
<CheckIcon className="mt-1 h-5 w-5 shrink-0 text-primary" />
<span>
Een inschatting van de
bodemtextuur en het
Expand Down Expand Up @@ -279,7 +279,7 @@ export default function AppIndex() {
</CardTitle>
<CardDescription />
</CardHeader>
<CardContent className="flex-grow">
<CardContent className="grow">
<div className="grid gap-2">
<div className="flex items-center text-sm text-muted-foreground">
<p>Adres:</p>
Expand Down Expand Up @@ -349,7 +349,7 @@ export default function AppIndex() {
</CardTitle>
<CardDescription />
</CardHeader>
<CardContent className="flex-grow text-sm text-muted-foreground">
<CardContent className="grow text-sm text-muted-foreground">
<p>
Maak een nieuw bedrijf aan en
beheer je percelen, gewassen en
Expand Down Expand Up @@ -386,7 +386,7 @@ export default function AppIndex() {
</CardTitle>
<CardDescription />
</CardHeader>
<CardContent className="flex-grow">
<CardContent className="grow">
<p className="text-sm text-muted-foreground">
Bekijk alle percelen op de kaart
en selecteer een perceel voor
Expand Down
4 changes: 2 additions & 2 deletions fdm-app/app/routes/farm.create.$b_id_farm.$calendar._index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export default function ChooseFieldImportMethod() {
RVO Mijn Percelen te uploaden.
</CardDescription>
</CardHeader>
<CardContent className="flex-grow flex flex-col justify-between">
<CardContent className="grow flex flex-col justify-between">
<Accordion
type="single"
collapsible
Expand Down Expand Up @@ -145,7 +145,7 @@ export default function ChooseFieldImportMethod() {
Selecteer je percelen direct op de kaart.
</CardDescription>
</CardHeader>
<CardContent className="flex-grow flex items-end justify-center">
<CardContent className="grow flex items-end justify-center">
<NavLink to="./atlas" className="w-full">
<Button
variant="outline"
Expand Down
44 changes: 22 additions & 22 deletions fdm-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,18 @@
"@radix-ui/react-separator": "^1.1.7",
"@radix-ui/react-slot": "^1.2.3",
"@radix-ui/react-switch": "^1.2.6",
"@react-email/components": "^0.5.6",
"@react-email/components": "^0.5.7",
"@react-email/tailwind": "1.2.2",
"@react-router/node": "^7.9.4",
"@react-router/serve": "^7.9.4",
"@remix-run/file-storage": "^0.9.0",
"@remix-run/form-data-parser": "^0.10.1",
"@react-router/node": "^7.9.5",
"@react-router/serve": "^7.9.5",
"@remix-run/file-storage": "^0.10.0",
"@remix-run/form-data-parser": "^0.12.0",
"@sentry/profiling-node": "^10.22.0",
"@sentry/react-router": "^10.22.0",
"@svenvw/fdm-calculator": "workspace:^",
"@svenvw/fdm-core": "workspace:^",
"@svenvw/fdm-data": "workspace:*",
"@tailwindcss/vite": "^4.1.14",
"@tailwindcss/vite": "^4.1.16",
Comment thread
SvenVw marked this conversation as resolved.
"@tanstack/react-table": "^8.21.3",
"@turf/centroid": "^7.2.0",
"@turf/turf": "^7.2.0",
Expand All @@ -51,29 +51,29 @@
"flatgeobuf": "^4.3.1",
"framer-motion": "^12.23.24",
"fuzzysort": "^3.1.0",
"isbot": "^5.1.31",
"isbot": "^5.1.32",
"lodash.throttle": "^4.1.1",
"lucide-react": "^0.545.0",
"mapbox-gl": "^3.15.0",
"nanoid": "^5.1.5",
"lucide-react": "^0.552.0",
"mapbox-gl": "^3.16.0",
"nanoid": "^5.1.6",
"next-themes": "^0.4.6",
"postgres": "^3.4.7",
"posthog-js": "^1.284.0",
"posthog-js": "^1.285.1",
"posthog-node": "^5.11.0",
"postmark": "^4.0.5",
"proj4": "^2.19.10",
"radix-ui": "^1.4.3",
"react": "^19.2.0",
"react-day-picker": "9.11.1",
"react-dom": "^19.2.0",
"react-hook-form": "^7.65.0",
"react-hook-form": "^7.66.0",
"react-map-gl": "^8.1.0",
"react-markdown": "^10.1.0",
"react-router": "^7.9.4",
"react-router-dom": "^7.9.4",
"react-router": "^7.9.5",
"react-router-dom": "^7.9.5",
"recharts": "^2.15.4",
"remark-gfm": "^4.0.1",
"remix-hook-form": "7.1.0",
"remix-hook-form": "7.1.1",
"remix-toast": "^3.3.0",
"remix-utils": "^9.0.0",
"shpjs": "^6.2.0",
Expand All @@ -86,23 +86,23 @@
},
"devDependencies": {
"@dotenvx/dotenvx": "catalog:",
"@react-router/dev": "^7.9.4",
"@react-router/fs-routes": "^7.9.4",
"@react-router/dev": "^7.9.5",
"@react-router/fs-routes": "^7.9.5",
"@svenvw/fdm-calculator": "workspace:*",
"@svenvw/fdm-core": "workspace:*",
"@svenvw/fdm-data": "workspace:*",
"@tailwindcss/postcss": "^4.1.14",
"@tailwindcss/postcss": "^4.1.16",
"@types/geojson": "^7946.0.16",
"@types/lodash.throttle": "^4.1.9",
"@types/mapbox-gl": "^3.4.1",
"@types/mapbox__geojson-extent": "^1.0.3",
"@types/mapbox__mapbox-gl-geocoder": "^5.0.0",
"@types/mapbox__mapbox-gl-geocoder": "^5.1.0",
"@types/react": "^19.2.2",
"@types/react-dom": "^19.2.2",
"@types/react-map-gl": "^6.1.7",
"@types/validator": "^13.15.3",
"@types/validator": "^13.15.4",
"postcss": "^8.5.6",
"tailwindcss": "^4.1.14",
"tailwindcss": "^4.1.16",
"typescript": "catalog:",
"vite": "catalog:",
"vite-node": "^3.2.4",
Expand All @@ -111,5 +111,5 @@
"engines": {
"node": ">=20.0.0"
},
"packageManager": "pnpm@10.18.3"
"packageManager": "pnpm@10.20.0"
}
2 changes: 1 addition & 1 deletion fdm-calculator/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,5 @@
"typescript": "catalog:",
"vitest": "catalog:"
},
"packageManager": "pnpm@10.18.3"
"packageManager": "pnpm@10.20.0"
}
Loading