various bug fixes

7 years ago · 4e39e1e0dc
10 changed files with 277 additions and 242 deletions
--- a/package.json
+++ b/package.json
@ -16,7 +16,7 @@
  "homepage": "https://github.com/nisstyre56/TextbookEngine#readme",
  "devDependencies": {
    "ramda": "^0.23.0",
-    "riot": "^3.3.1",
+    "riot": "3.3.4",
    "rollup": "^0.41.4",
    "rollup-plugin-commonjs": "^7.0.0",
    "rollup-plugin-node-resolve": "^2.0.0",
--- a/src/scripts/aboutview.tag
+++ b/src/scripts/aboutview.tag
@ -1,5 +1,14 @@
 <aboutview>
-  <p>
-  Created as an experiment in allowing students to find public domain copies of books for their courses easier
-  </p>
+  <div class="animated fadeIn">
+    <h3 style="margin-top: 5px;">About TextBook Commons</h3>
+    <p class="description">
+    I created this as an experiment in making it easier for students to find public domain copies of books for their courses. The problem that I kept having was that many courses (especially in the humanities) assign books which either have readily available public domain copies, or high quality alternatives (especially in math or computer science) that don't require paying exhorbitant amounts of money. Textbook Commons was created as an attempt at a solution to this problem. It will allow you to search for your course, then it will search for copies of the books for that course on Internet Archive and the OpenLibrary. This works surprisingly well for a number of courses. If it can't find anything on Internet Archive, then it will almost always find it on OpenLibrary if it is a published book, which will then lead you to much cheaper sources than your university's book store. This is by no means a perfect solution to the problem, but I think it makes a good base to build on for future efforts, and it is freely licensed and open source code available for anyone to hack on.
+    </p>
+      <a
+        class="btn source"
+        target="_blank"
+        href="https://github.com/nisstyre56/TextbookEngine">
+          Source Code
+      </a>
+  </div>
 </aboutview>
--- a/src/scripts/app.tag
+++ b/src/scripts/app.tag
@ -1,29 +1,29 @@
 <app>
-  <ul class="tab tab-block">
+  <ul class="navigate tab tab-block">
    <li class={"tab-item " + this.searchActive}>
-      <a onclick={toSearch} href="">Search</a>
+      <a onclick={toSearch} href="#">Search</a>
    </li>
    <li class={"tab-item " + this.aboutActive}>
-      <a onclick={toAbout} href="/about">About</a>
+      <a onclick={toAbout} href="#">About</a>
    </li>
  </ul>
-  <router>
-    <route path="/">
-      <div class="animated fadeIn">
-        <searchview></searchview>
-      </div>
-    </route>
-    <route path="/about">
-      <div class="animated fadeIn">
-        <aboutview></aboutview>
-      </div>
-    </route>
-  </router>
+  <searchview
+    if={this.searchActive}
+    ref="searchview"
+    opts={this.opts}
+  >
+  </searchview>
+  <aboutview
+    if={this.aboutActive}
+    ref="aboutview"
+  >
+  </aboutview>
 <script>
 import route from 'riot-route';
 this.route = route;
+this.riot = riot;

-this.searchActive = "";
+this.searchActive = "active";
 this.aboutActive = "";
 var self = this;

@ -34,7 +34,7 @@ this.route("about",
    self.update();
  });

