From fa4201a0a8d57a9ed91402a6b737d0c9abac8d78 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Sun, 7 Jun 2020 06:19:58 +0000 Subject: [PATCH 1/5] unnecessary directory check --- src/package-manager.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/package-manager.js b/src/package-manager.js index eabfbdf7b..a330cf87b 100644 --- a/src/package-manager.js +++ b/src/package-manager.js @@ -424,8 +424,7 @@ module.exports = class PackageManager { const packageName = path.basename(packagePath); if ( !packageName.startsWith('.') && - !packagesByName.has(packageName) && - fs.isDirectorySync(packagePath) + !packagesByName.has(packageName) ) { packages.push({ name: packageName, From 35f18fd99d11dd8bd48961745514ecf6ad10f490 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Mon, 8 Jun 2020 01:38:15 +0000 Subject: [PATCH 2/5] using withFileTypes to filter out non-folders no need to use path.basename --- src/package-manager.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/package-manager.js b/src/package-manager.js index a330cf87b..243f57da7 100644 --- a/src/package-manager.js +++ b/src/package-manager.js @@ -419,13 +419,17 @@ module.exports = class PackageManager { for (const packageDirPath of this.packageDirPaths) { if (fs.isDirectorySync(packageDirPath)) { - for (let packagePath of fs.readdirSync(packageDirPath)) { - packagePath = path.join(packageDirPath, packagePath); - const packageName = path.basename(packagePath); + + const packagePaths = fs.readdirSync(packageDirPath, { withFileTypes: true }) + .filter(dirent => dirent.isDirectory()) + .map(dirent => dirent.name); + + for (const packageName of packagePaths) { if ( !packageName.startsWith('.') && !packagesByName.has(packageName) ) { + const packagePath = path.join(packageDirPath, packageName); packages.push({ name: packageName, path: packagePath, From 6b807f7b29264e6f39a577890cece0f4a5c788cd Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Mon, 8 Jun 2020 05:58:05 +0000 Subject: [PATCH 3/5] run prettier --- src/package-manager.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/package-manager.js b/src/package-manager.js index 243f57da7..6668d7262 100644 --- a/src/package-manager.js +++ b/src/package-manager.js @@ -419,10 +419,11 @@ module.exports = class PackageManager { for (const packageDirPath of this.packageDirPaths) { if (fs.isDirectorySync(packageDirPath)) { - - const packagePaths = fs.readdirSync(packageDirPath, { withFileTypes: true }) - .filter(dirent => dirent.isDirectory()) - .map(dirent => dirent.name); + + const packagePaths = fs + .readdirSync(packageDirPath, { withFileTypes: true }) + .filter((dirent) => dirent.isDirectory()) + .map((dirent) => dirent.name); for (const packageName of packagePaths) { if ( @@ -433,7 +434,7 @@ module.exports = class PackageManager { packages.push({ name: packageName, path: packagePath, - isBundled: false + isBundled: false, }); packagesByName.add(packageName); } From 6ef38f381037a11ccc4da0e0d0e1e31be6718a2f Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Sun, 21 Jun 2020 19:03:04 +0000 Subject: [PATCH 4/5] lint --- src/package-manager.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/package-manager.js b/src/package-manager.js index 6668d7262..d42acc9a0 100644 --- a/src/package-manager.js +++ b/src/package-manager.js @@ -419,11 +419,10 @@ module.exports = class PackageManager { for (const packageDirPath of this.packageDirPaths) { if (fs.isDirectorySync(packageDirPath)) { - const packagePaths = fs .readdirSync(packageDirPath, { withFileTypes: true }) - .filter((dirent) => dirent.isDirectory()) - .map((dirent) => dirent.name); + .filter(dirent => dirent.isDirectory()) + .map(dirent => dirent.name); for (const packageName of packagePaths) { if ( @@ -434,7 +433,7 @@ module.exports = class PackageManager { packages.push({ name: packageName, path: packagePath, - isBundled: false, + isBundled: false }); packagesByName.add(packageName); } From d6cc11af897fc236bf0b43a13d71149650fa28f8 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Wed, 8 Jul 2020 08:55:02 -0500 Subject: [PATCH 5/5] Rename packagePaths to packageNames Co-authored-by: Sadick --- src/package-manager.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/package-manager.js b/src/package-manager.js index d42acc9a0..14f1c9377 100644 --- a/src/package-manager.js +++ b/src/package-manager.js @@ -419,12 +419,12 @@ module.exports = class PackageManager { for (const packageDirPath of this.packageDirPaths) { if (fs.isDirectorySync(packageDirPath)) { - const packagePaths = fs + const packageNames = fs .readdirSync(packageDirPath, { withFileTypes: true }) .filter(dirent => dirent.isDirectory()) .map(dirent => dirent.name); - for (const packageName of packagePaths) { + for (const packageName of packageNames) { if ( !packageName.startsWith('.') && !packagesByName.has(packageName)