Unverified Commit 53ddfc83 authored by Leah's avatar Leah Committed by GitHub

mark resolve issues inside a try block as warnings (#47763)

## Description

A require call inside a try block will only emit a warning instead of an error now.

I also added source information to the resolve issues where possible

### Example
```js
try {
  require("missing-module");
} ...
```
previously this would show an error in the overlay, now it's just a warning

## Additional Turbopack Updates

* https://github.com/vercel/turbo/pull/4414 (requirement for this)
* https://github.com/vercel/turbo/pull/4434
* https://github.com/vercel/turbo/pull/4447
* https://github.com/vercel/turbo/pull/4448
* https://github.com/vercel/turbo/pull/4446
parent 2eeb0c7f
This diff is collapsed.
...@@ -47,11 +47,11 @@ swc_emotion = { version = "0.29.10" } ...@@ -47,11 +47,11 @@ swc_emotion = { version = "0.29.10" }
testing = { version = "0.31.31" } testing = { version = "0.31.31" }
# Turbo crates # Turbo crates
turbo-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230331.3" } turbo-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230404.3" }
# [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-230331.3" } turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230404.3" }
# [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-230331.3" } turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230404.3" }
# General Deps # General Deps
......
...@@ -5,6 +5,7 @@ use turbo_binding::{ ...@@ -5,6 +5,7 @@ use turbo_binding::{
core::{ core::{
asset::{Asset, AssetVc, AssetsVc}, asset::{Asset, AssetVc, AssetsVc},
context::AssetContextVc, context::AssetContextVc,
issue::{IssueSeverity, OptionIssueSourceVc},
resolve::{origin::PlainResolveOriginVc, parse::RequestVc}, resolve::{origin::PlainResolveOriginVc, parse::RequestVc},
}, },
ecmascript::{ ecmascript::{
...@@ -40,9 +41,14 @@ impl RuntimeEntryVc { ...@@ -40,9 +41,14 @@ impl RuntimeEntryVc {
RuntimeEntry::Request(r, path) => (r, path), RuntimeEntry::Request(r, path) => (r, path),
}; };
let assets = cjs_resolve(PlainResolveOriginVc::new(context, path).into(), request) let assets = cjs_resolve(
.primary_assets() PlainResolveOriginVc::new(context, path).into(),
.await?; request,
OptionIssueSourceVc::none(),
IssueSeverity::Error.cell(),
)
.primary_assets()
.await?;
let mut runtime_entries = Vec::with_capacity(assets.len()); let mut runtime_entries = Vec::with_capacity(assets.len());
for asset in &assets { for asset in &assets {
......
...@@ -11,6 +11,7 @@ use turbo_binding::{ ...@@ -11,6 +11,7 @@ use turbo_binding::{
chunk::ChunkingContextVc, chunk::ChunkingContextVc,
compile_time_info::CompileTimeInfoVc, compile_time_info::CompileTimeInfoVc,
context::AssetContext, context::AssetContext,
issue::{IssueSeverity, OptionIssueSourceVc},
reference_type::EcmaScriptModulesReferenceSubType, reference_type::EcmaScriptModulesReferenceSubType,
resolve::parse::RequestVc, resolve::parse::RequestVc,
virtual_asset::VirtualAssetVc, virtual_asset::VirtualAssetVc,
...@@ -125,6 +126,8 @@ impl Transition for NextEdgeTransition { ...@@ -125,6 +126,8 @@ impl Transition for NextEdgeTransition {
route_module_kind route_module_kind
)), )),
Value::new(EcmaScriptModulesReferenceSubType::Undefined), Value::new(EcmaScriptModulesReferenceSubType::Undefined),
OptionIssueSourceVc::none(),
IssueSeverity::Error.cell(),
); );
let route_module_asset = match &*resolved_route_module_asset.first_asset().await? { let route_module_asset = match &*resolved_route_module_asset.first_asset().await? {
Some(a) => *a, Some(a) => *a,
......
...@@ -3,7 +3,7 @@ use turbo_binding::{ ...@@ -3,7 +3,7 @@ use turbo_binding::{
turbo::tasks_fs::FileSystemPathVc, turbo::tasks_fs::FileSystemPathVc,
turbopack::{ turbopack::{
core::{ core::{
issue::{Issue, IssueSeverity, IssueSeverityVc, IssueVc}, issue::{Issue, IssueSeverity, IssueSeverityVc, IssueVc, OptionIssueSourceVc},
resolve::{origin::ResolveOriginVc, parse::RequestVc}, resolve::{origin::ResolveOriginVc, parse::RequestVc},
}, },
turbopack::{ turbopack::{
...@@ -86,9 +86,14 @@ pub async fn assert_can_resolve_react_refresh( ...@@ -86,9 +86,14 @@ pub async fn assert_can_resolve_react_refresh(
/// Resolves the React Refresh runtime module from the given [AssetContextVc]. /// Resolves the React Refresh runtime module from the given [AssetContextVc].
#[turbo_tasks::function] #[turbo_tasks::function]
pub async fn resolve_react_refresh(origin: ResolveOriginVc) -> Result<EcmascriptChunkPlaceableVc> { pub async fn resolve_react_refresh(origin: ResolveOriginVc) -> Result<EcmascriptChunkPlaceableVc> {
if let Some(asset) = *cjs_resolve(origin, react_refresh_request()) if let Some(asset) = *cjs_resolve(
.first_asset() origin,
.await? react_refresh_request(),
OptionIssueSourceVc::none(),
IssueSeverity::Error.cell(),
)
.first_asset()
.await?
{ {
if let Some(placeable) = EcmascriptChunkPlaceableVc::resolve_from(asset).await? { if let Some(placeable) = EcmascriptChunkPlaceableVc::resolve_from(asset).await? {
Ok(placeable) Ok(placeable)
......
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use turbo_binding::turbopack::{ use turbo_binding::turbopack::{
core::resolve::{origin::ResolveOriginVc, parse::RequestVc}, core::{
issue::{IssueSeverity, OptionIssueSourceVc},
resolve::{origin::ResolveOriginVc, parse::RequestVc},
},
turbopack::ecmascript::{chunk::EcmascriptChunkPlaceableVc, resolve::cjs_resolve}, turbopack::ecmascript::{chunk::EcmascriptChunkPlaceableVc, resolve::cjs_resolve},
}; };
...@@ -13,7 +16,15 @@ pub async fn resolve_runtime_request( ...@@ -13,7 +16,15 @@ pub async fn resolve_runtime_request(
let runtime_request_path = format!("@vercel/turbopack-next/{}", path); let runtime_request_path = format!("@vercel/turbopack-next/{}", path);
let request = RequestVc::parse_string(runtime_request_path.clone()); let request = RequestVc::parse_string(runtime_request_path.clone());
if let Some(asset) = *cjs_resolve(origin, request).first_asset().await? { if let Some(asset) = *cjs_resolve(
origin,
request,
OptionIssueSourceVc::none(),
IssueSeverity::Error.cell(),
)
.first_asset()
.await?
{
if let Some(placeable) = EcmascriptChunkPlaceableVc::resolve_from(asset).await? { if let Some(placeable) = EcmascriptChunkPlaceableVc::resolve_from(asset).await? {
Ok(placeable) Ok(placeable)
} else { } else {
......
...@@ -7,7 +7,7 @@ use turbo_binding::{ ...@@ -7,7 +7,7 @@ use turbo_binding::{
core::{ core::{
asset::{Asset, AssetVc}, asset::{Asset, AssetVc},
ident::AssetIdentVc, ident::AssetIdentVc,
issue::{Issue, IssueSeverity, IssueSeverityVc, IssueVc}, issue::{Issue, IssueSeverity, IssueSeverityVc, IssueVc, OptionIssueSourceVc},
reference_type::{EcmaScriptModulesReferenceSubType, ReferenceType}, reference_type::{EcmaScriptModulesReferenceSubType, ReferenceType},
resolve::{ resolve::{
self, handle_resolve_error, node::node_cjs_resolve_options, parse::RequestVc, self, handle_resolve_error, node::node_cjs_resolve_options, parse::RequestVc,
...@@ -323,6 +323,8 @@ pub async fn load_next_json<T: DeserializeOwned>( ...@@ -323,6 +323,8 @@ pub async fn load_next_json<T: DeserializeOwned>(
context, context,
request, request,
resolve_options, resolve_options,
OptionIssueSourceVc::none(),
IssueSeverity::Error.cell(),
) )
.await?; .await?;
let resolve_result = &*resolve_result.await?; let resolve_result = &*resolve_result.await?;
......
...@@ -6,7 +6,21 @@ PlainIssue { ...@@ -6,7 +6,21 @@ PlainIssue {
description: "unable to resolve relative \"./not-existing-file\"", description: "unable to resolve relative \"./not-existing-file\"",
detail: "It was not possible to find the requested file.\nParsed request as written in source code: relative \"./not-existing-file\"\nPath where resolving has started: [project]/packages/next-swc/crates/next-dev-tests/tests/integration/turbopack/basic/comptime/input/index.js\nType of request: commonjs request\nImport map: No import map entry\n", detail: "It was not possible to find the requested file.\nParsed request as written in source code: relative \"./not-existing-file\"\nPath where resolving has started: [project]/packages/next-swc/crates/next-dev-tests/tests/integration/turbopack/basic/comptime/input/index.js\nType of request: commonjs request\nImport map: No import map entry\n",
documentation_link: "", documentation_link: "",
source: None, source: Some(
PlainIssueSource {
asset: PlainAsset {
ident: "[project]/packages/next-swc/crates/next-dev-tests/tests/integration/turbopack/basic/comptime/input/index.js",
},
start: SourcePos {
line: 3,
column: 5,
},
end: SourcePos {
line: 3,
column: 35,
},
},
),
sub_issues: [], sub_issues: [],
processing_path: Some( processing_path: Some(
[], [],
......
...@@ -6,7 +6,21 @@ PlainIssue { ...@@ -6,7 +6,21 @@ PlainIssue {
description: "unable to resolve relative \"./empty?import2-in-chunk1\"", description: "unable to resolve relative \"./empty?import2-in-chunk1\"",
detail: "It was not possible to find the requested file.\nParsed request as written in source code: relative \"./empty?import2-in-chunk1\"\nPath where resolving has started: [project]/packages/next-swc/crates/next-dev-tests/tests/integration/webpack/chunks/__skipped__/named-chunks/input/index.js\nType of request: EcmaScript Modules request\nImport map: No import map entry\n", detail: "It was not possible to find the requested file.\nParsed request as written in source code: relative \"./empty?import2-in-chunk1\"\nPath where resolving has started: [project]/packages/next-swc/crates/next-dev-tests/tests/integration/webpack/chunks/__skipped__/named-chunks/input/index.js\nType of request: EcmaScript Modules request\nImport map: No import map entry\n",
documentation_link: "", documentation_link: "",
source: None, source: Some(
PlainIssueSource {
asset: PlainAsset {
ident: "[project]/packages/next-swc/crates/next-dev-tests/tests/integration/webpack/chunks/__skipped__/named-chunks/input/index.js",
},
start: SourcePos {
line: 114,
column: 5,
},
end: SourcePos {
line: 117,
column: 0,
},
},
),
sub_issues: [], sub_issues: [],
processing_path: Some( processing_path: Some(
[], [],
......
...@@ -6,7 +6,21 @@ PlainIssue { ...@@ -6,7 +6,21 @@ PlainIssue {
description: "unable to resolve relative \"./empty?import1-in-chunk1\"", description: "unable to resolve relative \"./empty?import1-in-chunk1\"",
detail: "It was not possible to find the requested file.\nParsed request as written in source code: relative \"./empty?import1-in-chunk1\"\nPath where resolving has started: [project]/packages/next-swc/crates/next-dev-tests/tests/integration/webpack/chunks/__skipped__/named-chunks/input/index.js\nType of request: EcmaScript Modules request\nImport map: No import map entry\n", detail: "It was not possible to find the requested file.\nParsed request as written in source code: relative \"./empty?import1-in-chunk1\"\nPath where resolving has started: [project]/packages/next-swc/crates/next-dev-tests/tests/integration/webpack/chunks/__skipped__/named-chunks/input/index.js\nType of request: EcmaScript Modules request\nImport map: No import map entry\n",
documentation_link: "", documentation_link: "",
source: None, source: Some(
PlainIssueSource {
asset: PlainAsset {
ident: "[project]/packages/next-swc/crates/next-dev-tests/tests/integration/webpack/chunks/__skipped__/named-chunks/input/index.js",
},
start: SourcePos {
line: 110,
column: 3,
},
end: SourcePos {
line: 112,
column: 4,
},
},
),
sub_issues: [], sub_issues: [],
processing_path: Some( processing_path: Some(
[], [],
......
...@@ -6,7 +6,21 @@ PlainIssue { ...@@ -6,7 +6,21 @@ PlainIssue {
description: "unable to resolve relative \"./empty?import3-in-chunk2\"", description: "unable to resolve relative \"./empty?import3-in-chunk2\"",
detail: "It was not possible to find the requested file.\nParsed request as written in source code: relative \"./empty?import3-in-chunk2\"\nPath where resolving has started: [project]/packages/next-swc/crates/next-dev-tests/tests/integration/webpack/chunks/__skipped__/named-chunks/input/index.js\nType of request: EcmaScript Modules request\nImport map: No import map entry\n", detail: "It was not possible to find the requested file.\nParsed request as written in source code: relative \"./empty?import3-in-chunk2\"\nPath where resolving has started: [project]/packages/next-swc/crates/next-dev-tests/tests/integration/webpack/chunks/__skipped__/named-chunks/input/index.js\nType of request: EcmaScript Modules request\nImport map: No import map entry\n",
documentation_link: "", documentation_link: "",
source: None, source: Some(
PlainIssueSource {
asset: PlainAsset {
ident: "[project]/packages/next-swc/crates/next-dev-tests/tests/integration/webpack/chunks/__skipped__/named-chunks/input/index.js",
},
start: SourcePos {
line: 124,
column: 5,
},
end: SourcePos {
line: 127,
column: 0,
},
},
),
sub_issues: [], sub_issues: [],
processing_path: Some( processing_path: Some(
[], [],
......
...@@ -6,7 +6,21 @@ PlainIssue { ...@@ -6,7 +6,21 @@ PlainIssue {
description: "unable to resolve relative \"./empty?require.ensure:test\"", description: "unable to resolve relative \"./empty?require.ensure:test\"",
detail: "It was not possible to find the requested file.\nParsed request as written in source code: relative \"./empty?require.ensure:test\"\nPath where resolving has started: [project]/packages/next-swc/crates/next-dev-tests/tests/integration/webpack/chunks/__skipped__/parsing/input/index.js\nType of request: commonjs request\nImport map: No import map entry\n", detail: "It was not possible to find the requested file.\nParsed request as written in source code: relative \"./empty?require.ensure:test\"\nPath where resolving has started: [project]/packages/next-swc/crates/next-dev-tests/tests/integration/webpack/chunks/__skipped__/parsing/input/index.js\nType of request: commonjs request\nImport map: No import map entry\n",
documentation_link: "", documentation_link: "",
source: None, source: Some(
PlainIssueSource {
asset: PlainAsset {
ident: "[project]/packages/next-swc/crates/next-dev-tests/tests/integration/webpack/chunks/__skipped__/parsing/input/index.js",
},
start: SourcePos {
line: 29,
column: 14,
},
end: SourcePos {
line: 29,
column: 52,
},
},
),
sub_issues: [], sub_issues: [],
processing_path: Some( processing_path: Some(
[], [],
......
...@@ -6,7 +6,21 @@ PlainIssue { ...@@ -6,7 +6,21 @@ PlainIssue {
description: "unable to resolve dynamic", description: "unable to resolve dynamic",
detail: "It was not possible to find the requested file.\nParsed request as written in source code: dynamic\nPath where resolving has started: [project]/packages/next-swc/crates/next-dev-tests/tests/integration/webpack/chunks/__skipped__/weak-dependencies-context/input/index.js\nType of request: commonjs request\nImport map: No import map entry\n", detail: "It was not possible to find the requested file.\nParsed request as written in source code: dynamic\nPath where resolving has started: [project]/packages/next-swc/crates/next-dev-tests/tests/integration/webpack/chunks/__skipped__/weak-dependencies-context/input/index.js\nType of request: commonjs request\nImport map: No import map entry\n",
documentation_link: "", documentation_link: "",
source: None, source: Some(
PlainIssueSource {
asset: PlainAsset {
ident: "[project]/packages/next-swc/crates/next-dev-tests/tests/integration/webpack/chunks/__skipped__/weak-dependencies-context/input/index.js",
},
start: SourcePos {
line: 13,
column: 3,
},
end: SourcePos {
line: 13,
column: 19,
},
},
),
sub_issues: [], sub_issues: [],
processing_path: Some( processing_path: Some(
[], [],
......
...@@ -6,7 +6,21 @@ PlainIssue { ...@@ -6,7 +6,21 @@ PlainIssue {
description: "unable to resolve dynamic", description: "unable to resolve dynamic",
detail: "It was not possible to find the requested file.\nParsed request as written in source code: dynamic\nPath where resolving has started: [project]/packages/next-swc/crates/next-dev-tests/tests/integration/webpack/chunks/__skipped__/weak-dependencies/input/index.js\nType of request: commonjs request\nImport map: No import map entry\n", detail: "It was not possible to find the requested file.\nParsed request as written in source code: dynamic\nPath where resolving has started: [project]/packages/next-swc/crates/next-dev-tests/tests/integration/webpack/chunks/__skipped__/weak-dependencies/input/index.js\nType of request: commonjs request\nImport map: No import map entry\n",
documentation_link: "", documentation_link: "",
source: None, source: Some(
PlainIssueSource {
asset: PlainAsset {
ident: "[project]/packages/next-swc/crates/next-dev-tests/tests/integration/webpack/chunks/__skipped__/weak-dependencies/input/index.js",
},
start: SourcePos {
line: 5,
column: 3,
},
end: SourcePos {
line: 5,
column: 19,
},
},
),
sub_issues: [], sub_issues: [],
processing_path: Some( processing_path: Some(
[], [],
......
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