Merge branch 'master' of github.com:Colorless-Green-Ideas/MaterialDjango

Colorless-Green-Ideas · Aug 10, 2018 · 28a3fc6 · 28a3fc6
2 parents d171afd + 86b6a65
commit 28a3fc6
Show file tree

Hide file tree

Showing 4 changed files with 1,643 additions and 1 deletion.
diff --git a/materialdjango/static/materialdjango/components/bower_components b/materialdjango/static/materialdjango/components/bower_components
diff --git a/package.json b/package.json
@@ -15,6 +15,7 @@
   "author": "Jack Laxson <[email protected]>",
   "license": "MIT",
   "devDependencies": {
+    "rollup": "^0.63.2",
     "rollup-plugin-collect-sass": "^1.0.9",
     "rollup-plugin-node-resolve": "^3.3.0"
   }

diff --git a/tasks.py b/tasks.py
@@ -0,0 +1,12 @@
+from invoke import task
+
+@task
+def test(c):
+    c.run("")
+
+@task
+def rollup(c):
+    c.run("yarn run rollup -wc")
+@task
+def devserver(c):
+    c.run("pipenv run python testing/manage.py runserver 0.0.0.0:6660")