Skip to content

Commit

Permalink
Update to NodeJS 20.10.0 (techno-tim#547)
Browse files Browse the repository at this point in the history
* feat(node): updated to 20.10.0

* chore(deps): Updated

* chore(deps): Updated

* fix(lint): fixed

* chore(deps): Updated

* fix(stylelint): upgraded to 16 and removed stylelint-config-prettier

* fix(package): add resolutions for packages that don't support ESM
  • Loading branch information
timothystewart6 authored Jan 10, 2024
1 parent 22a4027 commit 04f6ee9
Show file tree
Hide file tree
Showing 8 changed files with 419 additions and 489 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@2fddd8803e2f5c9604345a0b591c3020ee971a93
with:
node-version: v18.18.2
node-version: v20.10.0
- name: Install Dependencies, Test, and Build
run: |
yarn install --frozen-lockfile --check-files --network-timeout 600000
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@2fddd8803e2f5c9604345a0b591c3020ee971a93
with:
node-version: v18.18.2
node-version: v20.10.0
- name: Install Dependencies, Test, and Build
run: |
yarn install --frozen-lockfile --check-files --network-timeout 600000
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v18.18.2
v20.10.0
13 changes: 1 addition & 12 deletions .stylelintrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"extends": [
"stylelint-config-prettier"
],
"rules": {
"block-no-empty": null,
Expand All @@ -13,23 +12,13 @@
]
}
],
"max-empty-lines": 2,
"unit-allowed-list": [
"em",
"rem",
"%",
"s",
"px",
"deg"
],
"indentation": [
2,
{
"except": [
"value"
],
"severity": "error"
}
]
}
}
}
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:18.18.2-alpine AS node-build
FROM node:20.10.0-alpine AS node-build
WORKDIR /usr/src/app
COPY package.json ./
COPY yarn.lock ./
Expand All @@ -8,7 +8,7 @@ RUN yarn install --frozen-lockfile --check-files --network-timeout 600000
RUN yarn build --noninteractive
RUN yarn install --frozen-lockfile --check-files --production --modules-folder node_modules_prod --network-timeout 600000

FROM node:18.18.2-alpine
FROM node:20.10.0-alpine
WORKDIR /usr/src/app
ENV NODE_ENV production
RUN mkdir -p /node_modules
Expand Down
17 changes: 10 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"@fortawesome/react-fontawesome": "^0.2.0",
"compression": "^1.7.4",
"express": "^4.18.2",
"helmet": "^6.2.0",
"helmet": "^7.1.0",
"morgan": "^1.10.0",
"prop-types": "^15.8.1",
"react": "^18.2.0",
Expand All @@ -38,24 +38,27 @@
"@babel/preset-react": "^7.23.3",
"babel-preset-razzle": "^4.2.18",
"eslint": "^8.56.0",
"eslint-config-prettier": "^8.10.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jsx": "^0.1.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-react": "^7.33.2",
"html-webpack-plugin": "^5.6.0",
"markdownlint-cli": "^0.33.0",
"markdownlint-cli": "^0.38.0",
"mini-css-extract-plugin": "^2.7.6",
"prettier": "^2.8.8",
"prettier": "^3.1.1",
"razzle": "^4.2.18",
"razzle-dev-utils": "^4.2.18",
"react-test-renderer": "^18.2.0",
"stylelint": "^15.11.0",
"stylelint-config-prettier": "^9.0.5",
"stylelint": "^16.1.0",
"url": "^0.11.3",
"webpack": "^5.88.2",
"webpack-dev-server": "^4.15.1"
},
"resolutions": {
"string-width": "4.2.3",
"table": "6.8.0"
}
}
4 changes: 2 additions & 2 deletions src/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,8 @@ server
<script async defer data-website-id="${
runtimeConfig.UMAMI_WEBSITE_ID
}" src="${runtimeConfig.UMAMI_APP_URL}/${
runtimeConfig.UMAMI_SCRIPT_NAME || 'umami.js'
}">
runtimeConfig.UMAMI_SCRIPT_NAME || 'umami.js'
}">
</script>`
: ''
}
Expand Down
864 changes: 401 additions & 463 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit 04f6ee9

Please sign in to comment.