diff --git a/packages/plugin-angular/package.json b/packages/plugin-angular/package.json
index 29b3ffd0..0a4ef437 100644
--- a/packages/plugin-angular/package.json
+++ b/packages/plugin-angular/package.json
@@ -31,13 +31,13 @@
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.es.js",
+      "import": "./dist/index.mjs",
       "require": "./dist/index.umd.js",
       "default": "./dist/index.umd.js"
     }
   },
   "main": "./dist/index.umd.js",
-  "module": "./dist/index.es.js",
+  "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "typesVersions": {
     "*": {
diff --git a/packages/plugin-angular/vite.config.ts b/packages/plugin-angular/vite.config.ts
index 2942656e..59faa5c4 100644
--- a/packages/plugin-angular/vite.config.ts
+++ b/packages/plugin-angular/vite.config.ts
@@ -26,9 +26,9 @@ export default defineConfig({
     minify: true,
     reportCompressedSize: true,
     lib: {
-      entry: path.resolve(__dirname, 'src/index.ts'),
       name: 'SignalDB',
-      fileName: format => `index.${format}.js`,
+      entry: path.resolve(__dirname, 'src/index.ts'),
+      fileName: format => (format === 'es' ? 'index.mjs' : `index.${format}.js`),
     },
     rollupOptions: {
       external: [
diff --git a/packages/plugin-maverickjs/package.json b/packages/plugin-maverickjs/package.json
index 6fe8d000..dbfd731e 100644
--- a/packages/plugin-maverickjs/package.json
+++ b/packages/plugin-maverickjs/package.json
@@ -30,13 +30,13 @@
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.es.js",
+      "import": "./dist/index.mjs",
       "require": "./dist/index.umd.js",
       "default": "./dist/index.umd.js"
     }
   },
   "main": "./dist/index.umd.js",
-  "module": "./dist/index.es.js",
+  "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "typesVersions": {
     "*": {
diff --git a/packages/plugin-maverickjs/vite.config.ts b/packages/plugin-maverickjs/vite.config.ts
index 0db557e1..da67d65f 100644
--- a/packages/plugin-maverickjs/vite.config.ts
+++ b/packages/plugin-maverickjs/vite.config.ts
@@ -26,9 +26,9 @@ export default defineConfig({
     minify: true,
     reportCompressedSize: true,
     lib: {
-      entry: path.resolve(__dirname, 'src/index.ts'),
       name: 'SignalDB',
-      fileName: format => `index.${format}.js`,
+      entry: path.resolve(__dirname, 'src/index.ts'),
+      fileName: format => (format === 'es' ? 'index.mjs' : `index.${format}.js`),
     },
     rollupOptions: {
       external: [
diff --git a/packages/plugin-meteor/package.json b/packages/plugin-meteor/package.json
index 3c56ee2a..cd80f2d6 100644
--- a/packages/plugin-meteor/package.json
+++ b/packages/plugin-meteor/package.json
@@ -31,13 +31,13 @@
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.es.js",
+      "import": "./dist/index.mjs",
       "require": "./dist/index.umd.js",
       "default": "./dist/index.umd.js"
     }
   },
   "main": "./dist/index.umd.js",
-  "module": "./dist/index.es.js",
+  "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "typesVersions": {
     "*": {
diff --git a/packages/plugin-meteor/vite.config.ts b/packages/plugin-meteor/vite.config.ts
index 4c483f11..c36dc248 100644
--- a/packages/plugin-meteor/vite.config.ts
+++ b/packages/plugin-meteor/vite.config.ts
@@ -26,9 +26,9 @@ export default defineConfig({
     minify: true,
     reportCompressedSize: true,
     lib: {
-      entry: path.resolve(__dirname, 'src/index.ts'),
       name: 'SignalDB',
-      fileName: format => `index.${format}.js`,
+      entry: path.resolve(__dirname, 'src/index.ts'),
+      fileName: format => (format === 'es' ? 'index.mjs' : `index.${format}.js`),
     },
     rollupOptions: {
       external: [
diff --git a/packages/plugin-mobx/package.json b/packages/plugin-mobx/package.json
index a52b67b4..7856be9b 100644
--- a/packages/plugin-mobx/package.json
+++ b/packages/plugin-mobx/package.json
@@ -30,13 +30,13 @@
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.es.js",
+      "import": "./dist/index.mjs",
       "require": "./dist/index.umd.js",
       "default": "./dist/index.umd.js"
     }
   },
   "main": "./dist/index.umd.js",
-  "module": "./dist/index.es.js",
+  "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "typesVersions": {
     "*": {
diff --git a/packages/plugin-mobx/vite.config.ts b/packages/plugin-mobx/vite.config.ts
index 48e8ee44..89f38d57 100644
--- a/packages/plugin-mobx/vite.config.ts
+++ b/packages/plugin-mobx/vite.config.ts
@@ -26,9 +26,9 @@ export default defineConfig({
     minify: true,
     reportCompressedSize: true,
     lib: {
-      entry: path.resolve(__dirname, 'src/index.ts'),
       name: 'SignalDB',
-      fileName: format => `index.${format}.js`,
+      entry: path.resolve(__dirname, 'src/index.ts'),
+      fileName: format => (format === 'es' ? 'index.mjs' : `index.${format}.js`),
     },
     rollupOptions: {
       external: [
diff --git a/packages/plugin-oby/package.json b/packages/plugin-oby/package.json
index 7ebcf586..345c4f60 100644
--- a/packages/plugin-oby/package.json
+++ b/packages/plugin-oby/package.json
@@ -30,13 +30,13 @@
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.es.js",
+      "import": "./dist/index.mjs",
       "require": "./dist/index.umd.js",
       "default": "./dist/index.umd.js"
     }
   },
   "main": "./dist/index.umd.js",
-  "module": "./dist/index.es.js",
+  "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "typesVersions": {
     "*": {
diff --git a/packages/plugin-oby/vite.config.ts b/packages/plugin-oby/vite.config.ts
index 0db557e1..da67d65f 100644
--- a/packages/plugin-oby/vite.config.ts
+++ b/packages/plugin-oby/vite.config.ts
@@ -26,9 +26,9 @@ export default defineConfig({
     minify: true,
     reportCompressedSize: true,
     lib: {
-      entry: path.resolve(__dirname, 'src/index.ts'),
       name: 'SignalDB',
-      fileName: format => `index.${format}.js`,
+      entry: path.resolve(__dirname, 'src/index.ts'),
+      fileName: format => (format === 'es' ? 'index.mjs' : `index.${format}.js`),
     },
     rollupOptions: {
       external: [
diff --git a/packages/plugin-preact/package.json b/packages/plugin-preact/package.json
index 96300263..7bb283df 100644
--- a/packages/plugin-preact/package.json
+++ b/packages/plugin-preact/package.json
@@ -30,13 +30,13 @@
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.es.js",
+      "import": "./dist/index.mjs",
       "require": "./dist/index.umd.js",
       "default": "./dist/index.umd.js"
     }
   },
   "main": "./dist/index.umd.js",
-  "module": "./dist/index.es.js",
+  "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "typesVersions": {
     "*": {
diff --git a/packages/plugin-preact/vite.config.ts b/packages/plugin-preact/vite.config.ts
index 105b6b29..5415ad00 100644
--- a/packages/plugin-preact/vite.config.ts
+++ b/packages/plugin-preact/vite.config.ts
@@ -26,9 +26,9 @@ export default defineConfig({
     minify: true,
     reportCompressedSize: true,
     lib: {
-      entry: path.resolve(__dirname, 'src/index.ts'),
       name: 'SignalDB',
-      fileName: format => `index.${format}.js`,
+      entry: path.resolve(__dirname, 'src/index.ts'),
+      fileName: format => (format === 'es' ? 'index.mjs' : `index.${format}.js`),
     },
     rollupOptions: {
       external: [
diff --git a/packages/plugin-reactively/package.json b/packages/plugin-reactively/package.json
index 94357871..8e72491b 100644
--- a/packages/plugin-reactively/package.json
+++ b/packages/plugin-reactively/package.json
@@ -30,13 +30,13 @@
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.es.js",
+      "import": "./dist/index.mjs",
       "require": "./dist/index.umd.js",
       "default": "./dist/index.umd.js"
     }
   },
   "main": "./dist/index.umd.js",
-  "module": "./dist/index.es.js",
+  "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "typesVersions": {
     "*": {
diff --git a/packages/plugin-reactively/vite.config.ts b/packages/plugin-reactively/vite.config.ts
index 513e99f2..67b8f412 100644
--- a/packages/plugin-reactively/vite.config.ts
+++ b/packages/plugin-reactively/vite.config.ts
@@ -26,9 +26,9 @@ export default defineConfig({
     minify: true,
     reportCompressedSize: true,
     lib: {
-      entry: path.resolve(__dirname, 'src/index.ts'),
       name: 'SignalDB',
-      fileName: format => `index.${format}.js`,
+      entry: path.resolve(__dirname, 'src/index.ts'),
+      fileName: format => (format === 'es' ? 'index.mjs' : `index.${format}.js`),
     },
     rollupOptions: {
       external: [
diff --git a/packages/plugin-sinuous/package.json b/packages/plugin-sinuous/package.json
index 7b97efa3..a9fe438f 100644
--- a/packages/plugin-sinuous/package.json
+++ b/packages/plugin-sinuous/package.json
@@ -30,13 +30,13 @@
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.es.js",
+      "import": "./dist/index.mjs",
       "require": "./dist/index.umd.js",
       "default": "./dist/index.umd.js"
     }
   },
   "main": "./dist/index.umd.js",
-  "module": "./dist/index.es.js",
+  "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "typesVersions": {
     "*": {
diff --git a/packages/plugin-sinuous/vite.config.ts b/packages/plugin-sinuous/vite.config.ts
index 3cdfeee4..02b82d9c 100644
--- a/packages/plugin-sinuous/vite.config.ts
+++ b/packages/plugin-sinuous/vite.config.ts
@@ -26,9 +26,9 @@ export default defineConfig({
     minify: true,
     reportCompressedSize: true,
     lib: {
-      entry: path.resolve(__dirname, 'src/index.ts'),
       name: 'SignalDB',
-      fileName: format => `index.${format}.js`,
+      entry: path.resolve(__dirname, 'src/index.ts'),
+      fileName: format => (format === 'es' ? 'index.mjs' : `index.${format}.js`),
     },
     rollupOptions: {
       external: [
diff --git a/packages/plugin-sjs/package.json b/packages/plugin-sjs/package.json
index 13b3e63c..d89563b1 100644
--- a/packages/plugin-sjs/package.json
+++ b/packages/plugin-sjs/package.json
@@ -30,13 +30,13 @@
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.es.js",
+      "import": "./dist/index.mjs",
       "require": "./dist/index.umd.js",
       "default": "./dist/index.umd.js"
     }
   },
   "main": "./dist/index.umd.js",
-  "module": "./dist/index.es.js",
+  "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "typesVersions": {
     "*": {
diff --git a/packages/plugin-sjs/vite.config.ts b/packages/plugin-sjs/vite.config.ts
index c21afdcd..4537dfb0 100644
--- a/packages/plugin-sjs/vite.config.ts
+++ b/packages/plugin-sjs/vite.config.ts
@@ -26,9 +26,9 @@ export default defineConfig({
     minify: true,
     reportCompressedSize: true,
     lib: {
-      entry: path.resolve(__dirname, 'src/index.ts'),
       name: 'SignalDB',
-      fileName: format => `index.${format}.js`,
+      entry: path.resolve(__dirname, 'src/index.ts'),
+      fileName: format => (format === 'es' ? 'index.mjs' : `index.${format}.js`),
     },
     rollupOptions: {
       external: [
diff --git a/packages/plugin-solid/package.json b/packages/plugin-solid/package.json
index a6868296..9e688b83 100644
--- a/packages/plugin-solid/package.json
+++ b/packages/plugin-solid/package.json
@@ -31,13 +31,13 @@
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.es.js",
+      "import": "./dist/index.mjs",
       "require": "./dist/index.umd.js",
       "default": "./dist/index.umd.js"
     }
   },
   "main": "./dist/index.umd.js",
-  "module": "./dist/index.es.js",
+  "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "typesVersions": {
     "*": {
diff --git a/packages/plugin-solid/vite.config.ts b/packages/plugin-solid/vite.config.ts
index 1e3c9ca1..482b9396 100644
--- a/packages/plugin-solid/vite.config.ts
+++ b/packages/plugin-solid/vite.config.ts
@@ -26,9 +26,9 @@ export default defineConfig({
     minify: true,
     reportCompressedSize: true,
     lib: {
-      entry: path.resolve(__dirname, 'src/index.ts'),
       name: 'SignalDB',
-      fileName: format => `index.${format}.js`,
+      entry: path.resolve(__dirname, 'src/index.ts'),
+      fileName: format => (format === 'es' ? 'index.mjs' : `index.${format}.js`),
     },
     rollupOptions: {
       external: [
diff --git a/packages/plugin-usignal/package.json b/packages/plugin-usignal/package.json
index 2b81d45a..65a35ee9 100644
--- a/packages/plugin-usignal/package.json
+++ b/packages/plugin-usignal/package.json
@@ -30,13 +30,13 @@
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.es.js",
+      "import": "./dist/index.mjs",
       "require": "./dist/index.umd.js",
       "default": "./dist/index.umd.js"
     }
   },
   "main": "./dist/index.umd.js",
-  "module": "./dist/index.es.js",
+  "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "typesVersions": {
     "*": {
diff --git a/packages/plugin-usignal/vite.config.ts b/packages/plugin-usignal/vite.config.ts
index 06ceda96..24cbe27f 100644
--- a/packages/plugin-usignal/vite.config.ts
+++ b/packages/plugin-usignal/vite.config.ts
@@ -26,9 +26,9 @@ export default defineConfig({
     minify: true,
     reportCompressedSize: true,
     lib: {
-      entry: path.resolve(__dirname, 'src/index.ts'),
       name: 'SignalDB',
-      fileName: format => `index.${format}.js`,
+      entry: path.resolve(__dirname, 'src/index.ts'),
+      fileName: format => (format === 'es' ? 'index.mjs' : `index.${format}.js`),
     },
     rollupOptions: {
       external: [
diff --git a/packages/plugin-vue/package.json b/packages/plugin-vue/package.json
index 9169001a..0eaae50b 100644
--- a/packages/plugin-vue/package.json
+++ b/packages/plugin-vue/package.json
@@ -30,13 +30,13 @@
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.es.js",
+      "import": "./dist/index.mjs",
       "require": "./dist/index.umd.js",
       "default": "./dist/index.umd.js"
     }
   },
   "main": "./dist/index.umd.js",
-  "module": "./dist/index.es.js",
+  "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "typesVersions": {
     "*": {
diff --git a/packages/plugin-vue/vite.config.ts b/packages/plugin-vue/vite.config.ts
index 10211fa0..658ca89c 100644
--- a/packages/plugin-vue/vite.config.ts
+++ b/packages/plugin-vue/vite.config.ts
@@ -26,9 +26,9 @@ export default defineConfig({
     minify: true,
     reportCompressedSize: true,
     lib: {
-      entry: path.resolve(__dirname, 'src/index.ts'),
       name: 'SignalDB',
-      fileName: format => `index.${format}.js`,
+      entry: path.resolve(__dirname, 'src/index.ts'),
+      fileName: format => (format === 'es' ? 'index.mjs' : `index.${format}.js`),
     },
     rollupOptions: {
       external: [
diff --git a/packages/signaldb/package.json b/packages/signaldb/package.json
index 08571457..2c1cefed 100644
--- a/packages/signaldb/package.json
+++ b/packages/signaldb/package.json
@@ -33,13 +33,13 @@
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.es.js",
+      "import": "./dist/index.mjs",
       "require": "./dist/index.umd.js",
       "default": "./dist/index.umd.js"
     }
   },
   "main": "./dist/index.umd.js",
-  "module": "./dist/index.es.js",
+  "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "typesVersions": {
     "*": {
diff --git a/packages/signaldb/vite.config.ts b/packages/signaldb/vite.config.ts
index 3a9c61e9..d32d4c73 100644
--- a/packages/signaldb/vite.config.ts
+++ b/packages/signaldb/vite.config.ts
@@ -26,9 +26,9 @@ export default defineConfig({
     minify: true,
     reportCompressedSize: true,
     lib: {
-      entry: path.resolve(__dirname, 'src/index.ts'),
       name: 'SignalDB',
-      fileName: format => `index.${format}.js`,
+      entry: path.resolve(__dirname, 'src/index.ts'),
+      fileName: format => (format === 'es' ? 'index.mjs' : `index.${format}.js`),
     },
     rollupOptions: {
       external: [