More general path normalize check on Windows

Author: nojaf

.github/workflows/ci.yml

@@ -360,10 +360,6 @@ jobs:
         if: runner.os != 'Windows'
         run: make -C tests/gentype_tests/typescript-react-example clean test
 
-      - name: Setup tmate session
-        uses: mxschmitt/action-tmate@v3
-        if: runner.os == 'Windows'
-
       - name: Run rewatch tests
         run: ./rewatch/tests/suite-ci.sh
         shell: bash

rewatch/tests/utils.sh

@@ -38,7 +38,7 @@ normalize_paths() {
       # Then normalize backslashes to forward slashes
       sed -i "s#\\\\#/#g" $1
       # Finally remove any remaining drive letter paths (like D:/a/rescript/rescript/rewatch/testrepo)
-      sed -i "s#[A-Z]:/a/rescript/rescript/rewatch/testrepo##g" $1
+      sed -i "s#[A-Z]:/\(a/\)\?[^:]*rescript/rescript/rewatch/testrepo##g" $1
     else
       sed -i "s#$(pwd_prefix)##g" $1;
     fi