update turbopack (#58243)

* https://github.com/vercel/turbo/pull/6399 * https://github.com/vercel/turbo/pull/6393 * https://github.com/vercel/turbo/pull/6403 * https://github.com/vercel/turbo/pull/6404 * https://github.com/vercel/turbo/pull/6394 * https://github.com/vercel/turbo/pull/6405 * https://github.com/vercel/turbo/pull/6351
2023-11-09 10:52:22 +01:00 · 2023-11-09 10:52:22 +01:00 · bf966e370e
commit bf966e370e
parent 51fec997f7
7 changed files with 85 additions and 66 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -322,7 +322,7 @@ dependencies = [
 [[package]]
 name = "auto-hash-map"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231108.1#df3980e03335520c7506fb8fd2b4f0a26b485483"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231109.2#0bd3879d6b969daa15a6edd3f065204fae3e5ce8"
 dependencies = [
 "serde",
 "smallvec",
@ -3542,7 +3542,7 @@ dependencies = [
 [[package]]
 name = "node-file-trace"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231108.1#df3980e03335520c7506fb8fd2b4f0a26b485483"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231109.2#0bd3879d6b969daa15a6edd3f065204fae3e5ce8"
 dependencies = [
 "anyhow",
 "serde",
@ -7688,7 +7688,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231108.1#df3980e03335520c7506fb8fd2b4f0a26b485483"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231109.2#0bd3879d6b969daa15a6edd3f065204fae3e5ce8"
 dependencies = [
 "anyhow",
 "async-trait",
@ -7720,7 +7720,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-build"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231108.1#df3980e03335520c7506fb8fd2b4f0a26b485483"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231109.2#0bd3879d6b969daa15a6edd3f065204fae3e5ce8"
 dependencies = [
 "anyhow",
 "cargo-lock",
@ -7732,7 +7732,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-bytes"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231108.1#df3980e03335520c7506fb8fd2b4f0a26b485483"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231109.2#0bd3879d6b969daa15a6edd3f065204fae3e5ce8"
 dependencies = [
 "anyhow",
 "bytes",
@ -7747,7 +7747,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-env"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231108.1#df3980e03335520c7506fb8fd2b4f0a26b485483"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231109.2#0bd3879d6b969daa15a6edd3f065204fae3e5ce8"
 dependencies = [
 "anyhow",
 "dotenvs",
@ -7761,7 +7761,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-fetch"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231108.1#df3980e03335520c7506fb8fd2b4f0a26b485483"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231109.2#0bd3879d6b969daa15a6edd3f065204fae3e5ce8"
 dependencies = [
 "anyhow",
 "indexmap 1.9.3",
@ -7778,7 +7778,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-fs"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231108.1#df3980e03335520c7506fb8fd2b4f0a26b485483"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231109.2#0bd3879d6b969daa15a6edd3f065204fae3e5ce8"
 dependencies = [
 "anyhow",
 "auto-hash-map",
@ -7808,7 +7808,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-hash"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231108.1#df3980e03335520c7506fb8fd2b4f0a26b485483"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231109.2#0bd3879d6b969daa15a6edd3f065204fae3e5ce8"
 dependencies = [
 "base16",
 "hex",
@ -7820,7 +7820,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-macros"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231108.1#df3980e03335520c7506fb8fd2b4f0a26b485483"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231109.2#0bd3879d6b969daa15a6edd3f065204fae3e5ce8"
 dependencies = [
 "anyhow",
 "convert_case 0.6.0",
@ -7834,7 +7834,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-macros-shared"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231108.1#df3980e03335520c7506fb8fd2b4f0a26b485483"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231109.2#0bd3879d6b969daa15a6edd3f065204fae3e5ce8"
 dependencies = [
 "proc-macro2",
 "quote",
@ -7844,7 +7844,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-malloc"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231108.1#df3980e03335520c7506fb8fd2b4f0a26b485483"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231109.2#0bd3879d6b969daa15a6edd3f065204fae3e5ce8"
 dependencies = [
 "mimalloc",
 ]
@ -7852,7 +7852,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-memory"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231108.1#df3980e03335520c7506fb8fd2b4f0a26b485483"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231109.2#0bd3879d6b969daa15a6edd3f065204fae3e5ce8"
 dependencies = [
 "anyhow",
 "auto-hash-map",
@ -7877,7 +7877,7 @@ dependencies = [
 [[package]]
 name = "turbopack"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231108.1#df3980e03335520c7506fb8fd2b4f0a26b485483"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231109.2#0bd3879d6b969daa15a6edd3f065204fae3e5ce8"
 dependencies = [
 "anyhow",
 "async-recursion",
@ -7908,7 +7908,7 @@ dependencies = [
 [[package]]
 name = "turbopack-binding"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231108.1#df3980e03335520c7506fb8fd2b4f0a26b485483"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231109.2#0bd3879d6b969daa15a6edd3f065204fae3e5ce8"
 dependencies = [
 "auto-hash-map",
 "mdxjs",
@ -7948,7 +7948,7 @@ dependencies = [
 [[package]]
 name = "turbopack-build"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231108.1#df3980e03335520c7506fb8fd2b4f0a26b485483"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231109.2#0bd3879d6b969daa15a6edd3f065204fae3e5ce8"
 dependencies = [
 "anyhow",
 "indexmap 1.9.3",
@ -7971,7 +7971,7 @@ dependencies = [
 [[package]]
 name = "turbopack-cli-utils"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231108.1#df3980e03335520c7506fb8fd2b4f0a26b485483"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231109.2#0bd3879d6b969daa15a6edd3f065204fae3e5ce8"
 dependencies = [
 "anyhow",
 "clap 4.4.2",
@ -7995,7 +7995,7 @@ dependencies = [
 [[package]]
 name = "turbopack-core"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231108.1#df3980e03335520c7506fb8fd2b4f0a26b485483"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231109.2#0bd3879d6b969daa15a6edd3f065204fae3e5ce8"
 dependencies = [
 "anyhow",
 "async-recursion",
@ -8025,7 +8025,7 @@ dependencies = [
 [[package]]
 name = "turbopack-css"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231108.1#df3980e03335520c7506fb8fd2b4f0a26b485483"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231109.2#0bd3879d6b969daa15a6edd3f065204fae3e5ce8"
 dependencies = [
 "anyhow",
 "async-trait",
@ -8047,7 +8047,7 @@ dependencies = [
 [[package]]
 name = "turbopack-dev"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231108.1#df3980e03335520c7506fb8fd2b4f0a26b485483"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231109.2#0bd3879d6b969daa15a6edd3f065204fae3e5ce8"
 dependencies = [
 "anyhow",
 "indexmap 1.9.3",
@ -8071,7 +8071,7 @@ dependencies = [
 [[package]]
 name = "turbopack-dev-server"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231108.1#df3980e03335520c7506fb8fd2b4f0a26b485483"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231109.2#0bd3879d6b969daa15a6edd3f065204fae3e5ce8"
 dependencies = [
 "anyhow",
 "async-compression",
@ -8108,7 +8108,7 @@ dependencies = [
 [[package]]
 name = "turbopack-ecmascript"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231108.1#df3980e03335520c7506fb8fd2b4f0a26b485483"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231109.2#0bd3879d6b969daa15a6edd3f065204fae3e5ce8"
 dependencies = [
 "anyhow",
 "async-trait",
@ -8142,7 +8142,7 @@ dependencies = [
 [[package]]
 name = "turbopack-ecmascript-hmr-protocol"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231108.1#df3980e03335520c7506fb8fd2b4f0a26b485483"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231109.2#0bd3879d6b969daa15a6edd3f065204fae3e5ce8"
 dependencies = [
 "serde",
 "serde_json",
@ -8153,7 +8153,7 @@ dependencies = [
 [[package]]
 name = "turbopack-ecmascript-plugins"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231108.1#df3980e03335520c7506fb8fd2b4f0a26b485483"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231109.2#0bd3879d6b969daa15a6edd3f065204fae3e5ce8"
 dependencies = [
 "anyhow",
 "async-trait",
@ -8176,7 +8176,7 @@ dependencies = [
 [[package]]
 name = "turbopack-ecmascript-runtime"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231108.1#df3980e03335520c7506fb8fd2b4f0a26b485483"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231109.2#0bd3879d6b969daa15a6edd3f065204fae3e5ce8"
 dependencies = [
 "anyhow",
 "indoc",
@ -8193,7 +8193,7 @@ dependencies = [
 [[package]]
 name = "turbopack-env"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231108.1#df3980e03335520c7506fb8fd2b4f0a26b485483"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231109.2#0bd3879d6b969daa15a6edd3f065204fae3e5ce8"
 dependencies = [
 "anyhow",
 "indexmap 1.9.3",
@ -8209,7 +8209,7 @@ dependencies = [
 [[package]]
 name = "turbopack-image"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231108.1#df3980e03335520c7506fb8fd2b4f0a26b485483"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231109.2#0bd3879d6b969daa15a6edd3f065204fae3e5ce8"
 dependencies = [
 "anyhow",
 "base64 0.21.4",
@ -8229,7 +8229,7 @@ dependencies = [
 [[package]]
 name = "turbopack-json"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231108.1#df3980e03335520c7506fb8fd2b4f0a26b485483"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231109.2#0bd3879d6b969daa15a6edd3f065204fae3e5ce8"
 dependencies = [
 "anyhow",
 "serde",
@ -8244,7 +8244,7 @@ dependencies = [
 [[package]]
 name = "turbopack-mdx"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231108.1#df3980e03335520c7506fb8fd2b4f0a26b485483"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231109.2#0bd3879d6b969daa15a6edd3f065204fae3e5ce8"
 dependencies = [
 "anyhow",
 "mdxjs",
@ -8259,7 +8259,7 @@ dependencies = [
 [[package]]
 name = "turbopack-node"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231108.1#df3980e03335520c7506fb8fd2b4f0a26b485483"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231109.2#0bd3879d6b969daa15a6edd3f065204fae3e5ce8"
 dependencies = [
 "anyhow",
 "async-stream",
@ -8294,7 +8294,7 @@ dependencies = [
 [[package]]
 name = "turbopack-static"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231108.1#df3980e03335520c7506fb8fd2b4f0a26b485483"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231109.2#0bd3879d6b969daa15a6edd3f065204fae3e5ce8"
 dependencies = [
 "anyhow",
 "serde",
@ -8310,7 +8310,7 @@ dependencies = [
 [[package]]
 name = "turbopack-swc-utils"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231108.1#df3980e03335520c7506fb8fd2b4f0a26b485483"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231109.2#0bd3879d6b969daa15a6edd3f065204fae3e5ce8"
 dependencies = [
 "swc_core",
 "turbo-tasks",
@ -8321,7 +8321,7 @@ dependencies = [
 [[package]]
 name = "turbopack-wasm"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231108.1#df3980e03335520c7506fb8fd2b4f0a26b485483"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231109.2#0bd3879d6b969daa15a6edd3f065204fae3e5ce8"
 dependencies = [
 "anyhow",
 "indexmap 1.9.3",
--- a/Cargo.toml
+++ b/Cargo.toml
@ -40,11 +40,11 @@ next-transform-strip-page-exports = { path = "packages/next-swc/crates/next-tran
 testing = { version = "0.35.7" }

 # Turbo crates
-turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231108.1" }
+turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231109.2" }
 # [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros..
-turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231108.1" }
+turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231109.2" }
 # [TODO]: need to refactor embed_directory! macro usage in next-core
-turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231108.1" }
+turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231109.2" }

 # General Deps

--- a/packages/next-swc/crates/napi/src/next_api/utils.rs
+++ b/packages/next-swc/crates/napi/src/next_api/utils.rs
@ -131,20 +131,32 @@ impl From<&PlainIssue> for NapiIssue {
 #[napi(object)]
 pub struct NapiIssueSource {
    pub source: NapiSource,
-    pub start: NapiSourcePos,
-    pub end: NapiSourcePos,
+    pub range: Option<NapiIssueSourceRange>,
 }

 impl From<&PlainIssueSource> for NapiIssueSource {
    fn from(
        PlainIssueSource {
            asset: source,
-            start,
-            end,
+            range,
        }: &PlainIssueSource,
    ) -> Self {
        Self {
            source: (&**source).into(),
+            range: range.as_ref().map(|range| range.into()),
+        }
+    }
+}
+
+#[napi(object)]
+pub struct NapiIssueSourceRange {
+    pub start: NapiSourcePos,
+    pub end: NapiSourcePos,
+}
+
+impl From<&(SourcePos, SourcePos)> for NapiIssueSourceRange {
+    fn from((start, end): &(SourcePos, SourcePos)) -> Self {
+        Self {
            start: (*start).into(),
            end: (*end).into(),
        }
--- a/packages/next/package.json
+++ b/packages/next/package.json
@ -193,7 +193,7 @@
    "@types/ws": "8.2.0",
    "@vercel/ncc": "0.34.0",
    "@vercel/nft": "0.22.6",
-    "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231108.1",
+    "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231109.2",
    "acorn": "8.5.0",
    "amphtml-validator": "1.0.35",
    "anser": "1.4.9",
--- a/packages/next/src/build/swc/index.ts
+++ b/packages/next/src/build/swc/index.ts
@ -485,9 +485,11 @@ export interface Issue {
      ident: string
      content?: string
    }
+    range?: {
      start: { line: number; column: number }
      end: { line: number; column: number }
    }
+  }
  documentationLink: string
  subIssues: Issue[]
 }
--- a/packages/next/src/server/lib/router-utils/setup-dev-bundler.ts
+++ b/packages/next/src/server/lib/router-utils/setup-dev-bundler.ts
@ -293,10 +293,12 @@ async function startWatcher(opts: SetupOpts) {
        .replace('\\\\?\\', '')

      if (source) {
-        const { start, end } = source
-        message = `${issue.severity} - ${formattedFilePath}:${start.line + 1}:${
-          start.column
-        }  ${formattedTitle}`
+        if (source.range) {
+          const { start, end } = source.range
+          message = `${issue.severity} - ${formattedFilePath}:${
+            start.line + 1
+          }:${start.column}  ${formattedTitle}`
+
          if (source.source.content) {
            const {
              codeFrameColumns,
@ -312,6 +314,9 @@ async function startWatcher(opts: SetupOpts) {
                { forceColor: true }
              )
          }
+        } else {
+          message = `${issue.severity} - ${formattedFilePath}  ${formattedTitle}`
+        }
      } else {
        message = `${formattedTitle}`
      }
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -1065,8 +1065,8 @@ importers:
        specifier: 0.22.6
        version: 0.22.6
      '@vercel/turbopack-ecmascript-runtime':
-        specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231108.1
-        version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231108.1(react-refresh@0.12.0)(webpack@5.86.0)'
+        specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231109.2
+        version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231109.2(react-refresh@0.12.0)(webpack@5.86.0)'
      acorn:
        specifier: 8.5.0
        version: 8.5.0
@ -24646,9 +24646,9 @@ packages:
  /zwitch@2.0.4:
    resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}

-  '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231108.1(react-refresh@0.12.0)(webpack@5.86.0)':
-    resolution: {registry: https://registry.npmjs.org/, tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231108.1}
-    id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231108.1'
+  '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231109.2(react-refresh@0.12.0)(webpack@5.86.0)':
+    resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231109.2}
+    id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231109.2'
    name: '@vercel/turbopack-ecmascript-runtime'
    version: 0.0.0
    dependencies: