mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: fix dangling promise in npm install (#36379)

Browse source 
* Fix dangling promise introduced in #33979

* fix reject in callback

* simplify code

Co-authored-by: Black-Hole <158blackhole@gmail.com>

Co-authored-by: Black-Hole <158blackhole@gmail.com>
This commit is contained in:
hyrious 2022-11-19 07:21:11 +08:00 • committed by GitHub
parent 7529ebfe0e
commit 9c48992e21
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

32
npm/install.js
View file

@ -70,29 +70,21 @@ function isInstalled () {
// unzips and makes path.txt point at the correct executable // unzips and makes path.txt point at the correct executable
function extractFile (zipPath) { function extractFile (zipPath) {
return new Promise((resolve, reject) => { const distPath = process.env.ELECTRON_OVERRIDE_DIST_PATH || path.join(__dirname, 'dist');
const distPath = process.env.ELECTRON_OVERRIDE_DIST_PATH || path.join(__dirname, 'dist');
extract(zipPath, { dir: path.join(__dirname, 'dist') }) return extract(zipPath, { dir: path.join(__dirname, 'dist') }).then(() => {
.then(() => { // If the zip contains an "electron.d.ts" file,
// If the zip contains an "electron.d.ts" file, // move that up
// move that up const srcTypeDefPath = path.join(distPath, 'electron.d.ts');
const srcTypeDefPath = path.join(distPath, 'electron.d.ts'); const targetTypeDefPath = path.join(__dirname, 'electron.d.ts');
const targetTypeDefPath = path.join(__dirname, 'electron.d.ts'); const hasTypeDefinitions = fs.existsSync(srcTypeDefPath);
const hasTypeDefinitions = fs.existsSync(srcTypeDefPath);
if (hasTypeDefinitions) { if (hasTypeDefinitions) {
try { fs.renameSync(srcTypeDefPath, targetTypeDefPath);
fs.renameSync(srcTypeDefPath, targetTypeDefPath); }
} catch (err) {
reject(err);
}
}
// Write a "path.txt" file. // Write a "path.txt" file.
return fs.promises.writeFile(path.join(__dirname, 'path.txt'), platformPath); return fs.promises.writeFile(path.join(__dirname, 'path.txt'), platformPath);
})
.catch((err) => reject(err));
}); });
} }