[turbopack]: Update renamed SubpathValue (vercel#49636)

vercel/turbo#4895 renamed `ExportsValue` into `SubpathValue` --------- Co-authored-by: Tobias Koppers <tobias.koppers@googlemail.com> Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
hydRAnger · Jun 12, 2023 · cf7ecef · cf7ecef
1 parent cbe7afd
commit cf7ecef
Show file tree

Hide file tree

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

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-dev": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230517.2",
-    "@vercel/turbopack-node": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230517.2",
+    "@vercel/turbopack-dev": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230518.4",
+    "@vercel/turbopack-node": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230518.4",
     "anser": "^2.1.1",
     "css.escape": "^1.5.1",
     "next": "*",

diff --git a/packages/next-swc/crates/next-core/src/next_import_map.rs b/packages/next-swc/crates/next-core/src/next_import_map.rs
@@ -14,7 +14,7 @@ use turbopack_binding::{
                 },
                 parse::RequestVc,
                 pattern::Pattern,
-                resolve, AliasPattern, ExportsValue, ResolveAliasMapVc,
+                resolve, AliasPattern, ResolveAliasMapVc, SubpathValue,
             },
         },
         node::execution_context::ExecutionContextVc,
@@ -552,7 +552,7 @@ pub async fn insert_alias_option<const N: usize>(
 }
 
 fn export_value_to_import_mapping(
-    value: &ExportsValue,
+    value: &SubpathValue,
     conditions: &BTreeMap<String, ConditionValue>,
     project_path: FileSystemPathVc,
 ) -> Option<ImportMappingVc> {

diff --git a/...ues/Issue while running loader-fa8e05.txt → ...ues/Issue while running loader-8977b0.txt b/...ues/Issue while running loader-fa8e05.txt → ...ues/Issue while running loader-8977b0.txt
@@ -3,7 +3,7 @@ PlainIssue {
     context: "[project]/packages/next-swc/crates/next-dev-tests/tests/temp/next/webpack-loaders/emitted-errors/input/pages/hello.emit",
     category: "loaders",
     title: "Issue while running loader",
-    description: "Error: Error!\n at readResource (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:80:11)\n at  (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:58:5)\n at Module.transform (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:50:10)\n at  (/turbopack/[turbopack-node]/ipc/evaluate.ts/evaluate.js:1:74)\n at Module.run (/turbopack/[turbopack-node]/ipc/evaluate.ts:49:31)",
+    description: "Error: Error!\n at readResource (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:159:11)\n at  (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:112:5)\n at Module.transform (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:104:10)\n at  (/turbopack/[turbopack-node]/ipc/evaluate.ts/evaluate.js:1:74)\n at Module.run (/turbopack/[turbopack-node]/ipc/evaluate.ts:49:31)",
     detail: "",
     documentation_link: "",
     source: None,

diff --git a/...ues/Issue while running loader-9b6240.txt → ...ues/Issue while running loader-bba7d8.txt b/...ues/Issue while running loader-9b6240.txt → ...ues/Issue while running loader-bba7d8.txt
@@ -3,7 +3,7 @@ PlainIssue {
     context: "[project]/packages/next-swc/crates/next-dev-tests/tests/temp/next/webpack-loaders/emitted-errors/input/pages/hello.emit",
     category: "loaders",
     title: "Issue while running loader",
-    description: "Error: Warning!\n at readResource (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:80:11)\n at  (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:58:5)\n at Module.transform (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:50:10)\n at  (/turbopack/[turbopack-node]/ipc/evaluate.ts/evaluate.js:1:74)\n at Module.run (/turbopack/[turbopack-node]/ipc/evaluate.ts:49:31)",
+    description: "Error: Warning!\n at readResource (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:159:11)\n at  (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:112:5)\n at Module.transform (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:104:10)\n at  (/turbopack/[turbopack-node]/ipc/evaluate.ts/evaluate.js:1:74)\n at Module.run (/turbopack/[turbopack-node]/ipc/evaluate.ts:49:31)",
     detail: "",
     documentation_link: "",
     source: None,

diff --git a/...ues/Issue while running loader-8d8b58.txt → ...ues/Issue while running loader-bf74c3.txt b/...ues/Issue while running loader-8d8b58.txt → ...ues/Issue while running loader-bf74c3.txt
@@ -3,7 +3,7 @@ PlainIssue {
     context: "[project]/packages/next-swc/crates/next-dev-tests/tests/temp/next/webpack-loaders/emitted-errors/input/pages/hello.emit",
     category: "loaders",
     title: "Issue while running loader",
-    description: "Error: Warning!\n at readResource (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:80:11)\n at  (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:58:5)\n at Module.transform (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:50:10)\n at  (/turbopack/[turbopack-node]/ipc/evaluate.ts/evaluate.js:1:74)\n at Module.run (/turbopack/[turbopack-node]/ipc/evaluate.ts:49:31)",
+    description: "Error: Warning!\n at readResource (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:159:11)\n at  (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:112:5)\n at Module.transform (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:104:10)\n at  (/turbopack/[turbopack-node]/ipc/evaluate.ts/evaluate.js:1:74)\n at Module.run (/turbopack/[turbopack-node]/ipc/evaluate.ts:49:31)",
     detail: "",
     documentation_link: "",
     source: None,

diff --git a/...ues/Issue while running loader-d6914f.txt → ...ues/Issue while running loader-e411cf.txt b/...ues/Issue while running loader-d6914f.txt → ...ues/Issue while running loader-e411cf.txt
@@ -3,7 +3,7 @@ PlainIssue {
     context: "[project]/packages/next-swc/crates/next-dev-tests/tests/temp/next/webpack-loaders/emitted-errors/input/pages/hello.emit",
     category: "loaders",
     title: "Issue while running loader",
-    description: "Error: Error!\n at readResource (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:80:11)\n at  (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:58:5)\n at Module.transform (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:50:10)\n at  (/turbopack/[turbopack-node]/ipc/evaluate.ts/evaluate.js:1:74)\n at Module.run (/turbopack/[turbopack-node]/ipc/evaluate.ts:49:31)",
+    description: "Error: Error!\n at readResource (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:159:11)\n at  (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:112:5)\n at Module.transform (/turbopack/[turbopack-node]/transforms/webpack-loaders.ts:104:10)\n at  (/turbopack/[turbopack-node]/ipc/evaluate.ts/evaluate.js:1:74)\n at Module.run (/turbopack/[turbopack-node]/ipc/evaluate.ts:49:31)",
     detail: "",
     documentation_link: "",
     source: None,

diff --git a/...ion/turbopack/sass/warning/issues/Unsupported Sass request__c__ .__styles.sass-ed7929.txt b/...ion/turbopack/sass/warning/issues/Unsupported Sass request__c__ .__styles.sass-ed7929.txt