nuxt-loaders 1.1.0 → 1.1.2

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "nuxt-loaders",
   "configKey": "loaders",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/runtime/lib/utils/route-rules.js

@@ -76,20 +76,29 @@ export const getDefaultLoader = (routeRules, defaultLoaderName = "DefaultLoader"
 };
 export const getActiveLoader = (routeRules, path) => {
   if (path.endsWith("/")) {
-    path = path.substring(0, -1);
+    path = path.slice(0, -1);
   }
   const rules = Object.keys(routeRules).filter((rule2) => {
     if (rule2.endsWith("/")) {
-      rule2 = rule2.substring(0, -1);
+      rule2 = rule2.slice(0, -1);
     }
-    if (!path.startsWith(rule2)) return false;
     if (!rule2.endsWith("/*") && path != rule2) return false;
+    if (rule2.endsWith("/*")) {
+      rule2 = rule2.slice(0, -2);
+    }
+    if (!path.startsWith(rule2)) return false;
     return true;
   });
   if (rules.length <= 0) {
     return "";
   }
   const rule = rules.reduce((prev, curr) => {
+    if (curr.endsWith("/*")) {
+      curr = curr.slice(0, -2);
+    }
+    if (prev.endsWith("/*")) {
+      prev = prev.slice(0, -2);
+    }
     if (curr.split("/").length > prev.split("/").length) return curr;
     return prev;
   });

package/dist/runtime/plugin.js

@@ -2,8 +2,14 @@ import { defineNuxtPlugin } from "#app";
 import { getActiveLoader } from "./lib/utils/route-rules.js";
 import { useLoader } from "./composables/useLoader.js";
 export default defineNuxtPlugin((nuxt) => {
-  const pageLoadingStartHooks = ["page:loading:start", "app:created"];
-  const pageLoadingEndHooks = ["page:loading:end", "app:mounted"];
+  const pageLoadingStartHooks = [
+    "page:loading:start",
+    "app:created"
+  ];
+  const pageLoadingEndHooks = [
+    "page:loading:end",
+    "app:mounted"
+  ];
   const states = useLoader();
   const { isLoading } = states;
   const ctx = nuxt.$config.public.loaders;
@@ -12,8 +18,8 @@ export default defineNuxtPlugin((nuxt) => {
     nuxt.hooks.beforeEach((e) => {
       if (pageLoadingStartHooks.includes(e.name)) {
         const newActive = getActiveLoader(routeRules, nuxt._route.fullPath);
-        if (newActive && newActive !== ctx._activeLoader) {
-          ctx._activeLoader = newActive;
+        if (newActive !== ctx._activeLoader) {
+          ctx._activeLoader = newActive ?? "";
         }
         isLoading.value = true;
       } else if (pageLoadingEndHooks.includes(e.name)) {

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "nuxt-loaders",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Simple loading screen engine for Nuxt 4+",
   "repository": "haileabt/nuxt-loaders",
   "license": "MIT",
+  "homepage": "https://nuxt-loaders.vercel.app",
   "type": "module",
   "exports": {
     ".": {