Skip to content

Commit

Permalink
fix(dependency): Updated to lit-html 1.1.2 & lit-element 2.1.0
Browse files Browse the repository at this point in the history
In order to run luminave with the latest version of lit-html & lit-element, we had to get rid of
some deprecated code. classMap.js was renamed into class-map.js. when.js was removed. The directives
are working differently now, so we had to update defaultValue(). Also updated the README to make
clear that we recommend to use npm to install dependencies.

fix #114
  • Loading branch information
TimPietrusky committed Sep 8, 2019
1 parent 4112656 commit 5de1151
Show file tree
Hide file tree
Showing 65 changed files with 2,659 additions and 2,377 deletions.
4,832 changes: 2,553 additions & 2,279 deletions package-lock.json

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "luminave",
"version": "3.0.0",
"version": "3.5.0",
"description": "Manage all the lights with your web browser and create stunning visual experiences.",
"main": "index.js",
"author": "Tim Pietrusky",
Expand Down Expand Up @@ -33,8 +33,8 @@
"@apollo-elements/lib": "0.0.2",
"@apollo-elements/lit-apollo": "^0.0.5",
"@material/layout-grid": "^0.39.0",
"@material/mwc-button": "0.2.1",
"@material/mwc-icon": "0.2.1",
"@material/mwc-button": "^0.7.1",
"@material/mwc-icon": "^0.7.1",
"@polymer/app-layout": "3.0.1",
"@polymer/iron-icons": "3.0.1",
"@polymer/iron-pages": "3.0.1",
Expand All @@ -60,6 +60,7 @@
"immutability-helper": "github:nerddisco/immutability-helper",
"keytime": "github:nerddisco/keytime",
"lit-element": "^2.1.0",
"lit-html": "^1.1.2",
"nodejs-websocket": "^1.7.1",
"pwa-helpers": "^0.8.3",
"redux": "^3.7.2",
Expand Down
2 changes: 1 addition & 1 deletion src/app.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LitElement, html } from '@polymer/lit-element/lit-element.js'
import { LitElement, html } from 'lit-element'

import './components/luminave-menu/index.js'
import './components/luminave-dashboard/index.js'
Expand Down
2 changes: 1 addition & 1 deletion src/components/animation-bee/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LitElement, html } from '@polymer/lit-element/lit-element.js'
import { LitElement, html } from 'lit-element'
import { store } from '../../reduxStore.js'
import { repeat } from 'lit-html/directives/repeat.js'
import { addKeyframe, removeAnimation, setAnimation } from '../../actions/index.js'
Expand Down
2 changes: 1 addition & 1 deletion src/components/animation-list-item/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LitElement, html } from '@polymer/lit-element/lit-element.js'
import { LitElement, html } from 'lit-element'

