npm - mnfst - Versions diffs - 0.5.94 → 0.5.95 - Mend

mnfst 0.5.94 → 0.5.95

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/lib/manifest.integrity.json +1 -1
package/lib/manifest.localization.js +94 -77
package/package.json +1 -1

package/lib/manifest.integrity.json CHANGED Viewed

@@ -10,7 +10,7 @@
   "manifest.dropdowns.js": "sha384-WMrFoSpKfJuo81dyrwhVrDO8rq+rDwh2x8x4nH01BY5ZHkvjE+/SaT2gWCI0zOn+",
   "manifest.export.js": "sha384-qvdGz1TiGEDOeWJ5os1z03RURdKX+ezZEQ1KyV+9iC7X0esLK83mtY87t4MQv45t",
   "manifest.icons.js": "sha384-uOkboYrovjCpl22eey3Jaxpey+pOnot5NDnRRumcRxiR7IOVaRh1i20gYnWXR5dW",
-  "manifest.localization.js": "sha384-Uw2x2kBJyr5u6BnPieR68Iz0kCdMK/lvIJQajxZGwqBSfa3204W9Sz7X8DYerC9b",
+  "manifest.localization.js": "sha384-M40EWrbWs2MoJvUiYVQaPxPiOzMYBn/ywuMR02rvoSXG77eIHT/aRoYub9r6+jC+",
   "manifest.markdown.js": "sha384-3LgPiHrftPqAIJGhxi87C0TtfJXbsH0Qj4JmfmYgV4y5UjSx7nVSP+ppsRUWT0Xs",
   "manifest.resize.js": "sha384-Ak5gf44ERfh9pOSAD1qZzJSysslpwBCkevIlz7R3dszTUyzUKGKGF4pn5arOtgG0",
   "manifest.router.js": "sha384-n6xmIfWnYzd/0kkVTFuHhFzHuxiDgZ1Lg1W0yB6/w3Myw5pQ6PgE6SJBHfVsO7/D",

package/lib/manifest.localization.js CHANGED Viewed

@@ -1,5 +1,16 @@
 /* Manifest Localization */
+// Snapshot the original <html lang> attribute at the moment this script
+// loads, before any locale-mutation code (this plugin's own init, or any
+// other script) has had a chance to overwrite it. This is the developer's
+// declared default — the value baked into index.html's <html lang="…"> tag
+// — and is the locale $locale.reset() restores to. Captured at module
+// scope so both initializeLocalizationPlugin and the reset implementation
+// can reach it through lexical closure.
+const originalHtmlLang = (typeof document !== 'undefined' && document.documentElement)
+    ? (document.documentElement.lang || '')
+    : '';
 // Global setLocale wrapper - will be replaced with real implementation
 let setLocaleImpl = null;
