fix: persistent cache conflicts (#1131)

Co-authored-by: brightwwu <brightwwu@tencent.com>
farm-fe · Apr 7, 2024 · 9ae8643 · 9ae8643
1 parent f6fa2f5
commit 9ae8643
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 5 deletions.
diff --git a/.changeset/gentle-gorillas-agree.md b/.changeset/gentle-gorillas-agree.md
@@ -0,0 +1,5 @@
+---
+'@farmfe/core': patch
+---
+
+Fix persistent cache conflicts
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.3.2";
+const FARM_CACHE_VERSION: &str = "0.3.3";
 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/src/transform_css_to_script.rs b/crates/plugin_css/src/transform_css_to_script.rs
@@ -53,7 +53,12 @@ pub fn transform_css_to_script_modules(
         let store_key = CacheStoreKey {
           name: module_id.to_string() + "-transform_css_to_script_modules",
           key: sha256(
-            format!("{}{}", content_hash, module_id.to_string()).as_bytes(),
+            format!(
+              "transform_css_to_script_modules_{}_{}",
+              content_hash,
+              module_id.to_string()
+            )
+            .as_bytes(),
             32,
           ),
         };

diff --git a/crates/plugin_runtime/src/render_resource_pot/mod.rs b/crates/plugin_runtime/src/render_resource_pot/mod.rs
@@ -110,7 +110,12 @@ pub fn resource_pot_to_runtime_object(
         let store_key = CacheStoreKey {
           name: m_id.to_string() + "-resource_pot_to_runtime_object",
           key: sha256(
-            format!("{}{}", content_hash, m_id.to_string()).as_bytes(),
+            format!(
+              "resource_pot_to_runtime_object_{}_{}",
+              content_hash,
+              m_id.to_string()
+            )
+            .as_bytes(),
             32,
           ),
         };

diff --git a/examples/vite-adapter-vue/farm.config.ts b/examples/vite-adapter-vue/farm.config.ts
@@ -27,7 +27,7 @@ function configureVitePluginVue() {
 export default defineConfig({
   compilation: {
     // compilation options here
-    persistentCache: false
+    // persistentCache: false
   },
   plugins: [
     '@farmfe/plugin-sass',

diff --git a/examples/vite-adapter-vue/src/components/Intro.vue b/examples/vite-adapter-vue/src/components/Intro.vue
@@ -1,7 +1,7 @@
 <script lang="ts"></script>
 
 <template>
-   <p>
+  <p>
     Install
     <a href="https://github.com/vuejs/language-tools" target="_blank">Volar</a>
     in your IDE for a better DX