Merge branch 'canary' into update-install-native-script

vercel · Jul 21, 2023 · e59b3e1 · e59b3e1
2 parents 9e0cbd1 + e887772
commit e59b3e1
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 63 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -44,11 +44,11 @@ swc_core = { version = "0.79.13" }
 testing = { version = "0.33.20" }
 
 # Turbo crates
-turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230719.2" }
+turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230721.1" }
 # [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-230719.2" }
+turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230721.1" }
 # [TODO]: need to refactor embed_directory! macro usage in next-core
-turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230719.2" }
+turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230721.1" }
 
 # General Deps
 

diff --git a/packages/next-swc/crates/next-build/src/next_build.rs b/packages/next-swc/crates/next-build/src/next_build.rs
@@ -470,6 +470,8 @@ async fn handle_issues<T>(source: Vc<T>, issue_reporter: Vc<Box<dyn IssueReporte
     let has_fatal = issue_reporter.report_issues(
         TransientInstance::new(issues.clone()),
         TransientValue::new(source.node),
+        // TODO this should be Error, but we need to fix the errors happing first
+        IssueSeverity::Fatal.cell(),
     );
 
     if *has_fatal.await? {

diff --git a/packages/next-swc/crates/next-core/js/package.json b/packages/next-swc/crates/next-core/js/package.json
@@ -10,8 +10,8 @@
     "check": "tsc --noEmit"
   },
   "dependencies": {
-    "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230719.2",
-    "@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230719.2",
+    "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230721.1",
+    "@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230721.1",
     "anser": "^2.1.1",
     "css.escape": "^1.5.1",
     "next": "*",

diff --git a/packages/next-swc/crates/next-dev-tests/tests/integration.rs b/packages/next-swc/crates/next-dev-tests/tests/integration.rs
@@ -665,6 +665,7 @@ impl IssueReporter for TestIssueReporter {
         &self,
         captured_issues: TransientInstance<ReadRef<CapturedIssues>>,
         _source: TransientValue<RawVc>,
+        _min_failing_severity: Vc<IssueSeverity>,
     ) -> Result<Vc<bool>> {
         let log_options = LogOptions {
             current_dir: PathBuf::new(),