Skip to content

chore: upgrade nodejs version to 18.x #8768

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.

Sign up for GitHub

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

Merged
merged 11 commits into from
Jul 27, 2023
Merged

chore: upgrade nodejs version to 18.x #8768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7bbea72
chore: update nodejs version to 18.x
BrunoQuaresma Jul 27, 2023
cb12e52
Remove unecessary file
BrunoQuaresma Jul 27, 2023
b15bbfa
Merge branch 'main' into bq/upgrade-nodejs
matifali Jul 27, 2023
18ca39e
Fix fmt
BrunoQuaresma Jul 27, 2023
90c5394
Update deps
BrunoQuaresma Jul 27, 2023
8f101a8
Merge branch 'main' into bq/upgrade-nodejs
BrunoQuaresma Jul 27, 2023
c1e5eee
Fix e2e tests
BrunoQuaresma Jul 27, 2023
1d831f7
Merge branch 'main' into bq/upgrade-nodejs
BrunoQuaresma Jul 27, 2023
2587104
Fix deps
BrunoQuaresma Jul 27, 2023
5e7eecd
Fix timeout
BrunoQuaresma Jul 27, 2023
9c53a2d
Fix lint types
BrunoQuaresma Jul 27, 2023
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
2 changes: 1 addition & 1 deletion .github/actions/setup-node/action.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ runs:
- name: Setup Node
uses: buildjet/setup-node@v3
with:
node-version: 16.20.1
node-version: 18.17.0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
node-version: 18.17.0
node-version: 18.x

As we are installing the latest 18.x release in Dockerfile should we also do this in ci?
@kylecarbs for a 2nd thought.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not? The docker file is for the workspace and the CI should use the same version as well.

# See https://github.com/actions/setup-node#caching-global-packages-data
cache: "yarn"
cache-dependency-path: ${{ inputs.directory }}/yarn.lock
Expand Down
1 change: 1 addition & 0 deletions dogfood/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ RUN LAZYGIT_VERSION=$(curl -s "https://api.github.com/repos/jesseduffield/lazygi
# Install frontend utilities
RUN apt-get update && \
# Node.js (from nodesource) and Yarn (from yarnpkg)
curl -fsSL https://deb.nodesource.com/setup_18.x | sudo -E bash - &&\
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here we are installing the latest 18.x release.

apt-get install --yes --quiet \
nodejs yarn \
# Install browsers for e2e testing
Expand Down
2 changes: 2 additions & 0 deletions offlinedocs/.npmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
save-exact=true
engine-strict=true
12 changes: 8 additions & 4 deletions offlinedocs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,18 @@
"remark-gfm": "3.0.1"
},
"devDependencies": {
"@react-native-community/eslint-config": "^3.2.0",
"@react-native-community/eslint-plugin": "^1.3.0",
"@types/node": "18.0.0",
"@types/react": "18.2.15",
"@react-native-community/eslint-config": "3.2.0",
"@react-native-community/eslint-plugin": "1.3.0",
"@types/node": "18.17.0",
"@types/react": "18.2.17",
"@types/react-dom": "18.2.7",
"eslint": "8.45.0",
"eslint-config-next": "13.4.10",
"prettier": "3.0.0",
"typescript": "4.7.3"
},
"engines": {
"npm": ">=9.0.0 <10.0.0",
"node": ">=18.0.0 <19.0.0"
}
}
56 changes: 28 additions & 28 deletions offlinedocs/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1142,9 +1142,9 @@
eslint-visitor-keys "^3.3.0"

"@eslint-community/regexpp@^4.4.0":
version "4.6.0"
resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.6.0.tgz#5b63f0df5528a44e28aa8578d393de908cc3d4d0"
integrity sha512-uiPeRISaglZnaZk8vwrjQZ1CxogZeY/4IYft6gBOTqu1WhVXWmCmZMWxUv2Q/pxSvPdp1JPaO62kLOcOkMqWrw==
version "4.6.2"
resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.6.2.tgz#1816b5f6948029c5eaacb0703b850ee0cb37d8f8"
integrity sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==

"@eslint/eslintrc@^2.1.0":
version "2.1.0"
Expand Down Expand Up @@ -1377,7 +1377,7 @@
resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f"
integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==

