Merge branch 'main' into refactor/node

farm-fe · Sep 25, 2024 · 0436688 · 0436688
2 parents a379051 + 84d7242
commit 0436688
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -92,7 +92,7 @@ Visit [Farm Documentation](https://farmfe.org) to learn more about Farm.
 
 Farm is much faster than similar tool， **20x** faster than webpack and **10x** faster than Vite in the benchmark:
 
-![benchmark](./assets/benchmark-full.png)
+![benchmark](https://raw.githubusercontent.com/farm-fe/performance-compare/main/full.png)
 
 See [Benchmark](https://github.com/farm-fe/performance-compare) for details.
 

diff --git a/bench/CHANGELOG.md b/bench/CHANGELOG.md
@@ -1,5 +1,13 @@
 # bench
 
+## 1.0.12
+
+### Patch Changes
+
+- Updated dependencies [e17551ad]
+- Updated dependencies [4542c3d8]
+  - @farmfe/core@1.3.23
+
 ## 1.0.11
 
 ### Patch Changes

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

diff --git a/crates/plugin_css/src/lib.rs b/crates/plugin_css/src/lib.rs
@@ -187,6 +187,7 @@ impl Plugin for FarmPluginCss {
   fn name(&self) -> &str {
     "FarmPluginCss"
   }
+
   /// This plugin should be executed at last
   fn priority(&self) -> i32 {
     -99

diff --git a/cspell.json b/cspell.json
@@ -43,6 +43,7 @@
     "Consolas",
     "Convertion",
     "consts",
+    "Convertion",
     "cpus",
     "csspart",
     "ctxt",

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.22"
+    "@farmfe/core": "workspace:^1.3.23"
   },
   "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.22",
+    "@farmfe/core": "workspace:^1.3.23",
     "less": "*",
     "sass": "*",
     "stylus": "*"

diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @farmfe/core
 
+## 1.3.23
+
+### Patch Changes
+
+- e17551ad: support css module name coversion
+- 4542c3d8: Temporarily disable the esbuild attribute in the vite plugin
+
 ## 1.3.22
 
 ### Patch Changes

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

diff --git a/packages/core/src/config/types.ts b/packages/core/src/config/types.ts
@@ -134,6 +134,12 @@ interface ResolvedCss extends CssConfig {
   };
 }
 
+interface ResolvedCss extends CssConfig {
+  modules?: CssConfig['modules'] & {
+    localsConversion?: never;
+  };
+}
+
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface ResolvedCompilation
   extends Exclude<Config['config'], undefined> {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml