Skip to content

Commit bf966e3

Browse files

File tree

7 files changed

+85
-66
lines changed

7 files changed

+85
-66
lines changed

Cargo.lock

Lines changed: 33 additions & 33 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ next-transform-strip-page-exports = { path = "packages/next-swc/crates/next-tran
4040
testing = { version = "0.35.7" }
4141

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

4949
# General Deps
5050

packages/next-swc/crates/napi/src/next_api/utils.rs

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,20 +131,32 @@ impl From<&PlainIssue> for NapiIssue {
131131
#[napi(object)]
132132
pub struct NapiIssueSource {
133133
pub source: NapiSource,
134-
pub start: NapiSourcePos,
135-
pub end: NapiSourcePos,
134+
pub range: Option<NapiIssueSourceRange>,
136135
}
137136

138137
impl From<&PlainIssueSource> for NapiIssueSource {
139138
fn from(
140139
PlainIssueSource {
141140
asset: source,
142-
start,
143-
end,
141+
range,
144142
}: &PlainIssueSource,
145143
) -> Self {
146144
Self {
147145
source: (&**source).into(),
146+
range: range.as_ref().map(|range| range.into()),
147+
}
148+
}
149+
}
150+
151+
#[napi(object)]
152+
pub struct NapiIssueSourceRange {
153+
pub start: NapiSourcePos,
154+
pub end: NapiSourcePos,
155+
}
156+
157+
impl From<&(SourcePos, SourcePos)> for NapiIssueSourceRange {
158+
fn from((start, end): &(SourcePos, SourcePos)) -> Self {
159+
Self {
148160
start: (*start).into(),
149161
end: (*end).into(),
150162
}

packages/next/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@
193193
"@types/ws": "8.2.0",
194194
"@vercel/ncc": "0.34.0",
195195
"@vercel/nft": "0.22.6",
196-
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231108.1",
196+
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231109.2",
197197
"acorn": "8.5.0",
198198
"amphtml-validator": "1.0.35",
199199
"anser": "1.4.9",

packages/next/src/build/swc/index.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -485,8 +485,10 @@ export interface Issue {
485485
ident: string
486486
content?: string
487487
}
488-
start: { line: number; column: number }
489-
end: { line: number; column: number }
488+
range?: {
489+
start: { line: number; column: number }
490+
end: { line: number; column: number }
491+
}
490492
}
491493
documentationLink: string
492494
subIssues: Issue[]

0 commit comments

Comments
 (0)