@@ -8,6 +8,7 @@ import { readFile, writeFile } from "node:fs/promises";
8
8
import { resolve } from "node:path" ;
9
9
import { vendoredWithOptions } from "../run/vendored" ;
10
10
import { getRushJson , RushJsonProject } from "../../util/synthesizedRushJson" ;
11
+ import { sortPackageJson } from "../../util/sortPackageJson" ;
11
12
12
13
const log = createPrinter ( "migrate-tests" ) ;
13
14
@@ -133,7 +134,7 @@ async function updatePackageJson(projectFolder: string): Promise<boolean> {
133
134
packageJson . scripts [ "test" ] = "npm run test:node && npm run test:browser" ;
134
135
135
136
// Clean it up
136
- sortPackage ( packageJson ) ;
137
+ sortPackageJson ( packageJson ) ;
137
138
138
139
await writeFile ( packageJsonPath , JSON . stringify ( packageJson , null , 2 ) ) ;
139
140
@@ -146,27 +147,6 @@ async function updatePackageJson(projectFolder: string): Promise<boolean> {
146
147
return true ;
147
148
}
148
149
149
- function sortObjectByKeys ( unsortedObj : { [ key : string ] : string } ) : { [ key : string ] : string } {
150
- const sortedEntries = Object . entries ( unsortedObj ) . sort ( ( a , b ) => a [ 0 ] . localeCompare ( b [ 0 ] ) ) ;
151
- return Object . fromEntries ( sortedEntries ) ;
152
- }
153
-
154
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
155
- function sortPackage ( packageJson : any ) : void {
156
- if ( packageJson . dependencies ) {
157
- packageJson . dependencies = sortObjectByKeys ( packageJson . dependencies ) ;
158
- }
159
- if ( packageJson . devDependencies ) {
160
- packageJson . devDependencies = sortObjectByKeys ( packageJson . devDependencies ) ;
161
- }
162
- if ( packageJson . peerDependencies ) {
163
- packageJson . peerDependencies = sortObjectByKeys ( packageJson . peerDependencies ) ;
164
- }
165
- if ( packageJson . scripts ) {
166
- packageJson . scripts = sortObjectByKeys ( packageJson . scripts ) ;
167
- }
168
- }
169
-
170
150
async function runCleanup ( projectFolder : string ) : Promise < boolean > {
171
151
const prettierCommandArgs = [
172
152
"prettier" ,
0 commit comments