@@ -2,13 +2,19 @@ import chalk from "chalk"
22import { existsSync } from "fs-extra"
33import { posix } from "path"
44import semver from "semver"
5- import { PackageDetails } from "./PackageDetails"
5+ import { hashFile } from "./hash"
6+ import { PackageDetails , PatchedPackageDetails } from "./PackageDetails"
67import { packageIsDevDependency } from "./packageIsDevDependency"
78import { executeEffects } from "./patch/apply"
89import { readPatch } from "./patch/read"
910import { reversePatch } from "./patch/reverse"
1011import { getGroupedPatches } from "./patchFs"
1112import { join , relative , resolve } from "./path"
13+ import {
14+ getPatchApplicationState ,
15+ PatchState ,
16+ savePatchApplicationState ,
17+ } from "./stateFile"
1218
1319class PatchApplicationError extends Error {
1420 constructor ( msg : string ) {
@@ -68,6 +74,20 @@ function getInstalledPackageVersion({
6874 return result as string
6975}
7076
77+ function logPatchApplication ( patchDetails : PatchedPackageDetails ) {
78+ const sequenceString =
79+ patchDetails . sequenceNumber != null
80+ ? ` (${ patchDetails . sequenceNumber } ${
81+ patchDetails . sequenceName ? " " + patchDetails . sequenceName : ""
82+ } )`
83+ : ""
84+ console . log (
85+ `${ chalk . bold ( patchDetails . pathSpecifier ) } ${
86+ patchDetails . version
87+ } ${ sequenceString } ${ chalk . green ( "✔" ) } ,
88+ )
89+ }
90+
7191export function applyPatchesForApp ( {
7292 appPath,
7393 reverse,
@@ -92,10 +112,42 @@ export function applyPatchesForApp({
92112 const errors : string [ ] = [ ]
93113 const warnings : string [ ] = [ ...groupedPatches . warnings ]
94114
95- for ( const [ pathSpecifier , details ] of Object . entries (
115+ for ( const [ pathSpecifier , patches ] of Object . entries (
96116 groupedPatches . pathSpecifierToPatchFiles ,
97117 ) ) {
98- packageLoop: for ( const patchDetails of details ) {
118+ const state =
119+ patches . length > 1 ? getPatchApplicationState ( patches [ 0 ] ) : null
120+ const unappliedPatches = patches . slice ( 0 )
121+ const newState : PatchState [ ] | null = patches . length > 1 ? [ ] : null
122+ // if there are multiple patches to apply, we can't rely on the reverse-patch-dry-run behavior to make this operation
123+ // idempotent, so instead we need to check the state file to see whether we have already applied any of the patches
124+ // todo: once this is battle tested we might want to use the same approach for single patches as well, but it's not biggie since the dry run thing is fast
125+ if ( unappliedPatches && state ) {
126+ for ( let i = 0 ; i < state . patches . length ; i ++ ) {
127+ const patchThatWasApplied = state . patches [ i ]
128+ const patchToApply = unappliedPatches [ 0 ]
129+ const currentPatchHash = hashFile (
130+ join ( appPath , patchDir , patchToApply . patchFilename ) ,
131+ )
132+ if ( patchThatWasApplied . patchContentHash === currentPatchHash ) {
133+ // this patch was applied we can skip it
134+ unappliedPatches . shift ( )
135+ } else {
136+ console . error (
137+ chalk . red ( "Error:" ) ,
138+ `The patches for ${ chalk . bold ( pathSpecifier ) } ,
139+ `You should reinstall your node_modules folder to make sure the package is up to date` ,
140+ )
141+ process . exit ( 1 )
142+ }
143+ }
144+ }
145+ if ( unappliedPatches . length === 0 ) {
146+ // all patches have already been applied
147+ patches . forEach ( logPatchApplication )
148+ continue
149+ }
150+ packageLoop: for ( const patchDetails of patches ) {
99151 try {
100152 const { name, version, path, isDevOnly, patchFilename } = patchDetails
101153
@@ -132,6 +184,11 @@ export function applyPatchesForApp({
132184 cwd : process . cwd ( ) ,
133185 } )
134186 ) {
187+ newState ?. push ( {
188+ patchFilename,
189+ patchContentHash : hashFile ( join ( appPath , patchDir , patchFilename ) ) ,
190+ didApply : true ,
191+ } )
135192 // yay patch was applied successfully
136193 // print warning if version mismatch
137194 if ( installedPackageVersion !== version ) {
@@ -145,19 +202,7 @@ export function applyPatchesForApp({
145202 } ) ,
146203 )
147204 }
148- const sequenceString =
149- patchDetails . sequenceNumber != null
150- ? ` (${ patchDetails . sequenceNumber } ${
151- patchDetails . sequenceName
152- ? " " + patchDetails . sequenceName
153- : ""
154- } )`
155- : ""
156- console . log (
157- `${ chalk . bold (
158- pathSpecifier ,
159- ) } @${ version } ${ sequenceString } ${ chalk . green ( "✔" ) } ,
160- )
205+ logPatchApplication ( patchDetails )
161206 } else if ( installedPackageVersion === version ) {
162207 // completely failed to apply patch
163208 // TODO: propagate useful error messages from patch application
@@ -203,6 +248,10 @@ export function applyPatchesForApp({
203248 break packageLoop
204249 }
205250 }
251+
252+ if ( newState ) {
253+ savePatchApplicationState ( patches [ 0 ] , newState )
254+ }
206255 }
207256
208257 for ( const warning of warnings ) {
0 commit comments