Skip to content

Commit

Permalink
Merge pull request #8528 from weseek/support/141416-node-v20
Browse files Browse the repository at this point in the history
support: Node.js v20
  • Loading branch information
miya committed Feb 28, 2024
2 parents 4b8e66b + dbb4172 commit 43df264
Show file tree
Hide file tree
Showing 15 changed files with 54 additions and 56 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
#-------------------------------------------------------------------------------------------------------------

FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-18
FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-20

# The node image includes a non-root user with sudo access. Use the
# "remoteUser" property in devcontainer.json to use it. On Linux, update
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/ci-app-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,32 +51,32 @@ jobs:
test-prod-node16:
uses: weseek/growi/.github/workflows/reusable-app-prod.yml@dev/7.0.x
with:
node-version: 16.x
node-version: 18.x
skip-cypress: true
secrets:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}


test-prod-node18:
test-prod-node20:
uses: weseek/growi/.github/workflows/reusable-app-prod.yml@dev/7.0.x
with:
node-version: 18.x
node-version: 20.x
skip-cypress: ${{ contains( github.event.pull_request.labels.*.name, 'dependencies' ) }}
cypress-report-artifact-name: Cypress report
cypress-config-video: ${{ inputs.cypress-config-video || false }}
secrets:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}


run-reg-suit-node18:
needs: [test-prod-node18]
run-reg-suit-node20:
needs: [test-prod-node20]

uses: weseek/growi/.github/workflows/reusable-app-reg-suit.yml@dev/7.0.x

if: always()

with:
node-version: 18.x
node-version: 20.x
skip-reg-suit: ${{ contains( github.event.pull_request.labels.*.name, 'dependencies' ) }}
cypress-report-artifact-name: Cypress report
secrets:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:

strategy:
matrix:
node-version: [18.x]
node-version: [20.x]

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:

strategy:
matrix:
node-version: [18.x]
node-version: [20.x]

services:
mongodb:
Expand Down Expand Up @@ -174,7 +174,7 @@ jobs:

strategy:
matrix:
node-version: [18.x]
node-version: [20.x]

services:
mongodb:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci-slackbot-proxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

strategy:
matrix:
node-version: [18.x]
node-version: [20.x]

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:

strategy:
matrix:
node-version: [18.x]
node-version: [20.x]

services:
mysql:
Expand Down Expand Up @@ -179,7 +179,7 @@ jobs:

strategy:
matrix:
node-version: [18.x]
node-version: [20.x]

services:
mysql:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/list-unhealthy-branches.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: '16'
node-version: '18'

- name: List branches
id: list-branches
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-slackbot-proxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: '16'
node-version: '18'
cache: 'yarn'
cache-dependency-path: '**/yarn.lock'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: '18'
node-version: '20'
cache: 'yarn'
cache-dependency-path: '**/yarn.lock'

Expand Down Expand Up @@ -189,7 +189,7 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: '18'
node-version: '20'
cache: 'yarn'
cache-dependency-path: '**/yarn.lock'

