chore: revert change of replacing invalid css (#1831)

* chore: revert change of replacing invalid css * fix: css test
farm-fe · Oct 17, 2024 · 663dfee · 663dfee
1 parent d7cff30
commit 663dfee
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 12 deletions.
diff --git a/.changeset/late-starfishes-help.md b/.changeset/late-starfishes-help.md
@@ -0,0 +1,5 @@
+---
+"@farmfe/core": patch
+---
+
+Revert change of replacing invalid css
diff --git a/crates/core/src/cache/cache_store.rs b/crates/core/src/cache/cache_store.rs
@@ -9,7 +9,7 @@ use std::{
 
 use crate::config::Mode;
 
-const FARM_CACHE_VERSION: &str = "0.4.8";
+const FARM_CACHE_VERSION: &str = "0.4.9";
 const FARM_CACHE_MANIFEST_FILE: &str = "farm-cache.json";
 
 // TODO make CacheStore a trait and implement DiskCacheStore or RemoteCacheStore or more.

diff --git a/crates/plugin_css/tests/fixtures/analyze_deps/basic.css b/crates/plugin_css/tests/fixtures/analyze_deps/basic.css
@@ -19,7 +19,7 @@ div {
 
 p {
   background: url('@/img/logo.png');
-  top: -8px/2 + 1;
+  /* top: -8px/2 + 1; */
 }
 
 .home {filter: progid:DXImageTransform.Microsoft.Alpha(opacity=20)}
diff --git a/crates/toolkit/src/css/mod.rs b/crates/toolkit/src/css/mod.rs
@@ -36,9 +36,9 @@ pub fn parse_css_stylesheet(
   content = regex
     .replace_all(&content, "filter:\"$1.Microsoft.$2\"$3")
     .to_string();
-  // 3. replace invalid operator, eg: top: -8px/2 + 1 to top: "-8px/2 + 1" using regex. fix #1748
-  let regex = Regex::new(r#":\s*([^;{}]*?\d\s(?:\+|-|\*|/)\s\d[^;{}]*?)\s*(;|\})"#).unwrap();
-  content = regex.replace_all(&content, ":\"$1\"$2").to_string();
+  // // 3. replace invalid operator, eg: top: -8px/2 + 1 to top: "-8px/2 + 1" using regex. fix #1748
+  // let regex = Regex::new(r#":\s*([^;{}]*?\d\s+\s\d[^;{}]*?)\s*(;|\})"#).unwrap();
+  // content = regex.replace_all(&content, ":\"$1\"$2").to_string();
 
   let (cm, source_file) = create_swc_source_map(Source {
     path: PathBuf::from(id),

diff --git a/examples/tailwind/src/App.tsx b/examples/tailwind/src/App.tsx
@@ -17,7 +17,7 @@ const App = () => {
           Edit <code>src/App.tsx</code> and save to reload.
         </p>
         <a
-          className="text-blue-300"
+          className="text-blue-300 shadow"
           href="https://github.com/tailwindcss/tailwindcss"
           target="_blank"
           rel="noopener noreferrer"

diff --git a/examples/vite-adapter-vue/src/App.vue b/examples/vite-adapter-vue/src/App.vue
@@ -3,9 +3,9 @@
     <img src="/logo.png" alt="">
     <test />
 
-    <TinyButton type="primary" @click="btnClick">
+    <!-- <TinyButton type="primary" @click="btnClick">
       Tiny Vue Modal 最大化显示
-    </TinyButton>
+    </TinyButton> -->
 
     <test1 />
     <aboute />
@@ -15,11 +15,11 @@
 </template>
 
 <script lang="ts" setup>
-import { Button as TinyButton, Modal } from '@opentiny/vue'
+// import { Button as TinyButton, Modal } from '@opentiny/vue'
 
-function btnClick() {
-  Modal.alert({ message: '最大化显示', fullscreen: true })
-}
+// function btnClick() {
+//   Modal.alert({ message: '最大化显示', fullscreen: true })
+// }
 
 import test1 from './components/test1.vue';
 import test from './components/test.vue';