From 768d611e18d03c97d1d3fc4ef5be013ac59a2967 Mon Sep 17 00:00:00 2001 From: Patrick Hallisey Date: Wed, 15 May 2024 08:25:48 -0700 Subject: [PATCH] Sort the keys in devDependencies and overrides --- .../scripts/typespec/New-EmitterPackageJson.ps1 | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/eng/common/scripts/typespec/New-EmitterPackageJson.ps1 b/eng/common/scripts/typespec/New-EmitterPackageJson.ps1 index 01e883d068c3..d9e45038b879 100644 --- a/eng/common/scripts/typespec/New-EmitterPackageJson.ps1 +++ b/eng/common/scripts/typespec/New-EmitterPackageJson.ps1 @@ -18,22 +18,24 @@ param ( $packageJson = Get-Content $PackageJsonPath | ConvertFrom-Json -AsHashtable # If we provide OverridesPath, use that to load a hashtable of version overrides -$overrides = @{} +$overrides = [ordered]@{} if ($OverridesPath) { Write-Host "Using overrides from $OverridesPath`:`n" - $overrides = Get-Content $OverridesPath | ConvertFrom-Json -AsHashtable + $overridesJson = Get-Content $OverridesPath | ConvertFrom-Json -AsHashtable + foreach ($key in $overridesJson.Keys | Sort-Object) { + $overrides[$key] = $overridesJson[$key] + } Write-Host ($overrides | ConvertTo-Json) Write-Host "" } - # If there's a peer dependency and a dev dependency for the same package, carry the # dev dependency forward into emitter-package.json -$devDependencies = @{} +$devDependencies = [ordered]@{} -foreach ($package in $packageJson.peerDependencies.Keys) { +foreach ($package in $packageJson.peerDependencies.Keys | Sort-Object) { $pinnedVersion = $packageJson.devDependencies[$package] if ($pinnedVersion -and -not $overrides[$package]) { Write-Host "Pinning $package to $pinnedVersion"