Skip to content

Commit 0d34fcb

Browse files
committed
dep: migrate to node-fetch v3
1 parent 58abe1e commit 0d34fcb

File tree

4 files changed

+137
-86
lines changed

4 files changed

+137
-86
lines changed

package-lock.json

+124-78
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,20 @@
2121
"jar"
2222
],
2323
"engines": {
24-
"node": ">=8"
24+
"node": ">=12"
2525
},
2626
"author": "Nico Lueg",
2727
"license": "MIT",
2828
"dependencies": {
2929
"find-java-home": "^1.2.2",
30-
"node-fetch": "^2.6.6",
30+
"node-fetch": "^3.2.0",
3131
"tar": "^6.1.11",
3232
"typescript": "^4.5.5",
3333
"yauzl": "^2.10.0"
3434
},
3535
"devDependencies": {
36-
"@types/jest": "^27.0.3",
36+
"@types/jest": "^27.4.0",
3737
"@types/node": "^17.0.5",
38-
"@types/node-fetch": "^2.5.12",
3938
"@types/tar": "^6.1.1",
4039
"@types/yauzl": "^2.9.2",
4140
"@typescript-eslint/eslint-plugin": "^5.10.0",

src/install/install.spec.ts

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
import { getUrlToCall } from './install';
21
import { generateInstallOptions } from './generate-install-options';
2+
import { getUrlToCall } from './install';
33

44
describe('install-jdk', () => {
55
it('creates valid url for default parameters', () => {
6-
const url = getUrlToCall(generateInstallOptions());
6+
const url = getUrlToCall({
7+
...generateInstallOptions(),
8+
os: 'windows', // Required to get the correct url on every platform
9+
});
710
expect(url).toBe(
811
'https://api.adoptopenjdk.net/v3/binary/latest/8/ga/windows/x64/jre/hotspot/normal/adoptopenjdk'
912
);

src/install/install.ts

+5-2
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,16 @@ function download(dir: string, url: string): Promise<string> {
7474
response.body
7575
?.pipe(destStream)
7676
.on('finish', () => resolve(destinationFilePath))
77-
.on('error', (err) => reject(err));
77+
.once('error', (err) => reject(err));
7878
})
7979
.catch((err) => reject(err));
8080
});
8181
}
8282

83-
function moveOneFolderUp(filePath: string, installPath: string): Promise<string> {
83+
function moveOneFolderUp(
84+
filePath: string,
85+
installPath: string
86+
): Promise<string> {
8487
return new Promise<string>((resolve, reject) => {
8588
const newFilePath = path.join(
8689
installPath,

0 commit comments

Comments
 (0)