nuxt-users 1.34.2 → 1.34.4

package/CHANGELOG.md

@@ -1,6 +1,53 @@
 # Changelog
 
 
+## v1.34.4
+
+[compare changes](https://github.com/rrd108/nuxt-users/compare/v1.34.3...v1.34.4)
+
+### 🩹 Fixes
+
+- Conflicting runtimeconfig ([563dcca](https://github.com/rrd108/nuxt-users/commit/563dcca))
+- Lint errors ([b590e6d](https://github.com/rrd108/nuxt-users/commit/b590e6d))
+- **deps:** Update nuxtjs monorepo to v3.19.2 ([9963034](https://github.com/rrd108/nuxt-users/commit/9963034))
+- Use runtimeconfig for nitro ([346ad0d](https://github.com/rrd108/nuxt-users/commit/346ad0d))
+
+### 🏡 Chore
+
+- **release:** V1.34.3 ([23b3a30](https://github.com/rrd108/nuxt-users/commit/23b3a30))
+- Fix whitespace ([2e24416](https://github.com/rrd108/nuxt-users/commit/2e24416))
+
+### ✅ Tests
+
+- Add for config conflict ([59271e3](https://github.com/rrd108/nuxt-users/commit/59271e3))
+
+### ❤️ Contributors
+
+- Rrd108 ([@rrd108](https://github.com/rrd108))
+
+## v1.34.3
+
+[compare changes](https://github.com/rrd108/nuxt-users/compare/v1.34.2...v1.34.3)
+
+### 🩹 Fixes
+
+- Remember me closes #3 ([#3](https://github.com/rrd108/nuxt-users/issues/3))
+- Hard reload ([187c828](https://github.com/rrd108/nuxt-users/commit/187c828))
+- Conflicting runtimeconfig ([563dcca](https://github.com/rrd108/nuxt-users/commit/563dcca))
+- Lint errors ([b590e6d](https://github.com/rrd108/nuxt-users/commit/b590e6d))
+
+### 🏡 Chore
+
+- **release:** V1.34.2 ([60d87dc](https://github.com/rrd108/nuxt-users/commit/60d87dc))
+
+### ✅ Tests
+
+- Add for config conflict ([59271e3](https://github.com/rrd108/nuxt-users/commit/59271e3))
+
+### ❤️ Contributors
+
+- Rrd108 ([@rrd108](https://github.com/rrd108))
+
 ## v1.34.2
 
 [compare changes](https://github.com/rrd108/nuxt-users/compare/v1.34.1...v1.34.2)

package/dist/cli.mjs

@@ -50,12 +50,29 @@ const getOptionsFromEnv = () => {
 const loadOptions = async () => {
   try {
     console.log("[Nuxt Users] Loading Nuxt project...");
-    const nuxt = await loadNuxt({ cwd: process.cwd() });
-    const nuxtUsersConfig = nuxt.options.nuxtUsers;
+    const nuxt = await loadNuxt({ cwd: process.cwd(), ready: false });
+    const topLevelConfig = nuxt.options.nuxtUsers;
+    const originalRuntimeConfig = await (async () => {
+      try {
+        const configPath = await import('node:path').then((p) => p.resolve(process.cwd(), "nuxt.config.ts"));
+        const config = await import(configPath).then((m) => m.default);
+        return config?.runtimeConfig?.nuxtUsers;
+      } catch {
+        return nuxt.options.runtimeConfig?.nuxtUsers;
+      }
+    })();
     await nuxt.close();
-    if (nuxtUsersConfig) {
-      console.log("[Nuxt Users] Using configuration from Nuxt project");
-      return defu(nuxtUsersConfig, defaultOptions);
+    if (topLevelConfig || originalRuntimeConfig) {
+      console.log("[Nuxt Users] Using configuration from nuxt.config");
+      let mergedConfig = defu(topLevelConfig, originalRuntimeConfig, defaultOptions);
+      const configuredConnector = topLevelConfig?.connector || originalRuntimeConfig?.connector;
+      if (configuredConnector) {
+        mergedConfig = {
+          ...mergedConfig,
+          connector: configuredConnector
+        };
+      }
+      return mergedConfig;
     } else {
       console.log("[Nuxt Users] No nuxt-users configuration found, using environment variables");
       return getOptionsFromEnv();

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "nuxt-users",
   "configKey": "nuxtUsers",
-  "version": "1.34.2",
+  "version": "1.34.4",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.0"

package/dist/module.mjs

@@ -205,29 +205,6 @@ const module = defineNuxtModule({
     nuxt.hook("nitro:config", async (nitroConfig) => {
       nitroConfig.experimental = nitroConfig.experimental || {};
       nitroConfig.experimental.database = true;
-      nitroConfig.database = nitroConfig.database || {};
-      if (!nitroConfig.database.default) {
-        const finalConnectorConfig = nuxt.options.runtimeConfig.nuxtUsers;
-        const connectorOptions = { ...finalConnectorConfig.connector.options };
-        let nitroConnector;
-        switch (finalConnectorConfig.connector.name) {
-          case "sqlite":
-            nitroConnector = "better-sqlite3";
-            break;
-          case "mysql":
-            nitroConnector = "mysql2";
-            break;
-          case "postgresql":
-            nitroConnector = "postgresql";
-            break;
-          default:
-            nitroConnector = "better-sqlite3";
-        }
-        nitroConfig.database.default = {
-          connector: nitroConnector,
-          options: connectorOptions
-        };
-      }
       nitroConfig.experimental.tasks = true;
       nitroConfig.scanDirs = nitroConfig.scanDirs || [];
       nitroConfig.scanDirs.push(resolver.resolve("./runtime/server/tasks"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-users",
-  "version": "1.34.2",
+  "version": "1.34.4",
   "description": "A comprehensive user management module for Nuxt 3 and Nuxt 4 applications with authentication, authorization, database support, and CLI tools",
   "keywords": [
     "nuxt",