Expand Down
6 changes: 3 additions & 3 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ pull_request_rules:
conditions:
- author = dependabot[bot]
- '#approved-reviews-by >= 1'
- check-success = "lint (18.x)"
- check-success = "test (18.x)"
- check-success = "launch-dev (18.x)"
- check-success = "lint (20.x)"
- check-success = "test (20.x)"
- check-success = "launch-dev (20.x)"
- check-success = "test-prod-node16 / launch-prod"
- check-success = "test-prod-node18 / launch-prod"
actions:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ See [GROWI Docs: Environment Variables](https://docs.growi.org/en/admin-guide/ad

## Dependencies

- Node.js v16.x or v18.x
- Node.js v18.x or v20.x
- npm 6.x
- yarn
- [Turborepo](https://turbo.build/repo)
Expand Down
2 changes: 1 addition & 1 deletion README_JP.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ Crowi からの移行は **[こちら](https://docs.growi.org/en/admin-guide/mig

## 依存関係

- Node.js v16.x or v18.x
- Node.js v18.x or v20.x
- npm 6.x
- yarn
- [Turborepo](https://turbo.build/repo)
Expand Down
8 changes: 4 additions & 4 deletions apps/app/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
##
## base
##
FROM node:18-slim AS base
FROM node:20-slim AS base

ENV optDir /opt

Expand All @@ -18,7 +18,7 @@ RUN turbo prune --scope=@growi/app --docker
##
## deps-resolver
##
FROM node:18-slim AS deps-resolver
FROM node:20-slim AS deps-resolver

ENV optDir /opt

Expand Down Expand Up @@ -62,7 +62,7 @@ RUN tar -cf node_modules.tar \
##
## builder
##
FROM node:18-slim AS builder
FROM node:20-slim AS builder

ENV optDir /opt

Expand Down Expand Up @@ -107,7 +107,7 @@ RUN tar -cf packages.tar \
##
## release
##
FROM node:18-slim
FROM node:20-slim
LABEL maintainer Yuki Takei <[email protected]>

ENV NODE_ENV production
Expand Down
2 changes: 1 addition & 1 deletion apps/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"@akebifiky/remark-simple-plantuml": "^1.0.2",
"@aws-sdk/client-s3": "3.454.0",
"@aws-sdk/s3-request-presigner": "3.454.0",
"@azure/identity": "^3.3.2",
"@azure/identity": "^4.0.1",
"@azure/storage-blob": "^12.16.0",
"@browser-bunyan/console-formatted-stream": "^1.8.0",
"@elastic/elasticsearch7": "npm:@elastic/elasticsearch@^7.17.0",
Expand Down
8 changes: 4 additions & 4 deletions apps/slackbot-proxy/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
##
## base
##
FROM node:18-slim AS base
FROM node:20-slim AS base

ENV optDir /opt

Expand All @@ -17,7 +17,7 @@ RUN turbo prune --scope=@growi/slackbot-proxy --docker
##
## deps-resolver
##
FROM node:18-slim AS deps-resolver
FROM node:20-slim AS deps-resolver

ENV optDir /opt

Expand Down Expand Up @@ -57,7 +57,7 @@ RUN tar -cf node_modules.tar \
##
## builder
##
FROM node:18-slim AS builder
FROM node:20-slim AS builder

ENV optDir /opt

Expand Down Expand Up @@ -95,7 +95,7 @@ RUN tar -cf packages.tar \
##
## release
##
FROM node:18-slim
FROM node:20-slim
LABEL maintainer Yuki Takei <[email protected]>

ENV NODE_ENV production
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@
"vitest-mock-extended": "^1.1.3"
},
"engines": {
"node": "^16 || ^18",
"npm": ">=8.5 < 9",
"node": "^18 || ^20",
"npm": ">=8.5 < 9.6.6",
"yarn": ">=1.22 <2"
}
}
44 changes: 21 additions & 23 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -844,27 +844,25 @@
"@azure/abort-controller" "^1.0.0"
tslib "^2.2.0"

"@azure/identity@^3.3.2":
version "3.3.2"
resolved "https://registry.yarnpkg.com/@azure/identity/-/identity-3.3.2.tgz#052c33f1e5f952fd4701fb5cffc4da82994a5f28"
integrity sha512-aDLwgMXpNBEXOlfCP9r5Rn+inmbnTbadlOnrKI2dPS9Lpf4gHvpYBV+DEZKttakfJ+qn4iWWb7zONQSO3A4XSA==
"@azure/identity@^4.0.1":
version "4.0.1"
resolved "https://registry.yarnpkg.com/@azure/identity/-/identity-4.0.1.tgz#16a885d384fd06447a21da92c08960df492fe91e"
integrity sha512-yRdgF03SFLqUMZZ1gKWt0cs0fvrDIkq2bJ6Oidqcoo5uM85YMBnXWMzYKK30XqIT76lkFyAaoAAy5knXhrG4Lw==
dependencies:
"@azure/abort-controller" "^1.0.0"
"@azure/core-auth" "^1.5.0"
"@azure/core-client" "^1.4.0"
"@azure/core-rest-pipeline" "^1.1.0"
"@azure/core-tracing" "^1.0.0"
"@azure/core-util" "^1.0.0"
"@azure/core-util" "^1.3.0"
"@azure/logger" "^1.0.0"
"@azure/msal-browser" "^2.37.1"
"@azure/msal-common" "^13.1.0"
"@azure/msal-node" "^1.17.3"
"@azure/msal-browser" "^3.5.0"
"@azure/msal-node" "^2.5.1"
events "^3.0.0"
jws "^4.0.0"
open "^8.0.0"
stoppable "^1.1.0"
tslib "^2.2.0"
uuid "^8.3.0"

"@azure/logger@^1.0.0":
version "1.0.4"
Expand All @@ -873,24 +871,24 @@
dependencies:
tslib "^2.2.0"

"@azure/msal-browser@^2.37.1":
version "2.38.3"
resolved "https://registry.yarnpkg.com/@azure/msal-browser/-/msal-browser-2.38.3.tgz#2f131fa9b7a8a9546fc8d34e5d99ce4c18b04147"
integrity sha512-2WuLFnWWPR1IdvhhysT18cBbkXx1z0YIchVss5AwVA95g7CU5CpT3d+5BcgVGNXDXbUU7/5p0xYHV99V5z8C/A==
"@azure/msal-browser@^3.5.0":
version "3.10.0"
resolved "https://registry.yarnpkg.com/@azure/msal-browser/-/msal-browser-3.10.0.tgz#8925659e8d1a4bd21e389cca4683eb52658c778e"
integrity sha512-mnmi8dCXVNZI+AGRq0jKQ3YiodlIC4W9npr6FCB9WN6NQT+6rq+cIlxgUb//BjLyzKsnYo+i4LROGeMyU+6v1A==
dependencies:
"@azure/msal-common" "13.3.1"
"@azure/msal-common" "14.7.1"

"@azure/msal-common@13.3.1", "@azure/msal-common@^13.1.0":
version "13.3.1"
resolved "https://registry.yarnpkg.com/@azure/msal-common/-/msal-common-13.3.1.tgz#012465bf940d12375dc47387b754ccf9d6b92180"
integrity sha512-Lrk1ozoAtaP/cp53May3v6HtcFSVxdFrg2Pa/1xu5oIvsIwhxW6zSPibKefCOVgd5osgykMi5jjcZHv8XkzZEQ==
"@azure/msal-common@14.7.1":
version "14.7.1"
resolved "https://registry.yarnpkg.com/@azure/msal-common/-/msal-common-14.7.1.tgz#b13443fbacc87ce2019a91e81a6582ea73847c75"
integrity sha512-v96btzjM7KrAu4NSEdOkhQSTGOuNUIIsUdB8wlyB9cdgl5KqEKnTonHUZ8+khvZ6Ap542FCErbnTyDWl8lZ2rA==

"@azure/msal-node@^1.17.3":
version "1.18.4"
resolved "https://registry.yarnpkg.com/@azure/msal-node/-/msal-node-1.18.4.tgz#c921b0447c92fb3b0cb1ebf5a9a76fcad2ec7c21"
integrity sha512-Kc/dRvhZ9Q4+1FSfsTFDME/v6+R2Y1fuMty/TfwqE5p9GTPw08BPbKgeWinE8JRHRp+LemjQbUZsn4Q4l6Lszg==
"@azure/msal-node@^2.5.1":
version "2.6.4"
resolved "https://registry.yarnpkg.com/@azure/msal-node/-/msal-node-2.6.4.tgz#457bd86a52461178ab2d1ba3d9d6705d95b2186e"
integrity sha512-nNvEPx009/80UATCToF+29NZYocn01uKrB91xtFr7bSqkqO1PuQGXRyYwryWRztUrYZ1YsSbw9A+LmwOhpVvcg==
dependencies:
"@azure/msal-common" "13.3.1"
"@azure/msal-common" "14.7.1"
jsonwebtoken "^9.0.0"
uuid "^8.3.0"

Expand Down

0 comments on commit 43df264

Please sign in to comment.