Merge pull request #206 from forumone/2.x-RC

v2.2.0

Author: kmonahan

.ddev/config.yaml

@@ -14,7 +14,7 @@ database:
 use_dns_when_possible: true
 composer_version: "2"
 web_environment: []
-nodejs_version: "20"
+nodejs_version: "22"
 
 # Key features of ddev's config.yaml:
 

.github/workflows/publish-demo-site.yml

@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '22'
       - name: Install npm packages
         run: npm ci
       - name: Build Storybook artifact

.gitignore

@@ -39,3 +39,4 @@ tsconfig.tsbuildinfo
 
 # Storybook build files
 storybook-static/
+storybook/

.nvmrc

@@ -1 +1 @@
-20
+22

Dockerfile

@@ -1,4 +1,4 @@
-ARG NODE_VERSION="18"
+ARG NODE_VERSION="22"
 
 FROM node:${NODE_VERSION}-alpine AS artifact
 # Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.

next-env.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
+/// <reference path="./.next/types/routes.d.ts" />
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/app/api-reference/config/typescript for more information.

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "nextjs-project",
-  "version": "2.1.3",
+  "version": "2.2.0",
   "private": true,
   "scripts": {
     "dev": "next dev",
@@ -9,7 +9,7 @@
     "export": "next build && next export",
     "lint": "next lint && stylelint \"source/**/*.css\"",
     "prepare": "husky install",
-    "prettier": "prettier --check pages source/",
+    "prettier": "prettier --check app source/",
     "prettier:write": "prettier --write app source/",
     "tsc": "tsc --noEmit",
     "test": "npm run lint && npm run tsc",
@@ -24,60 +24,63 @@
     ">= 1% in US"
   ],
   "dependencies": {
-    "next": "15.4.5",
+    "next": "15.5.2",
     "react": "19.1.1",
     "react-dom": "19.1.1",
     "react-select": "^5.10.2"
   },
   "devDependencies": {
-    "@csstools/postcss-global-data": "^3.0.0",
+    "@csstools/postcss-global-data": "^3.1.0",
     "@eslint/eslintrc": "^3.3.1",
-    "@forumone/eslint-config-es5": "^3.0.2",
+    "@forumone/eslint-config-es5": "^3.0.3",
     "@forumone/eslint-config-react": "^3.0.2",
-    "@next/eslint-plugin-next": "15.4.5",
-    "@storybook/addon-a11y": "^9.1.1",
-    "@storybook/addon-docs": "^9.1.1",
-    "@storybook/addon-links": "^9.1.1",
-    "@storybook/nextjs": "^9.1.1",
+    "@next/eslint-plugin-next": "15.5.2",
+    "@storybook/addon-a11y": "^9.1.4",
+    "@storybook/addon-docs": "^9.1.4",
+    "@storybook/addon-links": "^9.1.4",
+    "@storybook/nextjs": "^9.1.4",
     "@svgr/babel-plugin-add-jsx-attribute": "^8.0.0",
     "@svgr/babel-plugin-remove-jsx-attribute": "^8.0.0",
     "@svgr/cli": "^8.1.0",
-    "@types/node": "^20.19.9",
-    "@types/react": "19.1.9",
-    "@types/react-dom": "19.1.7",
+    "@types/node": "^22.18.1",
+    "@types/react": "19.1.12",
+    "@types/react-dom": "19.1.9",
     "@typescript-eslint/eslint-plugin": "^8.29.1",
     "@typescript-eslint/parser": "^8.29.1",
     "clsx": "^2.1.1",
     "css-loader": "^7.1.2",
     "csstype": "3.1.3",
-    "enhanced-resolve": "^5.18.2",
-    "eslint": "^9.32.0",
+    "enhanced-resolve": "^5.18.3",
+    "eslint": "^9.34.0",
     "html-react-parser": "^5.2.6",
     "husky": "^9.1.7",
     "inquirer": "^10.2.2",
     "plop": "^4.0.1",
     "postcss": "^8.5.6",
     "postcss-advanced-variables": "github:kmonahan/postcss-advanced-variables",
     "postcss-import": "^16.1.1",
-    "postcss-loader": "^8.1.1",
+    "postcss-loader": "^8.2.0",
     "postcss-nesting": "^13.0.2",
-    "postcss-preset-env": "^10.2.4",
+    "postcss-preset-env": "^10.3.1",
     "postcss-rem": "^3.0.0",
     "prettier": "^3.6.2",
     "prettier-plugin-organize-imports": "^4.2.0",
-    "storybook": "^9.1.1",
+    "storybook": "^9.1.4",
     "style-loader": "^4.0.0",
-    "stylelint": "^16.23.0",
+    "stylelint": "^16.23.1",
     "stylelint-config-standard": "^39.0.0",
     "stylelint-order": "^7.0.0",
     "stylelint-webpack-plugin": "^5.0.1",
-    "typescript": "~5.8.3",
-    "yaml": "^2.8.0"
+    "typescript": "~5.9.2",
+    "yaml": "^2.8.1"
   },
   "overrides": {
     "csstype": "3.1.3",
-    "@types/react": "19.1.9",
-    "@types/react-dom": "19.1.7",
+    "@types/react": "19.1.12",
+    "@types/react-dom": "19.1.9",
     "storybook": "$storybook"
+  },
+  "engines": {
+    "node": ">=22"
   }
 }