@atlaspack/fs 2.13.2-dev.3689 → 2.14.1-canary.3710

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/fs",
-  "version": "2.13.2-dev.3689+7a2e6e783",
+  "version": "2.14.1-canary.3710+d874396ab",
   "description": "Blazing fast, zero configuration web application bundler",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
@@ -52,17 +52,17 @@
     "check-ts": "tsc --noEmit index.d.ts"
   },
   "dependencies": {
-    "@atlaspack/build-cache": "2.13.2-dev.3689+7a2e6e783",
-    "@atlaspack/feature-flags": "2.13.2-dev.3689+7a2e6e783",
-    "@atlaspack/logger": "2.13.2-dev.3689+7a2e6e783",
-    "@atlaspack/rust": "2.13.2-dev.3689+7a2e6e783",
-    "@atlaspack/types-internal": "2.13.2-dev.3689+7a2e6e783",
-    "@atlaspack/utils": "2.13.2-dev.3689+7a2e6e783",
-    "@atlaspack/workers": "2.13.2-dev.3689+7a2e6e783",
+    "@atlaspack/build-cache": "2.13.3-canary.3710+d874396ab",
+    "@atlaspack/feature-flags": "2.14.1-canary.3710+d874396ab",
+    "@atlaspack/logger": "2.14.1-canary.3710+d874396ab",
+    "@atlaspack/rust": "3.0.1-canary.3710+d874396ab",
+    "@atlaspack/types-internal": "2.14.1-canary.3710+d874396ab",
+    "@atlaspack/utils": "2.14.1-canary.3710+d874396ab",
+    "@atlaspack/workers": "2.14.1-canary.3710+d874396ab",
     "@parcel/watcher": "^2.0.7"
   },
   "devDependencies": {
-    "@atlaspack/watcher-watchman-js": "2.13.2-dev.3689+7a2e6e783",
+    "@atlaspack/watcher-watchman-js": "2.14.1-canary.3710+d874396ab",
     "graceful-fs": "^4.2.4",
     "ncp": "^2.0.0",
     "nullthrows": "^1.1.1",
@@ -72,5 +72,6 @@
     "@atlaspack/fs": "./lib/browser.js",
     "./src/NodeFS.js": "./src/NodeFS.browser.js"
   },
-  "gitHead": "7a2e6e7835fa846b27021b374097c6a4f37541ba"
+  "type": "commonjs",
+  "gitHead": "d874396ab648d0d5505d66c7eb73e1748f1eaf68"
 }

package/src/NodeVCSAwareFS.js

@@ -6,7 +6,7 @@ import {getVcsStateSnapshot, getEventsSince} from '@atlaspack/rust';
 import type {FilePath} from '@atlaspack/types-internal';
 import type {Event, Options as WatcherOptions} from '@parcel/watcher';
 import {registerSerializableClass} from '@atlaspack/build-cache';
-import {instrument, instrumentAsync} from '@atlaspack/logger';
+import logger, {instrumentAsync} from '@atlaspack/logger';
 import {getFeatureFlagValue} from '@atlaspack/feature-flags';
 
 // $FlowFixMe
@@ -87,15 +87,19 @@ export class NodeVCSAwareFS extends NodeFS {
     );
     let watcherEventsSince = [];
 
-    const vcsEventsSince = instrument(
-      'NodeVCSAwareFS::rust.getEventsSince',
-      () => getEventsSince(gitRepoPath, vcsState, null),
-    ).map((e) => ({
-      path: e.path,
-      type: e.changeType,
-    }));
-
-    if (getFeatureFlagValue('vcsMode') !== 'NEW') {
+    const vcsEventsSince =
+      vcsState != null
+        ? (
+            await instrumentAsync('NodeVCSAwareFS::rust.getEventsSince', () =>
+              getEventsSince(gitRepoPath, vcsState, null),
+            )
+          ).map((e) => ({
+            path: e.path,
+            type: e.changeType,
+          }))
+        : null;
+
+    if (getFeatureFlagValue('vcsMode') !== 'NEW' && vcsEventsSince != null) {
       watcherEventsSince = await instrumentAsync(
         'NodeVCSAwareFS::watchman.getEventsSince',
         () => this.watcher().getEventsSince(dir, nativeSnapshotPath, opts),
@@ -104,6 +108,19 @@ export class NodeVCSAwareFS extends NodeFS {
     }
 
     if (['NEW_AND_CHECK', 'NEW'].includes(getFeatureFlagValue('vcsMode'))) {
+      if (vcsEventsSince == null) {
+        logger.error({
+          origin: '@atlaspack/fs',
+          message:
+            'Missing VCS state. There was an error when writing the snapshot. Please clear your cache.',
+          meta: {
+            trackableEvent: 'vcs_state_snapshot_read_failed',
+          },
+        });
+
+        return [];
+      }
+
       return vcsEventsSince;
     }
 
@@ -137,9 +154,22 @@ export class NodeVCSAwareFS extends NodeFS {
       );
     }
 
-    const vcsState = instrument('NodeVCSAwareFS::getVcsStateSnapshot', () =>
-      getVcsStateSnapshot(gitRepoPath, this.#excludePatterns),
-    );
+    let vcsState = null;
+    try {
+      vcsState = await instrumentAsync(
+        'NodeVCSAwareFS::getVcsStateSnapshot',
+        () => getVcsStateSnapshot(gitRepoPath, this.#excludePatterns),
+      );
+    } catch (err) {
+      logger.error({
+        origin: '@atlaspack/fs',
+        message: `Failed to get VCS state snapshot: ${err.message}`,
+        meta: {
+          trackableEvent: 'vcs_state_snapshot_failed',
+          error: err,
+        },
+      });
+    }
 
     const snapshotContents = {
       vcsState,