From 3a71df0588845892eabc1f1cd7e049ffabbf39ba Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sun, 16 Feb 2025 11:42:58 +0100 Subject: [PATCH] refactor: use lex-comparator --- exec/build-commands/package.json | 1 + exec/build-commands/src/approveBuilds.ts | 3 ++- pnpm-lock.yaml | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/exec/build-commands/package.json b/exec/build-commands/package.json index 960f840b6a..c79fe47bb5 100644 --- a/exec/build-commands/package.json +++ b/exec/build-commands/package.json @@ -46,6 +46,7 @@ "@pnpm/plugin-commands-rebuild": "workspace:*", "@pnpm/prepare-temp-dir": "workspace:*", "@pnpm/read-project-manifest": "workspace:*", + "@pnpm/util.lex-comparator": "catalog:", "chalk": "catalog:", "enquirer": "catalog:", "render-help": "catalog:" diff --git a/exec/build-commands/src/approveBuilds.ts b/exec/build-commands/src/approveBuilds.ts index 18a367601e..32947f6ed6 100644 --- a/exec/build-commands/src/approveBuilds.ts +++ b/exec/build-commands/src/approveBuilds.ts @@ -1,6 +1,7 @@ import { type Config } from '@pnpm/config' import { globalInfo } from '@pnpm/logger' import { readProjectManifest } from '@pnpm/read-project-manifest' +import { lexCompare } from '@pnpm/util.lex-comparator' import renderHelp from 'render-help' import { prompt } from 'enquirer' import chalk from 'chalk' @@ -132,5 +133,5 @@ Do you approve?`, } function sortUniqueStrings (array: string[]): string[] { - return Array.from(new Set(array)).sort((a, b) => a.localeCompare(b)) + return Array.from(new Set(array)).sort(lexCompare) } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a048c90b71..b3e169550c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2096,6 +2096,9 @@ importers: '@pnpm/read-project-manifest': specifier: workspace:* version: link:../../pkg-manifest/read-project-manifest + '@pnpm/util.lex-comparator': + specifier: 'catalog:' + version: 3.0.0 chalk: specifier: 'catalog:' version: 4.1.2