Skip to content

Commit 473bcc7

Browse files
committed
CR fixes
1 parent 884033f commit 473bcc7

3 files changed

Lines changed: 15 additions & 13 deletions

File tree

app/components/Package/Compatibility.vue

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,21 @@ function getName(engine: string): string {
2323
function getIcon(engine: string): string {
2424
return engineIcons[engine] || 'i-carbon:code'
2525
}
26+
27+
const sortedEngines = computed(() => {
28+
const entries = Object.entries(props.engines ?? {})
29+
return entries.sort(([a], [b]) => a.localeCompare(b))
30+
})
2631
</script>
2732
<template>
2833
<CollapsibleSection
29-
v-if="engines && Object.keys(engines).length"
34+
v-if="sortedEngines.length"
3035
:title="$t('package.compatibility')"
3136
id="compatibility"
3237
>
3338
<dl class="space-y-2">
3439
<div
35-
v-for="(version, engine) in engines"
40+
v-for="[engine, version] in sortedEngines"
3641
:key="engine"
3742
class="flex justify-between gap-4 py-1"
3843
>

shared/utils/package-analysis.ts

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@ export type TypesStatus =
1212
export interface PackageAnalysis {
1313
moduleFormat: ModuleFormat
1414
types: TypesStatus
15-
engines?: {
16-
node?: string
17-
npm?: string
18-
}
15+
engines?: Record<string, string>
1916
/** Associated create-* package if it exists */
2017
createPackage?: CreatePackageInfo
2118
}
@@ -306,12 +303,7 @@ export function analyzePackage(
306303
return {
307304
moduleFormat,
308305
types,
309-
engines: pkg.engines
310-
? {
311-
node: pkg.engines.node,
312-
npm: pkg.engines.npm,
313-
}
314-
: undefined,
306+
engines: pkg.engines,
315307
createPackage: options?.createPackage,
316308
}
317309
}

test/unit/shared/utils/package-analysis.spec.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,12 +217,17 @@ describe('analyzePackage', () => {
217217
name: 'test',
218218
main: 'index.js',
219219
engines: {
220+
bun: '>=1.0.0',
220221
node: '>=18',
221222
npm: '>=9',
222223
},
223224
})
224225

225-
expect(result.engines).toEqual({ node: '>=18', npm: '>=9' })
226+
expect(result.engines).toEqual({
227+
bun: '>=1.0.0',
228+
node: '>=18',
229+
npm: '>=9',
230+
})
226231
})
227232

228233
it('detects @types package when typesPackage info is provided', () => {

0 commit comments

Comments
 (0)