-this.route("/",
+this.route("search",
  function() {
    self.aboutActive = "";
    self.searchActive = "active";
@ -50,7 +50,7 @@ toAbout(e) {

 toSearch(e) {
  e.preventDefault();
-  this.route("");
+  this.route("search");
  return;
 }

--- a/src/scripts/class.tag
+++ b/src/scripts/class.tag
@ -7,13 +7,13 @@
      </div>
      <div if={ books } class="card-body">
          <div class="dropdown">
-            <button
+            <a
              class="btn btn-link dropdown-toggle tooltip tooltip-bottom"
              tabindex="0"
              data-tooltip={`${this.books.length} ${this.books.length > 1 ? "books" : "book"}`}
            >
              Find Books <i class="icon-caret"></i>
-            </button>
+            </a>
            <ul class="menu">
              <li class="menu-header">
                <span class="menu-header-text">
--- a/src/scripts/results.tag
+++ b/src/scripts/results.tag
@ -1,37 +1,37 @@
 <results>
-      <div if={notLoading} class="courses container">
-       <row if={rows.length > 0}
-            class="course-row columns"
-            each={ rows }
-            data="{ this }"
-            classrow={ row }>
-      </row>
-      <div if={rows.length <= 0}
-           class="empty"
-      >
-        No Results, Sorry!
-      </div>
-    </div>
+  <div class="courses container">
+    <row
+      class="course-row columns"
+      each={ this.rows }
+      data={ this }
+      classrow={ this.row }>
+    </row>
+    <span if={this.noResults}>
+      No Results!
+    </span>
+  </div>
 <script>
-clicker() {
-  alert("clicked");
-}
+
 this.rows = [];
 var self = this;
-self.opts = this.parent.parent.parent.parent.opts;
+self.options = self.opts.opts;
+
+self.notLoading = true;
+self.noResults = false;

-this.opts.resultsEv.on("loading",
+self.options.resultsEv.on("loading",
  function() {
    self.notLoading = false;
    self.update();
  });

-this.opts.resultsEv.on("newResults",
+self.options.resultsEv.on("newResults",
  function(data) {
-    console.log("new search results detected");
-    console.log(data);
    self.rows = data;
    self.notLoading = true;
+    if (self.rows.length == 0) {
+      self.noResults = true;
+    }
    self.update();
 });
 </script>
--- a/src/scripts/search.js
+++ b/src/scripts/search.js
@ -1,5 +1,5 @@
 import riot from 'riot';
-import router from 'riot-route/lib/tag';
+import route from 'riot-route';
 import './book.tag';
 import './class.tag';
 import './results.tag';
@ -15,8 +15,12 @@ function mount() {
  riot.mount("app", {
                      booksLoading : false,
                      resultsEv :  resultsEv,
-                      notLoading: true
+                      notLoading : true
                     });
+
 }

+
+route.start(true);
+
 mount();
--- a/src/scripts/search.tag
+++ b/src/scripts/search.tag
@ -36,7 +36,7 @@
    </div>
  </form>

-  <div if={ opts.booksLoading } class="search-load">
+  <div if={ options.booksLoading } class="search-load">
  </div>

 <script>
@ -45,13 +45,13 @@ import {filterCourses, groupsof} from './helpers.js';
 import 'whatwg-fetch';

 var self = this;
-self.opts = this.parent.parent.parent.parent.opts;
+self.options = self.opts.opts;

 submit(ev) {
    ev.preventDefault();
-    self.opts.booksLoading = true;
+    self.options.booksLoading = true;
    self.update();
-    self.opts.resultsEv.trigger("loading");
+    self.options.resultsEv.trigger("loading");
    console.log(ev);
    fetch("/search/fc?title="+self.refs.title.value+"&sem="+self.refs.sem.value).then(
      function(response) {
@ -60,8 +60,8 @@ submit(ev) {
            function(courses) {
              var fcourses = filterCourses(courses);
              var cgroups = groupsof(3, fcourses);
-              self.opts.resultsEv.trigger("newResults", cgroups);
-              self.opts.booksLoading = false;
+              self.options.resultsEv.trigger("newResults", cgroups);
+              self.options.booksLoading = false;
              self.update();
          });
        }
--- a/src/scripts/searchview.tag
+++ b/src/scripts/searchview.tag
@ -1,24 +1,26 @@
 <searchview>
-  <section class="page-top navbar-section">
-    <div class="container">
-      <div class="columns">
-        <div class="column">
-          <h1 class="title inline-block">TextBook Commons</h1>
-          <figure class="inline-block avatar-icon avatar avatar-xl">
-            <img class="logo" src="/goal.png" />
-          </figure>
-        </div>
+  <div class="animated fadeIn">
+    <section class="page-top navbar-section">
+      <div class="container">
+       <div class="columns">
+         <div class="column">
+           <h1 class="title inline-block">TextBook Commons</h1>
+           <figure class="inline-block avatar-icon avatar avatar-xl">
+             <img class="logo" src="/goal.png" />
+           </figure>
+         </div>
+       </div>
+       <div class="columns">
+         <div class="title column col-sm-12 col-md-12 col-lg-12">
+           <h4>Search for a course and find your books</h4>
+           <h6>Currently indexes courses for McMaster University.
+               <span>Created By <a href="https://twitter.com/weskerfoot">@weskerfoot</a></span>
+           </h6>
+         </div>
+       </div>
+       <search opts={this.opts.opts}></search>
      </div>
-      <div class="columns">
-        <div class="title column col-sm-12 col-md-12 col-lg-12">
-          <h4>Search for a course and find your books</h4>
-          <h6>Currently indexes courses for McMaster University.
-              <span>Created By <a href="https://twitter.com/weskerfoot">@weskerfoot</a></span>
-          </h6>
-        </div>
-      </div>
-      <search></search>
-    </div>
-  </section>
-  <results></results>
+    </section>
+    <results opts={this.opts.opts}></results>
+  </div>
 </searchview>
--- a/src/styles/search.scss
+++ b/src/styles/search.scss
@ -1,5 +1,22 @@
 $blue: #1c75bc;

+.navigate {
+  margin: auto;
+  width: 70%;
+}
+
+.description {
+  margin: auto;
+  width: 70%;
+  text-align: justify;
+  color: black;
+  line-height: 1.5em;
+}
+
+.source {
+  margin-top: 5px;
+}
+
 .app {
  color: $blue;
 }
--- a/yarn.lock
+++ b/yarn.lock
@ -27,8 +27,8 @@ acorn@^4.0.1:
  resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.11.tgz#edcda3bd937e7556410d42ed5860f67399c794c0"

 ajv@^4.9.1:
-  version "4.11.5"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.5.tgz#b6ee74657b993a01dce44b7944d56f485828d5bd"
+  version "4.11.8"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
  dependencies:
    co "^4.6.0"
    json-stable-stringify "^1.0.1"
@ -57,11 +57,11 @@ aproba@^1.0.3:
  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.1.1.tgz#95d3600f07710aa0e9298c726ad5ecf2eacbabab"

 are-we-there-yet@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.2.tgz#80e470e95a084794fe1899262c5667c6e88de1b3"
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d"
  dependencies:
    delegates "^1.0.0"
-    readable-stream "^2.0.0 || ^1.1.13"
+    readable-stream "^2.0.6"

 arr-diff@^2.0.0:
  version "2.0.0"
@ -70,8 +70,8 @@ arr-diff@^2.0.0:
    arr-flatten "^1.0.1"

 arr-flatten@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.0.1.tgz#e5ffe54d45e19f32f216e91eb99c8ce892bb604b"
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.0.3.tgz#a274ed85ac08849b6bd7847c4580745dc51adfb1"

 array-unique@^0.2.1:
  version "0.2.1"
@ -85,14 +85,14 @@ asn1@~0.2.3:
  version "0.2.3"
  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"

+assert-plus@1.0.0, assert-plus@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+
 assert-plus@^0.2.0:
  version "0.2.0"
  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"

-assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-
 async-each@^1.0.0:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
@ -135,9 +135,9 @@ boom@2.x.x:
  dependencies:
    hoek "2.x.x"

-brace-expansion@^1.0.0:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.6.tgz#7197d7eaa9b87e648390ea61fc66c84427420df9"
+brace-expansion@^1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.7.tgz#3effc3c50e000531fb720eaff80f0ae8ef23cf59"
  dependencies:
    balanced-match "^0.4.1"
    concat-map "0.0.1"
@ -168,7 +168,7 @@ buble@^0.15.0:
    minimist "^1.2.0"
    os-homedir "^1.0.1"

-buffer-shims@^1.0.0:
+buffer-shims@~1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51"

@ -243,11 +243,11 @@ dashdash@^1.12.0:
  dependencies:
    assert-plus "^1.0.0"

-debug@~2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
+debug@^2.2.0:
+  version "2.6.6"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.6.tgz#a9fa6fbe9ca43cf1e79f73b75c0189cbb7d6db5a"
  dependencies:
-    ms "0.7.1"
+    ms "0.7.3"

 deep-extend@~0.4.0:
  version "0.4.1"
@ -275,6 +275,10 @@ escape-string-regexp@^1.0.2:
  version "1.0.5"
  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"

+eslint-config-riot@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-riot/-/eslint-config-riot-1.0.0.tgz#fbd65386980b30fbcd0e1305d4c3fb8614ef2119"
+
 estree-walker@^0.2.1:
  version "0.2.1"
  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.2.1.tgz#bdafe8095383d8414d5dc2ecf4c9173b6db9412e"
@ -296,8 +300,8 @@ expand-range@^1.8.1:
    fill-range "^2.1.0"

 extend@^3.0.0, extend@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.0.tgz#5a474353b9f3353ddd8176dfd37b91c83a46f1d4"
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"

 extglob@^0.3.1:
  version "0.3.2"
@ -314,8 +318,8 @@ fast-levenshtein@~2.0.4:
  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"

 filename-regex@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.0.tgz#996e3e80479b98b9897f15a8a58b3d084e926775"
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"

 fill-range@^2.1.0:
  version "2.2.3"
@ -342,8 +346,8 @@ forever-agent@~0.6.1:
  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"

 form-data@~2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.2.tgz#89c3534008b97eada4cbb157d58f6f5df025eae4"
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1"
  dependencies:
    asynckit "^0.4.0"
    combined-stream "^1.0.5"
@ -360,7 +364,7 @@ fsevents@^1.0.0:
    nan "^2.3.0"
    node-pre-gyp "^0.6.29"

-fstream-ignore@~1.0.5:
+fstream-ignore@^1.0.5:
  version "1.0.5"
  resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105"
  dependencies:
@ -368,7 +372,7 @@ fstream-ignore@~1.0.5:
    inherits "2"
    minimatch "^3.0.0"

-fstream@^1.0.0, fstream@^1.0.2, fstream@~1.0.10:
+fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2:
  version "1.0.11"
  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
  dependencies:
@ -377,9 +381,9 @@ fstream@^1.0.0, fstream@^1.0.2, fstream@~1.0.10:
    mkdirp ">=0.5 0"
    rimraf "2"

-gauge@~2.7.1:
-  version "2.7.3"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.3.tgz#1c23855f962f17b3ad3d0dc7443f304542edfe09"
+gauge@~2.7.3:
+  version "2.7.4"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
  dependencies:
    aproba "^1.0.3"
    console-control-strings "^1.0.0"
@ -391,8 +395,8 @@ gauge@~2.7.1:
    wide-align "^1.1.0"

 getpass@^0.1.1:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.6.tgz#283ffd9fc1256840875311c1b60e8c40187110e6"
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
  dependencies:
    assert-plus "^1.0.0"

@ -482,8 +486,8 @@ ini@~1.3.0:
  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"

 interpret@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.1.tgz#d579fb7f693b858004947af39fa0db49f795602c"
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.3.tgz#cbc35c62eeee73f19ab7b10a801511401afc0f90"

 is-binary-path@^1.0.0:
  version "1.0.1"
@ -491,7 +495,7 @@ is-binary-path@^1.0.0:
  dependencies:
    binary-extensions "^1.0.0"

-is-buffer@^1.0.2:
+is-buffer@^1.1.5:
  version "1.1.5"
  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc"

@ -586,18 +590,19 @@ jsonify@~0.0.0:
  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"

 jsprim@^1.2.2:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.3.1.tgz#2a7256f70412a29ee3670aaca625994c4dcff252"
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.0.tgz#a3b87e40298d8c380552d8cc7628a0bb95a22918"
  dependencies:
+    assert-plus "1.0.0"
    extsprintf "1.0.2"
    json-schema "0.2.3"
    verror "1.3.6"

 kind-of@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.1.0.tgz#475d698a5e49ff5e53d14e3e732429dc8bf4cf47"
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.0.tgz#b58abe4d5c044ad33726a8c1525b48cf891bff07"
  dependencies:
-    is-buffer "^1.0.2"
+    is-buffer "^1.1.5"

 levn@~0.3.0:
  version "0.3.0"
@ -636,21 +641,21 @@ micromatch@^2.1.5, micromatch@^2.3.11:
    parse-glob "^3.0.4"
    regex-cache "^0.4.2"

-mime-db@~1.26.0:
-  version "1.26.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.26.0.tgz#eaffcd0e4fc6935cf8134da246e2e6c35305adff"
+mime-db@~1.27.0:
+  version "1.27.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.27.0.tgz#820f572296bbd20ec25ed55e5b5de869e5436eb1"

 mime-types@^2.1.12, mime-types@~2.1.7:
-  version "2.1.14"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.14.tgz#f7ef7d97583fcaf3b7d282b6f8b5679dab1e94ee"
+  version "2.1.15"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.15.tgz#a4ebf5064094569237b8cf70046776d09fc92aed"
  dependencies:
-    mime-db "~1.26.0"
+    mime-db "~1.27.0"

 minimatch@^3.0.0, minimatch@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774"
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
  dependencies:
-    brace-expansion "^1.0.0"
+    brace-expansion "^1.1.7"

 minimist@0.0.8:
  version "0.0.8"
@ -660,51 +665,54 @@ minimist@^1.2.0:
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"

-"mkdirp@>=0.5 0", mkdirp@~0.5.1:
+"mkdirp@>=0.5 0", mkdirp@^0.5.1:
  version "0.5.1"
  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
  dependencies:
    minimist "0.0.8"

-ms@0.7.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
+ms@0.7.3:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.3.tgz#708155a5e44e33f5fd0fc53e81d0d40a91be1fff"

 nan@^2.3.0:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.5.1.tgz#d5b01691253326a97a2bbee9e61c55d8d60351e2"
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.6.2.tgz#e4ff34e6c95fdfb5aecc08de6596f43605a7db45"

 node-pre-gyp@^0.6.29:
-  version "0.6.33"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.33.tgz#640ac55198f6a925972e0c16c4ac26a034d5ecc9"
-  dependencies:
-    mkdirp "~0.5.1"
-    nopt "~3.0.6"
-    npmlog "^4.0.1"
-    rc "~1.1.6"
-    request "^2.79.0"
-    rimraf "~2.5.4"
-    semver "~5.3.0"
-    tar "~2.2.1"
-    tar-pack "~3.3.0"
-
-nopt@~3.0.6:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
+  version "0.6.34"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.34.tgz#94ad1c798a11d7fc67381b50d47f8cc18d9799f7"
+  dependencies:
+    mkdirp "^0.5.1"
+    nopt "^4.0.1"
+    npmlog "^4.0.2"
+    rc "^1.1.7"
+    request "^2.81.0"
+    rimraf "^2.6.1"
+    semver "^5.3.0"
+    tar "^2.2.1"
+    tar-pack "^3.4.0"
+
+nopt@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
  dependencies:
    abbrev "1"
+    osenv "^0.1.4"

 normalize-path@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.0.1.tgz#47886ac1662760d4261b7d979d241709d3ce3f7a"
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+  dependencies:
+    remove-trailing-separator "^1.0.1"

-npmlog@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.0.2.tgz#d03950e0e78ce1527ba26d2a7592e9348ac3e75f"
+npmlog@^4.0.2:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.0.tgz#dc59bee85f64f00ed424efb2af0783df25d1c0b5"
  dependencies:
    are-we-there-yet "~1.1.2"
    console-control-strings "~1.1.0"
-    gauge "~2.7.1"
+    gauge "~2.7.3"
    set-blocking "~2.0.0"

 number-is-nan@^1.0.0:
@ -726,18 +734,12 @@ object.omit@^2.0.0:
    for-own "^0.1.4"
    is-extendable "^0.1.1"

-once@^1.3.0:
+once@^1.3.0, once@^1.3.3:
  version "1.4.0"
  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
  dependencies:
    wrappy "1"

-once@~1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.3.3.tgz#b2e261557ce4c314ec8304f3fa82663e4297ca20"
-  dependencies:
-    wrappy "1"
-
 optionator@^0.8.2:
  version "0.8.2"
  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
@ -749,10 +751,21 @@ optionator@^0.8.2:
    type-check "~0.3.2"
    wordwrap "~1.0.0"

-os-homedir@^1.0.1:
+os-homedir@^1.0.0, os-homedir@^1.0.1:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"

+os-tmpdir@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+
+osenv@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644"
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.0"
+
 parse-glob@^3.0.4:
  version "3.0.4"
  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
@ -805,37 +818,25 @@ randomatic@^1.1.3:
    is-number "^2.0.2"
    kind-of "^3.0.2"

-rc@~1.1.6:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.1.7.tgz#c5ea564bb07aff9fd3a5b32e906c1d3a65940fea"
+rc@^1.1.7:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.1.tgz#2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95"
  dependencies:
    deep-extend "~0.4.0"
    ini "~1.3.0"
    minimist "^1.2.0"
    strip-json-comments "~2.0.1"

-"readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.2:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.3.tgz#9cf49463985df016c8ae8813097a9293a9b33729"
-  dependencies:
-    buffer-shims "^1.0.0"
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "~1.0.0"
-    process-nextick-args "~1.0.6"
-    string_decoder "~0.10.x"
-    util-deprecate "~1.0.1"
-
-readable-stream@~2.1.4:
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.1.5.tgz#66fa8b720e1438b364681f2ad1a63c618448c9d0"
+readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.4:
+  version "2.2.9"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.9.tgz#cf78ec6f4a6d1eb43d26488cac97f042e74b7fc8"
  dependencies:
-    buffer-shims "^1.0.0"
+    buffer-shims "~1.0.0"
    core-util-is "~1.0.0"
    inherits "~2.0.1"
    isarray "~1.0.0"
    process-nextick-args "~1.0.6"
-    string_decoder "~0.10.x"
+    string_decoder "~1.0.0"
    util-deprecate "~1.0.1"

 readdirp@^2.0.0:
@ -860,6 +861,10 @@ regex-cache@^0.4.2:
    is-equal-shallow "^0.1.3"
    is-primitive "^2.0.0"

+remove-trailing-separator@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.0.1.tgz#615ebb96af559552d4bf4057c8436d486ab63cc4"
+
 repeat-element@^1.1.2:
  version "1.1.2"
  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
@ -868,7 +873,7 @@ repeat-string@^1.5.2:
  version "1.6.1"
  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"

-request@^2.79.0:
+request@^2.81.0:
  version "2.81.0"
  resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
  dependencies:
@ -900,28 +905,28 @@ resolve@1.1.7:
  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"

 resolve@^1.1.6, resolve@^1.1.7:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.2.tgz#1f0442c9e0cbb8136e87b9305f932f46c7f28235"
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.3.tgz#655907c3469a8680dc2de3a275a8fdd69691f0e5"
  dependencies:
    path-parse "^1.0.5"

-rimraf@2, rimraf@~2.5.1, rimraf@~2.5.4:
-  version "2.5.4"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.5.4.tgz#96800093cbf1a0c86bd95b4625467535c29dfa04"
+rimraf@2, rimraf@^2.5.1, rimraf@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d"
  dependencies:
    glob "^7.0.5"

-riot-cli@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/riot-cli/-/riot-cli-3.0.0.tgz#02c6fc704d5db5655802ea180b68acc83c7df2e6"
+riot-cli@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/riot-cli/-/riot-cli-3.0.1.tgz#65843bffc12734bc68d1b3d23b4c3f1b0ee450e5"
  dependencies:
    chalk "^1.1.3"
    chokidar "^1.6.1"
    co "^4.6.0"
    optionator "^0.8.2"
-    riot-compiler "^3.0.0"
-    rollup "^0.36.3"
-    shelljs "^0.7.5"
+    riot-compiler "^3.2.1"
+    rollup "^0.41.6"
+    shelljs "^0.7.7"

 riot-compiler@^3.0.0, riot-compiler@^3.2.1:
  version "3.2.1"
@ -946,19 +951,21 @@ riot-router@^0.9.7:
    riot-route "^3.0.2"

 riot-tmpl@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/riot-tmpl/-/riot-tmpl-3.0.3.tgz#35f070c552cd70d78645d33de94aa5248d57ae50"
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/riot-tmpl/-/riot-tmpl-3.0.4.tgz#0daeb97c82b5f355e13d976d51ea937fc5118a85"
+  dependencies:
+    eslint-config-riot "^1.0.0"

-riot@^3.0.7, riot@^3.3.1:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/riot/-/riot-3.3.2.tgz#56cddd5dbcb6215aa780cfeff90e3a31b3c9f4fa"
+riot@3.3.4, riot@^3.0.7:
+  version "3.4.4"
+  resolved "https://registry.yarnpkg.com/riot/-/riot-3.4.4.tgz#9741d12f1d529f1557a6949e5773cce3fb7d9aba"
  dependencies:
-    riot-cli "^3.0.0"
+    riot-cli "^3.0.1"
    riot-compiler "^3.2.1"
    riot-observable "^3.0.0"
    riot-tmpl "^3.0.3"
    simple-dom "0.3.2"
-    simple-html-tokenizer "^0.4.0"
+    simple-html-tokenizer "^0.4.1"

 rollup-plugin-buble@^0.15.0:
  version "0.15.0"
@ -978,8 +985,8 @@ rollup-plugin-commonjs@^7.0.0:
    rollup-pluginutils "^2.0.1"

 rollup-plugin-node-resolve@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-2.0.0.tgz#07e0ae94ac002a3ea36e8f33ca121d9f836b1309"
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-2.1.1.tgz#cbb783b0d15b02794d58915350b2f0d902b8ddc8"
  dependencies:
    browser-resolve "^1.11.0"
    builtin-modules "^1.1.0"
@ -1007,15 +1014,9 @@ rollup-pluginutils@^2.0.1:
    estree-walker "^0.3.0"
    micromatch "^2.3.11"

-rollup@^0.36.3:
-  version "0.36.4"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.36.4.tgz#a224494c5386c1d73d38f7bb86f69f5eb011a3d2"
-  dependencies:
-    source-map-support "^0.4.0"
-
-rollup@^0.41.4:
-  version "0.41.5"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.41.5.tgz#cdfaade5cd1c2c7314351566a50ef74df6e66e3d"
+rollup@^0.41.4, rollup@^0.41.6:
+  version "0.41.6"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.41.6.tgz#e0d05497877a398c104d816d2733a718a7a94e2a"
  dependencies:
    source-map-support "^0.4.0"

@ -1023,7 +1024,7 @@ safe-buffer@^5.0.1:
  version "5.0.1"
  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7"

-semver@~5.3.0:
+semver@^5.3.0:
  version "5.3.0"
  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"

@ -1035,7 +1036,7 @@ set-immediate-shim@^1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"

-shelljs@^0.7.5:
+shelljs@^0.7.7:
  version "0.7.7"
  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.7.tgz#b2f5c77ef97148f4b4f6e22682e10bba8667cff1"
  dependencies:
@ -1051,9 +1052,9 @@ simple-dom@0.3.2:
  version "0.3.2"
  resolved "https://registry.yarnpkg.com/simple-dom/-/simple-dom-0.3.2.tgz#0663d10f1556f1500551d518f56e3aba0871371d"

-simple-html-tokenizer@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.4.0.tgz#ee41cff5bae6a4333f747e77360e26202fb8313d"
+simple-html-tokenizer@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.4.1.tgz#028988bb7fe8b2e6645676d82052587d440b02d3"

 sntp@1.x.x:
  version "1.0.9"
@ -1062,22 +1063,22 @@ sntp@1.x.x:
    hoek "2.x.x"

 source-map-support@^0.4.0:
-  version "0.4.11"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.11.tgz#647f939978b38535909530885303daf23279f322"
+  version "0.4.15"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.15.tgz#03202df65c06d2bd8c7ec2362a193056fef8d3b1"
  dependencies:
-    source-map "^0.5.3"
+    source-map "^0.5.6"

-source-map@^0.5.3:
+source-map@^0.5.6:
  version "0.5.6"
  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"

 spectre.css@^0.2.9:
-  version "0.2.9"
-  resolved "https://registry.yarnpkg.com/spectre.css/-/spectre.css-0.2.9.tgz#301b69465131426f4e5a9211a68729c4d95ae112"
+  version "0.2.14"
+  resolved "https://registry.yarnpkg.com/spectre.css/-/spectre.css-0.2.14.tgz#4a3f9afd289e8bafcd3e96b13999e08d9e2ebffd"

 sshpk@^1.7.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.11.0.tgz#2d8d5ebb4a6fab28ffba37fa62a90f4a3ea59d77"
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.0.tgz#ff2a3e4fd04497555fed97b39a0fd82fafb3a33c"
  dependencies:
    asn1 "~0.2.3"
    assert-plus "^1.0.0"
@ -1098,9 +1099,11 @@ string-width@^1.0.1:
    is-fullwidth-code-point "^1.0.0"
    strip-ansi "^3.0.0"

-string_decoder@~0.10.x:
-  version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+string_decoder@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.0.tgz#f06f41157b664d86069f84bdbdc9b0d8ab281667"
+  dependencies:
+    buffer-shims "~1.0.0"

 stringstream@~0.0.4:
  version "0.0.5"
@ -1120,20 +1123,20 @@ supports-color@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"

-tar-pack@~3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.3.0.tgz#30931816418f55afc4d21775afdd6720cee45dae"
-  dependencies:
-    debug "~2.2.0"
-    fstream "~1.0.10"
-    fstream-ignore "~1.0.5"
-    once "~1.3.3"
-    readable-stream "~2.1.4"
-    rimraf "~2.5.1"
-    tar "~2.2.1"
-    uid-number "~0.0.6"
-
-tar@~2.2.1:
+tar-pack@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.0.tgz#23be2d7f671a8339376cbdb0b8fe3fdebf317984"
+  dependencies:
+    debug "^2.2.0"
+    fstream "^1.0.10"
+    fstream-ignore "^1.0.5"
+    once "^1.3.3"
+    readable-stream "^2.1.4"
+    rimraf "^2.5.1"
+    tar "^2.2.1"
+    uid-number "^0.0.6"
+
+tar@^2.2.1:
  version "2.2.1"
  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
  dependencies:
@ -1163,7 +1166,7 @@ type-check@~0.3.2:
  dependencies:
    prelude-ls "~1.1.2"

-uid-number@~0.0.6:
+uid-number@^0.0.6:
  version "0.0.6"
  resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"

@ -1182,8 +1185,8 @@ verror@1.3.6:
    extsprintf "1.0.2"

 vlq@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.1.tgz#14439d711891e682535467f8587c5630e4222a6c"
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.2.tgz#e316d5257b40b86bb43cb8d5fea5d7f54d6b0ca1"

 whatwg-fetch@^2.0.2:
  version "2.0.3"