Skip to content

Commit 471dc61

Browse files
BrunoQuaresmaBrunoQuaresma
authored
chore: upgrade nodejs version to 18.x (coder#8768)
1 parent 3114a60 commit 471dc61

File tree

10 files changed

+1282
-1606
lines changed

10 files changed

+1282
-1606
lines changed

‎.github/actions/setup-node/action.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ runs:
1313
- name: Setup Node
1414
uses: buildjet/setup-node@v3
1515
with:
16-
node-version: 16.20.1
16+
node-version: 18.17.0
1717
# See https://github.com/actions/setup-node#caching-global-packages-data
1818
cache: "yarn"
1919
cache-dependency-path: ${{ inputs.directory }}/yarn.lock

‎dogfood/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ RUN LAZYGIT_VERSION=$(curl -s "https://api.github.com/repos/jesseduffield/lazygi
190190
# Install frontend utilities
191191
RUN apt-get update && \
192192
# Node.js (from nodesource) and Yarn (from yarnpkg)
193+
curl -fsSL https://deb.nodesource.com/setup_18.x | sudo -E bash - &&\
193194
apt-get install --yes --quiet \
194195
nodejs yarn \
195196
# Install browsers for e2e testing

‎offlinedocs/.npmrc

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
save-exact=true
2+
engine-strict=true

‎offlinedocs/package.json

+8-4
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,18 @@
3232
"remark-gfm": "3.0.1"
3333
},
3434
"devDependencies": {
35-
"@react-native-community/eslint-config": "^3.2.0",
36-
"@react-native-community/eslint-plugin": "^1.3.0",
37-
"@types/node": "18.0.0",
38-
"@types/react": "18.2.15",
35+
"@react-native-community/eslint-config": "3.2.0",
36+
"@react-native-community/eslint-plugin": "1.3.0",
37+
"@types/node": "18.17.0",
38+
"@types/react": "18.2.17",
3939
"@types/react-dom": "18.2.7",
4040
"eslint": "8.45.0",
4141
"eslint-config-next": "13.4.10",
4242
"prettier": "3.0.0",
4343
"typescript": "4.7.3"
44+
},
45+
"engines": {
46+
"npm": ">=9.0.0 <10.0.0",
47+
"node": ">=18.0.0 <19.0.0"
4448
}
4549
}

‎offlinedocs/yarn.lock

+28-28
Original file line numberDiff line numberDiff line change
@@ -1142,9 +1142,9 @@
11421142
eslint-visitor-keys "^3.3.0"
11431143

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

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

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

1399-
"@react-native-community/eslint-plugin@^1.1.0", "@react-native-community/eslint-plugin@^1.3.0":
1399+
"@react-native-community/eslint-plugin@1.3.0", "@react-native-community/eslint-plugin@^1.1.0":
14001400
version "1.3.0"
14011401
resolved "https://registry.yarnpkg.com/@react-native-community/eslint-plugin/-/eslint-plugin-1.3.0.tgz#9e558170c106bbafaa1ef502bd8e6d4651012bf9"
14021402
integrity sha512-+zDZ20NUnSWghj7Ku5aFphMzuM9JulqCW+aPXT6IfIXFbb8tzYTTOSeRFOtuekJ99ibW2fUCSsjuKNlwDIbHFg==
@@ -1445,9 +1445,9 @@
14451445
"@types/lodash" "*"
14461446

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

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

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

14691469
"@types/parse-json@^4.0.0":
14701470
version "4.0.0"
@@ -1488,10 +1488,10 @@
14881488
dependencies:
14891489
"@types/react" "*"
14901490

