fix byonm issue

denoland · dsherret · Nov 18, 2024 · Oct 22, 2024 · Oct 23, 2024 · Oct 23, 2024
commit 742ae3f535595fca45fa1f40a98e0c12ab66583f
diff --git a/cli/standalone/binary.rs b/cli/standalone/binary.rs
@@ -571,7 +571,7 @@ impl<'a> DenoCompileBinaryWriter<'a> {
         }
       }
       InnerCliNpmResolverRef::Byonm(resolver) => {
-        let npm_vfs_builder = VfsBuilder::new(root_path.clone())?;
+        let npm_vfs_builder = self.build_npm_vfs(&root_path, cli_options)?;
         (
           Some(npm_vfs_builder),
           Some(NodeModules::Byonm {
@@ -591,7 +591,6 @@ impl<'a> DenoCompileBinaryWriter<'a> {
       }
     };
     let mut vfs = if let Some(npm_vfs) = maybe_npm_vfs {
-      // todo: probably need to modify this a bit
       npm_vfs
     } else {
       VfsBuilder::new(root_path.clone())?
@@ -742,8 +741,8 @@ impl<'a> DenoCompileBinaryWriter<'a> {
         } else {
           // DO NOT include the user's registry url as it may contain credentials,
           // but also don't make this dependent on the registry url
-          let root_path = npm_resolver.global_cache_root_folder();
-          let mut builder = VfsBuilder::new(root_path)?;
+          let global_cache_root_path = npm_resolver.global_cache_root_folder();
+          let mut builder = VfsBuilder::new(global_cache_root_path)?;
           let mut packages =
             npm_resolver.all_system_packages(&self.npm_system_info);
           packages.sort_by(|a, b| a.id.cmp(&b.id)); // determinism
@@ -753,12 +752,12 @@ impl<'a> DenoCompileBinaryWriter<'a> {
             builder.add_dir_recursive(&folder)?;
           }
 
-          // Flatten all the registries folders into a single "node_modules/localhost" folder
+          // Flatten all the registries folders into a single ".deno_compile_node_modules/localhost" folder
           // that will be used by denort when loading the npm cache. This avoids us exposing
           // the user's private registry information and means we don't have to bother
           // serializing all the different registry config into the binary.
           builder.with_root_dir(|root_dir| {
-            root_dir.name = "node_modules".to_string();
+            root_dir.name = ".deno_compile_node_modules".to_string();
             let mut new_entries = Vec::with_capacity(root_dir.entries.len());
             let mut localhost_entries = IndexMap::new();
             for entry in std::mem::take(&mut root_dir.entries) {
@@ -793,6 +792,8 @@ impl<'a> DenoCompileBinaryWriter<'a> {
             root_dir.entries = new_entries;
           });
 
+          builder.set_new_root_path(root_path.to_path_buf())?;
+
           Ok(builder)
         }
       }

diff --git a/cli/standalone/mod.rs b/cli/standalone/mod.rs
@@ -407,7 +407,7 @@ pub async fn run(data: StandaloneData) -> Result<i32, AnyError> {
   let root_dir_url =
     Arc::new(ModuleSpecifier::from_directory_path(&root_path).unwrap());
   let main_module = root_dir_url.join(&metadata.entrypoint_key).unwrap();
-  let root_node_modules_path = root_path.join("node_modules");
+  let root_node_modules_path = root_path.join(".deno_compile_node_modules");
   let npm_cache_dir = NpmCacheDir::new(
     &RealDenoCacheEnv,
     root_node_modules_path.clone(),

diff --git a/cli/standalone/serialization.rs b/cli/standalone/serialization.rs
@@ -229,9 +229,10 @@ impl<'a> DenoCompileModuleData<'a> {
 
     fn into_string_unsafe(data: Cow<'static, [u8]>) -> ModuleSourceCode {
       match data {
-        Cow::Borrowed(d) => ModuleSourceCode::String(unsafe {
-          FastString::from_static(std::str::from_utf8_unchecked(d))
-        }),
+        Cow::Borrowed(d) => ModuleSourceCode::String(
+          // SAFETY: we know this is a valid utf8 string
+          unsafe { FastString::from_static(std::str::from_utf8_unchecked(d)) },
+        ),
         Cow::Owned(d) => ModuleSourceCode::Bytes(d.into_boxed_slice().into()),
       }
     }
@@ -440,6 +441,7 @@ fn deserialize_npm_snapshot(
     Ok((input, id))
   }
 
+  #[allow(clippy::needless_lifetimes)] // clippy bug
   fn parse_root_package<'a>(
     id_to_npm_id: &'a impl Fn(usize) -> Result<NpmPackageId, AnyError>,
   ) -> impl Fn(&[u8]) -> Result<(&[u8], (PackageReq, NpmPackageId)), AnyError> + 'a
@@ -452,6 +454,7 @@ fn deserialize_npm_snapshot(
     }
   }
 
+  #[allow(clippy::needless_lifetimes)] // clippy bug
   fn parse_package_dep<'a>(
     id_to_npm_id: &'a impl Fn(usize) -> Result<NpmPackageId, AnyError>,
   ) -> impl Fn(&[u8]) -> Result<(&[u8], (String, NpmPackageId)), AnyError> + 'a

diff --git a/cli/standalone/virtual_fs.rs b/cli/standalone/virtual_fs.rs
@@ -68,6 +68,25 @@ impl VfsBuilder {
     })
   }
 
+  pub fn set_new_root_path(
+    &mut self,
+    root_path: PathBuf,
+  ) -> Result<(), AnyError> {
+    self.root_path = canonicalize_path(&root_path)?;
+    self.root_dir = VirtualDirectory {
+      name: self
+        .root_path
+        .file_stem()
+        .map(|s| s.to_string_lossy().into_owned())
+        .unwrap_or("root".to_string()),
+      entries: vec![VfsEntry::Dir(VirtualDirectory {
+        name: std::mem::take(&mut self.root_dir.name),
+        entries: std::mem::take(&mut self.root_dir.entries),
+      })],
+    };
+    Ok(())
+  }
+
   pub fn with_root_dir<R>(
     &mut self,
     with_root: impl FnOnce(&mut VirtualDirectory) -> R,

diff --git a/tests/specs/compile/byonm_main_sub_dir/deno.json b/tests/specs/compile/byonm_main_sub_dir/deno.json
@@ -1,3 +1,3 @@
 {
-  "unstable": ["byonm"]
+  "nodeModulesDir": "manual"
 }
diff --git a/tests/specs/compile/detect_cjs/output.out b/tests/specs/compile/detect_cjs/output.out
@@ -1 +1,2 @@
-error: Module not found: file:///[WILDLINE]/add.js
+error: Uncaught SyntaxError: The requested module './add.js' does not provide an export named 'add'
+    at <anonymous> (file:///[WILDLINE])