Skip to content

Commit c8ba931

Browse files
committed
Merge branch 'main' into cli_improvments
# Conflicts: # tests/snapshots/cli.js.snap # tests/snapshots/deps.js.snap
2 parents 10adfca + 24d9da5 commit c8ba931

File tree

9 files changed

+7486
-7383
lines changed

9 files changed

+7486
-7383
lines changed

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
node_modules
22
/.nyc_output
3-
/cjs
4-
/coverage
3+
/index.cjs
4+
/coverage

eslint.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ export default [
1414
globals: { ...globals.builtin, ...globals.node },
1515
},
1616
},
17-
{ ignores: ['cjs'] },
17+
{ ignores: ['index.cjs'] },
1818
]

index.js

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -90,23 +90,17 @@ const sortObjectBySemver = sortObjectBy((a, b) => {
9090
})
9191

9292
const getPackageName = (ident) => {
93-
const parts = ident.split('@')
94-
95-
if (ident.startsWith('@')) {
96-
// Handle cases where package name starts with '@'
97-
return parts.length > 2 ? parts.slice(0, -1).join('@') : ident
98-
}
99-
100-
// Handle cases where package name doesn't start with '@'
101-
return parts.length > 1 ? parts.slice(0, -1).join('@') : ident
93+
const index = ident.indexOf('@', ident.startsWith('@') ? 1 : 0)
94+
// This should not happen, unless user manually edit the package.json file
95+
return index === -1 ? ident : ident.slice(0, index)
10296
}
10397

10498
const sortObjectByIdent = (a, b) => {
105-
const PackageNameA = getPackageName(a)
106-
const PackageNameB = getPackageName(b)
99+
const packageNameA = getPackageName(a)
100+
const packageNameB = getPackageName(b)
107101

108-
if (PackageNameA < PackageNameB) return -1
109-
if (PackageNameA > PackageNameB) return 1
102+
if (packageNameA < packageNameB) return -1
103+
if (packageNameA > packageNameB) return 1
110104
return 0
111105
}
112106

0 commit comments

Comments
 (0)