Merge branch 'main' into ci/cancel-test

farm-fe · Jan 12, 2025 · a17bcac · a17bcac
2 parents 44c05b6 + 2423ee6
commit a17bcac
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/.changeset/sixty-mice-double.md b/.changeset/sixty-mice-double.md
diff --git a/.changeset/tiny-berries-think.md b/.changeset/tiny-berries-think.md
@@ -0,0 +1,5 @@
+---
+"@farmfe/core": patch
+---
+
+Fix query strings in external imports are duplicated
diff --git a/crates/plugin_resolve/src/lib.rs b/crates/plugin_resolve/src/lib.rs
@@ -83,7 +83,7 @@ impl Plugin for FarmPluginResolve {
       // check external first, if the source is set as external, return it immediately
       if external_config.is_external(source) {
         return Ok(Some(PluginResolveHookResult {
-          resolved_path: param.source.clone(),
+          resolved_path: String::from(source),
           external: true,
           side_effects: false,
           query,

diff --git a/packages/create-farm/CHANGELOG.md b/packages/create-farm/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.0.18
+
+### Patch Changes
+
+- d575d727: Add support for tauri v2
+
 ## 0.0.17
 
 ### Patch Changes
@@ -71,7 +77,7 @@
 ### Patch Changes
 
 - 068c3ea5: support more frameworks electron, tauri, nestjs
-All notable changes to this project will be documented in this file.
+  All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

diff --git a/packages/create-farm/package.json b/packages/create-farm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-farm",
-  "version": "0.0.17",
+  "version": "0.0.18",
   "description": "Rapidly create a new farm project.",
   "repository": "https://github.com/farm-fe/farm/tree/main/packages/create-farm",
   "bugs": {