Release/2025-10

.github/workflows/deploy-docs-test.yml

@@ -35,7 +35,7 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@v4
         with:
-          version: 10.17.0
+          version: 10.18.3
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v4
         with:

.github/workflows/deploy-docs.yml

@@ -38,7 +38,7 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@v4
         with:
-          version: 10.17.0
+          version: 10.18.3
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v4
         with:

.github/workflows/release-comment.yml

@@ -0,0 +1,41 @@
+name: Release PR Comment
+
+on:
+  pull_request:
+    types: [opened, reopened]
+    branches:
+      - main # Only trigger for PRs targeting main
+
+jobs:
+  add-comment:
+    runs-on: ubuntu-latest
+    if: startsWith(github.head_ref, 'release/') || startsWith(github.head_ref, 'hotfix/')
+    permissions:
+      pull-requests: write
+    steps:
+      - name: Add PR Comment
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const isHotfix = context.payload.pull_request.head.ref.startsWith('hotfix/');
+            const branchType = isHotfix ? 'Hotfix' : 'Release';
+            const workflowName = 'Release'; // The name of your workflow file
+
+            const commentBody = `
+            👋 **${branchType} Branch PR Detected!**
+
+            Before merging this Pull Request into \`main\`, please ensure you have finalized the ${branchType.toLowerCase()} by **manually running the '${workflowName}' workflow** on this \`${context.payload.pull_request.head.ref}\` branch.
+
+            This will:
+            1.  Bump package versions.
+            2.  Generate changelogs.
+            3.  Create Git tags.
+
+            You can trigger the workflow from the 'Actions' tab, selecting the '${workflowName}' workflow, and choosing this \`${context.payload.pull_request.head.ref}\` branch.
+            `;
+            github.rest.issues.createComment({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: commentBody
+            });

.github/workflows/release.yml

@@ -1,61 +1,107 @@
-name: Prerelease
+name: Release
 
 on:
   push:
-    paths:
-      - 'fdm-core/**'
-      - 'fdm-data/**'
     branches:
       - main
+      - development
+  workflow_dispatch: # This enables the manual trigger
+  pull_request:
+    branches:
+      - main # Trigger for pull requests targeting main
 
-concurrency: 
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+concurrency: ${{ github.workflow }}-${{ github.ref }}
 
 jobs:
-  Release:
+  release:
     name: Release
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [22]
     permissions:
-      contents: read
+      contents: write
       packages: write
+      pull-requests: write # Required for the status check
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
-      - name: Cache turbo build setup
-        uses: actions/cache@v4
-        with: 
-          path: .turbo
-          key: ${{ runner.os }}-turbo-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-turbo-
-
-      - name: Setup pnpm 10
+      - name: Setup pnpm
         uses: pnpm/action-setup@v4
         with:
-          version: 10.17.0
+          version: 10.18.3
 
-      - name: Use Node.js ${{ matrix.node-version }}
+      - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: ${{ matrix.node-version }}
-          registry-url: 'https://npm.pkg.github.com'
+          node-version: 22
           cache: 'pnpm'
 
       - name: Install Dependencies
-        run: pnpm i
+        run: pnpm install --frozen-lockfile
 
-      - name: Bump snapshot
-        run: pnpm changeset version
+      # Runs for the 'development' branch on push
+      - name: Publish Snapshot
+        if: github.ref == 'refs/heads/development'
+        run: |
+          pnpm changeset version --snapshot
+          pnpm changeset publish --tag development
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build packages
-        run: pnpm build --filter=@svenvw/fdm-core --filter=@svenvw/fdm-data --filter=@svenvw/fdm-calculator
-
-      - name: Publish snapshot
-        run: pnpm changeset publish
+      # Runs MANUALLY on a 'release/*' or 'hotfix/*' branch
+      - name: Version Packages
+        if: github.event_name == 'workflow_dispatch' && (startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/hotfix/'))
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          pnpm changeset version
+          pnpm changeset tag
+          git add .
+          git commit -m "chore: bump version of packages for release"
+          git push --follow-tags
         env:
-          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      # Runs for the 'main' branch on push
+      - name: Publish Packages and Create Releases
+        if: github.ref == 'refs/heads/main'
+        run: |
+          pnpm build --filter="!@svenvw/fdm-app"
+          pnpm changeset publish --no-git-tag
+
+          git tag --points-at HEAD | while read -r tag; do
+            gh release create "$tag" --generate-notes
+          done
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  verify-versioning:
+    name: Verify Versioning
+    runs-on: ubuntu-latest
+    if: github.event_name == 'pull_request' && (startsWith(github.head_ref, 'release/') || startsWith(github.head_ref, 'hotfix/'))
+    permissions:
+      pull-requests: write # Required to update PR status
+      contents: read # Required to checkout code
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.ref }}
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+          fetch-depth: 0
+
+      - name: Check for Versioning Commit
+        id: check_commit
+        run: |
+          if git log --format="%s" -n 1 | grep -q "chore: bump version of packages for release"; then
+            echo "::notice::Versioning commit found. All good!"
+            echo "versioning_commit_found=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "::error::Versioning commit 'chore: bump version of packages for release' not found. Please run the 'Release' workflow manually on this branch."
+            echo "versioning_commit_found=false" >> "$GITHUB_OUTPUT"
+            exit 1
+          fi
+        shell: bash