@@ -24,13 +35,6 @@ window.__manifestSetLocale = setLocale;
 function initializeLocalizationPlugin() {
-    // Snapshot the original <html lang> attribute before any locale mutation.
-    // This is the developer's declared default — the value baked into
-    // index.html's <html lang="…"> tag. Used by $locale.reset() to restore
-    // the project to its declared default language regardless of current
-    // runtime state (which gets mutated by set/toggle/URL detection).
-    const originalHtmlLang = document.documentElement.lang || '';
     // Environment detection for debug logging
     const isDevelopment = window.location.hostname === 'localhost' ||
         window.location.hostname === '127.0.0.1' ||
@@ -530,6 +534,85 @@ function initializeLocalizationPlugin() {
     setLocaleImpl = setLocaleReal;
     window.__manifestSetLocale = setLocaleReal;
+    // $locale.reset implementation — exposed across functions via window so the
+    // magic registration (in registerLocaleMagic, a sibling top-level function)
+    // can call it. Inlining the logic in the magic's closure would put it out
+    // of scope from safeStorage / isValidLanguageCode / isRTL / originalHtmlLang.
+    function resetLocaleReal(href) {
+        const store = Alpine.store('locale');
+        const available = store?.available || [originalHtmlLang || 'en'];
+        // 1. Clear stored UI-toggle preference so future page loads re-detect.
+        safeStorage.remove('lang');
+        // 2. Resolve the default locale. Matches initial detection minus URL
+        // and localStorage layers, since reset opts out of both:
+        //   a. Original <html lang> baked into index.html (snapshotted at
+        //      plugin init, before any locale mutation).
+        //   b. Browser language if it matches an available locale.
+        //   c. First locale registered in manifest.json.
+        let defaultLocale = null;
+        if (originalHtmlLang
+            && isValidLanguageCode(originalHtmlLang)
+            && available.includes(originalHtmlLang)) {
+            defaultLocale = originalHtmlLang;
+        } else if (navigator.language) {
+            const browserLang = navigator.language.split('-')[0];
+            if (isValidLanguageCode(browserLang) && available.includes(browserLang)) {
+                defaultLocale = browserLang;
+            }
+        }
+        if (!defaultLocale) {
+            defaultLocale = available[0] || 'en';
+        }
+        // 3. Resolve target URL (passed-in href or current) and strip its
+        // leading locale segment, if any.
+        let target;
+        try {
+            target = new URL(href || window.location.href, window.location.href);
+        } catch {
+            return false;
+        }
+        const segs = target.pathname.split('/').filter(Boolean);
+        if (segs.length && available.includes(segs[0])) {
+            segs.shift();
+        }
+        target.pathname = '/' + segs.join('/');
+        // 4. Apply the default locale to the live store + DOM before
+        // navigating, so $locale.current and any reactive readers update
+        // immediately.
+        if (store && store.current !== defaultLocale) {
+            store.current = defaultLocale;
+            store.direction = isRTL(defaultLocale) ? 'rtl' : 'ltr';
+            try {
+                document.documentElement.lang = defaultLocale;
+                document.documentElement.dir = store.direction;
+            } catch { /* DOM unavailable */ }
+            try {
+                window.dispatchEvent(new CustomEvent('localechange', {
+                    detail: { locale: defaultLocale }
+                }));
+            } catch { /* event dispatch unavailable */ }
+        }
+        // 5. Navigate to the locale-stripped URL. SPA hop in the live app,
+        // MPA hop in prerendered output so the new URL's prerendered HTML
+        // loads from disk.
+        const isSameOrigin = target.origin === window.location.origin;
+        const isPrerendered = !!document.querySelector('meta[name="manifest:prerendered"]:not([content="0"]):not([content="false"])');
+        if (isSameOrigin && !isPrerendered && typeof history?.pushState === 'function') {
+            history.pushState(null, '', target.pathname + target.search + target.hash);
+            window.dispatchEvent(new PopStateEvent('popstate'));
+        } else {
+            window.location.assign(target.toString());
+        }
+        return true;
+    }
+    window.__manifestResetLocale = resetLocaleReal;
     // Event listener cleanup tracking
     let routeChangeListener = null;
@@ -679,77 +762,11 @@ function registerLocaleMagic() {
                     // loads from disk.
                     if (prop === 'reset') {
                         return (href) => {
-                            const store = Alpine.store('locale');
-                            const available = store?.available || [originalHtmlLang || 'en'];
-                            // Clear stored UI-toggle preference so future
-                            // page loads re-detect from scratch.
-                            safeStorage.remove('lang');
-                            // Resolve the default locale from declarations.
-                            let defaultLocale = null;
-                            if (originalHtmlLang
-                                && isValidLanguageCode(originalHtmlLang)
-                                && available.includes(originalHtmlLang)) {
-                                defaultLocale = originalHtmlLang;
-                            } else if (navigator.language) {
-                                const browserLang = navigator.language.split('-')[0];
-                                if (isValidLanguageCode(browserLang)
-                                    && available.includes(browserLang)) {
-                                    defaultLocale = browserLang;
-                                }
-                            }
-                            if (!defaultLocale) {
-                                defaultLocale = available[0] || 'en';
+                            if (window.__manifestResetLocale) {
+                                return window.__manifestResetLocale(href);
                             }
-                            // Resolve target URL (passed-in href or current)
-                            // and strip its leading locale segment, if any.
-                            let target;
-                            try {
-                                target = new URL(href || window.location.href, window.location.href);
-                            } catch {
-                                return false;
-                            }
-                            const segs = target.pathname.split('/').filter(Boolean);
-                            if (segs.length && available.includes(segs[0])) {
-                                segs.shift();
-                            }
-                            target.pathname = '/' + segs.join('/');
-                            // Apply the default locale to the live store + DOM
-                            // before navigating, so $locale.current and any
-                            // reactive readers update immediately. Skip the
-                            // setLocale wrapper because it would attempt URL
-                            // updates of its own — we're handling navigation
-                            // explicitly below.
-                            if (store && store.current !== defaultLocale) {
-                                store.current = defaultLocale;
-                                store.direction = isRTL(defaultLocale) ? 'rtl' : 'ltr';
-                                try {
-                                    document.documentElement.lang = defaultLocale;
-                                    document.documentElement.dir = store.direction;
-                                } catch { /* DOM unavailable */ }
-                                try {
-                                    window.dispatchEvent(new CustomEvent('localechange', {
-                                        detail: { locale: defaultLocale }
-                                    }));
-                                } catch { /* event dispatch unavailable */ }
-                            }
-                            // Navigate to the locale-stripped URL.
-                            const isSameOrigin = target.origin === window.location.origin;
-                            const isPrerendered = !!document.querySelector('meta[name="manifest:prerendered"]:not([content="0"]):not([content="false"])');
-                            if (isSameOrigin && !isPrerendered && typeof history?.pushState === 'function') {
-                                // SPA hop: keep the in-memory app, fire route-change.
-                                history.pushState(null, '', target.pathname + target.search + target.hash);
-                                window.dispatchEvent(new PopStateEvent('popstate'));
-                            } else {
-                                // MPA hop: load the prerendered HTML for the new URL.
-                                window.location.assign(target.toString());
-                            }
-                            return true;
+                            console.error('[Manifest Localization] resetLocale not available');
+                            return false;
                         };
                     }
                     return undefined;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
     "name": "mnfst",
-    "version": "0.5.94",
+    "version": "0.5.95",
     "private": false,
     "workspaces": [
         "templates/starter",