Merge 1fc8777 into baf5c94

crates/turbopack-core/src/reference_type.rs

@@ -44,8 +44,6 @@ pub enum EcmaScriptModulesReferenceSubType {
 #[turbo_tasks::value(serialization = "auto_for_input")]
 #[derive(Debug, Clone, PartialOrd, Ord, Hash)]
 pub enum CssReferenceSubType {
-    AtImport,
-    Compose,
     /// Reference from any asset to a CSS-parseable asset.
     ///
     /// This marks the boundary between non-CSS and CSS assets. The Next.js App
@@ -60,6 +58,8 @@ pub enum CssReferenceSubType {
 #[derive(Debug, Clone, PartialOrd, Ord, Hash)]
 pub enum UrlReferenceSubType {
     EcmaScriptNewUrl,
+    CssAtImport,
+    // Other url references from css, e.g. url(myurl); composes: foo from 'myurl'
     CssUrl,
     Custom(u8),
     Undefined,

crates/turbopack-css/src/references/compose.rs

@@ -2,12 +2,12 @@ use anyhow::Result;
 use turbo_tasks::{Value, ValueToString, Vc};
 use turbopack_core::{
     chunk::ChunkableModuleReference,
+    issue::IssueSeverity,
     reference::ModuleReference,
-    reference_type::CssReferenceSubType,
+    reference_type::UrlReferenceSubType,
     resolve::{origin::ResolveOrigin, parse::Request, ModuleResolveResult},
 };
-
-use crate::references::css_resolve;
+use turbopack_ecmascript::resolve::url_resolve;
 
 /// A `composes: ... from ...` CSS module reference.
 #[turbo_tasks::value]
@@ -30,14 +30,15 @@ impl CssModuleComposeReference {
 impl ModuleReference for CssModuleComposeReference {
     #[turbo_tasks::function]
     fn resolve_reference(&self) -> Vc<ModuleResolveResult> {
-        css_resolve(
+        url_resolve(
             self.origin,
             self.request,
-            Value::new(CssReferenceSubType::Compose),
+            Value::new(UrlReferenceSubType::CssUrl),
             // TODO: add real issue source, currently impossible because `CssClassName` doesn't
             // contain the source span
             // https://docs.rs/swc_css_modules/0.21.16/swc_css_modules/enum.CssClassName.html
             None,
+            IssueSeverity::Error.cell(),
         )
     }
 }

crates/turbopack-css/src/references/import.rs

@@ -24,16 +24,16 @@ use swc_core::{
 use turbo_tasks::{Value, ValueToString, Vc};
 use turbopack_core::{
     chunk::{ChunkableModuleReference, ChunkingContext},
-    issue::IssueSource,
+    issue::{IssueSeverity, IssueSource},
     reference::ModuleReference,
-    reference_type::CssReferenceSubType,
+    reference_type::UrlReferenceSubType,
     resolve::{origin::ResolveOrigin, parse::Request, ModuleResolveResult},
 };
+use turbopack_ecmascript::resolve::url_resolve;
 
 use crate::{
     chunk::CssImport,
     code_gen::{CodeGenerateable, CodeGeneration},
-    references::css_resolve,
 };
 
 #[turbo_tasks::value(into = "new", eq = "manual", serialization = "none")]
@@ -345,11 +345,12 @@ impl ImportAssetReference {
 impl ModuleReference for ImportAssetReference {
     #[turbo_tasks::function]
     fn resolve_reference(&self) -> Vc<ModuleResolveResult> {
-        css_resolve(
+        url_resolve(
             self.origin,
             self.request,
-            Value::new(CssReferenceSubType::AtImport),
+            Value::new(UrlReferenceSubType::CssAtImport),
             Some(self.issue_source),
+            IssueSeverity::Error.cell(),
         )
     }
 }

crates/turbopack-css/src/references/url.rs

@@ -90,7 +90,7 @@ impl ModuleReference for UrlAssetReference {
             self.origin,
             self.request,
             Value::new(UrlReferenceSubType::CssUrl),
-            self.issue_source,
+            Some(self.issue_source),
             IssueSeverity::Error.cell(),
         )
     }

crates/turbopack-ecmascript/src/references/esm/url.rs

@@ -97,7 +97,7 @@ impl ModuleReference for UrlAssetReference {
             self.origin,
             self.request,
             Value::new(UrlReferenceSubType::EcmaScriptNewUrl),
-            self.issue_source,
+            Some(self.issue_source),
             try_to_severity(self.in_try),
         )
     }

crates/turbopack-ecmascript/src/resolve/mod.rs

@@ -94,7 +94,7 @@ pub async fn url_resolve(
     origin: Vc<Box<dyn ResolveOrigin>>,
     request: Vc<Request>,
     ty: Value<UrlReferenceSubType>,
-    issue_source: Vc<IssueSource>,
+    issue_source: Option<Vc<IssueSource>>,
     issue_severity: Vc<IssueSeverity>,
 ) -> Result<Vc<ModuleResolveResult>> {
     let ty = Value::new(ReferenceType::Url(ty.into_value()));
@@ -129,7 +129,7 @@ pub async fn url_resolve(
         request,
         resolve_options,
         issue_severity,
-        Some(issue_source),
+        issue_source,
     )
     .await
 }

crates/turbopack-tests/tests/snapshot/css/relative-uri-import/input/index.css

@@ -0,0 +1,5 @@
+@import "other.css";
+
+body {
+  background-color: blue;
+}

crates/turbopack-tests/tests/snapshot/css/relative-uri-import/input/index.js

@@ -0,0 +1 @@
+import "./index.css";

crates/turbopack-tests/tests/snapshot/css/relative-uri-import/input/other.css

@@ -0,0 +1,3 @@
+.foo {
+  background-color: red;
+}

crates/turbopack-tests/tests/snapshot/cssmodules/relative-uri-import/input/index.js

@@ -0,0 +1 @@
+import {foo} from "./index.module.css";

crates/turbopack-tests/tests/snapshot/cssmodules/relative-uri-import/input/index.module.css

@@ -0,0 +1,3 @@
+.bar {
+  composes: foo from 'other.module.css';
+}

crates/turbopack-tests/tests/snapshot/cssmodules/relative-uri-import/input/other.module.css

@@ -0,0 +1,3 @@
+.foo {
+  background-color: red;
+}