"@react-native-community/eslint-config@^3.2.0":
"@react-native-community/eslint-config@3.2.0":
version "3.2.0"
resolved "https://registry.yarnpkg.com/@react-native-community/eslint-config/-/eslint-config-3.2.0.tgz#42f677d5fff385bccf1be1d3b8faa8c086cf998d"
integrity sha512-ZjGvoeiBtCbd506hQqwjKmkWPgynGUoJspG8/MuV/EfKnkjCtBmeJvq2n+sWbWEvL9LWXDp2GJmPzmvU5RSvKQ==
Expand All @@ -1396,7 +1396,7 @@
eslint-plugin-react-hooks "^4.6.0"
eslint-plugin-react-native "^4.0.0"

"@react-native-community/eslint-plugin@^1.1.0", "@react-native-community/eslint-plugin@^1.3.0":
"@react-native-community/eslint-plugin@1.3.0", "@react-native-community/eslint-plugin@^1.1.0":
version "1.3.0"
resolved "https://registry.yarnpkg.com/@react-native-community/eslint-plugin/-/eslint-plugin-1.3.0.tgz#9e558170c106bbafaa1ef502bd8e6d4651012bf9"
integrity sha512-+zDZ20NUnSWghj7Ku5aFphMzuM9JulqCW+aPXT6IfIXFbb8tzYTTOSeRFOtuekJ99ibW2fUCSsjuKNlwDIbHFg==
Expand Down Expand Up @@ -1445,9 +1445,9 @@
"@types/lodash" "*"

"@types/lodash@*":
version "4.14.195"
resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.195.tgz#bafc975b252eb6cea78882ce8a7b6bf22a6de632"
integrity sha512-Hwx9EUgdwf2GLarOjQp5ZH8ZmblzcbTBC2wtQWNKARBSxM9ezRIAUpeDTgoQRAFB0+8CNWXVA9+MaSOzOF3nPg==
version "4.14.196"
resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.196.tgz#a7c3d6fc52d8d71328b764e28e080b4169ec7a95"
integrity sha512-22y3o88f4a94mKljsZcanlNWPzO0uBsBdzLAngf2tp533LzZcQzb6+eZPJ+vCTt+bqF2XnvT9gejTLsAcJAJyQ==

"@types/mdast@^3.0.0":
version "3.0.12"
Expand All @@ -1461,10 +1461,10 @@
resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197"
integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==

"@types/node@18.0.0":
version "18.0.0"
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.0.0.tgz#67c7b724e1bcdd7a8821ce0d5ee184d3b4dd525a"
integrity sha512-cHlGmko4gWLVI27cGJntjs/Sj8th9aYwplmZFwmmgYQQvL5NUsgVJG7OddLvNfLqYS31KFN0s3qlaD9qCaxACA==
"@types/node@18.17.0":
version "18.17.0"
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.17.0.tgz#35d44267a33dd46b49ee0f73d31b05fd7407e290"
integrity sha512-GXZxEtOxYGFchyUzxvKI14iff9KZ2DI+A6a37o6EQevtg6uO9t+aUZKcaC1Te5Ng1OnLM7K9NVVj+FbecD9cJg==

"@types/parse-json@^4.0.0":
version "4.0.0"
Expand All @@ -1488,10 +1488,10 @@
dependencies:
"@types/react" "*"

"@types/react@*", "@types/react@18.2.15":
version "18.2.15"
resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.15.tgz#14792b35df676c20ec3cf595b262f8c615a73066"
integrity sha512-oEjE7TQt1fFTFSbf8kkNuc798ahTUzn3Le67/PWjE8MAfYAD/qB7O8hSTcromLFqHCt9bcdOg5GXMokzTjJ5SA==
"@types/react@*", "@types/react@18.2.17":
version "18.2.17"
resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.17.tgz#baa565b17ddb649c2dac85b5eaf9e9a1fe0f3b4e"
integrity sha512-u+e7OlgPPh+aryjOm5UJMX32OvB2E3QASOAqVMY6Ahs90djagxwv2ya0IctglNbNTexC12qCSMZG47KPfy1hAA==
dependencies:
"@types/prop-types" "*"
"@types/scheduler" "*"
Expand Down Expand Up @@ -2170,9 +2170,9 @@ doctrine@^3.0.0:
esutils "^2.0.2"

electron-to-chromium@^1.4.431:
version "1.4.468"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.468.tgz#3cbf64ad67d9f12bfe69fefe5eb1935ec4f6ab7a"
integrity sha512-6M1qyhaJOt7rQtNti1lBA0GwclPH+oKCmsra/hkcWs5INLxfXXD/dtdnaKUYQu/pjOBP/8Osoe4mAcNvvzoFag==
version "1.4.474"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.474.tgz#ca79fe098dd802cf8fe9fb968110a28dfb1f9e56"
integrity sha512-GsFT9gtxkFMkpHf13UeN/RFbWdLQVs4DMxA1aQv4xdUAT2qyXEoAQ0hodl2sUvWmztOlicM1UYnNPcoMdzQB5A==

