@lightningjs/blits 1.23.0 → 1.23.2

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## v1.23.2
+
+_18 mar 2025_
+
+- Fixed issue with keepAlive pages remaining in cache after navigating back
+
+## v1.23.1
+
+_17 mar 2025_
+
+- Fixed issue in vite plugin that ensures reacitivity setup in computed props when code block has a comment
+- Fixed warnings for non-declared variables in template when they refer to plugins (i.e. `$$apState.foo`)
+
 ## v1.23.0
 
 _13 mar 2025_

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lightningjs/blits",
-  "version": "1.23.0",
+  "version": "1.23.2",
   "description": "Blits: The Lightning 3 App Development Framework",
   "bin": "bin/index.js",
   "exports": {

package/src/lib/codegenerator/generator.js

@@ -80,7 +80,7 @@ export default function (templateObject = { children: [] }, devMode = false) {
 
 // This is used to get only variable from expression
 const extractVariables = function (value) {
-  const regEx = /\$\w+(\.\w+)?/g
+  const regEx = /\$\$?\w+(\.\w+)?/g
   const matches = value.match(regEx)
   if (matches !== null) {
     const shaderRegex = /\$shader/

package/src/lib/reactivity/effect.js

@@ -45,7 +45,7 @@ export const removeGlobalEffects = (effectsToRemove) => {
 }
 
 export const track = (target, key, global = false) => {
-  if (currentEffect) {
+  if (currentEffect !== null) {
     if (paused) {
       return
     }
@@ -55,12 +55,12 @@ export const track = (target, key, global = false) => {
     } else if (currentKey !== null && key !== currentKey) return
 
     let effectsMap = objectMap.get(target)
-    if (!effectsMap) {
+    if (effectsMap === undefined) {
       effectsMap = new Map()
       objectMap.set(target, effectsMap)
     }
     let effects = effectsMap.get(key)
-    if (!effects) {
+    if (effects === undefined) {
       effects = new Set()
       effectsMap.set(key, effects)
     }
@@ -73,11 +73,11 @@ export const track = (target, key, global = false) => {
 export const trigger = (target, key, force = false) => {
   if (paused === true) return
   const effectsMap = objectMap.get(target)
-  if (!effectsMap) {
+  if (effectsMap === undefined) {
     return
   }
   const effects = effectsMap.get(key)
-  if (effects) {
+  if (effects !== undefined) {
     for (let effect of effects) {
       effect(force)
     }

package/src/lib/reactivityguard/computedprops.js

@@ -133,12 +133,23 @@ export default (code) => {
             const openBraceIndex = prop.fullText.indexOf('{')
 
             if (openBraceIndex !== -1) {
+              // Extract indentation from the original function body
+              const indentMatch = prop.body.match(/^(\s+)/)
+              const indent = indentMatch ? indentMatch[1] + '  ' : '    ' // Default to 4 spaces if no indent found
+
               const modifiedPropText =
                 prop.fullText.substring(0, openBraceIndex + 1) +
+                '\n' +
+                indent +
                 commentText +
+                '\n' +
+                indent +
                 refCode +
-                ' ' +
+                '\n' +
+                indent +
                 prop.body +
+                '\n' +
+                prop.fullText.substring(0, openBraceIndex).match(/^(\s*)/)[0] +
                 '}'
 
               // Replace this property in the computed object text

package/src/router/router.js

@@ -328,15 +328,19 @@ const removeView = async (route, view, transition) => {
   }
 
   // cache the page when it's as 'keepAlive' instead of destroying
-  if (route.options && route.options.keepAlive === true && navigatingBack === false) {
+  if (navigatingBack === false && route.options && route.options.keepAlive === true) {
     cacheMap.set(route.hash, { view: view, focus: previousFocus })
   } else if (navigatingBack === true) {
     // remove the previous route from the cache when navigating back
     // cacheMap.delete will not throw an error if the route is not in the cache
     cacheMap.delete(route.hash)
   }
-
-  if (route.options && route.options.keepAlive !== true) {
+  /* Destroy the view in the following cases:
+   * 1. Navigating forward, and the previous route is not configured with "keep alive" set to true.
+   * 2. Navigating back, and the previous route is configured with "keep alive" set to true.
+   * 3. Navigating back, and the previous route is not configured with "keep alive" set to true.
+   */
+  if (route.options && (route.options.keepAlive !== true || navigatingBack === true)) {
     view.destroy()
     view = null
   }