diff --git a/Gruntfile.js b/Gruntfile.js index b63ad56..ee52833 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -17,7 +17,7 @@ module.exports = function (grunt) { grunt.loadTasks("tasks") - grunt.registerTask("default", ["bower-install-simple", "lint", "saveRevision", "copy", "sass", "postcss", "requirejs"]) + grunt.registerTask("default", ["lint", "saveRevision", "copy", "sass", "postcss", "requirejs"]) grunt.registerTask("lint", ["eslint"]) grunt.registerTask("dev", ["default", "connect:server", "watch"]) } diff --git a/README.md b/README.md index cf65dca..9f9f06a 100644 --- a/README.md +++ b/README.md @@ -14,8 +14,7 @@ HopGlass is a frontend for the [HopGlass Server](https://github.com/hopglass/hop # Dependencies -- npm -- bower +- yarn (recommended) or npm - grunt-cli - Sass (>= 3.2) diff --git a/app.js b/app.js index e848121..f63c931 100644 --- a/app.js +++ b/app.js @@ -1,20 +1,20 @@ require.config({ baseUrl: "lib", paths: { - "leaflet": "../bower_components/leaflet/dist/leaflet", - "leaflet.label": "../bower_components/Leaflet.label/dist/leaflet.label", - "leaflet.providers": "../bower_components/leaflet-providers/leaflet-providers", - "chroma-js": "../bower_components/chroma-js/chroma.min", - "moment": "../bower_components/moment/min/moment-with-locales.min", - "tablesort": "../bower_components/tablesort/tablesort.min", - "tablesort.numeric": "../bower_components/tablesort/src/sorts/tablesort.numeric", - "d3": "../bower_components/d3/d3.min", - "numeral": "../bower_components/numeraljs/min/numeral.min", - "numeral-intl": "../bower_components/numeraljs/min/languages.min", - "virtual-dom": "../bower_components/virtual-dom/dist/virtual-dom", - "rbush": "../bower_components/rbush/rbush", + "leaflet": "../node_modules/leaflet/dist/leaflet", + "leaflet.label": "../node_modules/leaflet-label/dist/leaflet.label", + "leaflet.providers": "../node_modules/leaflet-providers/leaflet-providers", + "chroma-js": "../node_modules/chroma-js/chroma.min", + "moment": "../node_modules/moment/min/moment-with-locales.min", + "tablesort": "../node_modules/tablesort/tablesort.min", + "tablesort.numeric": "../node_modules/tablesort/src/sorts/tablesort.numeric", + "d3": "../node_modules/d3/d3.min", + "numeral": "../node_modules/numeraljs/min/numeral.min", + "numeral-intl": "../node_modules/numeraljs/min/languages.min", + "virtual-dom": "../node_modules/virtual-dom/dist/virtual-dom", + "rbush": "../node_modules/rbush/rbush", "helper": "../helper", - "jshashes": "../bower_components/jshashes/hashes" + "jshashes": "../node_modules/jshashes/hashes" }, shim: { "leaflet.label": ["leaflet"], diff --git a/bower.json b/bower.json deleted file mode 100644 index be1795a..0000000 --- a/bower.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "name": "HopGlass", - "ignore": [ - "node_modules", - "bower_components", - "**/.*", - "test", - "tests" - ], - "dependencies": { - "Leaflet.label": "~0.2.1", - "chroma-js": "~0.6.1", - "leaflet": "~0.7.3", - "ionicons": "~2.0.1", - "moment": "~2.9.0", - "requirejs": "~2.1.16", - "tablesort": "https://github.com/tristen/tablesort.git#v3.0.2", - "roboto-slab-fontface": "*", - "es6-shim": "~0.27.1", - "almond": "~0.3.1", - "r.js": "~2.1.16", - "d3": "~3.5.5", - "numeraljs": "~1.5.3", - "roboto-fontface": "~0.3.0", - "virtual-dom": "~2.0.1", - "leaflet-providers": "~1.0.27", - "rbush": "https://github.com/mourner/rbush.git#~1.3.5", - "jshashes": "~1.0.5" - }, - "authors": [ - "Milan Pässler ", - "Nils Schneider " - ], - "license": "AGPL3", - "private": true -} diff --git a/build.js b/build.js index 021929a..7412f0c 100644 --- a/build.js +++ b/build.js @@ -1,6 +1,6 @@ ({ baseUrl: "lib", - name: "../bower_components/almond/almond", + name: "../node_modules/almond/almond", mainConfigFile: "app.js", include: "../app", wrap: true, diff --git a/index.html b/index.html index fcbf858..7a0a5a4 100644 --- a/index.html +++ b/index.html @@ -3,14 +3,14 @@ - - - - - + + + + + - - + + diff --git a/lib/map/clientlayer.js b/lib/map/clientlayer.js index c3fb439..4d8b9f8 100644 --- a/lib/map/clientlayer.js +++ b/lib/map/clientlayer.js @@ -1,15 +1,12 @@ -define(["leaflet", "jshashes"], - function (L, jsHashes) { - var MD5 = new jsHashes.MD5() - +define(["leaflet"], + function (L) { return L.TileLayer.Canvas.extend({ setData: function (d) { this.data = d //pre-calculate start angles this.data.all().forEach(function (d) { - var hash = MD5.hex(d.node.nodeinfo.node_id) - d.startAngle = (parseInt(hash.substr(0, 2), 16) / 255) * 2 * Math.PI + d.startAngle = (parseInt(d.node.nodeinfo.node_id.substr(10, 2), 16) / 255) * 2 * Math.PI }) this.redraw() }, diff --git a/package.json b/package.json index 796da69..de8ebe1 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,6 @@ "autoprefixer": "^6.3.3", "dart-sass": "^1.16.1", "grunt": "^1.0.3", - "grunt-bower-install-simple": "^1.1.2", "grunt-check-dependencies": "^0.6.0", "grunt-contrib-clean": "^0.6.0", "grunt-contrib-connect": "^0.8.0", @@ -21,6 +20,20 @@ "grunt-postcss": "^0.7.2", "grunt-sass": "^3.0.2" }, + "dependencies": { + "almond": "^0.3.3", + "chroma-js": "^0.7.8", + "d3": "^3.5.17", + "leaflet": "^0.7.7", + "leaflet-label": "^0.2.1-0", + "leaflet-providers": "^1.5.0", + "moment": "^2.23.0", + "numeraljs": "^1.5.6", + "rbush": "^1.4.3", + "requirejs": "^2.3.2", + "tablesort": "3.0.2", + "virtual-dom": "^2.1.1" + }, "eslintConfig": { "env": { "browser": true, diff --git a/scss/_leaflet.label.scss b/scss/_leaflet.label.scss index b96f885..4bdebf9 120000 --- a/scss/_leaflet.label.scss +++ b/scss/_leaflet.label.scss @@ -1 +1 @@ -../bower_components/Leaflet.label/dist/leaflet.label.css \ No newline at end of file +../node_modules/leaflet-label/dist/leaflet.label.css \ No newline at end of file diff --git a/scss/_leaflet.scss b/scss/_leaflet.scss index afb51f7..047e9d7 120000 --- a/scss/_leaflet.scss +++ b/scss/_leaflet.scss @@ -1 +1 @@ -../bower_components/leaflet/dist/leaflet.css \ No newline at end of file +../node_modules/leaflet/dist/leaflet.css \ No newline at end of file diff --git a/tasks/build.js b/tasks/build.js index 0843dfe..6a923ac 100644 --- a/tasks/build.js +++ b/tasks/build.js @@ -1,6 +1,6 @@ module.exports = function(grunt) { grunt.config.merge({ - bowerdir: "bower_components", + nodedir: "node_modules", copy: { html: { options: { @@ -22,7 +22,7 @@ module.exports = function(grunt) { src: ["es6-shim/es6-shim.min.js", "es6-shim/es6-shim.map"], expand: true, - cwd: "bower_components/", + cwd: "node_modules/", dest: "build/vendor/" }, robotoSlab: { @@ -31,7 +31,7 @@ module.exports = function(grunt) { ], expand: true, dest: "build/", - cwd: "bower_components/roboto-slab-fontface" + cwd: "node_modules/roboto-slab-fontface" }, roboto: { src: [ "fonts/*", @@ -39,7 +39,7 @@ module.exports = function(grunt) { ], expand: true, dest: "build/", - cwd: "bower_components/roboto-fontface" + cwd: "node_modules/roboto-fontface" }, ionicons: { src: [ "fonts/*", @@ -47,13 +47,13 @@ module.exports = function(grunt) { ], expand: true, dest: "build/", - cwd: "bower_components/ionicons/" + cwd: "node_modules/ionicons/" }, leafletImages: { src: [ "images/*" ], expand: true, dest: "build/", - cwd: "bower_components/leaflet/dist/" + cwd: "node_modules/leaflet/dist/" } }, sass: { @@ -84,31 +84,18 @@ module.exports = function(grunt) { cssmin: { target: { files: { - "build/style.css": [ "bower_components/leaflet/dist/leaflet.css", - "bower_components/Leaflet.label/dist/leaflet.label.css", + "build/style.css": [ "node_modules/leaflet/dist/leaflet.css", + "node_modules/leaflet-label/dist/leaflet.label.css", "style.css" ] } } }, - "bower-install-simple": { - options: { - directory: "<%=bowerdir%>", - color: true, - interactive: false, - production: true - }, - "prod": { - options: { - production: true - } - } - }, requirejs: { compile: { options: { baseUrl: "lib", - name: "../bower_components/almond/almond", + name: "../node_modules/almond/almond", mainConfigFile: "app.js", include: "../app", wrap: true, @@ -119,7 +106,6 @@ module.exports = function(grunt) { } }) - grunt.loadNpmTasks("grunt-bower-install-simple") grunt.loadNpmTasks("grunt-contrib-copy") grunt.loadNpmTasks("grunt-contrib-requirejs") grunt.loadNpmTasks("grunt-sass") diff --git a/tasks/linting.js b/tasks/linting.js index a05bce0..e6f2df7 100644 --- a/tasks/linting.js +++ b/tasks/linting.js @@ -4,11 +4,6 @@ module.exports = function (grunt) { options: { install: true }, - bower: { - options: { - packageManager: "bower" - } - }, npm: {} }, eslint: { diff --git a/yarn.lock b/yarn.lock index 1f00f87..e049dd8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -24,6 +24,11 @@ align-text@^0.1.1, align-text@^0.1.3: longest "^1.0.1" repeat-string "^1.5.2" +almond@^0.3.3: + version "0.3.3" + resolved "https://registry.yarnpkg.com/almond/-/almond-0.3.3.tgz#a0e7c95ac7624d6417b4494b1e68bff693168a20" + integrity sha1-oOfJWsdiTWQXtElLHmi/9pMWiiA= + amdefine@>=0.0.4: version "1.0.1" resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" @@ -44,11 +49,6 @@ ansi-regex@^3.0.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= -ansi-regex@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.0.0.tgz#70de791edf021404c3fd615aa89118ae0432e5a9" - integrity sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w== - ansi-styles@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.1.0.tgz#eaecbf66cd706882760b2f4691582b8f55d7a7de" @@ -219,11 +219,6 @@ bower-config@^0.5.2: optimist "~0.6.0" osenv "0.0.3" -bower@1.8.4: - version "1.8.4" - resolved "https://registry.yarnpkg.com/bower/-/bower-1.8.4.tgz#e7876a076deb8137f7d06525dc5e8c66db82f28a" - integrity sha1-54dqB23rgTf30GUl3F6MZtuC8oo= - brace-expansion@^1.0.0, brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" @@ -248,6 +243,11 @@ braces@^2.3.0, braces@^2.3.1: split-string "^3.0.2" to-regex "^3.0.1" +browser-split@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/browser-split/-/browser-split-0.0.1.tgz#7b097574f8e3ead606fb4664e64adfdda2981a93" + integrity sha1-ewl1dPjj6tYG+0Zk5krf3aKYGpM= + browserify-zlib@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.1.4.tgz#bb35f8a519f600e0fa6b8485241c979d0141fb2d" @@ -316,6 +316,11 @@ camelcase@^2.0.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f" integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8= +camelize@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/camelize/-/camelize-1.0.0.tgz#164a5483e630fa4321e5af07020e531831b2609b" + integrity sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs= + caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: version "1.0.30000929" resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000929.tgz#f18c557b9cbf33e2787134c915b82e3ed3331b87" @@ -329,15 +334,6 @@ center-align@^0.1.1: align-text "^0.1.3" lazy-cache "^1.0.3" -chalk@2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e" - integrity sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ== - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - chalk@^0.5.0, chalk@^0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.5.1.tgz#663b3a648b68b55d04690d49167aa837858f2174" @@ -405,6 +401,11 @@ chownr@^1.1.1: resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494" integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g== +chroma-js@^0.7.8: + version "0.7.8" + resolved "https://registry.yarnpkg.com/chroma-js/-/chroma-js-0.7.8.tgz#4765881b3cc368a571677917e81b5cd3ff041d40" + integrity sha1-R2WIGzzDaKVxZ3kX6Btc0/8EHUA= + class-utils@^0.3.5: version "0.3.6" resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" @@ -611,6 +612,11 @@ currently-unhandled@^0.4.1: dependencies: array-find-index "^1.0.1" +d3@^3.5.17: + version "3.5.17" + resolved "https://registry.yarnpkg.com/d3/-/d3-3.5.17.tgz#bc46748004378b21a360c9fc7cf5231790762fb8" + integrity sha1-vEZ0gAQ3iyGjYMn8fPUjF5B2L7g= + d@1: version "1.0.0" resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f" @@ -729,6 +735,11 @@ doctrine@^0.6.2: esutils "^1.1.6" isarray "0.0.1" +dom-walk@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.1.tgz#672226dc74c8f799ad35307df936aba11acd6018" + integrity sha1-ZyIm3HTI95mtNTB9+TaroRrNYBg= + ee-first@1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.0.3.tgz#6c98c4089abecb5a7b85c1ac449aa603d3b3dabe" @@ -746,6 +757,15 @@ error-ex@^1.2.0: dependencies: is-arrayish "^0.2.1" +error@^4.3.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/error/-/error-4.4.0.tgz#bf69ff251fb4a279c19adccdaa6b61e90d9bf12a" + integrity sha1-v2n/JR+0onnBmtzNqmth6Q2b8So= + dependencies: + camelize "^1.0.0" + string-template "~0.2.0" + xtend "~4.0.0" + errorhandler@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/errorhandler/-/errorhandler-1.0.2.tgz#587d47bbbbc48cffe132c3acda7215c902558108" @@ -920,6 +940,13 @@ esutils@^1.1.6: resolved "https://registry.yarnpkg.com/esutils/-/esutils-1.1.6.tgz#c01ccaa9ae4b897c6d0c3e210ae52f3c7a844375" integrity sha1-wBzKqa5LiXxtDD4hCuUvPHqEQ3U= +ev-store@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/ev-store/-/ev-store-7.0.0.tgz#1ab0c7f82136505dd74b31d17701cb2be6d26558" + integrity sha1-GrDH+CE2UF3XSzHRdwHLK+bSZVg= + dependencies: + individual "^3.0.0" + event-emitter@~0.3.5: version "0.3.5" resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39" @@ -1184,6 +1211,14 @@ glob@~7.0.0: once "^1.3.0" path-is-absolute "^1.0.0" +global@^4.3.0: + version "4.3.2" + resolved "https://registry.yarnpkg.com/global/-/global-4.3.2.tgz#e76989268a6c74c38908b1305b10fc0e394e9d0f" + integrity sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8= + dependencies: + min-document "^2.19.0" + process "~0.5.1" + globals@^6.1.0: version "6.4.1" resolved "https://registry.yarnpkg.com/globals/-/globals-6.4.1.tgz#8498032b3b6d1cc81eebc5f79690d8fe29fabf4f" @@ -1218,15 +1253,6 @@ graceful-fs@~2.0.0: resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU= -grunt-bower-install-simple@^1.1.2: - version "1.2.7" - resolved "https://registry.yarnpkg.com/grunt-bower-install-simple/-/grunt-bower-install-simple-1.2.7.tgz#9442b48a1d9abafa0b3530c82344432ea6cb5d40" - integrity sha512-5we1xo8In1ZnWxN73YhttAb25ya1U8VbEa71Ep2v2SMP61aZaa2JZsG04jZaN26zyI/Dbrxj3aKWmLAuN4/MeA== - dependencies: - bower "1.8.4" - chalk "2.4.1" - strip-ansi "5.0.0" - grunt-check-dependencies@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/grunt-check-dependencies/-/grunt-check-dependencies-0.6.0.tgz#f7206a3a61041a21cd273b86e3a52cbee974ea74" @@ -1530,6 +1556,11 @@ indent-string@^2.1.0: dependencies: repeating "^2.0.0" +individual@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/individual/-/individual-3.0.0.tgz#e7ca4f85f8957b018734f285750dc22ec2f9862d" + integrity sha1-58pPhfiVewGHNPKFdQ3CLsL5hi0= + inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" @@ -1680,6 +1711,11 @@ is-number@^3.0.0: dependencies: kind-of "^3.0.2" +is-object@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz#8952688c5ec2ffd6b03ecc85e769e02903083470" + integrity sha1-iVJojF7C/9awPsyF52ngKQMINHA= + is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" @@ -1774,6 +1810,21 @@ lazy-cache@^1.0.3: resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e" integrity sha1-odePw6UEdMuAhF07O24dpJpEbo4= +leaflet-label@^0.2.1-0: + version "0.2.1-0" + resolved "https://registry.yarnpkg.com/leaflet-label/-/leaflet-label-0.2.1-0.tgz#b91a678a4d78ac4c47cb230d3926254fd2a7e612" + integrity sha1-uRpnik14rExHyyMNOSYlT9Kn5hI= + +leaflet-providers@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/leaflet-providers/-/leaflet-providers-1.5.0.tgz#06d598231ef36f8d0566c219cedf18cef2ff80f5" + integrity sha512-btncloSyOHrgYNexoz2dRpCl+U9iDQME91RsOWQWNAD9jQUPAkq9mxuTvL/O9VOwrqcEtzhvuHBHIOacJAZDxQ== + +leaflet@^0.7.7: + version "0.7.7" + resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-0.7.7.tgz#1e352ba54e63d076451fa363c900890cb2cf75ee" + integrity sha1-HjUrpU5j0HZFH6NjyQCJDLLPde4= + levn@~0.2.5: version "0.2.5" resolved "https://registry.yarnpkg.com/levn/-/levn-0.2.5.tgz#ba8d339d0ca4a610e3a3f145b9caf48807155054" @@ -2132,6 +2183,13 @@ mime@1.2.11, mime@~1.2.11: resolved "https://registry.yarnpkg.com/mime/-/mime-1.2.11.tgz#58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10" integrity sha1-WCA+7Ybjpe8XrtK32evUfwpg3RA= +min-document@^2.19.0: + version "2.19.0" + resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685" + integrity sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU= + dependencies: + dom-walk "^0.1.0" + minimatch@0.3: version "0.3.0" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-0.3.0.tgz#275d8edaac4f1bb3326472089e7949c8394699dd" @@ -2207,6 +2265,11 @@ mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1: dependencies: minimist "0.0.8" +moment@^2.23.0: + version "2.23.0" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.23.0.tgz#759ea491ac97d54bac5ad776996e2a58cc1bc225" + integrity sha512-3IE39bHVqFbWWaPOMHZF98Q9c3LDKGTmypMiTM2QygGXXElkFWIH7GxfmlwmY2vwa+wmNsoYZmG2iusf1ZjJoA== + morgan@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.1.1.tgz#cde45d2e807ebcc439745846ea80392e69098146" @@ -2278,6 +2341,11 @@ next-tick@1: resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c" integrity sha1-yobR/ogoFpsBICCOPchCS524NCw= +next-tick@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-0.2.2.tgz#75da4a927ee5887e39065880065b7336413b310d" + integrity sha1-ddpKkn7liH45BliABltzNkE7MQ0= + node-pre-gyp@^0.10.0: version "0.10.3" resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc" @@ -2378,6 +2446,11 @@ number-is-nan@^1.0.0: resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= +numeraljs@^1.5.6: + version "1.5.6" + resolved "https://registry.yarnpkg.com/numeraljs/-/numeraljs-1.5.6.tgz#91ac1901578a42657b877583a28b5ea040a83271" + integrity sha1-kawZAVeKQmV7h3WDooteoECoMnE= + object-assign@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-2.1.1.tgz#43c36e5d569ff8e4816c4efa8be02d26967c18aa" @@ -2591,6 +2664,11 @@ process-nextick-args@~2.0.0: resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa" integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw== +process@~0.5.1: + version "0.5.2" + resolved "https://registry.yarnpkg.com/process/-/process-0.5.2.tgz#1638d8a8e34c2f440a91db95ab9aeb677fc185cf" + integrity sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8= + qs@0.6.6: version "0.6.6" resolved "https://registry.yarnpkg.com/qs/-/qs-0.6.6.tgz#6e015098ff51968b8a3c819001d5f2c89bc4b107" @@ -2613,6 +2691,11 @@ raw-body@1.1.6: dependencies: bytes "1" +rbush@^1.4.3: + version "1.4.3" + resolved "https://registry.yarnpkg.com/rbush/-/rbush-1.4.3.tgz#7874e2d38911d2719ea27731d32445da5ec4394c" + integrity sha1-eHTi04kR0nGeoncx0yRF2l7EOUw= + rc@^1.2.7: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" @@ -2710,6 +2793,11 @@ repeating@^2.0.0: dependencies: is-finite "^1.0.0" +requirejs@^2.3.2: + version "2.3.6" + resolved "https://registry.yarnpkg.com/requirejs/-/requirejs-2.3.6.tgz#e5093d9601c2829251258c0b9445d4d19fa9e7c9" + integrity sha512-ipEzlWQe6RK3jkzikgCupiTbTvm4S0/CAU5GlgptkN5SO6F3u0UD0K18wy6ErDqiCyP4J4YYe1HuAShvsxePLg== + requirejs@~2.1.0: version "2.1.22" resolved "https://registry.yarnpkg.com/requirejs/-/requirejs-2.1.22.tgz#dd78fd2d34180c0d62c724b5b8aebc0664e0366f" @@ -2985,6 +3073,11 @@ stream-counter@~0.2.0: dependencies: readable-stream "~1.1.8" +string-template@~0.2.0: + version "0.2.1" + resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add" + integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0= + string-width@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" @@ -3014,13 +3107,6 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -strip-ansi@5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.0.0.tgz#f78f68b5d0866c20b2c9b8c61b5298508dc8756f" - integrity sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow== - dependencies: - ansi-regex "^4.0.0" - strip-ansi@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.3.0.tgz#25f48ea22ca79187f3174a4db8759347bb126220" @@ -3090,6 +3176,11 @@ supports-color@^5.3.0: dependencies: has-flag "^3.0.0" +tablesort@3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/tablesort/-/tablesort-3.0.2.tgz#8fea0aff8f167bc4415af6c616018188f09a7380" + integrity sha1-j+oK/48We8RBWvbGFgGBiPCac4A= + tar@^4: version "4.4.8" resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d" @@ -3266,6 +3357,20 @@ vhost@1.0.0: resolved "https://registry.yarnpkg.com/vhost/-/vhost-1.0.0.tgz#654513f289a4f898aab745bbd633e40180c9c4c0" integrity sha1-ZUUT8omk+Jiqt0W71jPkAYDJxMA= +virtual-dom@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/virtual-dom/-/virtual-dom-2.1.1.tgz#80eda2d481b9ede0c049118cefcb4a05f21d1375" + integrity sha1-gO2i1IG57eDASRGM78tKBfIdE3U= + dependencies: + browser-split "0.0.1" + error "^4.3.0" + ev-store "^7.0.0" + global "^4.3.0" + is-object "^1.0.1" + next-tick "^0.2.2" + x-is-array "0.1.0" + x-is-string "0.1.0" + which@~1.3.0: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" @@ -3300,11 +3405,26 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= +x-is-array@0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/x-is-array/-/x-is-array-0.1.0.tgz#de520171d47b3f416f5587d629b89d26b12dc29d" + integrity sha1-3lIBcdR7P0FvVYfWKbidJrEtwp0= + +x-is-string@0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/x-is-string/-/x-is-string-0.1.0.tgz#474b50865af3a49a9c4657f05acd145458f77d82" + integrity sha1-R0tQhlrzpJqcRlfwWs0UVFj3fYI= + xml-escape@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/xml-escape/-/xml-escape-1.0.0.tgz#00963d697b2adf0c185c4e04e73174ba9b288eb2" integrity sha1-AJY9aXsq3wwYXE4E5zF0upsojrI= +xtend@~4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" + integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68= + yallist@^3.0.0, yallist@^3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"