Merge branch 'develop' into feat/DES-1101-update-alert-border-design

# Conflicts:
#	proprietary/tokens/src/components/ams/alert.tokens.json

.github/workflows/lint-test.yml

@@ -58,7 +58,7 @@ jobs:
           pnpm run --if-present test
 
       - name: "Retain build artifact: Storybook"
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
         with:
           name: storybook
           path: storybook/dist/

.lintstagedrc.json

@@ -1,7 +1,6 @@
 {
   "composer.json": "composer validate",
   "package.json": "npmPkgJsonLint --allowEmptyTargets",
-  "*.md": ["markdownlint", "prettier --check"],
-  "*.{js,json,jsx,mdx,ts,tsx}": ["eslint --no-error-on-unmatched-pattern", "prettier --check"],
+  "*.{md,js,json,jsx,mdx,ts,tsx}": ["eslint --no-error-on-unmatched-pattern", "prettier --check"],
   "*.{css,scss}": ["stylelint --allow-empty-input", "prettier --check"]
 }

.ncurc.major.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-undef */
 const minorConfig = require('./.ncurc.minor')
 
 module.exports = {

.ncurc.minor.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-undef */
 const patchConfig = require('./.ncurc.patch')
 
 module.exports = {

.ncurc.patch.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-undef */
 module.exports = {
   reject: [],
 }

.nvmrc

@@ -1 +1 @@
-v20
+22

.release-please-manifest.json

@@ -1,7 +1,7 @@
 {
-  "packages/css": "0.13.1",
-  "packages/react": "0.13.1",
-  "proprietary/assets": "0.2.2",
+  "packages/css": "0.14.0",
+  "packages/react": "0.14.0",
+  "proprietary/assets": "0.3.0",
   "proprietary/react-icons": "0.1.13",
-  "proprietary/tokens": "0.13.0"
+  "proprietary/tokens": "0.14.0"
 }

CONTRIBUTING.md

@@ -133,24 +133,25 @@ You can use any editor you like, but if you use [Visual Studio Code](https://cod
 
 - [EditorConfig](https://marketplace.visualstudio.com/items?itemName=EditorConfig.EditorConfig)
 - [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint)
-- [markdownlint](https://marketplace.visualstudio.com/items?itemName=DavidAnson.vscode-markdownlint)
 - [MDX](https://marketplace.visualstudio.com/items?itemName=silvenon.mdx)
 - [Prettier - Code formatter](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode)
 - [stylelint](https://marketplace.visualstudio.com/items?itemName=stylelint.vscode-stylelint)
 
 To enable correct validation and to fix lint/style errors on save, add this to your VSCode `settings.json`:
 
 ```json
+{
+  "eslint.useFlatConfig": true,
   "css.validate": false,
   "scss.validate": false,
   "stylelint.validate": ["css", "scss"],
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": true,
-    "source.fixAll.stylelint": true,
-    "source.fixAll.markdownlint": true
+    "source.fixAll.stylelint": true
   },
   "editor.defaultFormatter": "esbenp.prettier-vscode",
-  "editor.formatOnSave": true,
+  "editor.formatOnSave": true
+}
 ```
 
 </details>
@@ -196,7 +197,7 @@ The copyright holder for all files created by people working for the City of Ams
 If you use code from other EUPL-1.2 or higher licensed files that have a copyright notice, don’t forget to add this copyright notice as well.
 So, for a file with code written by someone working for the City of Amsterdam in 2023, but also containing code from another EUPL-1.2 or higher licensed file written by John Doe in 2021, the header would look like this:
 
-```javascript
+```ts
 /**
  * @license EUPL-1.2+
  * Copyright (c) 2021 John Doe
@@ -208,7 +209,7 @@ All documentation files should also start with a license header.
 We use the Creative Commons Zero (CC0) license for this.
 The license header looks like this:
 
-```md
+```html
 <!-- @license CC0-1.0 -->
 ```
 

documentation/publishing.md

@@ -40,9 +40,17 @@ This will cause a major version bump in both packages on release and add its des
    ```
 
 2. This triggers a GitHub Action, which creates a release PR.
-   Review and approve this PR, then merge it – no need to wait for the checks.
+   Review this PR and make sure to check the changelogs for the different packages.
+   A commit might only be a breaking change for one package, but it will be marked as breaking for all affected packages.
+
+   Note: Release Please uses the PR description to create the GitHub release notes.
+   When you update a changelog, be sure to update both CHANGELOG.md and the PR description.
+
+   Approve the PR, then merge it – no need to wait for the checks.
+
    The same Action will then publish the release to npm and GitHub.
    It also deploys the released version to our main Storybook environment.
+
 3. When complete, the Action adds a new release commit to `main`.
    Locally merge this commit back into `develop` and push it to the remote:
 

documentation/storybook.md

@@ -74,7 +74,7 @@ For example, when the child is a simple string (like in the default Button compo
 
 To do this, you can override the default like so:
 
-```js
+```txt
 argTypes: {
   children: {
     table: { disable: false },