1
- import picocolors from "picocolors"
2
- import { writeFileSync , existsSync } from "fs"
1
+ import { existsSync , writeFileSync } from "fs"
3
2
import { posix } from "path"
3
+ import { blue , bold , cyan , green , red , yellow } from "picocolors"
4
4
import semver from "semver"
5
5
import { hashFile } from "./hash"
6
6
import { logPatchSequenceError } from "./makePatch"
@@ -44,17 +44,16 @@ function getInstalledPackageVersion({
44
44
}
45
45
46
46
let err =
47
- `${ picocolors . red (
48
- "Error:" ,
49
- ) } Patch file found for package ${ posix . basename ( pathSpecifier ) } ` +
50
- ` which is not present at ${ relative ( "." , packageDir ) } `
47
+ `${ red ( "Error:" ) } Patch file found for package ${ posix . basename (
48
+ pathSpecifier ,
49
+ ) } ` + ` which is not present at ${ relative ( "." , packageDir ) } `
51
50
52
51
if ( ! isDevOnly && process . env . NODE_ENV === "production" ) {
53
52
err += `
54
53
55
54
If this package is a dev dependency, rename the patch file to
56
55
57
- ${ picocolors . bold ( patchFilename . replace ( ".patch" , ".dev.patch" ) ) }
56
+ ${ bold ( patchFilename . replace ( ".patch" , ".dev.patch" ) ) }
58
57
`
59
58
}
60
59
throw new PatchApplicationError ( err )
@@ -65,7 +64,7 @@ function getInstalledPackageVersion({
65
64
const result = semver . valid ( version )
66
65
if ( result === null ) {
67
66
throw new PatchApplicationError (
68
- `${ picocolors . red (
67
+ `${ red (
69
68
"Error:" ,
70
69
) } Version string '${ version } ' cannot be parsed from ${ join (
71
70
packageDir ,
@@ -85,9 +84,9 @@ function logPatchApplication(patchDetails: PatchedPackageDetails) {
85
84
} )`
86
85
: ""
87
86
console . log (
88
- `${ picocolors . bold ( patchDetails . pathSpecifier ) } @${
87
+ `${ bold ( patchDetails . pathSpecifier ) } @${
89
88
patchDetails . version
90
- } ${ sequenceString } ${ picocolors . green ( "✔" ) } `,
89
+ } ${ sequenceString } ${ green ( "✔" ) } `,
91
90
)
92
91
}
93
92
@@ -110,7 +109,7 @@ export function applyPatchesForApp({
110
109
const groupedPatches = getGroupedPatches ( patchesDirectory )
111
110
112
111
if ( groupedPatches . numPatchFiles === 0 ) {
113
- console . log ( picocolors . blue ( "No patch files found" ) )
112
+ console . log ( blue ( "No patch files found" ) )
114
113
return
115
114
}
116
115
@@ -140,10 +139,10 @@ export function applyPatchesForApp({
140
139
141
140
const problemsSummary = [ ]
142
141
if ( warnings . length ) {
143
- problemsSummary . push ( picocolors . yellow ( `${ warnings . length } warning(s)` ) )
142
+ problemsSummary . push ( yellow ( `${ warnings . length } warning(s)` ) )
144
143
}
145
144
if ( errors . length ) {
146
- problemsSummary . push ( picocolors . red ( `${ errors . length } error(s)` ) )
145
+ problemsSummary . push ( red ( `${ errors . length } error(s)` ) )
147
146
}
148
147
149
148
if ( problemsSummary . length ) {
@@ -201,8 +200,8 @@ export function applyPatchesForPackage({
201
200
appliedPatches . push ( unappliedPatches . shift ( ) ! )
202
201
} else {
203
202
console . log (
204
- picocolors . red ( "Error:" ) ,
205
- `The patches for ${ picocolors . bold ( pathSpecifier ) } have changed.` ,
203
+ red ( "Error:" ) ,
204
+ `The patches for ${ bold ( pathSpecifier ) } have changed.` ,
206
205
`You should reinstall your node_modules folder to make sure the package is up to date` ,
207
206
)
208
207
process . exit ( 1 )
@@ -249,9 +248,7 @@ export function applyPatchesForPackage({
249
248
if ( ! installedPackageVersion ) {
250
249
// it's ok we're in production mode and this is a dev only package
251
250
console . log (
252
- `Skipping dev-only ${ picocolors . bold (
253
- pathSpecifier ,
254
- ) } @${ version } ${ picocolors . blue ( "✔" ) } `,
251
+ `Skipping dev-only ${ bold ( pathSpecifier ) } @${ version } ${ blue ( "✔" ) } ` ,
255
252
)
256
253
continue
257
254
}
@@ -427,10 +424,7 @@ export function applyPatch({
427
424
const errors : string [ ] | undefined = bestEffort ? [ ] : undefined
428
425
executeEffects ( forward , { dryRun : false , cwd, bestEffort, errors } )
429
426
if ( errors ?. length ) {
430
- console . log (
431
- "Saving errors to" ,
432
- picocolors . cyan ( picocolors . bold ( "./patch-package-errors.log" ) ) ,
433
- )
427
+ console . log ( "Saving errors to" , cyan ( bold ( "./patch-package-errors.log" ) ) )
434
428
writeFileSync ( "patch-package-errors.log" , errors . join ( "\n\n" ) )
435
429
process . exit ( 0 )
436
430
}
@@ -464,20 +458,18 @@ function createVersionMismatchWarning({
464
458
path : string
465
459
} ) {
466
460
return `
467
- ${ picocolors . yellow (
468
- "Warning:" ,
469
- ) } patch-package detected a patch file version mismatch
461
+ ${ yellow ( "Warning:" ) } patch-package detected a patch file version mismatch
470
462
471
463
Don't worry! This is probably fine. The patch was still applied
472
464
successfully. Here's the deets:
473
465
474
466
Patch file created for
475
467
476
- ${ packageName } @${ picocolors . bold ( originalVersion ) }
468
+ ${ packageName } @${ bold ( originalVersion ) }
477
469
478
470
applied to
479
471
480
- ${ packageName } @${ picocolors . bold ( actualVersion ) }
472
+ ${ packageName } @${ bold ( actualVersion ) }
481
473
482
474
At path
483
475
@@ -487,7 +479,7 @@ ${picocolors.yellow(
487
479
breakage even though the patch was applied successfully. Make sure the package
488
480
still behaves like you expect (you wrote tests, right?) and then run
489
481
490
- ${ picocolors . bold ( `patch-package ${ pathSpecifier } ` ) }
482
+ ${ bold ( `patch-package ${ pathSpecifier } ` ) }
491
483
492
484
to update the version in the patch file name and make this warning go away.
493
485
`
@@ -505,8 +497,8 @@ function createBrokenPatchFileError({
505
497
pathSpecifier : string
506
498
} ) {
507
499
return `
508
- ${ picocolors . red ( picocolors . bold ( "**ERROR**" ) ) } ${ picocolors . red (
509
- `Failed to apply patch for package ${ picocolors . bold ( packageName ) } at path` ,
500
+ ${ red ( bold ( "**ERROR**" ) ) } ${ red (
501
+ `Failed to apply patch for package ${ bold ( packageName ) } at path` ,
510
502
) }
511
503
512
504
${ path }
@@ -545,15 +537,13 @@ function createPatchApplicationFailureError({
545
537
pathSpecifier : string
546
538
} ) {
547
539
return `
548
- ${ picocolors . red ( picocolors . bold ( "**ERROR**" ) ) } ${ picocolors . red (
549
- `Failed to apply patch for package ${ picocolors . bold ( packageName ) } at path` ,
540
+ ${ red ( bold ( "**ERROR**" ) ) } ${ red (
541
+ `Failed to apply patch for package ${ bold ( packageName ) } at path` ,
550
542
) }
551
543
552
544
${ path }
553
545
554
- This error was caused because ${ picocolors . bold (
555
- packageName ,
556
- ) } has changed since you
546
+ This error was caused because ${ bold ( packageName ) } has changed since you
557
547
made the patch file for it. This introduced conflicts with your patch,
558
548
just like a merge conflict in Git when separate incompatible changes are
559
549
made to the same piece of code.
@@ -572,10 +562,8 @@ ${picocolors.red(picocolors.bold("**ERROR**"))} ${picocolors.red(
572
562
573
563
Info:
574
564
Patch file: patches/${ patchFilename }
575
- Patch was made for version: ${ picocolors . green (
576
- picocolors . bold ( originalVersion ) ,
577
- ) }
578
- Installed version: ${ picocolors . red ( picocolors . bold ( actualVersion ) ) }
565
+ Patch was made for version: ${ green ( bold ( originalVersion ) ) }
566
+ Installed version: ${ red ( bold ( actualVersion ) ) }
579
567
`
580
568
}
581
569
@@ -587,9 +575,7 @@ function createUnexpectedError({
587
575
error : Error
588
576
} ) {
589
577
return `
590
- ${ picocolors . red ( picocolors . bold ( "**ERROR**" ) ) } ${ picocolors . red (
591
- `Failed to apply patch file ${ picocolors . bold ( filename ) } ` ,
592
- ) }
578
+ ${ red ( bold ( "**ERROR**" ) ) } ${ red ( `Failed to apply patch file ${ bold ( filename ) } ` ) }
593
579
594
580
${ error . stack }
595
581
0 commit comments