metro-file-map 0.80.6 → 0.80.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro-file-map",
-  "version": "0.80.6",
+  "version": "0.80.8",
   "description": "[Experimental] - 🚇 File crawling, watching and mapping for Metro",
   "main": "src/index.js",
   "repository": {

package/src/Watcher.js.flow

@@ -176,8 +176,8 @@ export class Watcher extends EventEmitter {
     const WatcherImpl = useWatchman
       ? WatchmanWatcher
       : FSEventsWatcher.isSupported()
-      ? FSEventsWatcher
-      : NodeWatcher;
+        ? FSEventsWatcher
+        : NodeWatcher;
 
     let watcher = 'node';
     if (WatcherImpl === WatchmanWatcher) {

package/src/crawlers/watchman/index.js

@@ -165,10 +165,14 @@ module.exports = async function watchmanCrawl({
     let isFresh = false;
     await Promise.all(
       Array.from(rootProjectDirMappings).map(
-        async ([root, { directoryFilters, watcher }], index) => {
+        async ([posixSeparatedRoot, { directoryFilters, watcher }], index) => {
           const since = previousState.clocks.get(
             (0, _normalizePathSeparatorsToPosix.default)(
-              pathUtils.absoluteToNormal(root)
+              pathUtils.absoluteToNormal(
+                (0, _normalizePathSeparatorsToSystem.default)(
+                  posixSeparatedRoot
+                )
+              )
             )
           );
           perfLogger?.annotate({
@@ -190,14 +194,14 @@ module.exports = async function watchmanCrawl({
             },
           });
           perfLogger?.point(`watchmanCrawl/query_${index}_start`);
-          const response = await cmd("query", root, query);
+          const response = await cmd("query", posixSeparatedRoot, query);
           perfLogger?.point(`watchmanCrawl/query_${index}_end`);
           const isSourceControlQuery =
             typeof since !== "string" && since?.scm?.["mergebase-with"] != null;
           if (!isSourceControlQuery) {
             isFresh = isFresh || response.is_fresh_instance;
           }
-          results.set(root, response);
+          results.set(posixSeparatedRoot, response);
         }
       )
     );

package/src/crawlers/watchman/index.js.flow

@@ -31,7 +31,7 @@ import {performance} from 'perf_hooks';
 const watchman = require('fb-watchman');
 
 type WatchmanRoots = Map<
-  string,
+  string, // Posix-separated absolute path
   $ReadOnly<{directoryFilters: Array<string>, watcher: string}>,
 >;
 
@@ -181,7 +181,7 @@ module.exports = async function watchmanCrawl({
 
     await Promise.all(
       Array.from(rootProjectDirMappings).map(
-        async ([root, {directoryFilters, watcher}], index) => {
+        async ([posixSeparatedRoot, {directoryFilters, watcher}], index) => {
           // Jest is only going to store one type of clock; a string that
           // represents a local clock. However, the Watchman crawler supports
           // a second type of clock that can be written by automation outside of
@@ -191,7 +191,11 @@ module.exports = async function watchmanCrawl({
           // By using scm queries, we can create the haste map on a different
           // system and import it, transforming the clock into a local clock.
           const since = previousState.clocks.get(
-            normalizePathSeparatorsToPosix(pathUtils.absoluteToNormal(root)),
+            normalizePathSeparatorsToPosix(
+              pathUtils.absoluteToNormal(
+                normalizePathSeparatorsToSystem(posixSeparatedRoot),
+              ),
+            ),
           );
 
           perfLogger?.annotate({
@@ -218,7 +222,7 @@ module.exports = async function watchmanCrawl({
           perfLogger?.point(`watchmanCrawl/query_${index}_start`);
           const response = await cmd<WatchmanQueryResponse>(
             'query',
-            root,
+            posixSeparatedRoot,
             query,
           );
           perfLogger?.point(`watchmanCrawl/query_${index}_end`);
@@ -232,7 +236,7 @@ module.exports = async function watchmanCrawl({
             isFresh = isFresh || response.is_fresh_instance;
           }
 
-          results.set(root, response);
+          results.set(posixSeparatedRoot, response);
         },
       ),
     );

package/src/flow-types.d.ts

@@ -8,7 +8,7 @@
  * @oncall react_native
  */
 
-import type {PerfLoggerFactory, RootPerfLogger, PerfLogger} from 'metro-config';
+import type {PerfLogger, PerfLoggerFactory, RootPerfLogger} from 'metro-config';
 import type {AbortSignal} from 'node-abort-controller';
 
 export type {PerfLoggerFactory, PerfLogger};