Skip to content

Commit

Permalink
Update NodeJS to v18 (#72245)
Browse files Browse the repository at this point in the history
* Update NodeJS to v18

* Bump moment-timezone packages to resolve crypto warning

* Set end year 2030 for moment-timezone data

Co-authored-by: Jarda Snajdr <jsnajdr@gmail.com>
  • Loading branch information
noahtallen and jsnajdr committed Jan 23, 2023
1 parent 87c4f93 commit 19abaf5
Show file tree
Hide file tree
Showing 18 changed files with 61 additions and 67 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Expand Up @@ -7,7 +7,7 @@ references:
defaults: &defaults
working_directory: ~/wp-calypso
docker:
- image: cimg/node:16.17.0
- image: cimg/node:18.13.0
environment:
CIRCLE_ARTIFACTS: /tmp/artifacts
CIRCLE_TEST_REPORTS: /tmp/test_results
Expand Down Expand Up @@ -136,7 +136,7 @@ commands:
jobs:
wp-desktop-assets:
docker:
- image: cimg/node:16.17.0-browsers
- image: cimg/node:18.13.0-browsers
<<: *desktop_defaults
environment:
VERSION: << pipeline.git.tag >>
Expand Down Expand Up @@ -235,7 +235,7 @@ jobs:

wp-desktop-linux:
docker:
- image: cimg/node:16.17.0-browsers
- image: cimg/node:18.13.0-browsers
<<: *desktop_defaults
shell: /bin/bash --login
environment:
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/tooling_request.yml
Expand Up @@ -20,5 +20,5 @@ body:
label: Context
description: Provide more context as applicable.
placeholder: |
eg. nodeJS: 16.17.0
eg. nodeJS: 18.13.0
browser: Firefox Nightly 92.0a1
2 changes: 1 addition & 1 deletion .github/workflows/editing-toolkit-plugin.yml
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Set up Node
uses: actions/setup-node@v1
with:
node-version: '^16.17.0'
node-version: '^18.13.0'

- name: Checkout code
uses: actions/checkout@HEAD
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gardening.yml
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: ^16.17.0
node-version: ^18.13.0

- name: Wait for prior instances of the workflow to finish
uses: softprops/turnstyle@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/icfy-stats.yml
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Set up Node
uses: actions/setup-node@v1
with:
node-version: '^16.17.0'
node-version: '^18.13.0'
- name: Checkout code
uses: actions/checkout@v2
- name: Fetch git history
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
@@ -1 +1 @@
16.17.0
18.13.0
2 changes: 1 addition & 1 deletion Dockerfile
@@ -1,5 +1,5 @@
ARG use_cache=false
ARG node_version=16.17.0
ARG node_version=18.13.0
ARG base_image=registry.a8c.com/calypso/base:latest

###################
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.base
Expand Up @@ -2,7 +2,7 @@
#### This image is not pushed to any repository and it shouldn't be used as base image for any other docker build.
#### Its main goal is to create a `/calypso/.cache` that can be copied over other images that can benefit from a warm cache.
#### Note that yarn v3 cache lives in `/calypso/.yarn`
FROM node:16.17.0-bullseye-slim as cache
FROM node:18.13.0-bullseye-slim as cache

ARG node_memory=8192
WORKDIR /calypso
Expand All @@ -26,7 +26,7 @@ ENTRYPOINT [ "/bin/bash" ]

#### base image
#### This image can be used as a base image for other builds, or to test and build calypso.
FROM node:16.17.0-bullseye-slim as base
FROM node:18.13.0-bullseye-slim as base

ARG node_memory=8192
ARG user=calypso
Expand Down
2 changes: 1 addition & 1 deletion apps/editing-toolkit/package.json
Expand Up @@ -130,7 +130,7 @@
"@automattic/calypso-jest": "workspace:^",
"@testing-library/jest-dom": "^5.16.2",
"@testing-library/react": "^12.1.3",
"@types/node": "^15.0.2",
"@types/node": "^18.11.18",
"@types/wordpress__plugins": "^3.0.0",
"@wordpress/eslint-plugin": "^12.3.0",
"@wordpress/jest-preset-default": "^8.2.0",
Expand Down
4 changes: 2 additions & 2 deletions client/package.json
Expand Up @@ -156,8 +156,8 @@
"mock-fs": "^5.0.0",
"mockdate": "^2.0.5",
"moment": "^2.26.0",
"moment-timezone": "^0.5.31",
"moment-timezone-data-webpack-plugin": "^1.3.0",
"moment-timezone": "^0.5.40",
"moment-timezone-data-webpack-plugin": "^1.5.1",
"nock": "^12.0.3",
"page": "^1.11.5",
"path-browserify": "^1.0.1",
Expand Down
1 change: 1 addition & 0 deletions client/webpack.config.js
Expand Up @@ -332,6 +332,7 @@ const webpackConfig = {
} ),
new MomentTimezoneDataPlugin( {
startYear: 2000,
endYear: 2030,
cacheDir: path.resolve( cachePath, 'moment-timezone' ),
} ),
new InlineConstantExportsPlugin( /\/client\/state\/action-types.js$/ ),
Expand Down
6 changes: 3 additions & 3 deletions package.json
@@ -1,7 +1,7 @@
{
"name": "wp-calypso",
"author": "Automattic Inc.",
"version": "16.17.0",
"version": "18.13.0",
"description": "A pure REST-API and JS based version of the WordPress.com admin.",
"private": true,
"workspaces": {
Expand Down Expand Up @@ -53,7 +53,7 @@
]
},
"engines": {
"node": "^16.17.0",
"node": "^18.13.0",
"yarn": "^3.1.1"
},
"scripts": {
Expand Down Expand Up @@ -155,7 +155,7 @@
"@types/debug": "^4.1.7",
"@types/fast-json-stable-stringify": "^2.0.0",
"@types/lodash": "^4.14.179",
"@types/node": "^16.11.26",
"@types/node": "^18.11.18",
"@types/page": "^1.11.5",
"@types/qs": "^6.9.7",
"@types/react": "^17.0.39",
Expand Down
2 changes: 1 addition & 1 deletion packages/calypso-config/package.json
Expand Up @@ -33,7 +33,7 @@
"dependencies": {
"@automattic/create-calypso-config": "workspace:^",
"@types/cookie": "^0.4.1",
"@types/node": "^16.11.26",
"@types/node": "^18.11.18",
"cookie": "^0.4.1",
"tslib": "^2.3.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/calypso-e2e/package.json
Expand Up @@ -32,7 +32,7 @@
"@automattic/languages": "workspace:^",
"@jest/globals": "^27.3.1",
"@types/jest": "^27.4.0",
"@types/node": "^16.17.0",
"@types/node": "^18.11.18",
"@types/node-fetch": "^2.6.1",
"@wordpress/i18n": "^4.9.0",
"asana-phrase": "^0.0.8",
Expand Down
2 changes: 1 addition & 1 deletion packages/jest-circus-allure-reporter/package.json
Expand Up @@ -28,7 +28,7 @@
"@automattic/calypso-eslint-overrides": "workspace:^",
"@automattic/calypso-typescript-config": "workspace:^",
"@types/jest": "^27.4.0",
"@types/node": "^16.11.26",
"@types/node": "^18.11.18",
"typescript": "^4.7.4"
},
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion packages/wp-babel-makepot/Dockerfile
@@ -1,4 +1,4 @@
FROM node:16.17.0
FROM node:18.13.0

# /src is where we expect source javascript to run our babel config over
RUN mkdir /src
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/README.md
Expand Up @@ -23,7 +23,7 @@ Automated end-to-end acceptance tests for the [wp-calypso](https://github.com/Au

Calypso E2E requires the following:

- [NodeJS 16.17.0](https://nodejs.org/en/blog/release/v16.17.0/) or higher
- [NodeJS 18.13.0](https://nodejs.org/en/blog/release/v16.17.0/) or higher
- [TypeScript 4.5](https://www.staging-typescript.org/docs/handbook/release-notes/typescript-4-5.html) or higher
- [Playwright 1.28](https://playwright.dev/docs/release-notes#version-128) or higher
- [yarn 3.1](https://github.com/yarnpkg/berry) or higher
Expand Down
83 changes: 38 additions & 45 deletions yarn.lock
Expand Up @@ -237,7 +237,7 @@ __metadata:
"@automattic/calypso-typescript-config": "workspace:^"
"@automattic/create-calypso-config": "workspace:^"
"@types/cookie": ^0.4.1
"@types/node": ^16.11.26
"@types/node": ^18.11.18
cookie: ^0.4.1
tslib: ^2.3.0
typescript: ^4.7.4
Expand Down Expand Up @@ -266,7 +266,7 @@ __metadata:
"@automattic/languages": "workspace:^"
"@jest/globals": ^27.3.1
"@types/jest": ^27.4.0
"@types/node": ^16.17.0
"@types/node": ^18.11.18
"@types/node-fetch": ^2.6.1
"@types/totp-generator": ^0.0.3
"@wordpress/i18n": ^4.9.0
Expand Down Expand Up @@ -940,7 +940,7 @@ __metadata:
"@automattic/calypso-typescript-config": "workspace:^"
"@types/allure-js-commons": ^0.0.1
"@types/jest": ^27.4.0
"@types/node": ^16.11.26
"@types/node": ^18.11.18
allure-js-commons: 2.0.0-beta.9
typescript: ^4.7.4
languageName: unknown
Expand Down Expand Up @@ -1804,7 +1804,7 @@ __metadata:
"@sentry/browser": ^7.11.1
"@testing-library/jest-dom": ^5.16.2
"@testing-library/react": ^12.1.3
"@types/node": ^15.0.2
"@types/node": ^18.11.18
"@types/wordpress__plugins": ^3.0.0
"@wordpress/a11y": ^3.9.0
"@wordpress/api-fetch": ^6.6.0
Expand Down Expand Up @@ -6845,10 +6845,10 @@ __metadata:
languageName: node
linkType: hard

"@types/node@npm:*, @types/node@npm:^16.11.26, @types/node@npm:^16.17.0":
version: 16.18.11
resolution: "@types/node@npm:16.18.11"
checksum: 7bdf5e865a7959a72881ede19a882219f9d0baadf9ef8fdf24523291d401a7fc43bf91aa3223b1961ca54e1363f542cc4d60c8b00a70b457b2e9439b82adac70
"@types/node@npm:*, @types/node@npm:^18.11.18":
version: 18.11.18
resolution: "@types/node@npm:18.11.18"
checksum: 1a308a03a7c1cfced411fc3187e49a507ab2b3ce7cdf0794b7511c8843aae5a8dbe52b16ba4217d2da1c8e3c50920c272b45fecff4cccc26606be7f42c33f4f5
languageName: node
linkType: hard

Expand All @@ -6866,13 +6866,6 @@ __metadata:
languageName: node
linkType: hard

"@types/node@npm:^15.0.2":
version: 15.14.9
resolution: "@types/node@npm:15.14.9"
checksum: fe5b69cffd20f97c814d568c1d791b3c367f9efa6567a18d2c15cd73c5437f47bcff73a2e10bdfe59f90ce7df47e6cc3c6d431c76d2213bf6099e8ab5d16d355
languageName: node
linkType: hard

"@types/normalize-package-data@npm:^2.4.0":
version: 2.4.0
resolution: "@types/normalize-package-data@npm:2.4.0"
Expand Down Expand Up @@ -8010,36 +8003,36 @@ __metadata:
languageName: node
linkType: hard

"@webpack-cli/configtest@npm:^1.1.1":
version: 1.1.1
resolution: "@webpack-cli/configtest@npm:1.1.1"
"@webpack-cli/configtest@npm:^1.2.0":
version: 1.2.0
resolution: "@webpack-cli/configtest@npm:1.2.0"
peerDependencies:
webpack: 4.x.x || 5.x.x
webpack-cli: 4.x.x
checksum: 905e86d4075ac93411e1e7673060373b4a9770426a6d476aa99842399d4b6cc1a0cc3380a811a5285c012fd48ba2ee9d2153a650d842c0f3085e997e3608412d
checksum: 560e4dbd92fc6e4f574654fb1325b90d02c634bcdf8564c22b0e44c1ecf8db828fbea9f20d0546fa809002bd27b1b6f544f74b13bd5ccdee64e8e9368df46cc2
languageName: node
linkType: hard

"@webpack-cli/info@npm:^1.4.1":
version: 1.4.1
resolution: "@webpack-cli/info@npm:1.4.1"
"@webpack-cli/info@npm:^1.5.0":
version: 1.5.0
resolution: "@webpack-cli/info@npm:1.5.0"
dependencies:
envinfo: ^7.7.3
peerDependencies:
webpack-cli: 4.x.x
checksum: 1381c7f8ffacc80414648a5fe38f222a27501d31f5463042ff5e9ffb24100330ea736d307502d5fcad7fecf1019691e5b4a417cda18b329d4b4327500bc6c4af
checksum: 3e7c7ceb30b15fecdf5b5492494fbc76accee27748445c04f2bf66d0c036793b59ae7c27f5f4f6013a500aeae82762244c51f49c1de3d046e0b2dcfe163b642b
languageName: node
linkType: hard

"@webpack-cli/serve@npm:^1.6.1":
version: 1.6.1
resolution: "@webpack-cli/serve@npm:1.6.1"
"@webpack-cli/serve@npm:^1.7.0":
version: 1.7.0
resolution: "@webpack-cli/serve@npm:1.7.0"
peerDependencies:
webpack-cli: 4.x.x
peerDependenciesMeta:
webpack-dev-server:
optional: true
checksum: 0aca33a1a590d580a1bda87d6b9794db8725fbf5a7731997733a221e57d25bb70499429e8837755ff7c578674665fd970dde124c8e26fba41c398ad200deb816
checksum: a2045c6ada073c517820424f97264a99c809e8bfdef866f5af7ceaefff44580351e9713b06d68e326469bd170111e370942825adcdac7eb242b2ee4343458a81
languageName: node
linkType: hard

Expand Down Expand Up @@ -11805,8 +11798,8 @@ __metadata:
mock-fs: ^5.0.0
mockdate: ^2.0.5
moment: ^2.26.0
moment-timezone: ^0.5.31
moment-timezone-data-webpack-plugin: ^1.3.0
moment-timezone: ^0.5.40
moment-timezone-data-webpack-plugin: ^1.5.1
nock: ^12.0.3
page: ^1.11.5
path-browserify: ^1.0.1
Expand Down Expand Up @@ -23329,25 +23322,25 @@ fsevents@^1.2.7:
languageName: node
linkType: hard

"moment-timezone-data-webpack-plugin@npm:^1.3.0":
version: 1.3.0
resolution: "moment-timezone-data-webpack-plugin@npm:1.3.0"
"moment-timezone-data-webpack-plugin@npm:^1.5.1":
version: 1.5.1
resolution: "moment-timezone-data-webpack-plugin@npm:1.5.1"
dependencies:
find-cache-dir: ^3.0.0
make-dir: ^3.0.0
peerDependencies:
moment-timezone: ">= 0.1.0"
webpack: 4.x.x || 5.x.x
checksum: f83390e29f135443e448422db3fab504bfb463ee659abe9fba46380a17f1459e088ee97038179130aefe2db5a41905d3b91120aaac9e6b1359aa18492fdf7b52
checksum: 2725039dc7bad7084413584d7033f43bfd77ab844a84d8ecc9c0fa544d6e8ac613ff0df897c2adcaacf7b9897fbf8d2c955ee1b2975c5eafcf1df9ea362a492a
languageName: node
linkType: hard

"moment-timezone@npm:^0.5.31":
version: 0.5.31
resolution: "moment-timezone@npm:0.5.31"
"moment-timezone@npm:^0.5.31, moment-timezone@npm:^0.5.40":
version: 0.5.40
resolution: "moment-timezone@npm:0.5.40"
dependencies:
moment: ">= 2.9.0"
checksum: e33b5312e6dd2b4fd093eb92fe4af746b40b8a7bd74b17a024ad9823306dcf557bf32dfe6873cac1940e9437b54ca5bda50fdea9a0618fc33adb151cf1904e1b
checksum: 448248744d89959f0d33640aa25493eb7d772c5e76d1e7ccd2d30d221e1a0b90bee22e9637ea3317087292500d8e28a195dfa0e6e5ecf485621abbbbe5d5fb8b
languageName: node
linkType: hard

Expand Down Expand Up @@ -33052,16 +33045,16 @@ resolve@^2.0.0-next.3:
linkType: hard

"webpack-cli@npm:^4.9.1, webpack-cli@npm:^4.9.2":
version: 4.9.2
resolution: "webpack-cli@npm:4.9.2"
version: 4.10.0
resolution: "webpack-cli@npm:4.10.0"
dependencies:
"@discoveryjs/json-ext": ^0.5.0
"@webpack-cli/configtest": ^1.1.1
"@webpack-cli/info": ^1.4.1
"@webpack-cli/serve": ^1.6.1
"@webpack-cli/configtest": ^1.2.0
"@webpack-cli/info": ^1.5.0
"@webpack-cli/serve": ^1.7.0
colorette: ^2.0.14
commander: ^7.0.0
execa: ^5.0.0
cross-spawn: ^7.0.3
fastest-levenshtein: ^1.0.12
import-local: ^3.0.2
interpret: ^2.2.0
Expand All @@ -33080,7 +33073,7 @@ resolve@^2.0.0-next.3:
optional: true
bin:
webpack-cli: bin/cli.js
checksum: 42666e258bd44f0f0374de0bff696ee7d87dbc31fb7c17fd24aab44d99ab278aafb888a3f62953362436c2d8c37274dc19e2ef36cfac00d3887ac77f92e72656
checksum: e144821a3eaf8c2598e80d6bc8b1b4035e6f5cb0046b3090ad0f858f87480f007127d5c5efa83c79436df3f31e0c0d6033fd9ea93526395984ef986ba5d72aa3
languageName: node
linkType: hard

Expand Down Expand Up @@ -33631,7 +33624,7 @@ resolve@^2.0.0-next.3:
"@types/fast-json-stable-stringify": ^2.0.0
"@types/gtag.js": ^0.0.10
"@types/lodash": ^4.14.179
"@types/node": ^16.11.26
"@types/node": ^18.11.18
"@types/page": ^1.11.5
"@types/qs": ^6.9.7
"@types/react": ^17.0.39
Expand Down

0 comments on commit 19abaf5

Please sign in to comment.