1491-
"@types/react@*", "@types/react@18.2.15":
1492-
version "18.2.15"
1493-
resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.15.tgz#14792b35df676c20ec3cf595b262f8c615a73066"
1494-
integrity sha512-oEjE7TQt1fFTFSbf8kkNuc798ahTUzn3Le67/PWjE8MAfYAD/qB7O8hSTcromLFqHCt9bcdOg5GXMokzTjJ5SA==
1491+
"@types/react@*", "@types/react@18.2.17":
1492+
version "18.2.17"
1493+
resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.17.tgz#baa565b17ddb649c2dac85b5eaf9e9a1fe0f3b4e"
1494+
integrity sha512-u+e7OlgPPh+aryjOm5UJMX32OvB2E3QASOAqVMY6Ahs90djagxwv2ya0IctglNbNTexC12qCSMZG47KPfy1hAA==
14951495
dependencies:
14961496
"@types/prop-types" "*"
14971497
"@types/scheduler" "*"
@@ -2170,9 +2170,9 @@ doctrine@^3.0.0:
21702170
esutils "^2.0.2"
21712171

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

21772177
emoji-regex@^9.2.2:
21782178
version "9.2.2"
@@ -2307,9 +2307,9 @@ eslint-config-next@13.4.10:
23072307
eslint-plugin-react-hooks "5.0.0-canary-7118f5dd7-20230705"
23082308

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

23142314
eslint-import-resolver-node@^0.3.6, eslint-import-resolver-node@^0.3.7:
23152315
version "0.3.7"
@@ -2586,9 +2586,9 @@ execa@^5.0.0:
25862586
strip-final-newline "^2.0.0"
25872587

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

48344834
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:
4835-
version "2.6.0"
4836-
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.0.tgz#b295854684dbda164e181d259a22cd779dcd7bc3"
4837-
integrity sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA==
4835+
version "2.6.1"
4836+
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.1.tgz#fd8c9a0ff42590b25703c0acb3de3d3f4ede0410"
4837+
integrity sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==
48384838

48394839
tsutils@^3.21.0:
48404840
version "3.21.0"

‎site/.npmrc

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
save-exact=true
2+
engine-strict=true

‎site/e2e/helpers.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,10 @@ const createTemplateVersionTar = async (
342342
Provision_Response.encode(response as Provision_Response).finish(),
343343
)
344344
})
345-
return Buffer.from((await tar.write()) as ArrayBuffer)
345+
const tarFile = await tar.write()
346+
return Buffer.from(
347+
tarFile instanceof Blob ? await tarFile.arrayBuffer() : tarFile,
348+
)
346349
}
347350

348351
const randomName = () => {

‎site/package.json

+6-2
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
"react-router-dom": "6.14.1",
8787
"react-syntax-highlighter": "15.5.0",
8888
"react-use": "17.4.0",
89-
"react-virtualized-auto-sizer": "1.0.7",
89+
"react-virtualized-auto-sizer": "1.0.20",
9090
"react-window": "1.8.8",
9191
"remark-gfm": "3.0.1",
9292
"rollup-plugin-visualizer": "5.9.0",
@@ -120,7 +120,7 @@
120120
"@testing-library/user-event": "14.4.3",
121121
"@types/chroma-js": "2.4.0",
122122
"@types/jest": "29.5.2",
123-
"@types/node": "14.18.22",
123+
"@types/node": "18.17.0",
124124
"@types/react": "18.2.6",
125125
"@types/react-dom": "18.2.4",
126126
"@types/react-helmet": "6.1.5",
@@ -172,5 +172,9 @@
172172
"resolutions": {
173173
"optionator": "0.9.3",
174174
"semver": "7.5.3"
175+
},
176+
"engines": {
177+
"npm": ">=9.0.0 <10.0.0",
178+
"node": ">=18.0.0 <19.0.0"
175179
}
176180
}

‎site/src/components/DeploymentBanner/DeploymentBannerView.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ export const DeploymentBannerView: FC<DeploymentBannerViewProps> = ({
5353
let canceled = false
5454
const loop = () => {
5555
if (canceled) {
56-
return
56+
return undefined
5757
}
5858
setTimeUntilRefresh(timeUntilRefresh--)
5959
if (timeUntilRefresh > 0) {
60-
return setTimeout(loop, 1000)
60+
return window.setTimeout(loop, 1000)
6161
}
6262
fetchStats()
6363
}

0 commit comments

Comments
 (0)