Fix bug in create-remix git repo path collisions (#7194)

remix-run · Aug 21, 2023 · 0e1e2c3 · 0e1e2c3
1 parent 3447963
commit 0e1e2c3
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/packages/create-remix/copy-template.ts b/packages/create-remix/copy-template.ts
@@ -312,7 +312,15 @@ async function downloadAndExtractTarball(
           header.name = header.name.replace(`${originalDirName}/`, "");
 
           if (filePath) {
-            if (header.name.startsWith(filePath)) {
+            // Include trailing slash on startsWith when filePath doesn't include
+            // it so something like `templates/remix` doesn't inadvertently
+            // include `templates/remix-javascript/*` files
+            if (
+              (filePath.endsWith(path.posix.sep) &&
+                header.name.startsWith(filePath)) ||
+              (!filePath.endsWith(path.posix.sep) &&
+                header.name.startsWith(filePath + path.posix.sep))
+            ) {
               filePathHasFiles = true;
               header.name = header.name.replace(filePath, "");
             } else {