Merge branch 'v2' into upgrade-napi-rs

Author: marcins

crates/parcel_config/Cargo.toml

@@ -11,7 +11,7 @@ indexmap = { version = "2.2.6", features = ["serde", "std"] }
 parcel_filesystem = { path = "../parcel_filesystem" }
 parcel_package_manager = { path = "../parcel_package_manager" }
 pathdiff = "0.2.1"
-serde = { version = "1.0.123", features = ["derive"] }
+serde = { version = "1.0.123", features = ["derive", "rc"] }
 serde_json5 = "0.1.0"
 thiserror = "1.0.59"
 

crates/parcel_config/src/parcel_config.rs

@@ -3,20 +3,23 @@ use std::path::PathBuf;
 use std::rc::Rc;
 
 use indexmap::IndexMap;
+use serde::Deserialize;
+use serde::Serialize;
 
 use super::config_error::ConfigError;
 use super::partial_parcel_config::PartialParcelConfig;
 use super::pipeline::is_match;
 use super::pipeline::PipelineMap;
 
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+#[serde(rename_all = "camelCase")]
 pub struct PluginNode {
   pub package_name: String,
   pub resolve_from: Rc<PathBuf>,
 }
 
 /// Represents a fully merged and validated .parcel_rc config
-#[derive(Debug, PartialEq)]
+#[derive(Debug, Deserialize, PartialEq, Serialize)]
 pub struct ParcelConfig {
   pub(crate) bundler: PluginNode,
   pub(crate) compressors: PipelineMap,

crates/parcel_config/src/pipeline.rs

@@ -2,6 +2,8 @@ use std::path::Path;
 
 use glob_match::glob_match;
 use indexmap::IndexMap;
+use serde::Deserialize;
+use serde::Serialize;
 
 use super::parcel_config::PluginNode;
 
@@ -25,15 +27,15 @@ use super::parcel_config::PluginNode;
 /// });
 /// ```
 ///
-#[derive(Debug, Default, PartialEq)]
-pub struct PipelineMap {
+#[derive(Debug, Default, Deserialize, PartialEq, Serialize)]
+pub struct PipelineMap(
   /// Maps patterns to a series of plugins, called pipelines
-  map: IndexMap<String, Vec<PluginNode>>,
-}
+  IndexMap<String, Vec<PluginNode>>,
+);
 
 impl PipelineMap {
   pub fn new(map: IndexMap<String, Vec<PluginNode>>) -> Self {
-    Self { map }
+    Self(map)
   }
 
   /// Finds pipelines contained by a pattern that match the given file path and named pipeline
@@ -74,7 +76,7 @@ impl PipelineMap {
     // If a pipeline is requested, a the glob needs to match exactly
     if let Some(pipeline) = named_pipeline {
       let exact_match = self
-        .map
+        .0
         .iter()
         .find(|(pattern, _)| is_match(pattern, path, basename, pipeline.as_ref()));
 
@@ -85,7 +87,7 @@ impl PipelineMap {
       }
     }
 
-    for (pattern, pipelines) in self.map.iter() {
+    for (pattern, pipelines) in self.0.iter() {
       if is_match(&pattern, path, basename, "") {
         matches.extend(pipelines.iter().cloned());
       }
@@ -97,15 +99,12 @@ impl PipelineMap {
   pub fn contains_named_pipeline(&self, pipeline: impl AsRef<str>) -> bool {
     let named_pipeline = format!("{}:", pipeline.as_ref());
 
-    self
-      .map
-      .keys()
-      .any(|glob| glob.starts_with(&named_pipeline))
+    self.0.keys().any(|glob| glob.starts_with(&named_pipeline))
   }
 
   pub fn named_pipelines(&self) -> Vec<&str> {
     self
-      .map
+      .0
       .keys()
       .filter_map(|glob| glob.split_once(':').map(|g| g.0))
       .collect()

packages/core/core/src/RequestTracker.js

@@ -65,6 +65,10 @@ export const requestGraphEdgeTypes = {
   dirname: 7,
 };
 
+class FSBailoutError extends Error {
+  name: string = 'FSBailoutError';
+}
+
 export type RequestGraphEdgeType = $Values<typeof requestGraphEdgeTypes>;
 
 type RequestGraphOpts = {|
@@ -855,7 +859,7 @@ export class RequestGraph extends ContentGraph<
               predictedTime,
             },
           });
-          throw new Error(
+          throw new FSBailoutError(
             'Responding to file system events exceeded threshold, start with empty cache.',
           );
         }
@@ -1543,55 +1547,58 @@ async function loadRequestGraph(options): Async<RequestGraph> {
 
   let cacheKey = getCacheKey(options);
   let requestGraphKey = `requestGraph-${cacheKey}`;
-
+  let timeout;
+  const snapshotKey = `snapshot-${cacheKey}`;
+  const snapshotPath = path.join(options.cacheDir, snapshotKey + '.txt');
   if (await options.cache.hasLargeBlob(requestGraphKey)) {
-    let {requestGraph} = await readAndDeserializeRequestGraph(
-      options.cache,
-      requestGraphKey,
-      cacheKey,
-    );
+    try {
+      let {requestGraph} = await readAndDeserializeRequestGraph(
+        options.cache,
+        requestGraphKey,
+        cacheKey,
+      );
 
-    let opts = getWatcherOptions(options);
-    let snapshotKey = `snapshot-${cacheKey}`;
-    let snapshotPath = path.join(options.cacheDir, snapshotKey + '.txt');
+      let opts = getWatcherOptions(options);
+
+      timeout = setTimeout(() => {
+        logger.warn({
+          origin: '@parcel/core',
+          message: `Retrieving file system events since last build...\nThis can take upto a minute after branch changes or npm/yarn installs.`,
+        });
+      }, 5000);
+      let startTime = Date.now();
+      let events = await options.inputFS.getEventsSince(
+        options.watchDir,
+        snapshotPath,
+        opts,
+      );
+      clearTimeout(timeout);
 
-    let timeout = setTimeout(() => {
-      logger.warn({
+      logger.verbose({
         origin: '@parcel/core',
-        message: `Retrieving file system events since last build...\nThis can take upto a minute after branch changes or npm/yarn installs.`,
+        message: `File system event count: ${events.length}`,
+        meta: {
+          trackableEvent: 'watcher_events_count',
+          watcherEventCount: events.length,
+          duration: Date.now() - startTime,
+        },
       });
-    }, 5000);
-    let startTime = Date.now();
-    let events = await options.inputFS.getEventsSince(
-      options.watchDir,
-      snapshotPath,
-      opts,
-    );
-    clearTimeout(timeout);
-
-    logger.verbose({
-      origin: '@parcel/core',
-      message: `File system event count: ${events.length}`,
-      meta: {
-        trackableEvent: 'watcher_events_count',
-        watcherEventCount: events.length,
-        duration: Date.now() - startTime,
-      },
-    });
 
-    requestGraph.invalidateUnpredictableNodes();
-    requestGraph.invalidateOnBuildNodes();
-    requestGraph.invalidateEnvNodes(options.env);
-    requestGraph.invalidateOptionNodes(options);
+      requestGraph.invalidateUnpredictableNodes();
+      requestGraph.invalidateOnBuildNodes();
+      requestGraph.invalidateEnvNodes(options.env);
+      requestGraph.invalidateOptionNodes(options);
 
-    try {
       await requestGraph.respondToFSEvents(
         options.unstableFileInvalidations || events,
         options,
         10000,
       );
       return requestGraph;
     } catch (e) {
+      // Prevent logging fs events took too long warning
+      clearTimeout(timeout);
+      logErrorOnBailout(options, snapshotPath, e);
       // This error means respondToFSEvents timed out handling the invalidation events
       // In this case we'll return a fresh RequestGraph
       return new RequestGraph();
@@ -1600,3 +1607,31 @@ async function loadRequestGraph(options): Async<RequestGraph> {
 
   return new RequestGraph();
 }
+function logErrorOnBailout(
+  options: ParcelOptions,
+  snapshotPath: string,
+  e: Error,
+): void {
+  if (e.message && e.message.includes('invalid clockspec')) {
+    const snapshotContents = options.inputFS.readFileSync(
+      snapshotPath,
+      'utf-8',
+    );
+    logger.warn({
+      origin: '@parcel/core',
+      message: `Error reading clockspec from snapshot, building with clean cache.`,
+      meta: {
+        snapshotContents: snapshotContents,
+        trackableEvent: 'invalid_clockspec_error',
+      },
+    });
+  } else if (!(e instanceof FSBailoutError)) {
+    logger.warn({
+      origin: '@parcel/core',
+      message: `Unexpected error loading cache from disk, building with clean cache.`,
+      meta: {
+        trackableEvent: 'cache_load_error',
+      },
+    });
+  }
+}