Merge branch 'supabase:main' into fix/import-map

Author: 0x5457

.github/workflows/ci.yml

@@ -41,7 +41,7 @@ jobs:
   cargo-fmt:
     if: github.event.pull_request.draft == false
     name: 'fmt'
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     steps:
       - uses: actions/checkout@v4
       - uses: denoland/setup-deno@v2
@@ -53,7 +53,7 @@ jobs:
   cargo-clippy:
     if: github.event.pull_request.draft == false
     name: 'cargo clippy'
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     steps:
       - uses: actions/checkout@v4
       - name: Install deps
@@ -67,7 +67,7 @@ jobs:
   cargo-test:
     if: github.event.pull_request.draft == false
     name: 'cargo test'
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     steps:
       - name: Install deps
         run: |

.github/workflows/mirror.yml

@@ -13,7 +13,7 @@ permissions:
 
 jobs:
   mirror:
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     permissions:
       contents: read
       packages: write

.github/workflows/release.yml

@@ -12,7 +12,7 @@ permissions:
 
 jobs:
   release:
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     outputs:
       published: ${{ steps.semantic.outputs.new_release_published }}
       version: ${{ steps.semantic.outputs.new_release_version }}
@@ -37,7 +37,7 @@ jobs:
     needs:
       - release
     if: needs.release.outputs.published == 'true'
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     env:
       arch: amd64
     outputs:
@@ -124,7 +124,7 @@ jobs:
 
   merge_manifest:
     needs: [release, publish_x86, publish_arm]
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     permissions:
       contents: read
       packages: write

Cargo.lock

@@ -40,18 +40,6 @@ docker build -t supabase/edge-runtime .
 docker run -it --rm -p 9000:9000 -v ./examples/:/examples supabase/edge-runtime start --main-service /examples/main
 ```
 
-Another option would be to install [Orb](https://docs.orbstack.dev/install) and
-use an [Orbstack Machine](https://docs.orbstack.dev/machines/) to run a Linux
-Machine.
-
-First create a machine:
-
-```
-orb create ubuntu new-ubuntu
-```
-
-and run `orb` in the base directory to enter the virtual machine.
-
 ## How to run tests
 
 ```sh

DEVELOPERS.md

@@ -272,7 +272,7 @@ fn main() -> Result<ExitCode, anyhow::Error> {
                   "{}",
                   concat!(
                     "if `oneshot` policy is enabled, the maximum ",
-                    "parallelism is fixed to `1` as forcibly"
+                    "parallelism is fixed to `1` as forcibly ^^"
                   )
                 );
               }

cli/src/main.rs

@@ -87,6 +87,7 @@ tokio-util = { workspace = true, features = ["rt", "compat"] }
 tracing-subscriber = { workspace = true, features = ["env-filter", "tracing-log"] }
 
 async-tungstenite = { version = "0.25.0", default-features = false }
+diff = "0.1"
 tungstenite = { version = "0.21.0", default-features = false, features = ["handshake"] }
 
 [build-dependencies]

crates/base/Cargo.toml

@@ -1,3 +1,4 @@
+use std::borrow::Cow;
 use std::fs::read_dir;
 use std::path::Path;
 use std::path::PathBuf;
@@ -33,6 +34,7 @@ async fn test_eszip_migration() {
   let mut passed = 0;
   let mut failed = 0;
   let mut snapshot_created = 0;
+  let mut diff_msgs = vec![];
 
   println!("running {} eszip tests", paths.len());
   for path in paths {
@@ -54,12 +56,22 @@ async fn test_eszip_migration() {
       passed += 1;
       snapshot_created += 1;
     } else {
-      let snapshot_buf = read(snapshot_path).await.unwrap();
+      let snapshot_buf = read(&snapshot_path).await.unwrap();
       if snapshot_buf == buf {
         println!("ok");
         passed += 1;
       } else {
         println!("FAILED");
+        diff_msgs.push(format!("{}", snapshot_path.to_string_lossy()).into());
+        diff_msgs.push(Cow::Borrowed("--------------------"));
+        diff_msgs.extend(
+          render_diff(
+            &String::from_utf8_lossy(&snapshot_buf),
+            &String::from_utf8_lossy(buf),
+          )
+          .map(Cow::Owned),
+        );
+        diff_msgs.push(Cow::Borrowed("\n"));
         failed += 1;
       }
     }
@@ -68,6 +80,9 @@ async fn test_eszip_migration() {
   let msg =
       format!("eszip test result: {status}. {passed} passed ({snapshot_created} snapshot created); {failed} failed");
   if failed > 0 {
+    for line in diff_msgs {
+      eprintln!("{line}");
+    }
     panic!("{msg}");
   } else {
     eprintln!("{msg}");
@@ -324,3 +339,14 @@ fn get_bool_from_json_value(
 ) -> Option<bool> {
   value.get(key).and_then(|it| it.as_bool())
 }
+
+fn render_diff<'l>(
+  left: &'l str,
+  right: &'l str,
+) -> impl Iterator<Item = String> + 'l {
+  diff::lines(left, right).into_iter().map(|it| match it {
+    diff::Result::Left(l) => format!("-{l}"),
+    diff::Result::Both(l, _) => format!(" {l}"),
+    diff::Result::Right(r) => format!("+{r}"),
+  })
+}

crates/base/tests/eszip_migration.rs

@@ -621,7 +621,7 @@ pub async fn create_module_loader_for_eszip(
     )
     .context("Failed to load npm vfs.")?;
 
-    let fs = DenoCompileFileSystem::new(vfs);
+    let fs = DenoCompileFileSystem::new(vfs).use_real_fs(false);
     let fs_backed_vfs = fs.file_backed_vfs().clone();
 
     (