wip

alpinejs · Jul 21, 2023 · 394edf0 · 394edf0
1 parent 61be5cd
commit 394edf0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/packages/alpinejs/src/evaluator.js b/packages/alpinejs/src/evaluator.js
@@ -68,9 +68,9 @@ function generateFunctionFromString(expression, el) {
     // calling function so that we don't throw an error AND a "return" statement can b e used.
     let rightSideSafeExpression = 0
         // Support expressions starting with "if" statements like: "if (...) doSomething()"
-        || /^[\n\s]*if.*\(.*\)/.test(expression)
+        || /^[\n\s]*if.*\(.*\)/.test(expression.trim())
         // Support expressions starting with "let/const" like: "let foo = 'bar'"
-        || /^(let|const)\s/.test(expression)
+        || /^(let|const)\s/.test(expression.trim())
             ? `(async()=>{ ${expression} })()`
             : expression
 

diff --git a/packages/navigate/src/index.js b/packages/navigate/src/index.js
@@ -104,6 +104,12 @@ export default function (Alpine) {
 
         })
     })
+
+    // Because DOMContentLoaded is fired on first load,
+    // we should fire alpine:navigated as a replacement as well...
+    setTimeout(() => {
+        fireEventForOtherLibariesToHookInto()
+    })
 }
 
 function fetchHtmlOrUsePrefetchedHtml(fromDestination, callback) {