Merge branch 'main' into refactor/node

farm-fe · Oct 18, 2024 · 2a0ad60 · 2a0ad60
2 parents f107a4e + 92ce692
commit 2a0ad60
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 17 deletions.
diff --git a/.changeset/ninety-mangos-buy.md b/.changeset/ninety-mangos-buy.md
diff --git a/bench/CHANGELOG.md b/bench/CHANGELOG.md
@@ -1,5 +1,12 @@
 # bench
 
+## 1.0.18
+
+### Patch Changes
+
+- Updated dependencies [663dfeed]
+  - @farmfe/core@1.3.29
+
 ## 1.0.17
 
 ### Patch Changes

diff --git a/bench/package.json b/bench/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bench",
-  "version": "1.0.17",
+  "version": "1.0.18",
   "private": true,
   "description": "",
   "scripts": {},

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 />
@@ -21,9 +21,9 @@ import home from "./pages/index.vue";
 import aboute from "../deps/node_modules/my-ui/index.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';

diff --git a/js-plugins/solid/package.json b/js-plugins/solid/package.json
@@ -39,7 +39,7 @@
     "solid-js": "^1.7.8"
   },
   "peerDependencies": {
-    "@farmfe/core": "workspace:^1.3.28"
+    "@farmfe/core": "workspace:^1.3.29"
   },
   "files": [
     "build"

diff --git a/js-plugins/vue/package.json b/js-plugins/vue/package.json
@@ -50,7 +50,7 @@
     "source-map": "^0.7.4"
   },
   "peerDependencies": {
-    "@farmfe/core": "workspace:^1.3.28",
+    "@farmfe/core": "workspace:^1.3.29",
     "less": "*",
     "sass": "*",
     "stylus": "*"

diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @farmfe/core
 
+## 1.3.29
+
+### Patch Changes
+
+- 663dfeed: Revert change of replacing invalid css
+
 ## 1.3.28
 
 ### Patch Changes

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@farmfe/core",
-  "version": "1.3.28",
+  "version": "1.3.29",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",