fix file tracking bug and add more rigid testing

Author: lindsaylevine

lib/helpers/handleFileTracking.js

@@ -26,20 +26,20 @@ const handleFileTracking = ({ functionsPath, publishPath }) => {
       TRACKING_FILE_SEPARATOR
     );
 
-    const cleanConfiguredFiles = (trackedFiles) => {
+    const cleanConfiguredFiles = (trackedFiles, dirPath) => {
       trackedFiles.forEach((file) => {
-        const filePath = join(publishPath, file);
+        const filePath = join(dirPath, file);
         if (file !== "" && existsSync(filePath)) {
           removeSync(filePath);
         }
       });
     };
 
     if (isConfiguredPublishDir) {
-      cleanConfiguredFiles(trackedPublish.split("\n"));
+      cleanConfiguredFiles(trackedPublish.split("\n"), publishPath);
     }
     if (isConfiguredFunctionsDir) {
-      cleanConfiguredFiles(trackedFunctions.split("\n"));
+      cleanConfiguredFiles(trackedFunctions.split("\n"), functionsPath);
     }
   }
 

tests/configurableDirs.test.js

@@ -26,6 +26,7 @@ beforeAll(
       .withNextConfig("next.config.js")
       .withPackageJson("package.json")
       .withCustomFunctions("my-functions")
+      .withFileTracking()
       .runWithRequire({ functionsDir: FUNCTIONS_DIR, publishDir: PUBLISH_DIR });
   },
   // time out after 180 seconds

tests/fixtures/.nonfiletracking

@@ -0,0 +1,2 @@
+next_shows_id
+---

tests/fixtures/my-functions/next_shows_id/next_shows_id.js

@@ -50,6 +50,13 @@ class NextAppBuilder {
     return this.withFile(functionsDir);
   }
 
+  withFileTracking() {
+    return this.withFile(
+      ".nonfiletracking",
+      join("node_modules", ".cache", "next-on-netlify", ".nonfiletracking")
+    );
+  }
+
   // Copy a file from the fixtures folder to the app's staging folder
   withFile(fixture, target = null) {
     // If no target file name is given, use the same name as the fixture