1.0.33

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@designestate/dees-element",
-  "version": "1.0.20",
+  "version": "1.0.33",
   "private": false,
   "description": "a custom element class extending lit element class",
   "main": "dist_ts/index.js",
@@ -9,22 +9,22 @@
   "license": "MIT",
   "scripts": {
     "test": "(tstest test/ --web)",
-    "build": "(tsbuild --web)"
+    "build": "(tsbuild --web && tsbundle npm)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.27",
+    "@gitzone/tsbuild": "^2.1.28",
-    "@gitzone/tsbundle": "^1.0.87",
+    "@gitzone/tsbundle": "^1.0.88",
-    "@gitzone/tstest": "^1.0.57",
+    "@gitzone/tstest": "^1.0.60",
-    "@pushrocks/tapbundle": "^3.2.14",
+    "@pushrocks/tapbundle": "^3.2.15",
-    "@types/node": "^16.9.0",
+    "@types/node": "^16.11.12",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@designestate/dees-domtools": "^1.0.93",
+    "@designestate/dees-domtools": "^1.0.103",
     "@pushrocks/isounique": "^1.0.4",
     "@pushrocks/smartrx": "^2.0.19",
-    "lit-element": "^2.5.1"
+    "lit": "^2.0.2"
   },
   "browserslist": [
     "last 1 chrome versions"

test/test.browser.ts

@@ -6,6 +6,7 @@ tap.test('should create a static element', async () => {
   class MyButton extends deesElement.DeesElement {
     // STATIC
     public static styles = [
+      deesElement.cssManager.defaultStyles,
       deesElement.css`
       .buttonClass {
         background: ${deesElement.cssManager.bdTheme('blue', 'black')};

ts/dees-element.classes.cssmanager.ts

@@ -1,4 +1,4 @@
-import { CSSResult, unsafeCSS } from 'lit-element';
+import { CSSResult, unsafeCSS } from 'lit';
 import * as plugins from './dees-element.plugins';
 import * as domtools from '@designestate/dees-domtools';
 
@@ -65,7 +65,7 @@ export class CssManager {
       });
       returnCssVar = newTriplet.cssVarName;
     }
-    return plugins.litElement.unsafeCSS(`var(${returnCssVar})`);
+    return plugins.lit.unsafeCSS(`var(${returnCssVar})`);
   }
 
   public cssGridColumns = (amountOfColumnsArg: number, gapSizeArg: number): CSSResult => {
@@ -75,6 +75,6 @@ export class CssManager {
         gapSizeArg * (amountOfColumnsArg - 1)
       }px/${amountOfColumnsArg}))`;
     }
-    return plugins.litElement.unsafeCSS(returnString);
+    return plugins.lit.unsafeCSS(returnString);
   };
 }

ts/dees-element.classes.dees-element.ts

@@ -1,14 +1,14 @@
 import * as plugins from './dees-element.plugins';
 
-export class DeesElement extends plugins.litElement.LitElement {
+export class DeesElement extends plugins.lit.LitElement {
   // INSTANCE
-  @plugins.litElement.property({ type: Boolean })
+  @plugins.lit.property({ type: Boolean })
   public goBright: boolean = false;
 
   // domtools
   public domtoolsPromise = plugins.domtools.elementBasic.setup(this);
 
-  @plugins.litElement.property()
+  @plugins.lit.property()
   domtools?: plugins.domtools.DomTools;
 
   private themeSubscription: plugins.smartrx.rxjs.Subscription;
@@ -20,17 +20,17 @@ export class DeesElement extends plugins.litElement.LitElement {
     });
   }
 
-  public connectedCallback() {
+  public async connectedCallback() {
     super.connectedCallback();
-    this.domtoolsPromise.then(async (domtools) => {
+    const domtools = await this.domtoolsPromise;
-      this.themeSubscription = domtools.themeManager.themeObservable.subscribe((goBrightArg) => {
+    this.themeSubscription = domtools.themeManager.themeObservable.subscribe((goBrightArg) => {
-        this.goBright = goBrightArg;
+      this.goBright = goBrightArg;
-      });
+    });  
-    });
     this.dispatchEvent(new CustomEvent('deesElementConnected'));
   }
 
-  public disconnectedCallback() {
+  public async disconnectedCallback() {
+    await this.domtoolsPromise;
     super.disconnectedCallback();
     this.themeSubscription.unsubscribe();
     this.dispatchEvent(new CustomEvent('deesElementDisconnected'));

ts/dees-element.plugins.ts

@@ -8,8 +8,9 @@ export {
 };
 
 // third party scope
-import { css, unsafeCSS, LitElement, property } from 'lit-element';
+import { css, unsafeCSS, LitElement } from 'lit';
-const litElement = {
+import { property } from 'lit/decorators/property.js';
+const lit = {
   css,
   unsafeCSS,
   LitElement,
@@ -19,6 +20,6 @@ const litElement = {
 import * as domtools from '@designestate/dees-domtools';
 
 export {
-  litElement,
+  lit,
   domtools
 };

ts/index.ts

@@ -1,16 +1,22 @@
 import { CssManager } from './dees-element.classes.cssmanager';
-import * as plugins from './dees-element.plugins';
 
-export {
+// lit exports
-  customElement,
+export { html, TemplateResult, css, unsafeCSS } from 'lit';
-  property,
-  internalProperty,
-  html,
-  TemplateResult,
-  css,
-  unsafeCSS
-} from 'lit-element';
 
+export { customElement } from 'lit/decorators/custom-element.js';
+
+export { property } from 'lit/decorators/property.js';
+
+export { state } from 'lit/decorators/state.js';
+
+// domtools exports
+import * as domtools from '@designestate/dees-domtools';
+export { domtools };
+
+// DeesElements exports
 export { DeesElement } from './dees-element.classes.dees-element';
 
+/**
+ * a singleton instance of CssManager
+ */
 export const cssManager = new CssManager();