/*
* A animation list item
Expand Down
2 changes: 1 addition & 1 deletion src/components/animation-list/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LitElement, html } from '@polymer/lit-element/lit-element.js'
import { LitElement, html } from 'lit-element'
import { repeat } from 'lit-html/directives/repeat.js'
import { store } from '../../reduxStore.js'
import '../animation-list-item/index.js'
Expand Down
2 changes: 1 addition & 1 deletion src/components/animation-manager/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LitElement, html } from '@polymer/lit-element/lit-element.js'
import { LitElement, html } from 'lit-element'
import { repeat } from 'lit-html/directives/repeat.js'
import { connect } from 'pwa-helpers/connect-mixin.js'
import { store } from '../../reduxStore.js'
Expand Down
2 changes: 1 addition & 1 deletion src/components/bpm-meter/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LitElement, html } from '@polymer/lit-element/lit-element.js'
import { LitElement, html } from 'lit-element'

/*
* Show BPM (Beats per Minute)
Expand Down
2 changes: 1 addition & 1 deletion src/components/channel-grid/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LitElement, html } from '@polymer/lit-element/lit-element.js'
import { LitElement, html } from 'lit-element'
import { repeat } from 'lit-html/directives/repeat.js'
import { shared } from '../../styles/shared.js'

Expand Down
2 changes: 1 addition & 1 deletion src/components/config-manager/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LitElement, html } from '@polymer/lit-element/lit-element.js'
import { LitElement, html } from 'lit-element'
import { STORAGE_STATE } from '/src/constants/index.js'

/*
Expand Down
2 changes: 1 addition & 1 deletion src/components/connect-button/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LitElement, html } from '@polymer/lit-element/lit-element.js'
import { LitElement, html } from 'lit-element'
import { connect } from 'pwa-helpers/connect-mixin.js'
import { store } from '../../reduxStore.js'
import { getConnections } from '../../selectors/index.js'
Expand Down
2 changes: 1 addition & 1 deletion src/components/dekk-manager/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LitElement, html } from '@polymer/lit-element/lit-element.js'
import { LitElement, html } from 'lit-element'
import { connect } from 'pwa-helpers/connect-mixin.js'
import { store } from '../../reduxStore.js'
import { connectDekk, setDekkData, addSceneToTimeline, removeSceneFromTimelineAndResetFixtures } from '../../actions/index.js'
Expand Down
2 changes: 1 addition & 1 deletion src/components/dmx-fixture-property/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LitElement, html } from '@polymer/lit-element/lit-element.js'
import { LitElement, html } from 'lit-element'
import { repeat } from 'lit-html/directives/repeat.js'
import { rgbToHex } from '../../directives/rgb-to-hex.js'
import { defaultValue } from '../../directives/default-value.js'
Expand Down
2 changes: 1 addition & 1 deletion src/components/dmx-fixture/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LitElement, html } from '@polymer/lit-element/lit-element.js'
import { LitElement, html } from 'lit-element'
import { repeat } from 'lit-html/directives/repeat.js'
import { store } from '../../reduxStore.js'
import { setChannels, setFixture, setFixtureProperties, addKeyframes } from '../../actions/index.js'
Expand Down
2 changes: 1 addition & 1 deletion src/components/fivetwelve/fivetwelve-manager.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LitElement, html } from '@polymer/lit-element/lit-element.js'
import { LitElement, html } from 'lit-element'
import { connect } from 'pwa-helpers/connect-mixin.js'
import { store } from '../../reduxStore.js'
import { setFivetwelve } from '../../actions/fivetwelve.js'
Expand Down
2 changes: 1 addition & 1 deletion src/components/fixture-list-item/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LitElement, html } from '@polymer/lit-element/lit-element.js'
import { LitElement, html } from 'lit-element'
import { links } from '../../styles/links.js'

/*
Expand Down
2 changes: 1 addition & 1 deletion src/components/fixture-list/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LitElement, html } from '@polymer/lit-element/lit-element.js'
import { LitElement, html } from 'lit-element'
import { repeat } from 'lit-html/directives/repeat.js'
import '../fixture-list-item/index.js'
import { shared } from '../../styles/shared.js'
Expand Down
2 changes: 1 addition & 1 deletion src/components/fixture-manager/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LitElement, html } from '@polymer/lit-element/lit-element.js'
import { LitElement, html } from 'lit-element'
import { repeat } from 'lit-html/directives/repeat.js'
import { connect } from 'pwa-helpers/connect-mixin.js'
import { store } from '../../reduxStore.js'
Expand Down
4 changes: 1 addition & 3 deletions src/components/integration/integration-configuration.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

import { LitElement, html } from 'lit-element/lit-element.js'
import { defaultValue } from '../../directives/default-value.js'
import { classMap } from 'lit-html/directives/classMap.js'
import { classMap } from 'lit-html/directives/class-map.js'

/*
* Handle the configuration of an integration (like the API of modV)
Expand Down Expand Up @@ -65,8 +65,6 @@ class IntegrationConfiguration extends LitElement {
? 'disconnect'
: 'connect'



const statusClasses = {
'status': true,
'connected': connectionStatus === 'connected',
Expand Down
2 changes: 1 addition & 1 deletion src/components/keyframe-grid/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LitElement, html } from '@polymer/lit-element/lit-element.js'
import { LitElement, html } from 'lit-element'
import { repeat } from 'lit-html/directives/repeat.js'
import { shared } from '../../styles/shared.js'

Expand Down
2 changes: 1 addition & 1 deletion src/components/live-mode/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LitElement, html } from '@polymer/lit-element/lit-element.js'
import { LitElement, html } from 'lit-element'
import { connect } from 'pwa-helpers/connect-mixin.js'
import { store } from '../../reduxStore.js'
import { setLive } from '../../actions/index.js'
Expand Down
2 changes: 1 addition & 1 deletion src/components/luminave-dashboard/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LitElement, html } from '@polymer/lit-element/lit-element.js'
import { LitElement, html } from 'lit-element'
import '@polymer/paper-tabs/paper-tab.js'
import '@polymer/paper-tabs/paper-tabs.js'

Expand Down
2 changes: 1 addition & 1 deletion src/components/luminave-menu/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LitElement, html } from '@polymer/lit-element/lit-element.js'
import { LitElement, html } from 'lit-element'
import { connect } from 'pwa-helpers/connect-mixin.js'
import { store } from '../../reduxStore.js'
import '@polymer/paper-tabs/paper-tab.js'
Expand Down
2 changes: 1 addition & 1 deletion src/components/luminave-status/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LitElement, html } from '@polymer/lit-element/lit-element.js'
import { LitElement, html } from 'lit-element'
import { connect } from 'pwa-helpers/connect-mixin.js'
import { store } from '../../reduxStore.js'
import { getUsbDmxControllerConnected, getModvConnected } from '../../selectors/index.js'
Expand Down
2 changes: 1 addition & 1 deletion src/components/luminave-status/indicator.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LitElement, html } from '@polymer/lit-element/lit-element.js'
import { LitElement, html } from 'lit-element'

/*
* Show the status of something, for example USB or modV
Expand Down
2 changes: 1 addition & 1 deletion src/components/midi-controller/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LitElement, html } from '@polymer/lit-element/lit-element.js'
import { LitElement, html } from 'lit-element'
import { connect } from 'pwa-helpers/connect-mixin.js'
import { store } from '../../reduxStore.js'
import WebMidi from 'webmidi'
Expand Down
11 changes: 7 additions & 4 deletions src/components/midi-grid/midi-grid.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import { LitElement, html } from '@polymer/lit-element/lit-element.js'
import { LitElement, html } from 'lit-element'
import { repeat } from 'lit-html/directives/repeat.js'
import { connect } from 'pwa-helpers/connect-mixin.js'
import { store } from '../../reduxStore.js'
import { learnMidi, addScenesToMidi, removeSceneFromMidi, addMidiMapping } from '../../actions/index.js'
import '../scene-list/index.js'
import { MIDI_TYPES, MIDI_TYPE_KNOB, MIDI_TYPE_FADER, MIDI_TYPE_EMPTY, MIDI_TYPE_BUTTON, MIDI_TYPE_ROUND_BUTTON } from '../../constants/index.js'
import { getMidiLearning, getScenes, getLive } from '../../selectors/index.js'
import { classMap } from 'lit-html/directives/classMap.js'
import { when } from 'lit-html/directives/when.js'
import { classMap } from 'lit-html/directives/class-map.js'
import '@material/mwc-button/mwc-button.js'
import '@material/mwc-icon/mwc-icon.js'

Expand Down Expand Up @@ -281,7 +280,11 @@ class MidiGrid extends connect(store)(LitElement) {
itemTemplates.push(html`
<div style="${this.computeItemVars(element, index, learnIndex)}" class="${classMap(itemClasses)}">
${when(isEditing, () => this.templateEdit(element, index), () => this.templateNormal(element, index))}
${
isEditing
? this.templateEdit(element, index)
: this.templateNormal(element, index)
}
</div>
`)
Expand Down
2 changes: 1 addition & 1 deletion src/components/midi-manager/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LitElement, html } from '@polymer/lit-element/lit-element.js'
import { LitElement, html } from 'lit-element'
import { repeat } from 'lit-html/directives/repeat.js'
import { connect } from 'pwa-helpers/connect-mixin.js'
import { store } from '../../reduxStore.js'
Expand Down
4 changes: 2 additions & 2 deletions src/components/modv/modv-color-grid.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { LitElement, html } from '@polymer/lit-element/lit-element.js'
import { LitElement, html } from 'lit-element'
import { repeat } from 'lit-html/directives/repeat.js'
import { classMap } from 'lit-html/directives/classMap.js'
import { classMap } from 'lit-html/directives/class-map.js'
import '@polymer/paper-tooltip/paper-tooltip.js'
import { collator } from '../../utils/index.js'

Expand Down
2 changes: 1 addition & 1 deletion src/components/modv/modv-manager.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LitElement, html } from '@polymer/lit-element/lit-element.js'
import { LitElement, html } from 'lit-element'
import { connect } from 'pwa-helpers/connect-mixin.js'
import { store } from '../../reduxStore.js'
import { setModv } from '../../actions/index.js'
Expand Down
2 changes: 1 addition & 1 deletion src/components/modv/modv-mapper.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LitElement, html } from '@polymer/lit-element/lit-element.js'
import { LitElement, html } from 'lit-element'
import './modv-color-grid.js'
import { defaultValue } from '../../directives/default-value.js'

Expand Down
2 changes: 1 addition & 1 deletion src/components/rainbow-text/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LitElement, html } from '@polymer/lit-element/lit-element.js'
import { LitElement, html } from 'lit-element'
import { repeat } from 'lit-html/directives/repeat.js'

/*
Expand Down
2 changes: 1 addition & 1 deletion src/components/scene-bee/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LitElement, html } from '@polymer/lit-element/lit-element.js'
import { LitElement, html } from 'lit-element'
import { store } from '../../reduxStore.js'
import { setSceneName, addAnimationToScene, addFixturesToScene, removeFixtureFromScene, removeAnimationFromScene, addSceneToTimeline, removeScene, resetUniverseAndFixtures, removeFixtureFromSceneAndUniverse } from '../../actions/index.js'
import '../fixture-list/index.js'
Expand Down
2 changes: 1 addition & 1 deletion src/components/scene-list-item/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LitElement, html } from '@polymer/lit-element/lit-element.js'
import { LitElement, html } from 'lit-element'
import { defaultValue } from '../../directives/default-value.js'

/*
Expand Down
2 changes: 1 addition & 1 deletion src/components/scene-list/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LitElement, html } from '@polymer/lit-element/lit-element.js'
import { LitElement, html } from 'lit-element'
import { repeat } from 'lit-html/directives/repeat.js'
import '../scene-list-item/index.js'
import { shared } from '../../styles/shared.js'
Expand Down
2 changes: 1 addition & 1 deletion src/components/scene-manager/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LitElement, html } from '@polymer/lit-element/lit-element.js'
import { LitElement, html } from 'lit-element'
import { repeat } from 'lit-html/directives/repeat.js'
import { connect } from 'pwa-helpers/connect-mixin.js'
import { store } from '../../reduxStore.js'
Expand Down
2 changes: 1 addition & 1 deletion src/components/search/search-field.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LitElement, html } from '@polymer/lit-element/lit-element.js'
import { LitElement, html } from 'lit-element'

/*
* Search a list of elements
Expand Down
2 changes: 1 addition & 1 deletion src/components/storage-manager/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LitElement, html } from '@polymer/lit-element/lit-element.js'
import { LitElement, html } from 'lit-element'
import { connect } from 'pwa-helpers/connect-mixin.js'
import { store } from '../../reduxStore.js'
import { STORAGE_STATE } from '../../constants/index.js'
Expand Down
2 changes: 1 addition & 1 deletion src/components/tap-button/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LitElement, html } from '@polymer/lit-element/lit-element.js'
import { LitElement, html } from 'lit-element'
import { store } from '../../reduxStore.js'
import { setBpm } from '../../actions/index.js'

Expand Down
2 changes: 1 addition & 1 deletion src/components/timeline/timeline-animation.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LitElement, html, css } from '@polymer/lit-element/lit-element.js'
import { LitElement, html, css } from 'lit-element'
import { addToFixtureBatch } from '../../utils/index.js'
import TimelineKeytime from './timeline-keytime.js'
import { toFixedNumber } from '../../utils/index.js'
Expand Down
2 changes: 1 addition & 1 deletion src/components/timeline/timeline-manager.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LitElement, html } from '@polymer/lit-element/lit-element.js'
import { LitElement, html } from 'lit-element'
import { repeat } from 'lit-html/directives/repeat.js'
import { connect } from 'pwa-helpers/connect-mixin.js'
import { store } from '../../reduxStore.js'
Expand Down
2 changes: 1 addition & 1 deletion src/components/timeline/timeline-scene.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LitElement, html } from '@polymer/lit-element/lit-element.js'
import { LitElement, html } from 'lit-element'
import { repeat } from 'lit-html/directives/repeat.js'
import { store } from '../../reduxStore.js'
import { connect } from 'pwa-helpers/connect-mixin.js'
Expand Down
2 changes: 1 addition & 1 deletion src/components/ui-spacer/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LitElement, html } from '@polymer/lit-element/lit-element.js'
import { LitElement, html } from 'lit-element'

/*
* A spacer to be used to make some space between components
Expand Down
2 changes: 1 addition & 1 deletion src/components/universe-manager/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LitElement, html } from '@polymer/lit-element/lit-element.js'
import { LitElement, html } from 'lit-element'
import { repeat } from 'lit-html/directives/repeat.js'
import { connect } from 'pwa-helpers/connect-mixin.js'
import { store } from '../../reduxStore.js'
Expand Down
2 changes: 1 addition & 1 deletion src/components/usb-dmx-manager/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LitElement, html } from '@polymer/lit-element/lit-element.js'
import { LitElement, html } from 'lit-element'
import { connect } from 'pwa-helpers/connect-mixin.js'
import { store } from '../../reduxStore.js'
import Controller from 'webusb-dmx512-controller/controller.js'
Expand Down
2 changes: 1 addition & 1 deletion src/components/venue/manager.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LitElement, html } from '@polymer/lit-element/lit-element.js'
import { LitElement, html } from 'lit-element'
import { repeat } from 'lit-html/directives/repeat.js'
import { connect } from 'pwa-helpers/connect-mixin.js'
import { store } from '../../reduxStore.js'
Expand Down
4 changes: 2 additions & 2 deletions src/components/venue/slot-grid.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LitElement, html } from '@polymer/lit-element/lit-element.js'
import { LitElement, html } from 'lit-element'
import { connect } from 'pwa-helpers/connect-mixin.js'
import { store } from '../../reduxStore.js'
import { addVenueSlot, setVenueSlot, removeVenueSlot } from '../../actions/venue.js'
Expand All @@ -8,7 +8,7 @@ import '../../components/venue/slot-item.js'
import { repeat } from 'lit-html/directives/repeat.js'
import uuidv1 from 'uuid/v1.js'
import { defaultValue } from '../../directives/default-value.js'
import { classMap } from 'lit-html/directives/classMap.js'
import { classMap } from 'lit-html/directives/class-map.js'

/*
* Show MIDI buttons in a grid
Expand Down
Loading

0 comments on commit 5de1151

Please sign in to comment.