Merge branch 'v2-dev' into feat/add_command_and_isProduction

farm-fe · Dec 24, 2024 · 1fe101a · 1fe101a
2 parents 0fc0d2b + 7642c9c
commit 1fe101a
Show file tree

Hide file tree

Showing 101 changed files with 2,105 additions and 487 deletions.
diff --git a/.changeset/nine-dots-mate.md b/.changeset/nine-dots-mate.md
@@ -0,0 +1,5 @@
+---
+"@farmfe/js-plugin-tailwindcss": patch
+---
+
+feat: support tailwindcss plugin
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/README.md b/README.md
@@ -111,7 +111,7 @@ See [Contributing Guide](https://github.com/farm-fe/farm/blob/main/CONTRIBUTING.
 
 - Wechat group
 
-<br><img src="https://github.com/user-attachments/assets/a72d401e-706b-4283-aa2f-1502b11c64d2" width="30%" />
+<br><img src="https://github.com/user-attachments/assets/7fabf743-7932-429d-a444-8f24489c79de" width="30%" />
 
 - QQ group
 

diff --git a/README.zh-CN.md b/README.zh-CN.md
@@ -106,7 +106,7 @@ Farm 远快于业界常用的 JS 构建工具，在 benchmark 测试中，Farm
 
 - 微信交流群
 
-<br><img src="https://github.com/user-attachments/assets/a72d401e-706b-4283-aa2f-1502b11c64d2" width="30%" />
+<br><img src="https://github.com/user-attachments/assets/7fabf743-7932-429d-a444-8f24489c79de" width="30%" />
 
 - QQ 群
 

diff --git a/bench/CHANGELOG.md b/bench/CHANGELOG.md
@@ -1,5 +1,13 @@
 # bench
 
+## 1.0.33
+
+### Patch Changes
+
+- Updated dependencies [b235a919]
+- Updated dependencies [6b849123]
+  - @farmfe/core@1.6.0
+
 ## 1.0.32
 
 ### Patch Changes

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

diff --git a/crates/compiler/CHANGELOG.md b/crates/compiler/CHANGELOG.md
@@ -6,6 +6,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.0.13](https://github.com/farm-fe/farm/compare/farmfe_compiler-v0.0.12...farmfe_compiler-v0.0.13) - 2024-12-09
+
+### Added
+
+- v1.5.0 (#1987)
+- support tree shake import namespace (#1942)
+
+### Fixed
+
+- new import meta url runtime & merge electron preload output files (#1984)
+- cjs2esm entry omit default reexport (#1972)
+- bundle export cjs entry file (#1964)
+- external alias #1957 (#1959)
+- bundle global variable preserve (#1940)
+
 ## [0.0.12](https://github.com/farm-fe/farm/compare/farmfe_compiler-v0.0.11...farmfe_compiler-v0.0.12) - 2024-10-31
 
 ### Added

diff --git a/crates/compiler/Cargo.toml b/crates/compiler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "farmfe_compiler"
-version = "0.0.12"
+version = "0.0.13"
 edition = "2021"
 authors = ["brightwu(吴明亮) <[email protected]>"]
 license = "MIT"
@@ -10,25 +10,25 @@ repository = "https://github.com/farm-fe/farm"
 documentation = "https://docs.rs/farmfe_compiler"
 
 [dependencies]
-farmfe_core = { path = "../core", version = "0.7.0" }
-farmfe_plugin_partial_bundling = { path = "../plugin_partial_bundling", version = "0.0.12" }
-farmfe_plugin_resolve = { path = "../plugin_resolve", version = "0.0.12" }
-farmfe_plugin_script = { path = "../plugin_script", version = "0.0.11" }
-farmfe_plugin_runtime = { path = "../plugin_runtime", version = "0.0.12" }
-farmfe_plugin_html = { path = "../plugin_html", version = "0.0.12" }
-farmfe_plugin_tree_shake = { path = "../plugin_tree_shake", version = "0.0.11" }
-farmfe_plugin_css = { path = "../plugin_css", version = "0.0.14" }
-farmfe_plugin_lazy_compilation = { path = "../plugin_lazy_compilation", version = "0.0.12" }
-farmfe_plugin_static_assets = { path = "../plugin_static_assets", version = "0.0.12" }
-farmfe_plugin_minify = { path = "../plugin_minify", version = "0.0.12" }
-farmfe_toolkit = { path = "../toolkit", version = "0.0.14" }
+farmfe_core = { path = "../core", version = "0.7.1" }
+farmfe_plugin_partial_bundling = { path = "../plugin_partial_bundling", version = "0.0.13" }
+farmfe_plugin_resolve = { path = "../plugin_resolve", version = "0.0.13" }
+farmfe_plugin_script = { path = "../plugin_script", version = "0.0.12" }
+farmfe_plugin_runtime = { path = "../plugin_runtime", version = "0.0.13" }
+farmfe_plugin_html = { path = "../plugin_html", version = "0.0.13" }
+farmfe_plugin_tree_shake = { path = "../plugin_tree_shake", version = "0.0.12" }
+farmfe_plugin_css = { path = "../plugin_css", version = "0.0.15" }
+farmfe_plugin_lazy_compilation = { path = "../plugin_lazy_compilation", version = "0.0.13" }
+farmfe_plugin_static_assets = { path = "../plugin_static_assets", version = "0.0.13" }
+farmfe_plugin_minify = { path = "../plugin_minify", version = "0.0.13" }
+farmfe_toolkit = { path = "../toolkit", version = "0.0.15" }
 farmfe_utils = { path = "../utils", version = "0.1.6" }
-farmfe_testing_helpers = { path = "../testing_helpers", version = "0.0.14" }
-farmfe_plugin_json = { path = "../plugin_json", version = "0.0.12" }
-farmfe_plugin_polyfill = { path = "../plugin_polyfill", version = "0.0.12" }
-farmfe_plugin_progress = { path = "../plugin_progress", version = "0.0.12" }
-farmfe_plugin_define = { path = "../plugin_define", version = "0.0.12" }
-farmfe_plugin_bundle = { path = "../plugin_bundle", version = "0.0.6" }
+farmfe_testing_helpers = { path = "../testing_helpers", version = "0.0.15" }
+farmfe_plugin_json = { path = "../plugin_json", version = "0.0.13" }
+farmfe_plugin_polyfill = { path = "../plugin_polyfill", version = "0.0.13" }
+farmfe_plugin_progress = { path = "../plugin_progress", version = "0.0.13" }
+farmfe_plugin_define = { path = "../plugin_define", version = "0.0.13" }
+farmfe_plugin_bundle = { path = "../plugin_bundle", version = "0.0.7" }
 num_cpus = "1.16.0"
 farmfe_testing = { path = "../macro_testing", version = "0.0.2" }
 

diff --git a/crates/compiler/src/build/module_cache.rs b/crates/compiler/src/build/module_cache.rs
@@ -230,6 +230,7 @@ pub fn set_module_graph_cache(module_ids: Vec<ModuleId>, context: &Arc<Compilati
             }
           })
           .collect(),
+        is_expired: false,
       };
 
       context

diff --git a/crates/core/CHANGELOG.md b/crates/core/CHANGELOG.md
@@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.7.1](https://github.com/farm-fe/farm/compare/farmfe_core-v0.7.0...farmfe_core-v0.7.1) - 2024-12-09
+
+### Added
+
+- v1.5.0 (#1987)
+
+### Fixed
+
+- freebsd build & cargo publish (#1938)
+- *(runtime)* async cache (#1902)
+
 ## [0.7.0](https://github.com/farm-fe/farm/compare/farmfe_core-v0.6.4...farmfe_core-v0.7.0) - 2024-10-31
 
 ### Added

diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "farmfe_core"
-version = "0.7.0"
+version = "0.7.1"
 edition = "2021"
 authors = ["brightwu(吴明亮) <[email protected]>"]
 license = "MIT"

diff --git a/crates/core/src/cache/cache_store.rs b/crates/core/src/cache/cache_store.rs
@@ -7,7 +7,7 @@ use std::path::{Path, PathBuf};
 
 use crate::config::Mode;
 
-const FARM_CACHE_VERSION: &str = "0.6.0";
+const FARM_CACHE_VERSION: &str = "0.6.1";
 const FARM_CACHE_MANIFEST_FILE: &str = "farm-cache.json";
 
 // TODO make CacheStore a trait and implement DiskCacheStore or RemoteCacheStore or more.
@@ -172,6 +172,19 @@ impl CacheStore {
 
     None
   }
+
+  pub fn remove_cache(&self, name: &str) {
+    if !self.manifest.contains_key(name) {
+      return;
+    }
+
+    let (_, cache_key) = self.manifest.remove(name).unwrap();
+    let cache_file = self.cache_dir.join(cache_key);
+
+    if cache_file.exists() && cache_file.is_file() {
+      std::fs::remove_file(cache_file).ok();
+    }
+  }
 }
 
 /// Cache key of the store, it's a pair of (name, cache_key), a name should only be related to one cache key.
-Original file line number
+Diff line change
@@ Expand Up @@
     - 微信交流群
-    <br><img src="https://github.com/user-attachments/assets/a72d401e-706b-4283-aa2f-1502b11c64d2" width="30%" />
+    <br><img src="https://github.com/user-attachments/assets/7fabf743-7932-429d-a444-8f24489c79de" width="30%" />
     - QQ 群
@@ Expand Down @@