Skip to content

Commit 7286bc6

Browse files
azure-sdkhallipr
andauthored
Sort the keys in devDependencies and overrides (Azure#44082)
Co-authored-by: Patrick Hallisey <[email protected]>
1 parent de7c112 commit 7286bc6

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

eng/common/scripts/typespec/New-EmitterPackageJson.ps1

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,24 @@ param (
1818
$packageJson = Get-Content $PackageJsonPath | ConvertFrom-Json -AsHashtable
1919

2020
# If we provide OverridesPath, use that to load a hashtable of version overrides
21-
$overrides = @{}
21+
$overrides = [ordered]@{}
2222

2323
if ($OverridesPath) {
2424
Write-Host "Using overrides from $OverridesPath`:`n"
25-
$overrides = Get-Content $OverridesPath | ConvertFrom-Json -AsHashtable
25+
$overridesJson = Get-Content $OverridesPath | ConvertFrom-Json -AsHashtable
26+
foreach ($key in $overridesJson.Keys | Sort-Object) {
27+
$overrides[$key] = $overridesJson[$key]
28+
}
2629
Write-Host ($overrides | ConvertTo-Json)
2730
Write-Host ""
2831
}
2932

30-
3133
# If there's a peer dependency and a dev dependency for the same package, carry the
3234
# dev dependency forward into emitter-package.json
3335

34-
$devDependencies = @{}
36+
$devDependencies = [ordered]@{}
3537

36-
foreach ($package in $packageJson.peerDependencies.Keys) {
38+
foreach ($package in $packageJson.peerDependencies.Keys | Sort-Object) {
3739
$pinnedVersion = $packageJson.devDependencies[$package]
3840
if ($pinnedVersion -and -not $overrides[$package]) {
3941
Write-Host "Pinning $package to $pinnedVersion"

0 commit comments

Comments
 (0)