fix: css resolving issue (#1834)

.changeset/serious-candles-lie.md

@@ -0,0 +1,5 @@
+---
+"@farmfe/core": patch
+---
+
+fix css url resolving issue

.github/workflows/rust-build.yaml

@@ -136,6 +136,8 @@ jobs:
           osx-version: '12.3'
       - uses: goto-bus-stop/setup-zig@v2
         if: ${{ matrix.settings.zig }}
+        with:
+          version: 0.14.0-dev.1983+6bf52b050
       - name: Build in docker
         uses: addnab/docker-run-action@v3
         if: ${{ matrix.settings.docker }}

crates/compiler/tests/fixtures/script/import_meta_url_with_URL/absolute_public_path/lit_str/output.js

@@ -1,4 +1,4 @@
-//foo-276e63.txt:
+//foo-276e63.txt?url:
  foo
 
 //index.js:

crates/compiler/tests/fixtures/script/import_meta_url_with_URL/relative_public_path/tip/complate/output.js

@@ -1,4 +1,4 @@
-//foo_bar-47689c.txt:
+//foo_bar-47689c.txt?url:
  foo_bar
 
 //index.js:

crates/compiler/tests/fixtures/script/import_meta_url_with_URL/relative_public_path/tip/normal/output.js

@@ -1,7 +1,7 @@
-//bar-a57e94.txt:
+//bar-a57e94.txt?url:
  bar
 
-//foo-8bdf4c.txt:
+//foo-8bdf4c.txt?url:
  foo
 
 //index.js:

crates/compiler/tests/fixtures/script/import_meta_url_with_URL/relative_public_path/tip/tip_star_star/output.js

@@ -1,4 +1,4 @@
-//foo-8bdf4c.txt:
+//foo-8bdf4c.txt?url:
  foo
 
 //index.js:

crates/plugin_static_assets/src/lib.rs

@@ -79,10 +79,6 @@ impl FarmPluginStaticAssets {
       )
     }
   }
-
-  fn remove_resource_name_query(name: &str) -> String {
-    name.split('?').next().unwrap_or(name).to_string()
-  }
 }
 
 impl Plugin for FarmPluginStaticAssets {
@@ -255,7 +251,7 @@ impl Plugin for FarmPluginStaticAssets {
 
         context.emit_file(EmitFileParams {
           resolved_path: param.module_id.clone(),
-          name: Self::remove_resource_name_query(&resource_name),
+          name: resource_name,
           content: bytes,
           resource_type: ResourceType::Asset(ext.to_string()),
         });

crates/toolkit/src/css/mod.rs

@@ -32,7 +32,7 @@ pub fn parse_css_stylesheet(
   // 1. replace --: '' to --farm-empty: ''
   let mut content = orig_content.replace("--:", "--farm-empty:");
   // 2. replace filter: xxx.Microsoft.xxx to filter: "xxx.Microsoft.xxx" using regex. fix #1557
-  let regex = Regex::new(r#"filter:\s*(.*?)\.Microsoft\.(.*?)(;|\})"#).unwrap();
+  let regex = Regex::new(r#"filter:\s*([^'"]*?)\.Microsoft\.(.*?)(;|\})"#).unwrap();
   content = regex
     .replace_all(&content, "filter:\"$1.Microsoft.$2\"$3")
     .to_string();

examples/css-url/package.json

@@ -5,6 +5,7 @@
   "dependencies": {
     "clsx": "^1.2.1",
     "core-js": "^3.30.1",
+    "font-awesome": "^4.7.0",
     "react": "18",
     "react-dom": "18"
   },

examples/css-url/src/main.tsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import 'font-awesome/css/font-awesome.css'
 import './main.css';
 
 import('./dynamic.css');
@@ -7,6 +8,7 @@ export function Main() {
   return (
     <>
     <div className={'main'}>
+      <div className='fa fa-search'></div>
       main
     </div>
     <div className={'main-2'}>