also looking at this
fix(installer): resolve versions against live sources when one is unreachable
#255
6 files
+400
-44
| @@ -13,6 +13,8 @@ export async function installResolvedSystemPackages( | ||
| 13 | 13 | platform?: installer.Platform |
| 14 | 14 | nativeInstall: (specs: string[]) => Promise<number> |
| 15 | 15 | onRetry?: (message: string) => void |
| 16 | /** Diagnostics that change which version is installed; `quiet` does not suppress these. */ | |
| 17 | onWarn?: (message: string) => void | |
| 16 | 18 | }, |
| 17 | 19 | ): Promise<Map<string, string>> { |
| 18 | 20 | const versions = new Map<string, string>() |
| @@ -20,12 +22,19 @@ export async function installResolvedSystemPackages( | ||
| 20 | 22 | for (const { domain, version } of requests) { |
| 21 | 23 | if (installer.isSupported(domain, options.platform)) { |
| 22 | 24 | const installed = await installer.installPackage(domain, version, { |
| 23 | installDir: options.installDir, platform: options.platform, quiet: true, onRetry: options.onRetry, | |
| 25 | installDir: options.installDir, | |
| 26 | platform: options.platform, | |
| 27 | quiet: true, | |
| 28 | onRetry: options.onRetry, | |
| 29 | onWarn: options.onWarn, | |
| 24 | 30 | }) |
| 25 | 31 | versions.set(domain, installed.version) |
| 26 | 32 | continue |
| 27 | 33 | } |
| 28 | const resolved = await installer.resolvePackageVersion(domain, version, options.platform) | |
| 34 | const resolved = await installer.resolvePackageVersion(domain, version, options.platform, { | |
| 35 | onRetry: options.onRetry, | |
| 36 | onWarn: options.onWarn, | |
| 37 | }) | |
| 29 | 38 | const previous = native.get(domain) |
| 30 | 39 | if (previous && previous !== resolved) |
| 31 | 40 | throw new Error(`Conflicting required versions for ${domain}: ${previous} and ${resolved}`) |
| @@ -51,6 +60,7 @@ export async function installResolvedSystemPackage( | ||
| 51 | 60 | platform?: installer.Platform |
| 52 | 61 | nativeInstall: (spec: string) => Promise<number> |
| 53 | 62 | onRetry?: (message: string) => void |
| 63 | onWarn?: (message: string) => void | |
| 54 | 64 | }, |
| 55 | 65 | ): Promise<string> { |
| 56 | 66 | const versions = await installResolvedSystemPackages([{ domain, version }], { |