Merge branch 'develop' of https://github.com/Amsterdam/design-system …

…into feature/code-connect

.github/dependabot.yml

@@ -14,6 +14,21 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+    # Prod and dev dependencies are split in two groups,
+    # because their PRs get a different prefix ('fix' for prod, 'chore' for dev)
+    groups:
+      patch-and-minor-dependencies:
+        applies-to: "version-updates"
+        dependency-type: "production"
+        update-types:
+          - "patch"
+          - "minor"
+      patch-and-minor-dev-dependencies:
+        applies-to: "version-updates"
+        dependency-type: "development"
+        update-types:
+          - "patch"
+          - "minor"
     versioning-strategy: "increase-if-necessary"
     open-pull-requests-limit: 20
     commit-message:

.github/workflows/feature-branch-cleanup.yml

@@ -19,14 +19,17 @@ jobs:
           BRANCH_NAME=$(echo $RAW_BRANCH_NAME | sed 's/[^/]*\///')
           echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_ENV
 
-      - name: Check out
+      - name: Check out branch to access .nvmrc
         uses: actions/checkout@v4
-        with:
-          ref: gh-pages
 
       - uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version-file: .nvmrc
+
+      - name: Check out gh-pages branch
+        uses: actions/checkout@v4
+        with:
+          ref: gh-pages
 
       - name: Delete folder
         run: |

.github/workflows/feature-branch-deploy.yml

@@ -33,13 +33,12 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version-file: .nvmrc
 
       - uses: pnpm/action-setup@v4
         name: Install pnpm
         id: pnpm-install
         with:
-          version: 9
           run_install: false
 
       - name: Install dependencies

.github/workflows/lint-test.yml

@@ -16,13 +16,12 @@ jobs:
       - name: Set up Node.js version
         uses: actions/setup-node@v4
         with:
-          node-version: "20"
+          node-version-file: .nvmrc
 
       - name: Install pnpm
         uses: pnpm/action-setup@v4
         id: pnpm-install
         with:
-          version: 9
           run_install: false
 
       - name: Get pnpm store directory
@@ -54,13 +53,12 @@ jobs:
       - name: Set up Node.js version
         uses: actions/setup-node@v4
         with:
-          node-version: "20"
+          node-version-file: .nvmrc
 
       - name: Install pnpm
         uses: pnpm/action-setup@v4
         id: pnpm-install
         with:
-          version: 9
           run_install: false
 
       - name: Get pnpm store directory

.github/workflows/publish.yml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: Create release
-        uses: googleapis/release-please-action@v4
+        uses: google-github-actions/release-please-action@v4
         id: release
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -33,15 +33,14 @@ jobs:
       - name: Set up Node.js version
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version-file: .nvmrc
           registry-url: "https://registry.npmjs.org"
         if: ${{ steps.release.outputs.releases_created == 'true' }}
 
       - name: Install pnpm
         uses: pnpm/action-setup@v4
         id: pnpm-install
         with:
-          version: 9
           run_install: false
         if: ${{ steps.release.outputs.releases_created == 'true' }}
 

.release-please-manifest.json

@@ -1,7 +1,7 @@
 {
-  "packages/css": "0.11.1",
-  "packages/react": "0.11.1",
-  "proprietary/assets": "0.2.1",
-  "proprietary/react-icons": "0.1.12",
-  "proprietary/tokens": "0.11.0"
+  "packages/css": "0.13.1",
+  "packages/react": "0.13.1",
+  "proprietary/assets": "0.2.2",
+  "proprietary/react-icons": "0.1.13",
+  "proprietary/tokens": "0.13.0"
 }

README.md

@@ -9,7 +9,7 @@ This helps everyone work faster and better, with more time to create value.
 To our citizens and businesses, all our channels look the same and work similarly;
 they are broadly accessible and evoke trust.
 
-We aim to create libraries for, or support otherwise, Figma, CSS, React, React Native, Salesforce, and Mendix.
+We aim to create libraries for, or support otherwise, Figma, CSS, React, React Native, and Mendix.
 
 ## Related resources
 

documentation/git.md

@@ -26,7 +26,7 @@ Configure this immediately after downloading.
 
 From the directory that holds the repository:
 
-```bash
+```sh
 git config user.name Your Name
 
 git config user.email [email protected]
@@ -139,7 +139,7 @@ For users of Git via the CLI, it may be helpful to create aliases for some commo
 You can save this in a configuration file of your shell.
 For example:
 
-```bash
+```sh
 alias gcd="git checkout develop"
 alias gcp="git checkout -"
 alias gh="git push"

documentation/publishing.md

@@ -32,7 +32,7 @@ This will cause a major version bump in both packages on release and add its des
 
 1. Locally merge the latest version of `develop` into `main` using a fast-forward merge, and push to the remote:
 
-   ```shell
+   ```sh
      git checkout main
      git pull
      git merge --ff-only origin/develop
@@ -46,7 +46,7 @@ This will cause a major version bump in both packages on release and add its des
 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:
 
-   ```shell
+   ```sh
     git checkout develop
     git pull
     git merge --ff-only origin/main

documentation/storybook.md

