Mercurial > code > home > repos > light9

changeset 1713:bd0c83b063df

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bower, polymer, coffee updates Ignore-this: 39b3c5edc1ea34c1f138c538341269f
author Drew Perttula <drewp@bigasterisk.com>
date Fri, 04 May 2018 07:58:13 +0000
parents 96b37d4f96aa
children f2265601ead6
files light9/web/lib/bower.json makefile package.json
diffstat 3 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/light9/web/lib/bower.json	Fri May 04 03:10:36 2018 +0000
+++ b/light9/web/lib/bower.json	Fri May 04 07:58:13 2018 +0000
@@ -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"
   }
 }
--- a/makefile	Fri May 04 03:10:36 2018 +0000
+++ b/makefile	Fri May 04 07:58:13 2018 +0000
@@ -75,7 +75,7 @@
 ### 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 @@
 	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:
--- a/package.json	Fri May 04 03:10:36 2018 +0000
+++ b/package.json	Fri May 04 07:58:13 2018 +0000
@@ -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",