diff --git a/src/Fable.Cli/Fable.Cli.fsproj b/src/Fable.Cli/Fable.Cli.fsproj
index b9ccc15705..02f32f97ae 100644
--- a/src/Fable.Cli/Fable.Cli.fsproj
+++ b/src/Fable.Cli/Fable.Cli.fsproj
@@ -5,14 +5,20 @@
Exe
net5.0
4.0.0
- 4.0.0-snake-island-alpha-021
- * Rust, fixed curried apply, @ncave
-* Python, allow modules with uppercase letters, @dbrattli
-* Rust, added Math.DivRem support, @ncave
-* Rust, retain inlined funcs with CompiledName attr, @ncave
-* Python, fixes for extreme math values, @dbrattli
-* Rust, union fix for import prefixes, @alexswan10k
-* Rust, fixed build dependency for wasm32, @ncave
+ 4.0.0-snake-island-alpha-022
+ * Update F# compiler
+* Make Fable 4 compatible with Feliz plugins
+* Rust, Fixed inner attributes (#3121)
+* Rust, Output crate attributes only on last file (#3119)
+* Rust, Added collection wrappers (#3118)
+* Rust, fix byref nested context not correctly propagating (#3103)
+* Rust, Fixed passing fields by ref (#3116)
+* Rust, Fixed struct record copy (#3114)
+* Rust, Output string type (#3113)
+* Python, type var cleanup. Use Any for types starting with $$ (#3100)
+* Rust, Fixed string format without args
+* Rust, Fixed closure ident cloning (#3106)
+* Rust, Fixed static, member and interface imports (#3105)
Major
false
diff --git a/src/Fable.Cli/RELEASE_NOTES.md b/src/Fable.Cli/RELEASE_NOTES.md
index 781cd0b5fa..43c1bedeee 100644
--- a/src/Fable.Cli/RELEASE_NOTES.md
+++ b/src/Fable.Cli/RELEASE_NOTES.md
@@ -1,3 +1,19 @@
+### 4.0.0-snake-island-alpha-022
+
+* Update F# compiler
+* Make Fable 4 compatible with Feliz plugins
+* Rust, Fixed inner attributes (#3121)
+* Rust, Output crate attributes only on last file (#3119)
+* Rust, Added collection wrappers (#3118)
+* Rust, fix byref nested context not correctly propagating (#3103)
+* Rust, Fixed passing fields by ref (#3116)
+* Rust, Fixed struct record copy (#3114)
+* Rust, Output string type (#3113)
+* Python, type var cleanup. Use Any for types starting with $$ (#3100)
+* Rust, Fixed string format without args
+* Rust, Fixed closure ident cloning (#3106)
+* Rust, Fixed static, member and interface imports (#3105)
+
### 4.0.0-snake-island-alpha-021
* Rust, fixed curried apply, @ncave
diff --git a/src/Fable.Transforms/FSharp2Fable.fs b/src/Fable.Transforms/FSharp2Fable.fs
index 30e65097cd..007e7b0fac 100644
--- a/src/Fable.Transforms/FSharp2Fable.fs
+++ b/src/Fable.Transforms/FSharp2Fable.fs
@@ -1668,10 +1668,9 @@ let resolveInlineExpr (com: IFableCompiler) ctx info expr =
// If it happens we're importing a member in the current file
// use IdentExpr instead of Import
let isImportToSameFile =
- info.FileName = com.CurrentFile && (
- let dirName, info = Path.GetDirectoryAndFileNames(importInfo.Path)
- dirName = "." && info = Path.GetFileName(com.CurrentFile)
- )
+ Path.Combine(Path.GetDirectoryName(info.FileName), importInfo.Path)
+ |> Path.normalizeFullPath
+ |> (=) com.CurrentFile
if isImportToSameFile then
Fable.IdentExpr { makeTypedIdent t importInfo.Selector with Range = r }
else
diff --git a/src/Fable.Transforms/Global/Compiler.fs b/src/Fable.Transforms/Global/Compiler.fs
index cf36755bc3..ad6848d5e4 100644
--- a/src/Fable.Transforms/Global/Compiler.fs
+++ b/src/Fable.Transforms/Global/Compiler.fs
@@ -1,7 +1,7 @@
namespace Fable
module Literals =
- let [] VERSION = "4.0.0-snake-island-alpha-021"
+ let [] VERSION = "4.0.0-snake-island-alpha-022"
type CompilerOptionsHelper =
static member Make(?language,