Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Node 20 #1147

Draft
wants to merge 7 commits into
base: master
Choose a base branch
from
Draft

Node 20 #1147

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: 2.1
executors:
docker_hugo_node:
docker:
- image: node:14.17.0-alpine
- image: node:20.12.0-alpine

jobs:
# Circle's "Auto-cancel redundant builds" feature doesn't work on the default branch. When merging PRs on data, this
Expand All @@ -24,8 +24,8 @@ jobs:
executor: docker_hugo_node
resource_class: large
environment:
- HUGO_VERSION: '0.88.1'
- HUGO_BINARY: hugo_extended_0.88.1_linux-64bit
- HUGO_VERSION: '0.111.1'
- HUGO_BINARY: hugo_extended_0.111.1_linux-64bit
steps:
- run:
command: |
Expand Down Expand Up @@ -57,11 +57,11 @@ jobs:

test:
docker:
- image: cypress/base:14.17.0
- image: cypress/base:20.11.1
resource_class: large
environment:
- HUGO_VERSION: '0.88.1'
- HUGO_BINARY: hugo_extended_0.88.1_linux-64bit
- HUGO_VERSION: '0.111.1'
- HUGO_BINARY: hugo_extended_0.111.1_linux-64bit
steps:
- run:
command: |
Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:

production_test:
docker:
- image: cypress/base:14.17.0
- image: cypress/base:20.11.1
resource_class: large
environment:
- CYPRESS_baseUrl: 'https://www.datarequests.org'
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
14.17.0
20.12.0
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Datenanfragen.de is designed as a static website, running on [Hugo](https://gohu

To build the project locally for development, follow these steps:

1. Install [Yarn 1](https://classic.yarnpkg.com/en/docs/install) (Classic) and the extended(!) version of [Hugo](https://gohugo.io/getting-started/quick-start/) (v0.88.1).
1. Install [Yarn 1](https://classic.yarnpkg.com/en/docs/install) (Classic) and the extended(!) version of [Hugo](https://gohugo.io/getting-started/quick-start/) (v0.111.3).
2. Clone the repo and run `yarn` in the root directory of the repo to fetch all required dependencies.
3. Run the deploy script (`./deploy.sh`) to fetch and prepare the required resources from our [data](https://github.com/datenanfragen/data) repository.
4. Open two terminal windows. In the first, run `yarn dev` to start the Webpack file watcher, which will automatically build the JS files. In the second one, run `hugo server` to have Hugo continuously build the actual website and the SCSS.
Expand Down
6 changes: 3 additions & 3 deletions cypress/e2e/company-database/search.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ describe('Search for company by slug and visit company detail page', () => {

// The blur should fix the flaking here: https://github.com/cypress-io/cypress/issues/5830
cy.get('#aa-search-input').type('1&1').blur();
cy.get('.aa-suggestions').contains('1&1 Internet SE').click();
cy.get('.aa-suggestions').contains('1&1 Internet Ltd.').click();

cy.url().should('include', '/company/1und1');
cy.title().should('include', '1&1 Internet SE');
cy.url().should('include', '/company/1and1-gb');
cy.title().should('include', '1&1 Internet Ltd.');
});
});
2 changes: 1 addition & 1 deletion netlify.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[build]
publish = "public"
command = "./deploy.sh"
environment = {NODE_VERSION = "14.17.0", HUGO_VERSION = "0.88.1", YARN_VERSION = "1.22.4"}
environment = {NODE_VERSION = "20.12.0", HUGO_VERSION = "0.111.3", YARN_VERSION = "1.22.19"}
167 changes: 85 additions & 82 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,108 +46,111 @@
"build-sample-letters": "node ./scripts/build-sample-letters/build.js"
},
"dependencies": {
"autocomplete.js": "^0.37.0",
"autocomplete.js": "^0.38.1",
"brutusin-json-forms": "https://github.com/brutusin/json-forms",
"deepmerge": "^4.2.2",
"deepmerge": "^4.3.1",
"fast-deep-equal": "^3.1.3",
"idb": "^7.0.2",
"immer": "^9.0.12",
"js-cookie": "^2.2.1",
"idb": "^8.0.0",
"immer": "^10.0.4",
"js-cookie": "^3.0.5",
"letter-generator": "^2.2.1",
"libphonenumber-js": "^1.7.23",
"localforage": "^1.7.1",
"pdfkit": "^0.12.1",
"preact": "^10.5.5",
"libphonenumber-js": "^1.10.59",
"localforage": "^1.10.0",
"pdfkit": "^0.15.0",
"preact": "^10.20.1",
"preact-i18n": "^2.3.0-preactx",
"prop-types": "^15.7.2",
"qrcode": "^1.4.4",
"react-instantsearch-dom": "^6.26.0",
"prop-types": "^15.8.1",
"qrcode": "^1.5.3",
"react-instantsearch-dom": "^6.40.4",
"react-scrollspy": "^3.4.0",
"typesense": "^1.2.2",
"typesense-instantsearch-adapter": "^2.4.0",
"zustand": "^3.7.1"
"typesense": "^1.7.2",
"typesense-instantsearch-adapter": "^2.8.0",
"zustand": "^4.5.2"
},
"devDependencies": {
"@babel/core": "^7.12.0",
"@babel/eslint-parser": "^7.16.3",
"@babel/plugin-proposal-class-properties": "^7.5.5",
"@babel/plugin-proposal-optional-chaining": "^7.9.0",
"@babel/plugin-transform-block-scoping": "^7.4.4",
"@babel/plugin-transform-react-jsx": "^7.3.0",
"@babel/plugin-transform-runtime": "^7.6.2",
"@babel/preset-env": "^7.7.1",
"@babel/preset-typescript": "^7.16.7",
"@babel/runtime": "^7.6.2",
"@babel/core": "^7.24.3",
"@babel/eslint-parser": "^7.24.1",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-proposal-optional-chaining": "^7.21.0",
"@babel/plugin-transform-block-scoping": "^7.24.1",
"@babel/plugin-transform-react-jsx": "^7.23.4",
"@babel/plugin-transform-runtime": "^7.24.3",
"@babel/preset-env": "^7.24.3",
"@babel/preset-typescript": "^7.24.1",
"@babel/runtime": "^7.24.1",
"@cypress/skip-test": "^2.6.1",
"@this-dot/cypress-indexeddb": "^2.0.0",
"@types/fs-extra": "^9.0.13",
"@types/js-cookie": "^3.0.1",
"@types/preact-i18n": "^2.3.0-preactx",
"@types/qrcode": "^1.4.2",
"@types/react-instantsearch-dom": "^6.12.3",
"@typescript-eslint/eslint-plugin": "^5.15.0",
"@typescript-eslint/parser": "^5.15.0",
"babel-loader": "^8.0.6",
"carbone": "^3.2.3",
"cross-env": "^7.0.2",
"cssnano": "^5.0.12",
"cypress": "^12.8.1",
"cypress-wait-until": "^1.7.2",
"dattel-client": "^0.7.0",
"@this-dot/cypress-indexeddb": "^2.0.1",
"@types/fs-extra": "^11.0.4",
"@types/js-cookie": "^3.0.6",
"@types/preact-i18n": "^2.3.6",
"@types/qrcode": "^1.5.5",
"@types/react-instantsearch-dom": "^6.12.7",
"@typescript-eslint/eslint-plugin": "^7.5.0",
"@typescript-eslint/parser": "^7.5.0",
"babel-loader": "8",
"carbone": "^3.5.5",
"cross-env": "^7.0.3",
"cssnano": "^6.1.2",
"cypress": "^13.7.1",
"cypress-wait-until": "^3.0.1",
"dattel-client": "^0.8.3",
"es-dirname": "^0.1.0",
"eslint": "^8.3.0",
"eslint": "^8.57.0",
"eslint-config-preact": "^1.3.0",
"eslint-config-prettier": "^8.3.0",
"eslint-import-resolver-webpack": "^0.13.2",
"eslint-config-prettier": "^9.1.0",
"eslint-import-resolver-webpack": "^0.13.8",
"eslint-plugin-babel": "^5.3.0",
"eslint-plugin-cypress": "^2.12.1",
"eslint-plugin-cypress": "^2.15.1",
"eslint-plugin-eslint-comments": "^3.2.0",
"eslint-plugin-html": "^6.2.0",
"eslint-plugin-import": "^2.25.3",
"eslint-plugin-html": "^8.0.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-json": "^3.1.0",
"eslint-plugin-jsx-a11y": "^6.5.1",
"eslint-plugin-jsx-a11y": "^6.8.0",
"eslint-plugin-optimize-regex": "^1.2.1",
"eslint-plugin-preact-i18n": "^1.1.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-react": "^7.27.1",
"execa": "^6.1.0",
"fs-extra": "^10.1.0",
"glob": "^8.0.3",
"husky": "^4.2.5",
"imagemin-lint-staged": "^0.4.0",
"lint-staged": ">=9.4.3",
"matcher": "^4.0.0",
"node-sass": "^7.0.0",
"patch-package": "^6.4.7",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-react": "^7.34.1",
"execa": "^8.0.1",
"fs-extra": "^11.2.0",
"glob": "^10.3.12",
"husky": "^9.0.11",
"imagemin-lint-staged": "^0.5.1",
"lint-staged": ">=15.2.2",
"matcher": "^5.0.0",
"node-sass": "^9.0.0",
"patch-package": "^8.0.0",
"path": "^0.12.7",
"postcss": "^8.4.4",
"postcss-cli": "^9.1.0",
"postcss-fonticons": "^2.0.1",
"postcss-loader": "^6.2.1",
"postcss-preset-env": "^7.0.1",
"postcss": "^8.4.38",
"postcss-cli": "^11.0.0",
"postcss-fonticons": "^2.0.2",
"postcss-loader": "^8.1.1",
"postcss-preset-env": "^9.5.3",
"postcss-url": "^10.1.3",
"postinstall-postinstall": "^2.1.0",
"prettier": "^2.5.0",
"prettier": "^3.2.5",
"speed-measure-webpack-plugin": "^1.5.0",
"stylelint": "^14.1.0",
"stylelint": "^16.3.1",
"stylelint-a11y": "^1.2.1",
"stylelint-config-prettier": "^9.0.3",
"stylelint-config-recommended-scss": "^5.0.2",
"stylelint-prettier": "^2.0.0",
"stylelint-scss": "^4.0.0",
"stylelint-use-nesting": "^3.0.0",
"svg-pathdata": "^5.0.2",
"svgicons2svgfont": "^9.1.1",
"svgo": "^1.3.0",
"terser-webpack-plugin": "^3.0.1",
"tsm": "^2.2.1",
"type-fest": "^2.12.2",
"typescript": "^4.6.2",
"webpack": "^4.39.3",
"webpack-cli": "^3.3.5",
"webpack-merge": "^4.2.1",
"worker-loader": "^3.0.5",
"yesno": "^0.3.1"
"stylelint-config-prettier": "^9.0.5",
"stylelint-config-recommended-scss": "^14.0.0",
"stylelint-prettier": "^5.0.0",
"stylelint-scss": "^6.2.1",
"stylelint-use-nesting": "^5.1.1",
"svg-pathdata": "^6.0.3",
"svgicons2svgfont": "^12.0.0",
"svgo": "^3.2.0",
"terser-webpack-plugin": "^4.2.3",
"tsm": "^2.3.0",
"type-fest": "^4.14.0",
"typescript": "^5.4.3",
"webpack": "^4.47.0",
"webpack-cli": "4",
"webpack-merge": "^5.10.0",
"worker-loader": "^3.0.8",
"yesno": "^0.4.0"
},
"resolutions": {
"webpack/terser-webpack-plugin": "^4.2.3"
},
"browserslist": [
"last 2 versions",
Expand Down
13 changes: 0 additions & 13 deletions patches/zustand+3.7.1.patch

This file was deleted.

2 changes: 1 addition & 1 deletion scripts/compile-data-dump.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { readFileSync, writeFileSync } from 'fs';
import { join, basename } from 'path';
import glob from 'glob';
import * as glob from 'glob';
import dirname from 'es-dirname';

const companies = glob
Expand Down
2 changes: 1 addition & 1 deletion webpack.dev.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const merge = require('webpack-merge');
const { merge } = require('webpack-merge');
const common = require('./webpack.common.js');

module.exports = merge(common, {
Expand Down
2 changes: 1 addition & 1 deletion webpack.prod.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const merge = require('webpack-merge');
const { merge } = require('webpack-merge');
const common = require('./webpack.common.js');

const SpeedMeasurePlugin = require('speed-measure-webpack-plugin');
Expand Down
Loading