@@ -84,15 +84,9 @@ argTypes: {
 
 ## Best practices for stories
 
-1. Use decorators and / or `args.children` before reaching for `render`. `render` can easily mess up the stories’ code view.
+1. Import the Story’s component from the `src` directory so that Storybook can display its types.
+   Import other components from the package as usual.
+2. Use decorators and / or `args.children` before reaching for `render`. `render` can easily mess up the stories’ code view.
    Decorators are not shown in the code view, `args.children` are.
-2. Always check your stories’ code view.
-3. `args.children` can be an array, separated by commas and given ascending numbers as keys.
-
-## Future plans
-
-We are considering what to document for each component in the various libraries.
-
-We aim to document each implementation of each component – CSS, React, React Native, and Salesforce Lightning Web Components.
-
-We’re eager to get the most out of Storybook features for accessibility, testing, and more.
+3. Always check your stories’ code view.
+4. `args.children` can be an array, separated by commas and given ascending numbers as keys.

package.json

@@ -1,56 +1,59 @@
 {
   "version": "0.0.0",
-  "author": "Community for NL Design System",
-  "description": "Design system based on the NL Design System architecture",
+  "author": "Design System Team, City of Amsterdam <[email protected]>",
+  "description": "Reusable components, patterns and guidelines powering the City of Amsterdam’s digital services.",
+  "homepage": "https://designsystem.amsterdam/",
   "license": "EUPL-1.2",
   "name": "@amsterdam/design-system",
   "keywords": [
-    "nl-design-system"
+    "amsterdam",
+    "amsterdam-design-system",
+    "assets",
+    "css",
+    "design-system",
+    "icons",
+    "nl-design-system",
+    "react"
   ],
   "private": true,
   "engines": {
     "node": "^20",
     "npm": "^10",
     "pnpm": "^9"
   },
-  "volta": {
-    "node": "20.13.1",
-    "npm": "10.5.2",
-    "pnpm": "9.1.1"
-  },
   "workspaces": [
     "./packages/*",
     "./proprietary/*",
     "./storybook"
   ],
   "devDependencies": {
-    "@types/node": "22.5.5",
+    "@types/node": "22.8.7",
     "@typescript-eslint/eslint-plugin": "7.18.0",
     "@typescript-eslint/parser": "7.18.0",
     "conventional-changelog-conventionalcommits": "8.0.0",
     "eslint": "8.57.1",
     "eslint-config-prettier": "9.1.0",
-    "eslint-plugin-import": "2.30.0",
+    "eslint-plugin-import": "2.31.0",
     "eslint-plugin-jest": "28.8.3",
     "eslint-plugin-json": "3.1.0",
     "eslint-plugin-mdx": "3.1.5",
-    "eslint-plugin-react": "7.36.1",
-    "html-validate": "8.22.0",
+    "eslint-plugin-react": "7.37.2",
+    "html-validate": "8.24.2",
     "husky": "9.1.6",
     "lint-staged": "15.2.10",
-    "markdownlint-cli": "0.41.0",
-    "npm-check-updates": "17.1.2",
+    "markdownlint-cli": "0.42.0",
+    "npm-check-updates": "17.1.10",
     "npm-package-json-lint": "8.0.0",
     "npm-run-all": "4.1.5",
     "plop": "4.0.1",
     "postcss": "8.4.47",
     "prettier": "3.3.3",
     "rimraf": "6.0.1",
-    "stylelint": "16.9.0",
+    "stylelint": "16.10.0",
     "stylelint-config-standard-scss": "13.1.0",
     "stylelint-order": "6.0.4",
     "stylelint-use-logical": "2.1.2",
-    "typescript": "5.6.2",
+    "typescript": "5.6.3",
     "wait-on": "8.0.1"
   },
   "scripts": {
@@ -74,12 +77,29 @@
     "test": "npm run test-workspaces",
     "test-update": "npm-run-all --sequential clean lint build test",
     "test-workspaces": "pnpm -r --no-bail test",
-    "update-major": "npm-check-updates --configFileName .ncurc.major.js --deep --dep dev,prod --target latest --upgrade && pnpm install",
-    "update-minor": "npm-check-updates --configFileName .ncurc.minor.js --deep --dep dev,prod --target minor --upgrade && pnpm install",
-    "update-patch": "npm-check-updates --configFileName .ncurc.patch.js --deep --dep dev,prod --target patch --upgrade && pnpm install",
+    "update:major": "npm-check-updates --configFileName .ncurc.major.js --deep --dep dev,prod --target latest --upgrade && pnpm install",
+    "update:minor": "npm-check-updates --configFileName .ncurc.minor.js --deep --dep dev,prod --target minor --upgrade && pnpm install",
+    "update:patch": "npm-check-updates --configFileName .ncurc.patch.js --deep --dep dev,prod --target patch --upgrade && pnpm install",
     "watch:css": "npm run --workspace packages/css build:watch",
     "watch:react": "npm run --workspace packages/react build:watch",
     "watch:storybook": "npm run --workspace storybook start",
     "watch:tokens": "npm run --workspace proprietary/tokens watch"
-  }
+  },
+  "pnpm": {
+    "overrides": {
+      "tar@<6.2.1": ">=6.2.1",
+      "tough-cookie@<4.1.3": ">=4.1.3",
+      "braces@<3.0.3": ">=3.0.3",
+      "ws@>=8.0.0 <8.17.1": ">=8.17.1",
+      "semver@<5.7.2": ">=5.7.2",
+      "micromatch@<4.0.8": ">=4.0.8",
+      "body-parser@<1.20.3": ">=1.20.3",
+      "send@<0.19.0": ">=0.19.0",
+      "serve-static@<1.16.0": ">=1.16.0",
+      "express@<4.20.0": ">=4.20.0",
+      "path-to-regexp@<0.1.10": ">=0.1.10",
+      "cookie@<0.7.0": ">=0.7.0"
+    }
+  },
+  "packageManager": "[email protected]+sha512.22721b3a11f81661ae1ec68ce1a7b879425a1ca5b991c975b074ac220b187ce56c708fe5db69f4c962c989452eee76c82877f4ee80f474cebd61ee13461b6228"
 }