diff --git a/.github/workflows/code-analysis.yml b/.github/workflows/code-analysis.yml index 7ca6a71..2744f97 100644 --- a/.github/workflows/code-analysis.yml +++ b/.github/workflows/code-analysis.yml @@ -6,13 +6,13 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [16.x] + node-version: [22.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 # node setup - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} @@ -20,7 +20,7 @@ jobs: - name: Get yarn cache directory path id: yarn-cache-dir-path run: echo "::set-output name=dir::$(yarn cache dir)" - - uses: actions/cache@v3 + - uses: actions/cache@v4 id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`) with: path: ${{ steps.yarn-cache-dir-path.outputs.dir }} @@ -39,13 +39,13 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [16.x] + node-version: [22.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 # node setup - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} @@ -53,7 +53,7 @@ jobs: - name: Get yarn cache directory path id: yarn-cache-dir-path run: echo "::set-output name=dir::$(yarn cache dir)" - - uses: actions/cache@v3 + - uses: actions/cache@v4 id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`) with: path: ${{ steps.yarn-cache-dir-path.outputs.dir }} @@ -72,13 +72,13 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [16.x] + node-version: [22.x] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 # node setup - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} @@ -86,7 +86,7 @@ jobs: - name: Get yarn cache directory path id: yarn-cache-dir-path run: echo "::set-output name=dir::$(yarn cache dir)" - - uses: actions/cache@v3 + - uses: actions/cache@v4 id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`) with: path: ${{ steps.yarn-cache-dir-path.outputs.dir }} diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 45f864c..e300afe 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -8,7 +8,7 @@ jobs: strategy: matrix: - node-version: [16.x] + node-version: [22.x] services: postgres: @@ -22,11 +22,11 @@ jobs: options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 # Node setup - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 24ba4e1..7ca0963 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -69,6 +69,7 @@ - Update node dependency requirement @robgietema - Split profiles in core and default @robgietema - Move apply behaviors to the document class @robgietema +- Node 22 support @sneridagh ### Documentation diff --git a/frontend/src/config.js.sample b/frontend/src/config.js.sample new file mode 100644 index 0000000..dcbdb9d --- /dev/null +++ b/frontend/src/config.js.sample @@ -0,0 +1,23 @@ +/** + * Add your config changes here. + * @module config + * @example + * export default function applyConfig(config) { + * config.settings = { + * ...config.settings, + * port: 4300, + * listBlockTypes: { + * ...config.settings.listBlockTypes, + * 'my-list-item', + * } + * } + */ + +// All your imports required for the config here BEFORE this line +import '@plone/volto/config'; + +export default function applyConfig(config) { + config.settings.devProxyToApiPath = 'http://localhost:8000'; + config.settings.proxyRewriteTarget = new String(''); + return config; +} diff --git a/locales/en/LC_MESSAGES/nick.po b/locales/en/LC_MESSAGES/nick.po index cefb3a9..99886e7 100644 --- a/locales/en/LC_MESSAGES/nick.po +++ b/locales/en/LC_MESSAGES/nick.po @@ -545,7 +545,7 @@ msgstr "" msgid "Information about rights held in and over this item." msgstr "" -#: src/app.js:181 +#: src/app.js:183 # defaultMessage: Internal server error msgid "Internal server error" msgstr "" diff --git a/locales/nick.pot b/locales/nick.pot index c2c5fd4..4d6b57a 100644 --- a/locales/nick.pot +++ b/locales/nick.pot @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: Nick\n" -"POT-Creation-Date: 2024-11-28T20:18:45.815Z\n" +"POT-Creation-Date: 2024-12-01T16:28:13.317Z\n" "Last-Translator: Rob Gietema\n" "Language-Team: Nick\n" "MIME-Version: 1.0\n" @@ -545,7 +545,7 @@ msgstr "" msgid "Information about rights held in and over this item." msgstr "" -#: src/app.js:181 +#: src/app.js:183 # defaultMessage: Internal server error msgid "Internal server error" msgstr "" diff --git a/locales/nl/LC_MESSAGES/nick.po b/locales/nl/LC_MESSAGES/nick.po index 8f825d9..f3b0b64 100644 --- a/locales/nl/LC_MESSAGES/nick.po +++ b/locales/nl/LC_MESSAGES/nick.po @@ -545,7 +545,7 @@ msgstr "Naar afbeeldingen kan op pagina's worden verwezen of in een album worden msgid "Information about rights held in and over this item." msgstr "Informatie over rechten op en over dit item." -#: src/app.js:181 +#: src/app.js:183 # defaultMessage: Internal server error msgid "Internal server error" msgstr "Interne server fout" diff --git a/package.json b/package.json index ee5dc99..c0b1e17 100644 --- a/package.json +++ b/package.json @@ -54,12 +54,12 @@ ] }, "engines": { - "node": "^20.17.0" + "node": "^20 || ^22" }, "devDependencies": { "@babel/eslint-parser": "7.25.9", "babel-jest": "29.7.0", - "eslint": "9.15.0", + "eslint": "9.16.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-json": "4.0.1", "eslint-plugin-prettier": "5.2.1", diff --git a/packages/generator-nick/generators/app/templates/package.json.tpl b/packages/generator-nick/generators/app/templates/package.json.tpl index 55afd01..83ad081 100644 --- a/packages/generator-nick/generators/app/templates/package.json.tpl +++ b/packages/generator-nick/generators/app/templates/package.json.tpl @@ -42,7 +42,7 @@ ] }, "engines": { - "node": "^16.15.0" + "node": "^20 || ^22" }, "devDependencies": {}, "dependencies": {} diff --git a/packages/generator-nick/package.json b/packages/generator-nick/package.json index 30d4a38..928c1d7 100644 --- a/packages/generator-nick/package.json +++ b/packages/generator-nick/package.json @@ -30,7 +30,7 @@ "cms" ], "engines": { - "node": "^16.15.0" + "node": "^20 || ^22" }, "dependencies": { "update-notifier": "^5.0.1", diff --git a/yarn.lock b/yarn.lock index 44a1f68..98b73da 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1241,10 +1241,10 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@eslint/js@9.15.0": - version "9.15.0" - resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.15.0.tgz#df0e24fe869143b59731942128c19938fdbadfb5" - integrity sha512-tMTqrY+EzbXmKJR5ToI8lxu7jaN5EdmrBFJpQk5JmSlyLsx6o4t27r883K5xsLuCYCpfKBCGswMSWXsM+jB7lg== +"@eslint/js@9.16.0": + version "9.16.0" + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.16.0.tgz#3df2b2dd3b9163056616886c86e4082f45dbf3f4" + integrity sha512-tw2HxzQkrbeuvyj1tG2Yqq+0H9wGoI2IMk4EOsQeX+vmd75FtJAzf+gTA69WF+baUKRYQ3x2kbLE08js5OsTVg== "@eslint/object-schema@^2.1.4": version "2.1.4" @@ -2861,17 +2861,17 @@ eslint-visitor-keys@^4.2.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz#687bacb2af884fcdda8a6e7d65c606f46a14cd45" integrity sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw== -eslint@9.15.0: - version "9.15.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.15.0.tgz#77c684a4e980e82135ebff8ee8f0a9106ce6b8a6" - integrity sha512-7CrWySmIibCgT1Os28lUU6upBshZ+GxybLOrmRzi08kS8MBuO8QA7pXEgYgY5W8vK3e74xv0lpjo9DbaGU9Rkw== +eslint@9.16.0: + version "9.16.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.16.0.tgz#66832e66258922ac0a626f803a9273e37747f2a6" + integrity sha512-whp8mSQI4C8VXd+fLgSM0lh3UlmcFtVwUQjyKCFfsp+2ItAIYhlq/hqGahGqHE6cv9unM41VlqKk2VtKYR2TaA== dependencies: "@eslint-community/eslint-utils" "^4.2.0" "@eslint-community/regexpp" "^4.12.1" "@eslint/config-array" "^0.19.0" "@eslint/core" "^0.9.0" "@eslint/eslintrc" "^3.2.0" - "@eslint/js" "9.15.0" + "@eslint/js" "9.16.0" "@eslint/plugin-kit" "^0.2.3" "@humanfs/node" "^0.16.6" "@humanwhocodes/module-importer" "^1.0.1"