.github/workflows/tests.yml

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

fdm-app/CHANGELOG.md

@@ -1,5 +1,55 @@
 # Changelog fdm-app
 
+## 0.24.0
+
+### Minor Changes
+
+- 9dfde4c: Replace Meststoftype with Mestcode (RVO) at fertilizer forms
+- 5e711d7: Improve the design of the list of fertilizer applications by adding an icon for the type of fertilizer and better usage of spacing and aligning
+- bf8b0ff: In the fertilizer table show the RVO mestcode (p_type_rvo) colored by p_type instead of only p_type
+- 2c9aafa: Add new page at farm details to add whether the farm has an organic certification
+- 06314a5: Fixes that user can drop files as well for Mijn Percelen shapefile upload and Soil Analysis pdf upload.
+- b71bf41: Users can now edit previously created fertilizer applications, both for individual fields or a given cultivation type.
+- 77c309d: In case a field has an error at the nitrogen balance calculation, the balance at farm level and other fields are still shown, but an error message for the specific field is shown
+- c1ebe6d: Add new page at farm details to state whether the farmer has done grazing or intends it for a year
+- d756cf4: The users can now drop files onto the entire shapefile upload area during farm creation, not just on top of the text and icons.
+- d279d08: For cultivations default dates based on the cultivation catalogue date are used for b_lu_start and b_lu_end if available when adding a field with a cultivation
+- 276f35a: Show to the farm norms page the filling of the norms as well
+- 3eb4ec2: At the fertilizer applications page for a field show the metrics for norms, nitrogen balance and nutrient advice as well
+- 73be0f3: Add page to show on field level the norm values and fillings. It shows also the contribution of each fertilizer application to the various norms
+
+### Patch Changes
+
+- 1a89d67: Submit "other" errors for loaders and actions to Sentry
+- 8f8cc9f: At Nutrient Advice show progress bar for nutrients that have advice of 0
+- beef80c: Submit calculation errors at nitrogen balance calculation to Sentry
+- 8b854af: Move `getNutrientAdvice` to fdm-calculator and use the cached version of the function
+- 8f8cc9f: At Nutrient Advice show doses with precision of 2 if dose is between 0 and 1 kg / ha instead of showing 0
+- a2f8419: Fix parsing of `b_date` in the response for th soil analysis extraction
+- da64906: Fix link in header of fertilizers
+- 91d4103: Switch to use the cached version of the calculator functions for `norms` and `balance`
+- Updated dependencies [97083dd]
+- Updated dependencies [a74a6e8]
+- Updated dependencies [a226f7e]
+- Updated dependencies [77c309d]
+- Updated dependencies [a00a331]
+- Updated dependencies [726ae00]
+- Updated dependencies [8f9d4ff]
+- Updated dependencies [2f7b281]
+- Updated dependencies [c939de9]
+- Updated dependencies [b58cd07]
+- Updated dependencies [77c309d]
+- Updated dependencies [d6b8900]
+- Updated dependencies [b58cd07]
+- Updated dependencies [ac5d94f]
+- Updated dependencies [91d4103]
+- Updated dependencies [8b2bf8c]
+- Updated dependencies [6bcb528]
+- Updated dependencies [91d4103]
+  - @svenvw/fdm-data@0.18.0
+  - @svenvw/fdm-calculator@0.8.0
+  - @svenvw/fdm-core@0.26.0
+
 ## 0.23.2
 
 ### Patch Changes