@lightningjs/blits 0.6.8 → 0.6.10

package/src/router/router.js

@@ -30,6 +30,7 @@ const cacheMap = new WeakMap()
 const history = []
 let overrideOptions = {}
 let navigatingBack = false
+let previousFocus
 
 export const getHash = () => {
   return (document.location.hash || '/').replace(/^#/, '')
@@ -97,6 +98,12 @@ export const navigate = async function () {
 
       this[symbols.children].push(view)
 
+      // keep reference to the previous focus for storing in cache
+      previousFocus = Focus.get()
+
+      // set focus to the view that we're routing to
+      focus ? Focus.set(focus) : Focus.set(view)
+
       // apply before settings to holder element
       if (route.transition.before) {
         if (Array.isArray(route.transition.before)) {
@@ -143,8 +150,6 @@ export const navigate = async function () {
         Announcer.speak(route.announce.message, route.announce.politeness)
       }
 
-      // focus the new view
-      focus ? Focus.set(focus) : view.focus()
       this.activeView = this[symbols.children][this[symbols.children].length - 1]
     } else {
       Log.error(`Route ${hash} not found`)
@@ -172,7 +177,7 @@ const removeView = async (route, view, transition) => {
 
   // cache the page when it's as 'keepAlive' instead of destroying
   if (route.options && route.options.keepAlive === true) {
-    cacheMap.set(route, { view: view, focus: Focus.get() })
+    cacheMap.set(route, { view: view, focus: previousFocus })
   } else {
     // remove and cleanup
     for (let i = 0; i < view[symbols.children].length - 1; i++) {

package/vite/index.js

@@ -1,3 +1,20 @@
+/*
+ * Copyright 2023 Comcast Cable Communications Management, LLC
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 import preCompiler from './preCompiler.js'
 import { importChunkUrl } from '@lightningjs/vite-plugin-import-chunk-url'
 

package/vite/preCompiler.js

@@ -1,6 +1,21 @@
-import parser from '../src/lib/templateparser/parser.js'
-import generator from '../src/lib/codegenerator/generator.js'
-import path from 'path'
+/*
+ * Copyright 2023 Comcast Cable Communications Management, LLC
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import compiler from '../src/lib/precompiler/precompiler.js'
 
 export default function () {
   let config
@@ -11,42 +26,7 @@ export default function () {
     },
     transform(source, filePath) {
       if (config.blits && config.blits.precompile === false) return source
-      if (source.indexOf('Blits.Component(') > -1 || source.indexOf('Blits.Application(') > -1) {
-        // get the start of the template key in de component configuration object
-        const templateKeyRegex = /template:\s*([`"'])*/g
-        const templateStartResult = templateKeyRegex.exec(source)
-        const typeOfQuotesUsed = templateStartResult[1]
-        const templateStartIndex = templateStartResult.index
-
-        // get the template contents from the configuration object
-        const templateContentsRegex = new RegExp(
-          `${typeOfQuotesUsed}([\\s\\S]*?)${typeOfQuotesUsed}`
-        )
-
-        const templateContentResult = templateContentsRegex.exec(source.slice(templateStartIndex))
-        const templateEndIndex =
-          templateStartIndex + templateContentResult.index + templateContentResult[0].length
-
-        // Parse the template
-        let resourceName = 'Blits.Application'
-        if (source.indexOf('Blits.Component(') > -1) {
-          resourceName = source.match(/Blits\.Component\(['"](.*)['"]\s*,/)[1]
-        }
-        const componentPath = path.relative(process.cwd(), filePath)
-        const parsed = parser(templateContentResult[1], resourceName, null, componentPath)
-
-        // Generate the code
-        const code = generator.call({ components: {} }, parsed)
-
-        // Insert the code in the component using the 'code' key, replacing the template key
-        const replacement = `code: { render: ${code.render.toString()}, effects: [${code.effects.map(
-          (fn) => fn.toString() + ','
-        )}], context: {}}`
-        const newSource =
-          source.substring(0, templateStartIndex) + replacement + source.substring(templateEndIndex)
-
-        return newSource
-      }
+      return compiler(source, filePath)
     },
   }
 }

package/bin/index.cjs

@@ -1,25 +0,0 @@
-#!/usr/bin/env node
-
-const path = require('path')
-const fs = require('fs')
-
-const folder = process.argv.slice(2).pop()
-
-if (!folder) {
-  console.error('Please specify a folder for your new Lightning 3 App')
-} else {
-  if (fs.existsSync(folder)) {
-    console.error(`The directory ${folder} already exists! Choose a different location.`)
-  } else {
-    fs.cpSync(path.join(__dirname, '..', 'boilerplate'), folder, { recursive: true })
-    console.log(
-      '================================== ⚡️⚡️⚡️⚡️ ================================== '
-    )
-    console.log('Your new boilerplate Lightning 3 App has been created!')
-    console.log('')
-    console.log(`Go to ${folder}, run npm install, followed by npm run dev to get started`)
-    console.log(
-      '================================== ⚡️⚡️⚡️⚡️ ================================== '
-    )
-  }
-}

package/boilerplate/.vscode/settings.json

@@ -1,10 +0,0 @@
-{
-    "editor.formatOnSave": false,
-    "eslint.validate": [
-      "javascript"
-    ],
-    "editor.codeActionsOnSave": {
-      "source.fixAll.eslint": true
-    },
-    "js/ts.implicitProjectConfig.checkJs": true
-  }