emoji-regex@^9.2.2:
version "9.2.2"
Expand Down Expand Up @@ -2307,9 +2307,9 @@ eslint-config-next@13.4.10:
eslint-plugin-react-hooks "5.0.0-canary-7118f5dd7-20230705"

eslint-config-prettier@^8.5.0:
version "8.8.0"
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.8.0.tgz#bfda738d412adc917fd7b038857110efe98c9348"
integrity sha512-wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA==
version "8.9.0"
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.9.0.tgz#094b6254b2804b0544f7cee535f802b6d29ee10b"
integrity sha512-+sbni7NfVXnOpnRadUA8S28AUlsZt9GjgFvABIRL9Hkn8KqNzOp+7Lw4QWtrwn20KzU3wqu1QoOj2m+7rKRqkA==

eslint-import-resolver-node@^0.3.6, eslint-import-resolver-node@^0.3.7:
version "0.3.7"
Expand Down Expand Up @@ -2586,9 +2586,9 @@ execa@^5.0.0:
strip-final-newline "^2.0.0"

execa@^7.1.1:
version "7.1.1"
resolved "https://registry.yarnpkg.com/execa/-/execa-7.1.1.tgz#3eb3c83d239488e7b409d48e8813b76bb55c9c43"
integrity sha512-wH0eMf/UXckdUYnO21+HDztteVv05rq2GXksxT4fCGeHkBhw1DROXh40wcjMcRqDOWE7iPJ4n3M7e2+YFP+76Q==
version "7.2.0"
resolved "https://registry.yarnpkg.com/execa/-/execa-7.2.0.tgz#657e75ba984f42a70f38928cedc87d6f2d4fe4e9"
integrity sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==
dependencies:
cross-spawn "^7.0.3"
get-stream "^6.0.1"
Expand Down Expand Up @@ -4832,9 +4832,9 @@ tslib@^1.8.1:
integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==

tslib@^2.0.0, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.5.0, tslib@^2.6.0:
version "2.6.0"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.0.tgz#b295854684dbda164e181d259a22cd779dcd7bc3"
integrity sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA==
version "2.6.1"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.1.tgz#fd8c9a0ff42590b25703c0acb3de3d3f4ede0410"
integrity sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==

tsutils@^3.21.0:
version "3.21.0"
Expand Down
1 change: 1 addition & 0 deletions site/.npmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
save-exact=true
engine-strict=true
5 changes: 4 additions & 1 deletion site/e2e/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,10 @@ const createTemplateVersionTar = async (
Provision_Response.encode(response as Provision_Response).finish(),
)
})
return Buffer.from((await tar.write()) as ArrayBuffer)
const tarFile = await tar.write()
return Buffer.from(
tarFile instanceof Blob ? await tarFile.arrayBuffer() : tarFile,
)
}

const randomName = () => {
Expand Down
8 changes: 6 additions & 2 deletions site/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
"react-router-dom": "6.14.1",
"react-syntax-highlighter": "15.5.0",
"react-use": "17.4.0",
"react-virtualized-auto-sizer": "1.0.7",
"react-virtualized-auto-sizer": "1.0.20",
"react-window": "1.8.8",
"remark-gfm": "3.0.1",
"rollup-plugin-visualizer": "5.9.0",
Expand Down Expand Up @@ -120,7 +120,7 @@
"@testing-library/user-event": "14.4.3",
"@types/chroma-js": "2.4.0",
"@types/jest": "29.5.2",
"@types/node": "14.18.22",
"@types/node": "18.17.0",
"@types/react": "18.2.6",
"@types/react-dom": "18.2.4",
"@types/react-helmet": "6.1.5",
Expand Down Expand Up @@ -172,5 +172,9 @@
"resolutions": {
"optionator": "0.9.3",
"semver": "7.5.3"
},
"engines": {
"npm": ">=9.0.0 <10.0.0",
"node": ">=18.0.0 <19.0.0"
}
}
4 changes: 2 additions & 2 deletions site/src/components/DeploymentBanner/DeploymentBannerView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ export const DeploymentBannerView: FC<DeploymentBannerViewProps> = ({
let canceled = false
const loop = () => {
if (canceled) {
return
return undefined
}
setTimeUntilRefresh(timeUntilRefresh--)
if (timeUntilRefresh > 0) {
return setTimeout(loop, 1000)
return window.setTimeout(loop, 1000)
}
fetchStats()
}
Expand Down
Loading