Merge branch 'main' into workspace_start

denoland · Jul 3, 2024 · 2a957e0 · 2a957e0
2 parents 8ac81df 3242e27
commit 2a957e0
Show file tree

Hide file tree

Showing 47 changed files with 186,422 additions and 181,801 deletions.
diff --git a/cli/build.rs b/cli/build.rs
@@ -235,6 235,7 @@ mod ts {
  "es2023",
  "es2023.array",
  "es2023.collection",
  "es2023.intl",
  "esnext",
  "esnext.array",
  "esnext.collection",
@@ -243,6 244,8 @@ mod ts {
  "esnext.intl",
  "esnext.object",
  "esnext.promise",
  "esnext.regexp",
  "esnext.string",
  ];
 
  let path_dts = cwd.join("tsc/dts");
@@ -311,7 314,7 @@ mod ts {
 
  pub(crate) fn version() -> String {
  let file_text = std::fs::read_to_string("tsc/00_typescript.js").unwrap();
- let version_text = "  version = \"";
  let version_text = " version = \"";
  for line in file_text.lines() {
  if let Some(index) = line.find(version_text) {
  let remaining_line = &line[index version_text.len()..];
@@ -453,7 456,7 @@ fn main() {
  );
 
  let ts_version = ts::version();
- debug_assert_eq!(ts_version, "5.4.5"); // bump this assertion when it changes
  debug_assert_eq!(ts_version, "5.5.2"); // bump this assertion when it changes
  println!("cargo:rustc-env=TS_VERSION={}", ts_version);
  println!("cargo:rerun-if-env-changed=TS_VERSION");
 

diff --git a/cli/standalone/file_system.rs b/cli/standalone/file_system.rs
@@ -349,4 349,29 @@ impl FileSystem for DenoCompileFileSystem {
  .utime_async(path, atime_secs, atime_nanos, mtime_secs, mtime_nanos)
  .await
  }
 
  fn lutime_sync(
  &self,
  path: &Path,
  atime_secs: i64,
  atime_nanos: u32,
  mtime_secs: i64,
  mtime_nanos: u32,
  ) -> FsResult<()> {
  self.error_if_in_vfs(path)?;
  RealFs.lutime_sync(path, atime_secs, atime_nanos, mtime_secs, mtime_nanos)
  }
  async fn lutime_async(
  &self,
  path: PathBuf,
  atime_secs: i64,
  atime_nanos: u32,
  mtime_secs: i64,
  mtime_nanos: u32,
  ) -> FsResult<()> {
  self.error_if_in_vfs(&path)?;
  RealFs
  .lutime_async(path, atime_secs, atime_nanos, mtime_secs, mtime_nanos)
  .await
  }
 }