Merge branch 'develop' into master

Author: tjmonsi

.travis.yml

@@ -9,12 +9,28 @@ node_js:
 before_install:
 - export DISPLAY=:99.0
 - sh -e /etc/init.d/xvfb start
+- sudo apt install -y jq
 script: npm test && npm run wct-sauce
 branches:
   only:
   - master
   - develop
-env:
-  global:
-  - secure: IczLyQVw0rGAirfVHal4lcPNymjSQewhh2F8vu2rsp6ncNSAkSEVm9tXvSq47UkYzkLEUvi5l2rOIcmnfGsyjc8uCH3yFVpsMdoClP5W+2LO6XB7k6FyV3GXpfotEjKqIXqUWFosbFMdsV5X3zhuouckdvPcrY+QNltVl8P90JqGtVq5VqSIUZVhWsMxelrgY1p0iIx0YdftD0Hq8mip8ULztip+mbAAcLbUBOlOHHRdiG1cNp7GjpaBUPvtVY+/rDM8sgJ7SlK9F+BWsxj5If/Ky3n4HcyvvAAGeiqxJu0jxPQ37JwJKHligE5gK1O/piaAblSsy5kT4ElQXkxJLKLH8SQ7XViJ1NVGzh2AynDnx4J7PzWYfHKMYTbW2/6VaPOR/wr2xj1OdCRlNi8dK7y7Frhml9o58BakCDPx9zJgHd0s9lZQGdGA6O8DD6FpBwK9n8GqzEHI56phgtW8HH9T98r8ZSmm3iggwUesZo12kkkdc9/Eoe3X07G5cxq5r97E/rCnzhFz/uF786FX25H/pDIRUJ9K03VQuBMgG/vkFk1hzMEPjiFqFFXoa6odBR98OwbVFpR0JEpg4vcSRXDXfeNjxy1Pb2HXXSJAR9y2aCEW0U+IL4INPvK40igA/ijp16RP8TsLYszulzwxl8w8EvJTm0eJc1zlMc2QpZI=
-  - secure: M8pX7iiBmx8OdCmvMt6sbYSISIUVPYj6Xi52oP0TkOjDN14fxH2OS+Egnui2F9sudNFOgvGoiK4VnE3iH2z8wjFoA1YnbS+wHI1sK862qdtYlxk5pe4HglwrqAH4beg3cBQkN48ds0/gqifMuVxySbKn06KsU7fqMeOV5vunguSpWXbHBT+0vjJAF/J5f6JqZRbw0ggiAWThwqyulIYJPQ+BpYb2hoEhQfmUxGjTisILsNOWzU/qaYojf1PjBgfm7tpRCcvEZxohvqYQx6yCaus5U4I9gWNashpVWlOYbhtdxpRPA2thp2tfZLtuVP6CATeI+YwAcjbPhx4RG9Bxr/TNChh3s0rp4n+wcdXToQtPINnHjcDxK9Wlw+DbAu3tOoxHnhBR7KOWEOCZ3iTlRPMiGivBy5aopf1Lmk+h745PFdTOtF4QAWyY/gwzon1v3HWTwjZxwASSNoc8z4Q05f3vs+Iro9F6FBWsXTFciMpJ7hQ435SmYaX/LCyy3p6iP7W22+mH3vOdGE1yx8LqG3GQ4cRJaUFilRUVAFBF5NOHesB1m8kf1yAjpdqzJT1+/sJEmdmDLCq2WOZor/EjeXvr+4uAy3WvBz3avNKHzZavY/cpHSTTWuwZsLyU16OcQlaIhBWRbmxJj2NWOFI5OjKqXUImJMyp9iifbRTy53I=
+before_deploy:
+  - build_version=$(cat package.json | jq '.version')
+  - build_version=${build_version#\"}
+  - build_version=${build_version%\"}
+  - git tag -f v${build_version}
+deploy:
+  - provider: releases
+    skip_cleanup: true
+    api_key: $CHANGELOG_GITHUB_TOKEN
+    file_glob: true
+    file: dist/*
+    on:
+      branch: master
+  - provider: npm
+    skip_cleanup: true
+    email: $NPM_EMAIL
+    api_key: $NPM_TOKEN
+    on:
+      branch: master

element-lite-base.js

@@ -599,14 +599,14 @@ export const ElementLiteBase = dedupingMixin(base => {
      * @return {void}
      * @protected
      */
-    _invalidateProperties () {
+    _invalidateProperties (forceInvalidate) {
       if (!this.__dataInvalid && this.__dataReady) {
         this.__dataInvalid = true;
 
         Promise.resolve().then(() => {
           if (this.__dataInvalid) {
             this.__dataInvalid = false;
-            this._flushProperties();
+            this._flushProperties(forceInvalidate);
           }
         });
       }
@@ -621,16 +621,16 @@ export const ElementLiteBase = dedupingMixin(base => {
      * @return {void}
      * @protected
      */
-    _flushProperties () {
+    _flushProperties (forceFlush) {
       this.__dataCounter++;
 
       const props = this.__data;
       const changedProps = this.__dataPending;
       const old = this.__dataOld;
-      if (this._shouldPropertiesChange(props, changedProps, old)) {
+      if (this._shouldPropertiesChange(props, changedProps, old) || forceFlush) {
         this.__dataPending = null;
         this.__dataOld = {};
-        this._propertiesChanged(props, changedProps, old);
+        this._propertiesChanged(props, forceFlush ? props : changedProps, old);
       }
 
       this.__dataCounter--;
@@ -679,7 +679,7 @@ export const ElementLiteBase = dedupingMixin(base => {
         }
 
         if (this.__dataNotify[root(prop)]) {
-          this.dispatchEvent(new window.CustomEvent(`${camelToDashCase(root(prop))}-changed`, { detail: this.__data[root(prop)] }));
+          this.dispatchEvent(new window.CustomEvent(`${camelToDashCase(root(prop))}-change`, { detail: this.__data[root(prop)] }));
         }
 
         if (this.__dataObserver[prop]) {
@@ -919,7 +919,7 @@ export const ElementLiteBase = dedupingMixin(base => {
      */
     ready () {
       this.__dataReady = true;
-      this._flushProperties();
+      this._flushProperties(true);
     }
 
     /**

element-lite-lit-only.js element-lite-lit.jselement-lite-lit-only.js renamed to element-lite-lit.js

@@ -4,7 +4,7 @@ import { dedupingMixin } from './lib/deduping-mixin.js';
 import { render, html } from './lib/lit-html/lib/lit-extended.js';
 
 export { html };
-export const ElementLiteLitOnly = dedupingMixin(base => {
+export const ElementLiteLit = dedupingMixin(base => {
   /**
    * ElementLite is a set of methods coming from Polymer Property Mixins and Property Accessor Mixins
    * that automates the creation of setter and getters given a list of properties and
@@ -13,7 +13,7 @@ export const ElementLiteLitOnly = dedupingMixin(base => {
    *
    * @extends {HTMLElement}
   */
-  class ElementLiteLitOnly extends /** @type {HTMLElement} */(base) {
+  class ElementLiteLit extends /** @type {HTMLElement} */(base) {
     connectedCallback () {
       if (super.connectedCallback) super.connectedCallback();
       this.attachShadow({ mode: 'open' });
@@ -32,5 +32,5 @@ export const ElementLiteLitOnly = dedupingMixin(base => {
     render (self) { return html``; }
   }
 
-  return ElementLiteLitOnly;
+  return ElementLiteLit;
 });

element-lite-static-shadow.js element-lite-static.jselement-lite-static-shadow.js renamed to element-lite-static.js

@@ -1,22 +1,34 @@
 import { ElementLiteBase } from './element-lite-base.js';
 import { dedupingMixin } from './lib/deduping-mixin.js';
 
-export const ElementLiteStaticShadow = dedupingMixin(base => {
+export const ElementLiteStatic = dedupingMixin(base => {
   /**
    * ElementLite is a set of methods coming from Polymer Property Mixins and Property Accessor Mixins
    * that automates the creation of setter and getters given a list of properties and
    * allows auto-calling of methods given observers. This uses a static shadow DOM. It doesn't use
    * lit-html
    * @extends {ElementLiteBase}
   */
-  class ElementLiteStaticShadow extends ElementLiteBase(base) {
+  class ElementLiteStatic extends ElementLiteBase(base) {
+    constructor () {
+      super();
+      this.attachShadow({ mode: 'open' });
+      this.__template = document.createElement('template');
+      this.__template.innerHTML = this.render();
+
+      if (window.ShadyCSS) {
+        window.ShadyCSS.prepareTemplate(this.__template, this.constructor.is || this.tagName.toLowerCase());
+      }
+    }
+
     ready () {
       // attaches shadow
-      this.attachShadow({ mode: 'open' });
       super.ready();
-
       // renders the shadowRoot statically
-      this.shadowRoot = this.render();
+      if (window.ShadyCSS && this.__template) {
+        window.ShadyCSS.styleElement(this);
+      }
+      this.shadowRoot.appendChild(document.importNode(this.__template.content, true));
     }
 
     /**
@@ -25,5 +37,5 @@ export const ElementLiteStaticShadow = dedupingMixin(base => {
     render () { return ``; }
   }
 
-  return ElementLiteStaticShadow;
+  return ElementLiteStatic;
 });

element-lite.js

@@ -1,10 +1,10 @@
 import { ElementLiteBase } from './element-lite-base.js';
-import { ElementLiteStaticShadow } from './element-lite-static-shadow.js';
-import { ElementLiteLitOnly } from './element-lite-lit-only.js';
+import { ElementLiteStatic } from './element-lite-static.js';
+import { ElementLiteLit } from './element-lite-lit.js';
 import { dedupingMixin } from './lib/deduping-mixin.js';
 import { render, html } from './lib/lit-html/lib/lit-extended.js';
 
-export { html, ElementLiteBase, ElementLiteStaticShadow, ElementLiteLitOnly };
+export { html, ElementLiteBase, ElementLiteStatic, ElementLiteLit };
 export const ElementLite = dedupingMixin(base => {
   /**
    * ElementLite is a set of methods coming from Polymer Property Mixins and Property Accessor Mixins
@@ -37,6 +37,7 @@ export const ElementLite = dedupingMixin(base => {
      */
     _propertiesChanged (currentProps, changedProps, oldProps) {
       this.__isChanging = true;
+      this.__isInvalid = false;
       super._propertiesChanged(currentProps, changedProps, oldProps);
       this._setShadow();
 
@@ -67,9 +68,9 @@ export const ElementLite = dedupingMixin(base => {
     /**
      * Override which provides tracking of invalidated state.
     */
-    _invalidateProperties () {
+    _invalidateProperties (forceInvalidate) {
       this.__isInvalid = true;
-      super._invalidateProperties();
+      super._invalidateProperties(forceInvalidate);
     }
 
     /**
@@ -81,7 +82,7 @@ export const ElementLite = dedupingMixin(base => {
      * Helper method to re-render the whole setup.
      */
     invalidate () {
-      this._invalidateProperties();
+      this._invalidateProperties(true);
     }
   }