diff --git a/light9/web/lib/bower.json b/light9/web/lib/bower.json --- a/light9/web/lib/bower.json +++ b/light9/web/lib/bower.json @@ -25,6 +25,11 @@ "rdfstore": "https://github.com/antoniogarrote/rdfstore-js.git#b3f7c0c9c1da9b26261af0d4858722fa982411bb", "shortcut": "http://www.openjs.com/scripts/events/keyboard_shortcuts/shortcut.js", "sylvester": "~0.1.3", - "underscore": "~1.8.3" + "underscore": "~1.8.3", + "polymer": "Polymer/polymer#^2.0.0" + }, + "resolutions": { + "webcomponentsjs": "^v1.1.0", + "polymer": "^2.0.0" } } diff --git a/makefile b/makefile --- a/makefile +++ b/makefile @@ -75,7 +75,7 @@ env-mypy/bin/mypy: ### build ### coffee: - zsh -c 'coffee --map -cw light9/web/{.,live,timeline,paint,effects}/*.coffee' + zsh -c 'cd light9/web; ../../node_modules/coffeescript/bin/coffee --map -cw {.,live,timeline,paint,effects}/*.coffee' mypy-collector: env-mypy/bin/mypy env-mypy/bin/mypy --py2 --ignore-missing-imports --strict-optional --custom-typeshed-dir stubs --html-report /tmp/rep bin/collector light9/collector/*.py @@ -126,7 +126,7 @@ test_js_init: npm install test_js: - coffee -c light9/web/*.coffee + node_modules/coffeescript/bin/coffee -c light9/web/*.coffee node_modules/mocha/bin/mocha --compilers coffee:coffee-script/register --globals window,N3 light9/web/graph_test.coffee test_js_watch: diff --git a/package.json b/package.json --- a/package.json +++ b/package.json @@ -11,9 +11,10 @@ "dependencies": { "@webcomponents/shadycss": "^1.1.3", "@webcomponents/webcomponentsjs": "^1.2.0", - "bower": "^1.8.0", + "bower": "^1.8.4", "browserify": "^16.2.0", "chai": "^3.5.0", + "coffeescript": "^2.3.0", "d3": "^5.1.0", "mocha": "^2.5.3", "n3": "^1.0.0-alpha",