Unverified Commit bf966e37 authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub
parent 51fec997
This diff is collapsed.
...@@ -40,11 +40,11 @@ next-transform-strip-page-exports = { path = "packages/next-swc/crates/next-tran ...@@ -40,11 +40,11 @@ next-transform-strip-page-exports = { path = "packages/next-swc/crates/next-tran
testing = { version = "0.35.7" } testing = { version = "0.35.7" }
# Turbo crates # 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.. # [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 # [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 # General Deps
......
...@@ -131,20 +131,32 @@ impl From<&PlainIssue> for NapiIssue { ...@@ -131,20 +131,32 @@ impl From<&PlainIssue> for NapiIssue {
#[napi(object)] #[napi(object)]
pub struct NapiIssueSource { pub struct NapiIssueSource {
pub source: NapiSource, pub source: NapiSource,
pub start: NapiSourcePos, pub range: Option<NapiIssueSourceRange>,
pub end: NapiSourcePos,
} }
impl From<&PlainIssueSource> for NapiIssueSource { impl From<&PlainIssueSource> for NapiIssueSource {
fn from( fn from(
PlainIssueSource { PlainIssueSource {
asset: source, asset: source,
start, range,
end,
}: &PlainIssueSource, }: &PlainIssueSource,
) -> Self { ) -> Self {
Self { Self {
source: (&**source).into(), 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(), start: (*start).into(),
end: (*end).into(), end: (*end).into(),
} }
......
...@@ -193,7 +193,7 @@ ...@@ -193,7 +193,7 @@
"@types/ws": "8.2.0", "@types/ws": "8.2.0",
"@vercel/ncc": "0.34.0", "@vercel/ncc": "0.34.0",
"@vercel/nft": "0.22.6", "@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", "acorn": "8.5.0",
"amphtml-validator": "1.0.35", "amphtml-validator": "1.0.35",
"anser": "1.4.9", "anser": "1.4.9",
......
...@@ -485,8 +485,10 @@ export interface Issue { ...@@ -485,8 +485,10 @@ export interface Issue {
ident: string ident: string
content?: string content?: string
} }
start: { line: number; column: number } range?: {
end: { line: number; column: number } start: { line: number; column: number }
end: { line: number; column: number }
}
} }
documentationLink: string documentationLink: string
subIssues: Issue[] subIssues: Issue[]
......
...@@ -293,24 +293,29 @@ async function startWatcher(opts: SetupOpts) { ...@@ -293,24 +293,29 @@ async function startWatcher(opts: SetupOpts) {
.replace('\\\\?\\', '') .replace('\\\\?\\', '')
if (source) { if (source) {
const { start, end } = source if (source.range) {
message = `${issue.severity} - ${formattedFilePath}:${start.line + 1}:${ const { start, end } = source.range
start.column message = `${issue.severity} - ${formattedFilePath}:${
} ${formattedTitle}` start.line + 1
if (source.source.content) { }:${start.column} ${formattedTitle}`
const {
codeFrameColumns, if (source.source.content) {
} = require('next/dist/compiled/babel/code-frame') const {
message += codeFrameColumns,
'\n\n' + } = require('next/dist/compiled/babel/code-frame')
codeFrameColumns( message +=
source.source.content, '\n\n' +
{ codeFrameColumns(
start: { line: start.line + 1, column: start.column + 1 }, source.source.content,
end: { line: end.line + 1, column: end.column + 1 }, {
}, start: { line: start.line + 1, column: start.column + 1 },
{ forceColor: true } end: { line: end.line + 1, column: end.column + 1 },
) },
{ forceColor: true }
)
}
} else {
message = `${issue.severity} - ${formattedFilePath} ${formattedTitle}`
} }
} else { } else {
message = `${formattedTitle}` message = `${formattedTitle}`
......
...@@ -1065,8 +1065,8 @@ importers: ...@@ -1065,8 +1065,8 @@ importers:
specifier: 0.22.6 specifier: 0.22.6
version: 0.22.6 version: 0.22.6
'@vercel/turbopack-ecmascript-runtime': '@vercel/turbopack-ecmascript-runtime':
specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231108.1 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-231108.1(react-refresh@0.12.0)(webpack@5.86.0)' 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: acorn:
specifier: 8.5.0 specifier: 8.5.0
version: 8.5.0 version: 8.5.0
...@@ -24646,9 +24646,9 @@ packages: ...@@ -24646,9 +24646,9 @@ packages:
/zwitch@2.0.4: /zwitch@2.0.4:
resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} 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)': '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231109.2(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} 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-231108.1' id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231109.2'
name: '@vercel/turbopack-ecmascript-runtime' name: '@vercel/turbopack-ecmascript-runtime'
version: 0.0.0 version: 0.0.0
dependencies: dependencies:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment