leanweb 3.10.1 → 3.10.3

package/commands/build.js

@@ -54,7 +54,7 @@ const buildModule = (projectPath) => {
       imports.push(url);
       return '';
     });
-    const jsModule = `const sheet = new CSSStyleSheet();\nsheet.replaceSync(${JSON.stringify(inlineCss)});\nglobalThis.__lw_globalStyleSheet = sheet;\nglobalThis.__lw_globalStyleImports = ${JSON.stringify(imports)};\n`;
+    const jsModule = `globalThis.leanweb ??= {};\nconst sheet = new CSSStyleSheet();\nsheet.replaceSync(${JSON.stringify(inlineCss)});\nglobalThis.leanweb.__lw_globalStyleSheet = sheet;\nglobalThis.leanweb.__lw_globalStyleImports = ${JSON.stringify(imports)};\n`;
     utils.writeIfChanged(`${utils.dirs.build}/global-styles.js`, jsModule);
   };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "leanweb",
-  "version": "3.10.1",
+  "version": "3.10.3",
   "description": "Builds framework agnostic web components.",
   "bin": {
     "leanweb": "leanweb.js",

package/templates/lib/lw-element.js

@@ -1,77 +1,74 @@
 import * as parser from './lw-expr-parser.js';
 import LWEventBus from './lw-event-bus.js';
 
-globalThis.leanweb = globalThis.leanweb ?? {
-  componentsListeningOnUrlChanges: [],
-  eventBus: new LWEventBus(),
-  updateComponents(...tagNames) {
-    if (tagNames?.length) {
-      tagNames.forEach(tagName => {
-        leanweb.eventBus.dispatchEvent(tagName);
-      });
-    } else {
-      leanweb.eventBus.dispatchEvent('update');
-    }
-  },
-
-  set urlHash(hash) {
-    location.hash = hash;
-  },
-
-  get urlHash() {
-    return location.hash;
-  },
-
-  set urlHashPath(hashPath) {
-    const s = this.urlHash.split('?');
-    if (s.length === 1) {
-      this.urlHash = hashPath;
-    } else if (s.length > 1) {
-      this.urlHash = hashPath + '?' + s[1];
-    }
-  },
+globalThis.leanweb ??= {};
+
+leanweb.componentsListeningOnUrlChanges = [];
+leanweb.eventBus = new LWEventBus();
+leanweb.updateComponents = function (...tagNames) {
+  if (tagNames?.length) {
+    tagNames.forEach(tagName => {
+      leanweb.eventBus.dispatchEvent(tagName);
+    });
+  } else {
+    leanweb.eventBus.dispatchEvent('update');
+  }
+};
 
-  get urlHashPath() {
-    return this.urlHash.split('?')[0];
+Object.defineProperties(leanweb, {
+  urlHash: {
+    set(hash) { location.hash = hash; },
+    get() { return location.hash; }
   },
-
-  set urlHashParams(hashParams) {
-    if (!hashParams) {
-      return;
-    }
-
-    const paramArray = [];
-    Object.keys(hashParams).forEach(key => {
-      const value = hashParams[key];
-      if (Array.isArray(value)) {
-        value.forEach(v => {
-          paramArray.push(key + '=' + encodeURIComponent(v));
-        });
-      } else {
-        paramArray.push(key + '=' + encodeURIComponent(value));
+  urlHashPath: {
+    set(hashPath) {
+      const s = this.urlHash.split('?');
+      if (s.length === 1) {
+        this.urlHash = hashPath;
+      } else if (s.length > 1) {
+        this.urlHash = hashPath + '?' + s[1];
       }
-    });
-    this.urlHash = this.urlHashPath + '?' + paramArray.join('&');
+    },
+    get() { return this.urlHash.split('?')[0]; }
   },
+  urlHashParams: {
+    set(hashParams) {
+      if (!hashParams) {
+        return;
+      }
 
-  get urlHashParams() {
-    const ret = {};
-    const s = this.urlHash.split('?');
-    if (s.length > 1) {
-      const p = new URLSearchParams(s[1]);
-      p.forEach((v, k) => {
-        if (ret[k] === undefined) {
-          ret[k] = v;
-        } else if (Array.isArray(ret[k])) {
-          ret[k].push(v);
+      const paramArray = [];
+      Object.keys(hashParams).forEach(key => {
+        const value = hashParams[key];
+        if (Array.isArray(value)) {
+          value.forEach(v => {
+            paramArray.push(key + '=' + encodeURIComponent(v));
+          });
         } else {
-          ret[k] = [ret[k], v];
+          paramArray.push(key + '=' + encodeURIComponent(value));
         }
       });
+      this.urlHash = this.urlHashPath + '?' + paramArray.join('&');
+    },
+    get() {
+      const ret = {};
+      const s = this.urlHash.split('?');
+      if (s.length > 1) {
+        const p = new URLSearchParams(s[1]);
+        p.forEach((v, k) => {
+          if (ret[k] === undefined) {
+            ret[k] = v;
+          } else if (Array.isArray(ret[k])) {
+            ret[k].push(v);
+          } else {
+            ret[k] = [ret[k], v];
+          }
+        });
+      }
+      return ret;
     }
-    return ret;
   }
-};
+});
 
 globalThis.addEventListener('hashchange', () => {
   leanweb.componentsListeningOnUrlChanges.forEach(component => {
@@ -110,8 +107,8 @@ export default class LWElement extends HTMLElement {
     componentSheet.replaceSync(ast.css);
     node.innerHTML = ast.html;
     this.attachShadow({ mode: 'open' }).appendChild(node.content);
-    this.shadowRoot.adoptedStyleSheets = [globalThis.__lw_globalStyleSheet, componentSheet];
-    globalThis.__lw_globalStyleImports?.forEach(url => {
+    this.shadowRoot.adoptedStyleSheets = [globalThis.leanweb.__lw_globalStyleSheet, componentSheet].filter(Boolean);
+    globalThis.leanweb.__lw_globalStyleImports?.forEach(url => {
       const link = document.createElement('link');
       link.rel = 'stylesheet';
       link.href = url;