merging latest Lightning changes from upstream

README.md

@@ -1,5 +1,6 @@
 # Lightning
 
+[![npm](https://img.shields.io/npm/v/wpe-lightning)](https://www.npmjs.com/package/wpe-lightning)
 [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=55UJZHTXW8VTE)
 
 Lightning is a (TV) app development framework that offers great portability and performance.

package.json

@@ -1,21 +1,38 @@
 {
   "author": "Metrological, Bas van Meurs <b.van.meurs@metrological.com>",
   "name": "wpe-lightning",
-  "version": "1.0.8",
+  "version": "1.5.0",
   "license": "apache",
-  "main": "src/lightning.mjs",
+  "main": "dist/lightning.js",
+  "module": "index.js",
+  "files": [
+    "index.js",
+    "src/**",
+    "dist/**",
+    "devtools/**"
+  ],
   "scripts": {
-    "postinstall": "rollup -c"
-  },
-  "dependencies": {
-    "rollup": "^0.67.0",
-    "rollup-plugin-license": "^0.10.0"
+    "build": "rollup -c",
+    "release": "npm run build && npm publish"
   },
   "repository": {
     "type": "git",
     "url": "git@github.com:WebPlatformForEmbedded/Lightning.git"
   },
   "bugs": {
     "url": "https://github.com/WebPlatformForEmbedded/Lightning/issues"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.8.3",
+    "@babel/plugin-transform-parameters": "^7.8.3",
+    "@babel/plugin-transform-spread": "^7.8.3",
+    "@babel/preset-env": "^7.8.3",
+    "chai": "^4.2.0",
+    "mocha": "^6.2.1",
+    "rollup": "^1.30.1",
+    "rollup-plugin-babel": "^4.3.3",
+    "rollup-plugin-license": "^0.10.0",
+    "rollup-plugin-terser": "^5.1.2",
+    "sinon": "^7.5.0"
   }
 }

rollup.config.js

@@ -1,20 +1,137 @@
-const resolve = require('./rollup.plugin.resolver');
 import license from 'rollup-plugin-license';
-import pkg from './package.json';
+import { terser } from 'rollup-plugin-terser';
+import babel from 'rollup-plugin-babel';
 
-export default {
+const TERSER_CONFIG = {
+    keep_classnames: true,
+    keep_fnames: true,
+    sourcemap: true,
+}
+
+export default [{
+    /** lightning.js */
     input: './src/lightning.mjs',
     plugins: [
-        resolve("web"),
 
         /* Add version number to bundle */
         license({
             banner: `Lightning v<%= pkg.version %>\n\n https://github.com/WebPlatformForEmbedded/Lightning`,
           }),
     ],
     output: {
-        file: './dist/lightning-web.js',
-        format: 'iife',
+        file: './dist/lightning.js',
+        format: 'umd',
+        name: 'lng'
+    }
+},
+{
+    /** lightning.min.js */
+    input: './src/lightning.mjs',
+    plugins: [
+        terser(TERSER_CONFIG),
+
+        /* Add version number to bundle */
+        license({
+            banner: `Lightning v<%= pkg.version %>\n\n https://github.com/WebPlatformForEmbedded/Lightning`,
+        }),
+    ],
+    output: {
+        file: './dist/lightning.min.js',
+        format: 'umd',
+        name: 'lng',
+        sourcemap: true,
+    }
+
+},
+{
+    /** lightning.es5.js */
+    input: './src/lightning.mjs',
+    plugins: [
+
+        /* Add version number to bundle */
+        license({
+            banner: `Lightning v<%= pkg.version %>\n\n https://github.com/WebPlatformForEmbedded/Lightning`,
+        }),
+        babel({
+            presets: [
+                [
+                '@babel/env',
+                {
+                    targets: {
+                        ie: '11',
+                    },
+                    spec: true,
+                    debug: false
+                },
+                ],
+            ],
+            plugins: ['@babel/plugin-transform-spread', '@babel/plugin-transform-parameters'],
+        }),
+    ],
+    output: {
+        file: './dist/lightning.es5.js',
+        format: 'umd',
+        name: 'lng'
+    }
+},
+{
+    /** lightning.es5.min.js */
+    input: './src/lightning.mjs',
+    plugins: [
+        terser(TERSER_CONFIG),
+
+        /* Add version number to bundle */
+        license({
+            banner: `Lightning v<%= pkg.version %>\n\n https://github.com/WebPlatformForEmbedded/Lightning`,
+        }),
+        babel({
+            presets: [
+                [
+                '@babel/env',
+                {
+                    targets: {
+                        ie: '11',
+                    },
+                    spec: true,
+                    debug: false
+                },
+                ],
+            ],
+            plugins: ['@babel/plugin-transform-spread', '@babel/plugin-transform-parameters'],
+        }),
+    ],
+    output: {
+        file: './dist/lightning.es5.min.js',
+        format: 'umd',
+        name: 'lng',
+        sourcemap: true,
+    }
+},
+{
+    /** lightning-inspect.es5.js */
+    input: './devtools/lightning-inspect.js',
+    plugins: [
+
+        babel({
+            presets: [
+                [
+                '@babel/env',
+                {
+                    targets: {
+                        ie: '11',
+                    },
+                    spec: true,
+                    debug: false
+                },
+                ],
+            ],
+            plugins: ['@babel/plugin-transform-spread', '@babel/plugin-transform-parameters'],
+        }),
+    ],
+    output: {
+        file: './devtools/lightning-inspect.es5.js',
+        format: 'umd',
         name: 'lng'
     }
-};
+},
+]

src/animation/Transition.mjs

@@ -10,13 +10,14 @@ export default class Transition extends EventEmitter {
         this._settings = settings;
 
         this._element = element;
-        this._getter = Element.getGetter(property);
-        this._setter = Element.getSetter(property);
+
+        this._getter = element.constructor.getGetter(property);
+        this._setter = element.constructor.getSetter(property);
 
         this._merger = settings.merger;
 
         if (!this._merger) {
-            this._merger = Element.getMerger(property);
+            this._merger = element.constructor.getMerger(property);
         }
 
         this._startValue = this._getter(this._element);
@@ -199,5 +200,3 @@ export default class Transition extends EventEmitter {
 }
 
 Transition.prototype.isTransition = true;
-
-import Element from "../tree/Element.mjs";