@@ -184,8 +184,8 @@ jobs:
184184 git status
185185 conflict_count=$(git status | grep -c 'both modified:') || true
186186 working_tree_clean=$(git status | grep -c 'nothing to commit, working tree clean') || true
187- csr_snap_conflict=$(git status | grep 'both modified:' | grep -c 'csr.test.jsx .snap') || true
188- ssr_snap_conflict=$(git status | grep 'both modified:' | grep -c 'ssr.test.jsx .snap') || true
187+ csr_snap_conflict=$(git status | grep 'both modified:' | grep -c 'csr.test.js .snap') || true
188+ ssr_snap_conflict=$(git status | grep 'both modified:' | grep -c 'ssr.test.js .snap') || true
189189 common_conflict=$(git status | grep 'both modified:' | grep -c '_common') || true
190190 conflicts_sum=$((csr_snap_conflict + ssr_snap_conflict + common_conflict))
191191 echo "conflict_count: $conflict_count"
@@ -207,15 +207,15 @@ jobs:
207207 fi
208208
209209 if [ "$csr_snap_conflict" -eq "1" ];then
210- git checkout --theirs test/snap/__snapshots__/csr.test.jsx .snap
211- git add test/snap/__snapshots__/csr.test.jsx .snap
212- echo "resolve conflict csr.test.jsx .snap"
210+ git checkout --theirs test/snap/__snapshots__/csr.test.js .snap
211+ git add test/snap/__snapshots__/csr.test.js .snap
212+ echo "resolve conflict csr.test.js .snap"
213213 fi
214214
215215 if [ "$ssr_snap_conflict" -eq "1" ];then
216- git checkout --theirs test/snap/__snapshots__/ssr.test.jsx .snap
217- git add test/snap/__snapshots__/ssr.test.jsx .snap
218- echo "resolve conflict ssr.test.jsx .snap"
216+ git checkout --theirs test/snap/__snapshots__/ssr.test.js .snap
217+ git add test/snap/__snapshots__/ssr.test.js .snap
218+ echo "resolve conflict ssr.test.js .snap"
219219 fi
220220
221221 if [ "$common_conflict" -eq "1" ];then
0 commit comments