diff --git a/.sandstorm/Vagrantfile b/.sandstorm/Vagrantfile
index bce38b6..11baf87 100644
--- a/.sandstorm/Vagrantfile
+++ b/.sandstorm/Vagrantfile
@@ -16,7 +16,7 @@ end
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# Base on the Sandstorm snapshots of the official Debian 8 (jessie) box.
config.vm.box = "debian/contrib-stretch64"
- config.vm.box_version = "9.3.0"
+ config.vm.box_version = ">= 0"
if Vagrant.has_plugin?("vagrant-vbguest") then
# vagrant-vbguest is a Vagrant plugin that upgrades
diff --git a/.sandstorm/launcher.sh b/.sandstorm/launcher.sh
index 407ea66..82d4720 100755
--- a/.sandstorm/launcher.sh
+++ b/.sandstorm/launcher.sh
@@ -21,5 +21,5 @@ fi
cd /opt/app
cp post-receive /var/git/.git/hooks
-caddy &
-NODE_ENV=production HOME=/tmp npm start
+
+npm start
diff --git a/.sandstorm/sandstorm-files.list b/.sandstorm/sandstorm-files.list
index e9b0ac7..69cbe07 100644
--- a/.sandstorm/sandstorm-files.list
+++ b/.sandstorm/sandstorm-files.list
@@ -2,6 +2,7 @@
# This file is automatically updated and rewritten in sorted order every time
# the app runs in dev mode. You may manually add or remove files, but don't
# expect comments or ordering to be retained.
+bin
bin/bash
bin/cp
bin/dash
@@ -9,52 +10,72 @@ bin/ls
bin/mkdir
bin/rm
bin/sh
-etc/alternatives/node
+bin/sleep
+bin/touch
+etc/bash.bashrc
+etc/group
+etc/inputrc
etc/ld.so.cache
etc/localtime
etc/mailname
etc/mime.types
etc/python2.7/sitecustomize.py
etc/ssl/openssl.cnf
-lib/x86_64-linux-gnu/ld-2.19.so
+lib/terminfo/d/dumb
+lib/x86_64-linux-gnu/ld-2.24.so
lib/x86_64-linux-gnu/libacl.so.1
lib/x86_64-linux-gnu/libacl.so.1.1.0
lib/x86_64-linux-gnu/libattr.so.1
lib/x86_64-linux-gnu/libattr.so.1.1.0
-lib/x86_64-linux-gnu/libc-2.19.so
+lib/x86_64-linux-gnu/libaudit.so.1
+lib/x86_64-linux-gnu/libaudit.so.1.0.0
+lib/x86_64-linux-gnu/libbz2.so.1.0
+lib/x86_64-linux-gnu/libbz2.so.1.0.4
+lib/x86_64-linux-gnu/libc-2.24.so
lib/x86_64-linux-gnu/libc.so.6
-lib/x86_64-linux-gnu/libcrypt-2.19.so
+lib/x86_64-linux-gnu/libcap-ng.so.0
+lib/x86_64-linux-gnu/libcap-ng.so.0.0.0
lib/x86_64-linux-gnu/libcrypt.so.1
-lib/x86_64-linux-gnu/libdl-2.19.so
+lib/x86_64-linux-gnu/libdl-2.24.so
lib/x86_64-linux-gnu/libdl.so.2
+lib/x86_64-linux-gnu/libexpat.so.1
+lib/x86_64-linux-gnu/libexpat.so.1.6.2
lib/x86_64-linux-gnu/libgcc_s.so.1
-lib/x86_64-linux-gnu/libm-2.19.so
+lib/x86_64-linux-gnu/libglib-2.0.so.0
+lib/x86_64-linux-gnu/libglib-2.0.so.0.5000.3
+lib/x86_64-linux-gnu/liblzma.so.5
+lib/x86_64-linux-gnu/liblzma.so.5.2.2
+lib/x86_64-linux-gnu/libm-2.24.so
lib/x86_64-linux-gnu/libm.so.6
lib/x86_64-linux-gnu/libncurses.so.5
lib/x86_64-linux-gnu/libncurses.so.5.9
-lib/x86_64-linux-gnu/libnsl-2.19.so
+lib/x86_64-linux-gnu/libnsl-2.24.so
lib/x86_64-linux-gnu/libnsl.so.1
-lib/x86_64-linux-gnu/libnss_compat-2.19.so
+lib/x86_64-linux-gnu/libnss_compat-2.24.so
lib/x86_64-linux-gnu/libnss_compat.so.2
-lib/x86_64-linux-gnu/libnss_dns-2.19.so
lib/x86_64-linux-gnu/libnss_dns.so.2
-lib/x86_64-linux-gnu/libnss_files-2.19.so
+lib/x86_64-linux-gnu/libnss_files-2.24.so
lib/x86_64-linux-gnu/libnss_files.so.2
-lib/x86_64-linux-gnu/libnss_nis-2.19.so
+lib/x86_64-linux-gnu/libnss_nis-2.24.so
lib/x86_64-linux-gnu/libnss_nis.so.2
lib/x86_64-linux-gnu/libpcre.so.3
-lib/x86_64-linux-gnu/libpcre.so.3.13.1
-lib/x86_64-linux-gnu/libpthread-2.19.so
+lib/x86_64-linux-gnu/libpcre.so.3.13.3
+lib/x86_64-linux-gnu/libpopt.so.0
+lib/x86_64-linux-gnu/libpopt.so.0.0.0
+lib/x86_64-linux-gnu/libpthread-2.24.so
lib/x86_64-linux-gnu/libpthread.so.0
-lib/x86_64-linux-gnu/libresolv-2.19.so
+lib/x86_64-linux-gnu/libreadline.so.7
+lib/x86_64-linux-gnu/libreadline.so.7.0
lib/x86_64-linux-gnu/libresolv.so.2
-lib/x86_64-linux-gnu/librt-2.19.so
+lib/x86_64-linux-gnu/librt-2.24.so
lib/x86_64-linux-gnu/librt.so.1
lib/x86_64-linux-gnu/libselinux.so.1
lib/x86_64-linux-gnu/libtinfo.so.5
lib/x86_64-linux-gnu/libtinfo.so.5.9
-lib/x86_64-linux-gnu/libutil-2.19.so
+lib/x86_64-linux-gnu/libutil-2.24.so
lib/x86_64-linux-gnu/libutil.so.1
+lib/x86_64-linux-gnu/libuuid.so.1
+lib/x86_64-linux-gnu/libuuid.so.1.3.0
lib/x86_64-linux-gnu/libz.so.1
lib/x86_64-linux-gnu/libz.so.1.2.8
lib64/ld-linux-x86-64.so.2
@@ -63,17 +84,16 @@ opt/app/.babelrc
opt/app/.git/HEAD
opt/app/.git/config
opt/app/.git/index
-opt/app/.git/objects/5b/3b24544cfea847d096543cd6e4f1a8511331d0
opt/app/.git/objects/pack
opt/app/.git/refs
opt/app/.git/refs/heads/master
-opt/app/.nuxt/dist/0.nuxt.bundle.8c0b262207666e602d8c.js
+opt/app/.nuxt/dist/0.nuxt.bundle.7758b0246aea7dbe2f5d.js
opt/app/.nuxt/dist/1.nuxt.bundle.b470abedff89714ea658.js
opt/app/.nuxt/dist/index.html
-opt/app/.nuxt/dist/manifest.6e51e34aa2a1a30c8ac8.js
+opt/app/.nuxt/dist/manifest.4a9885e56f7868f79d36.js
opt/app/.nuxt/dist/nuxt.bundle.695fcd142525d910458b.js
opt/app/.nuxt/dist/server-bundle.json
-opt/app/.nuxt/dist/vendor.bundle.6e51e34aa2a1a30c8ac8.js
+opt/app/.nuxt/dist/vendor.bundle.4a9885e56f7868f79d36.js
opt/app/.sandstorm/launcher.sh
opt/app/Caddyfile
opt/app/README.md
@@ -431,6 +451,7 @@ opt/app/node_modules/babel-runtime/helpers/inherits.js
opt/app/node_modules/babel-runtime/helpers/objectWithoutProperties.js
opt/app/node_modules/babel-runtime/helpers/possibleConstructorReturn.js
opt/app/node_modules/babel-runtime/helpers/typeof.js
+opt/app/node_modules/babel-runtime/package.json
opt/app/node_modules/babel-runtime/regenerator/index.js
opt/app/node_modules/babel-template/lib/index.js
opt/app/node_modules/babel-template/package.json
@@ -1123,6 +1144,7 @@ opt/app/node_modules/core-js/modules/es7.system.global.js
opt/app/node_modules/core-js/modules/web.dom.iterable.js
opt/app/node_modules/core-js/modules/web.immediate.js
opt/app/node_modules/core-js/modules/web.timers.js
+opt/app/node_modules/core-js/package.json
opt/app/node_modules/core-js/shim.js
opt/app/node_modules/css-select/index.js
opt/app/node_modules/css-select/lib/attributes.js
@@ -2323,11 +2345,9 @@ opt/app/package.json
opt/app/post-receive
opt/app/server.js
opt/app/template
-opt/app/template/archetypes
opt/app/template/config.toml
opt/app/template/content
opt/app/template/content/_index.md
-opt/app/template/data
opt/app/template/layouts
opt/app/template/layouts/_default
opt/app/template/layouts/_default/single.html
@@ -2335,98 +2355,182 @@ opt/app/template/layouts/index.html
opt/app/template/layouts/partials
opt/app/template/layouts/partials/footer.html
opt/app/template/layouts/partials/header.html
-opt/app/template/static
proc/cpuinfo
sandstorm-http-bridge
sandstorm-http-bridge-config
sandstorm-manifest
+sbin
+sbin/getty
usr/bin
usr/bin/asciidoctor
usr/bin/env
usr/bin/git
usr/bin/git-receive-pack
usr/bin/git-upload-pack
-usr/bin/hugo
+usr/bin/iconv
usr/bin/node
usr/bin/nodejs
usr/bin/npm
-usr/bin/pygmentize
usr/bin/python
usr/bin/python2.7
usr/bin/ruby
-usr/bin/ruby2.1
+usr/bin/strace
+usr/bin/sudo
+usr/bin/touch
+usr/bin/yes
usr/lib/git-core/git
usr/lib/git-core/git-upload-pack
usr/lib/node_modules/npm/bin/npm-cli.js
-usr/lib/node_modules/npm/lib/cache/caching-client.js
-usr/lib/node_modules/npm/lib/cache/get-stat.js
usr/lib/node_modules/npm/lib/config/clear-credentials-by-uri.js
usr/lib/node_modules/npm/lib/config/cmd-list.js
usr/lib/node_modules/npm/lib/config/core.js
usr/lib/node_modules/npm/lib/config/defaults.js
-usr/lib/node_modules/npm/lib/config/find-prefix.js
usr/lib/node_modules/npm/lib/config/get-credentials-by-uri.js
+usr/lib/node_modules/npm/lib/config/lifecycle.js
usr/lib/node_modules/npm/lib/config/load-cafile.js
usr/lib/node_modules/npm/lib/config/load-prefix.js
-usr/lib/node_modules/npm/lib/config/load-uid.js
usr/lib/node_modules/npm/lib/config/nerf-dart.js
usr/lib/node_modules/npm/lib/config/set-credentials-by-uri.js
usr/lib/node_modules/npm/lib/config/set-user.js
usr/lib/node_modules/npm/lib/npm.js
usr/lib/node_modules/npm/lib/run-script.js
usr/lib/node_modules/npm/lib/start.js
+usr/lib/node_modules/npm/lib/utils/cache-file.js
usr/lib/node_modules/npm/lib/utils/completion/installed-shallow.js
usr/lib/node_modules/npm/lib/utils/correct-mkdir.js
+usr/lib/node_modules/npm/lib/utils/did-you-mean.js
usr/lib/node_modules/npm/lib/utils/error-handler.js
usr/lib/node_modules/npm/lib/utils/error-message.js
+usr/lib/node_modules/npm/lib/utils/is-windows-bash.js
+usr/lib/node_modules/npm/lib/utils/is-windows-shell.js
usr/lib/node_modules/npm/lib/utils/is-windows.js
+usr/lib/node_modules/npm/lib/utils/lifecycle-cmd.js
usr/lib/node_modules/npm/lib/utils/lifecycle.js
usr/lib/node_modules/npm/lib/utils/metrics-launch.js
usr/lib/node_modules/npm/lib/utils/metrics.js
usr/lib/node_modules/npm/lib/utils/no-progress-while-running.js
usr/lib/node_modules/npm/lib/utils/output.js
usr/lib/node_modules/npm/lib/utils/parse-json.js
+usr/lib/node_modules/npm/lib/utils/perf.js
usr/lib/node_modules/npm/lib/utils/spawn.js
usr/lib/node_modules/npm/lib/utils/umask.js
usr/lib/node_modules/npm/lib/utils/unsupported.js
usr/lib/node_modules/npm/lib/utils/usage.js
+usr/lib/node_modules/npm/node_modules/JSONStream/index.js
+usr/lib/node_modules/npm/node_modules/JSONStream/package.json
usr/lib/node_modules/npm/node_modules/abbrev/abbrev.js
usr/lib/node_modules/npm/node_modules/abbrev/package.json
usr/lib/node_modules/npm/node_modules/ansi-regex/index.js
usr/lib/node_modules/npm/node_modules/ansi-regex/package.json
usr/lib/node_modules/npm/node_modules/aproba/index.js
usr/lib/node_modules/npm/node_modules/aproba/package.json
+usr/lib/node_modules/npm/node_modules/are-we-there-yet/index.js
+usr/lib/node_modules/npm/node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_duplex.js
+usr/lib/node_modules/npm/node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_passthrough.js
+usr/lib/node_modules/npm/node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_readable.js
+usr/lib/node_modules/npm/node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_transform.js
+usr/lib/node_modules/npm/node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_writable.js
+usr/lib/node_modules/npm/node_modules/are-we-there-yet/node_modules/readable-stream/lib/internal/streams/BufferList.js
+usr/lib/node_modules/npm/node_modules/are-we-there-yet/node_modules/readable-stream/lib/internal/streams/destroy.js
+usr/lib/node_modules/npm/node_modules/are-we-there-yet/node_modules/readable-stream/lib/internal/streams/stream.js
+usr/lib/node_modules/npm/node_modules/are-we-there-yet/node_modules/readable-stream/package.json
+usr/lib/node_modules/npm/node_modules/are-we-there-yet/node_modules/readable-stream/readable.js
+usr/lib/node_modules/npm/node_modules/are-we-there-yet/package.json
+usr/lib/node_modules/npm/node_modules/are-we-there-yet/tracker-base.js
+usr/lib/node_modules/npm/node_modules/are-we-there-yet/tracker-group.js
+usr/lib/node_modules/npm/node_modules/are-we-there-yet/tracker-stream.js
+usr/lib/node_modules/npm/node_modules/are-we-there-yet/tracker.js
usr/lib/node_modules/npm/node_modules/asap/asap.js
usr/lib/node_modules/npm/node_modules/asap/package.json
usr/lib/node_modules/npm/node_modules/asap/raw.js
+usr/lib/node_modules/npm/node_modules/balanced-match/index.js
+usr/lib/node_modules/npm/node_modules/balanced-match/package.json
+usr/lib/node_modules/npm/node_modules/brace-expansion/index.js
+usr/lib/node_modules/npm/node_modules/brace-expansion/package.json
+usr/lib/node_modules/npm/node_modules/builtins/builtins.json
+usr/lib/node_modules/npm/node_modules/builtins/package.json
+usr/lib/node_modules/npm/node_modules/byline/lib/byline.js
+usr/lib/node_modules/npm/node_modules/byline/package.json
usr/lib/node_modules/npm/node_modules/chownr/chownr.js
usr/lib/node_modules/npm/node_modules/chownr/package.json
+usr/lib/node_modules/npm/node_modules/ci-info/index.js
+usr/lib/node_modules/npm/node_modules/ci-info/package.json
+usr/lib/node_modules/npm/node_modules/ci-info/vendors.json
+usr/lib/node_modules/npm/node_modules/cmd-shim/index.js
+usr/lib/node_modules/npm/node_modules/cmd-shim/lib/to-batch-syntax.js
+usr/lib/node_modules/npm/node_modules/cmd-shim/package.json
+usr/lib/node_modules/npm/node_modules/code-point-at/index.js
+usr/lib/node_modules/npm/node_modules/code-point-at/package.json
+usr/lib/node_modules/npm/node_modules/concat-map/index.js
+usr/lib/node_modules/npm/node_modules/concat-map/package.json
usr/lib/node_modules/npm/node_modules/config-chain/index.js
-usr/lib/node_modules/npm/node_modules/config-chain/node_modules/proto-list/package.json
-usr/lib/node_modules/npm/node_modules/config-chain/node_modules/proto-list/proto-list.js
usr/lib/node_modules/npm/node_modules/config-chain/package.json
+usr/lib/node_modules/npm/node_modules/configstore/index.js
+usr/lib/node_modules/npm/node_modules/configstore/package.json
+usr/lib/node_modules/npm/node_modules/console-control-strings/index.js
+usr/lib/node_modules/npm/node_modules/console-control-strings/package.json
+usr/lib/node_modules/npm/node_modules/core-util-is/lib/util.js
+usr/lib/node_modules/npm/node_modules/core-util-is/package.json
+usr/lib/node_modules/npm/node_modules/crypto-random-string/index.js
+usr/lib/node_modules/npm/node_modules/crypto-random-string/package.json
+usr/lib/node_modules/npm/node_modules/delegates/index.js
+usr/lib/node_modules/npm/node_modules/delegates/package.json
usr/lib/node_modules/npm/node_modules/dezalgo/dezalgo.js
usr/lib/node_modules/npm/node_modules/dezalgo/package.json
+usr/lib/node_modules/npm/node_modules/dot-prop/index.js
+usr/lib/node_modules/npm/node_modules/dot-prop/package.json
+usr/lib/node_modules/npm/node_modules/encoding/lib/encoding.js
+usr/lib/node_modules/npm/node_modules/encoding/lib/iconv-loader.js
+usr/lib/node_modules/npm/node_modules/encoding/package.json
+usr/lib/node_modules/npm/node_modules/err-code/index.js
+usr/lib/node_modules/npm/node_modules/err-code/package.json
+usr/lib/node_modules/npm/node_modules/figgy-pudding/index.js
+usr/lib/node_modules/npm/node_modules/figgy-pudding/package.json
+usr/lib/node_modules/npm/node_modules/find-npm-prefix/find-prefix.js
+usr/lib/node_modules/npm/node_modules/find-npm-prefix/package.json
+usr/lib/node_modules/npm/node_modules/fs-vacuum/package.json
+usr/lib/node_modules/npm/node_modules/fs-vacuum/vacuum.js
usr/lib/node_modules/npm/node_modules/fs-write-stream-atomic/index.js
usr/lib/node_modules/npm/node_modules/fs-write-stream-atomic/package.json
+usr/lib/node_modules/npm/node_modules/fs.realpath/index.js
+usr/lib/node_modules/npm/node_modules/fs.realpath/old.js
+usr/lib/node_modules/npm/node_modules/fs.realpath/package.json
+usr/lib/node_modules/npm/node_modules/gauge/base-theme.js
+usr/lib/node_modules/npm/node_modules/gauge/error.js
+usr/lib/node_modules/npm/node_modules/gauge/has-color.js
+usr/lib/node_modules/npm/node_modules/gauge/index.js
+usr/lib/node_modules/npm/node_modules/gauge/node_modules/aproba/index.js
+usr/lib/node_modules/npm/node_modules/gauge/node_modules/aproba/package.json
+usr/lib/node_modules/npm/node_modules/gauge/node_modules/string-width/index.js
+usr/lib/node_modules/npm/node_modules/gauge/node_modules/string-width/package.json
+usr/lib/node_modules/npm/node_modules/gauge/package.json
+usr/lib/node_modules/npm/node_modules/gauge/plumbing.js
+usr/lib/node_modules/npm/node_modules/gauge/process.js
+usr/lib/node_modules/npm/node_modules/gauge/progress-bar.js
+usr/lib/node_modules/npm/node_modules/gauge/render-template.js
+usr/lib/node_modules/npm/node_modules/gauge/set-immediate.js
+usr/lib/node_modules/npm/node_modules/gauge/set-interval.js
+usr/lib/node_modules/npm/node_modules/gauge/spin.js
+usr/lib/node_modules/npm/node_modules/gauge/template-item.js
+usr/lib/node_modules/npm/node_modules/gauge/theme-set.js
+usr/lib/node_modules/npm/node_modules/gauge/themes.js
+usr/lib/node_modules/npm/node_modules/gauge/wide-truncate.js
+usr/lib/node_modules/npm/node_modules/gentle-fs/index.js
+usr/lib/node_modules/npm/node_modules/gentle-fs/lib/bin-link.js
+usr/lib/node_modules/npm/node_modules/gentle-fs/lib/chown.js
+usr/lib/node_modules/npm/node_modules/gentle-fs/lib/link.js
+usr/lib/node_modules/npm/node_modules/gentle-fs/lib/mkdir.js
+usr/lib/node_modules/npm/node_modules/gentle-fs/lib/rm.js
+usr/lib/node_modules/npm/node_modules/gentle-fs/node_modules/aproba/index.js
+usr/lib/node_modules/npm/node_modules/gentle-fs/node_modules/aproba/package.json
+usr/lib/node_modules/npm/node_modules/gentle-fs/node_modules/iferr/index.js
+usr/lib/node_modules/npm/node_modules/gentle-fs/node_modules/iferr/package.json
+usr/lib/node_modules/npm/node_modules/gentle-fs/package.json
usr/lib/node_modules/npm/node_modules/glob/common.js
usr/lib/node_modules/npm/node_modules/glob/glob.js
-usr/lib/node_modules/npm/node_modules/glob/node_modules/fs.realpath/index.js
-usr/lib/node_modules/npm/node_modules/glob/node_modules/fs.realpath/old.js
-usr/lib/node_modules/npm/node_modules/glob/node_modules/fs.realpath/package.json
-usr/lib/node_modules/npm/node_modules/glob/node_modules/minimatch/minimatch.js
-usr/lib/node_modules/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/index.js
-usr/lib/node_modules/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/index.js
-usr/lib/node_modules/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json
-usr/lib/node_modules/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/index.js
-usr/lib/node_modules/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json
-usr/lib/node_modules/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/package.json
-usr/lib/node_modules/npm/node_modules/glob/node_modules/minimatch/package.json
-usr/lib/node_modules/npm/node_modules/glob/node_modules/path-is-absolute/index.js
-usr/lib/node_modules/npm/node_modules/glob/node_modules/path-is-absolute/package.json
usr/lib/node_modules/npm/node_modules/glob/package.json
usr/lib/node_modules/npm/node_modules/glob/sync.js
-usr/lib/node_modules/npm/node_modules/graceful-fs/fs.js
+usr/lib/node_modules/npm/node_modules/graceful-fs/clone.js
usr/lib/node_modules/npm/node_modules/graceful-fs/graceful-fs.js
usr/lib/node_modules/npm/node_modules/graceful-fs/legacy-streams.js
usr/lib/node_modules/npm/node_modules/graceful-fs/package.json
@@ -2437,25 +2541,70 @@ usr/lib/node_modules/npm/node_modules/hosted-git-info/git-host-info.js
usr/lib/node_modules/npm/node_modules/hosted-git-info/git-host.js
usr/lib/node_modules/npm/node_modules/hosted-git-info/index.js
usr/lib/node_modules/npm/node_modules/hosted-git-info/package.json
-usr/lib/node_modules/npm/node_modules/iferr/index.js
+usr/lib/node_modules/npm/node_modules/http-cache-semantics/node4/index.js
+usr/lib/node_modules/npm/node_modules/http-cache-semantics/package.json
+usr/lib/node_modules/npm/node_modules/iconv-lite/lib/bom-handling.js
+usr/lib/node_modules/npm/node_modules/iconv-lite/lib/extend-node.js
+usr/lib/node_modules/npm/node_modules/iconv-lite/lib/index.js
+usr/lib/node_modules/npm/node_modules/iconv-lite/lib/streams.js
+usr/lib/node_modules/npm/node_modules/iconv-lite/package.json
usr/lib/node_modules/npm/node_modules/iferr/package.json
+usr/lib/node_modules/npm/node_modules/import-lazy/index.js
+usr/lib/node_modules/npm/node_modules/import-lazy/package.json
usr/lib/node_modules/npm/node_modules/imurmurhash/imurmurhash.js
usr/lib/node_modules/npm/node_modules/imurmurhash/package.json
+usr/lib/node_modules/npm/node_modules/infer-owner/index.js
+usr/lib/node_modules/npm/node_modules/infer-owner/package.json
usr/lib/node_modules/npm/node_modules/inflight/inflight.js
usr/lib/node_modules/npm/node_modules/inflight/package.json
usr/lib/node_modules/npm/node_modules/inherits/inherits.js
usr/lib/node_modules/npm/node_modules/inherits/package.json
usr/lib/node_modules/npm/node_modules/ini/ini.js
usr/lib/node_modules/npm/node_modules/ini/package.json
+usr/lib/node_modules/npm/node_modules/is-ci/index.js
+usr/lib/node_modules/npm/node_modules/is-ci/node_modules/ci-info/index.js
+usr/lib/node_modules/npm/node_modules/is-ci/node_modules/ci-info/package.json
+usr/lib/node_modules/npm/node_modules/is-ci/node_modules/ci-info/vendors.json
+usr/lib/node_modules/npm/node_modules/is-ci/package.json
+usr/lib/node_modules/npm/node_modules/is-fullwidth-code-point/index.js
+usr/lib/node_modules/npm/node_modules/is-fullwidth-code-point/package.json
+usr/lib/node_modules/npm/node_modules/is-obj/index.js
+usr/lib/node_modules/npm/node_modules/is-obj/package.json
+usr/lib/node_modules/npm/node_modules/isarray/index.js
+usr/lib/node_modules/npm/node_modules/isarray/package.json
+usr/lib/node_modules/npm/node_modules/isexe/index.js
+usr/lib/node_modules/npm/node_modules/isexe/mode.js
+usr/lib/node_modules/npm/node_modules/isexe/package.json
+usr/lib/node_modules/npm/node_modules/json-parse-better-errors/index.js
+usr/lib/node_modules/npm/node_modules/json-parse-better-errors/package.json
+usr/lib/node_modules/npm/node_modules/jsonparse/jsonparse.js
+usr/lib/node_modules/npm/node_modules/jsonparse/package.json
+usr/lib/node_modules/npm/node_modules/libnpm/fetch.js
+usr/lib/node_modules/npm/node_modules/lru-cache/index.js
+usr/lib/node_modules/npm/node_modules/lru-cache/package.json
+usr/lib/node_modules/npm/node_modules/make-dir/index.js
+usr/lib/node_modules/npm/node_modules/make-dir/package.json
+usr/lib/node_modules/npm/node_modules/make-fetch-happen/agent.js
+usr/lib/node_modules/npm/node_modules/make-fetch-happen/index.js
+usr/lib/node_modules/npm/node_modules/make-fetch-happen/package.json
+usr/lib/node_modules/npm/node_modules/make-fetch-happen/warning.js
+usr/lib/node_modules/npm/node_modules/meant/index.js
+usr/lib/node_modules/npm/node_modules/meant/package.json
+usr/lib/node_modules/npm/node_modules/minimatch/minimatch.js
+usr/lib/node_modules/npm/node_modules/minimatch/package.json
usr/lib/node_modules/npm/node_modules/mkdirp/index.js
usr/lib/node_modules/npm/node_modules/mkdirp/package.json
+usr/lib/node_modules/npm/node_modules/node-fetch-npm/package.json
+usr/lib/node_modules/npm/node_modules/node-fetch-npm/src/blob.js
+usr/lib/node_modules/npm/node_modules/node-fetch-npm/src/body.js
+usr/lib/node_modules/npm/node_modules/node-fetch-npm/src/common.js
+usr/lib/node_modules/npm/node_modules/node-fetch-npm/src/fetch-error.js
+usr/lib/node_modules/npm/node_modules/node-fetch-npm/src/headers.js
+usr/lib/node_modules/npm/node_modules/node-fetch-npm/src/index.js
+usr/lib/node_modules/npm/node_modules/node-fetch-npm/src/request.js
+usr/lib/node_modules/npm/node_modules/node-fetch-npm/src/response.js
+usr/lib/node_modules/npm/node_modules/node-gyp/package.json
usr/lib/node_modules/npm/node_modules/nopt/lib/nopt.js
-usr/lib/node_modules/npm/node_modules/nopt/node_modules/osenv/node_modules/os-homedir/index.js
-usr/lib/node_modules/npm/node_modules/nopt/node_modules/osenv/node_modules/os-homedir/package.json
-usr/lib/node_modules/npm/node_modules/nopt/node_modules/osenv/node_modules/os-tmpdir/index.js
-usr/lib/node_modules/npm/node_modules/nopt/node_modules/osenv/node_modules/os-tmpdir/package.json
-usr/lib/node_modules/npm/node_modules/nopt/node_modules/osenv/osenv.js
-usr/lib/node_modules/npm/node_modules/nopt/node_modules/osenv/package.json
usr/lib/node_modules/npm/node_modules/nopt/package.json
usr/lib/node_modules/npm/node_modules/normalize-package-data/lib/extract_description.js
usr/lib/node_modules/npm/node_modules/normalize-package-data/lib/fixer.js
@@ -2463,131 +2612,66 @@ usr/lib/node_modules/npm/node_modules/normalize-package-data/lib/make_warning.js
usr/lib/node_modules/npm/node_modules/normalize-package-data/lib/normalize.js
usr/lib/node_modules/npm/node_modules/normalize-package-data/lib/typos.json
usr/lib/node_modules/npm/node_modules/normalize-package-data/lib/warning_messages.json
-usr/lib/node_modules/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/index.js
-usr/lib/node_modules/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/node_modules/builtin-modules/index.js
-usr/lib/node_modules/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/node_modules/builtin-modules/package.json
-usr/lib/node_modules/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/package.json
+usr/lib/node_modules/npm/node_modules/normalize-package-data/node_modules/resolve/index.js
+usr/lib/node_modules/npm/node_modules/normalize-package-data/node_modules/resolve/lib/async.js
+usr/lib/node_modules/npm/node_modules/normalize-package-data/node_modules/resolve/lib/caller.js
+usr/lib/node_modules/npm/node_modules/normalize-package-data/node_modules/resolve/lib/core.js
+usr/lib/node_modules/npm/node_modules/normalize-package-data/node_modules/resolve/lib/core.json
+usr/lib/node_modules/npm/node_modules/normalize-package-data/node_modules/resolve/lib/node-modules-paths.js
+usr/lib/node_modules/npm/node_modules/normalize-package-data/node_modules/resolve/lib/normalize-options.js
+usr/lib/node_modules/npm/node_modules/normalize-package-data/node_modules/resolve/lib/sync.js
+usr/lib/node_modules/npm/node_modules/normalize-package-data/node_modules/resolve/package.json
usr/lib/node_modules/npm/node_modules/normalize-package-data/package.json
usr/lib/node_modules/npm/node_modules/npm-cache-filename/index.js
usr/lib/node_modules/npm/node_modules/npm-cache-filename/package.json
+usr/lib/node_modules/npm/node_modules/npm-lifecycle/index.js
+usr/lib/node_modules/npm/node_modules/npm-lifecycle/lib/spawn.js
+usr/lib/node_modules/npm/node_modules/npm-lifecycle/package.json
+usr/lib/node_modules/npm/node_modules/npm-normalize-package-bin/index.js
+usr/lib/node_modules/npm/node_modules/npm-normalize-package-bin/package.json
usr/lib/node_modules/npm/node_modules/npm-package-arg/npa.js
usr/lib/node_modules/npm/node_modules/npm-package-arg/package.json
-usr/lib/node_modules/npm/node_modules/npm-registry-client/index.js
-usr/lib/node_modules/npm/node_modules/npm-registry-client/lib
-usr/lib/node_modules/npm/node_modules/npm-registry-client/lib/access.js
-usr/lib/node_modules/npm/node_modules/npm-registry-client/lib/adduser.js
-usr/lib/node_modules/npm/node_modules/npm-registry-client/lib/attempt.js
-usr/lib/node_modules/npm/node_modules/npm-registry-client/lib/authify.js
-usr/lib/node_modules/npm/node_modules/npm-registry-client/lib/deprecate.js
-usr/lib/node_modules/npm/node_modules/npm-registry-client/lib/dist-tags
-usr/lib/node_modules/npm/node_modules/npm-registry-client/lib/dist-tags/add.js
-usr/lib/node_modules/npm/node_modules/npm-registry-client/lib/dist-tags/fetch.js
-usr/lib/node_modules/npm/node_modules/npm-registry-client/lib/dist-tags/rm.js
-usr/lib/node_modules/npm/node_modules/npm-registry-client/lib/dist-tags/set.js
-usr/lib/node_modules/npm/node_modules/npm-registry-client/lib/dist-tags/update.js
-usr/lib/node_modules/npm/node_modules/npm-registry-client/lib/fetch.js
-usr/lib/node_modules/npm/node_modules/npm-registry-client/lib/get.js
-usr/lib/node_modules/npm/node_modules/npm-registry-client/lib/initialize.js
-usr/lib/node_modules/npm/node_modules/npm-registry-client/lib/logout.js
-usr/lib/node_modules/npm/node_modules/npm-registry-client/lib/ping.js
-usr/lib/node_modules/npm/node_modules/npm-registry-client/lib/publish.js
-usr/lib/node_modules/npm/node_modules/npm-registry-client/lib/request.js
-usr/lib/node_modules/npm/node_modules/npm-registry-client/lib/send-anonymous-CLI-metrics.js
-usr/lib/node_modules/npm/node_modules/npm-registry-client/lib/star.js
-usr/lib/node_modules/npm/node_modules/npm-registry-client/lib/stars.js
-usr/lib/node_modules/npm/node_modules/npm-registry-client/lib/tag.js
-usr/lib/node_modules/npm/node_modules/npm-registry-client/lib/team.js
-usr/lib/node_modules/npm/node_modules/npm-registry-client/lib/unpublish.js
-usr/lib/node_modules/npm/node_modules/npm-registry-client/lib/whoami.js
-usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/concat-stream/index.js
-usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_duplex.js
-usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_passthrough.js
-usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_readable.js
-usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_transform.js
-usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_writable.js
-usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/core-util-is/lib/util.js
-usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/core-util-is/package.json
-usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/isarray/index.js
-usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/isarray/package.json
-usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/process-nextick-args/index.js
-usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/process-nextick-args/package.json
-usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/util-deprecate/node.js
-usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/util-deprecate/package.json
-usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/package.json
-usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/readable.js
-usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/concat-stream/package.json
-usr/lib/node_modules/npm/node_modules/npm-registry-client/package.json
+usr/lib/node_modules/npm/node_modules/npm-registry-fetch/auth.js
+usr/lib/node_modules/npm/node_modules/npm-registry-fetch/check-response.js
+usr/lib/node_modules/npm/node_modules/npm-registry-fetch/config.js
+usr/lib/node_modules/npm/node_modules/npm-registry-fetch/errors.js
+usr/lib/node_modules/npm/node_modules/npm-registry-fetch/index.js
+usr/lib/node_modules/npm/node_modules/npm-registry-fetch/node_modules/safe-buffer/index.js
+usr/lib/node_modules/npm/node_modules/npm-registry-fetch/node_modules/safe-buffer/package.json
+usr/lib/node_modules/npm/node_modules/npm-registry-fetch/package.json
+usr/lib/node_modules/npm/node_modules/npm-registry-fetch/silentlog.js
usr/lib/node_modules/npm/node_modules/npmlog/log.js
-usr/lib/node_modules/npm/node_modules/npmlog/node_modules/are-we-there-yet/index.js
-usr/lib/node_modules/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/index.js
-usr/lib/node_modules/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/package.json
-usr/lib/node_modules/npm/node_modules/npmlog/node_modules/are-we-there-yet/package.json
-usr/lib/node_modules/npm/node_modules/npmlog/node_modules/are-we-there-yet/tracker-base.js
-usr/lib/node_modules/npm/node_modules/npmlog/node_modules/are-we-there-yet/tracker-group.js
-usr/lib/node_modules/npm/node_modules/npmlog/node_modules/are-we-there-yet/tracker-stream.js
-usr/lib/node_modules/npm/node_modules/npmlog/node_modules/are-we-there-yet/tracker.js
-usr/lib/node_modules/npm/node_modules/npmlog/node_modules/console-control-strings/index.js
-usr/lib/node_modules/npm/node_modules/npmlog/node_modules/console-control-strings/package.json
-usr/lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/base-theme.js
-usr/lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/error.js
-usr/lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/has-color.js
-usr/lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/index.js
-usr/lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/object-assign/index.js
-usr/lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/object-assign/package.json
-usr/lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/signal-exit/index.js
-usr/lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/signal-exit/package.json
-usr/lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/signal-exit/signals.js
-usr/lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/string-width/index.js
-usr/lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/string-width/node_modules/code-point-at/index.js
-usr/lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/string-width/node_modules/code-point-at/package.json
-usr/lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/string-width/node_modules/is-fullwidth-code-point/index.js
-usr/lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/string-width/node_modules/is-fullwidth-code-point/node_modules/number-is-nan/index.js
-usr/lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/string-width/node_modules/is-fullwidth-code-point/node_modules/number-is-nan/package.json
-usr/lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/string-width/node_modules/is-fullwidth-code-point/package.json
-usr/lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/string-width/package.json
-usr/lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/wide-align/align.js
-usr/lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/node_modules/wide-align/package.json
-usr/lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/package.json
-usr/lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/plumbing.js
-usr/lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/process.js
-usr/lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/progress-bar.js
-usr/lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/render-template.js
-usr/lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/set-immediate.js
-usr/lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/set-interval.js
-usr/lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/spin.js
-usr/lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/template-item.js
-usr/lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/theme-set.js
-usr/lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/themes.js
-usr/lib/node_modules/npm/node_modules/npmlog/node_modules/gauge/wide-truncate.js
-usr/lib/node_modules/npm/node_modules/npmlog/node_modules/set-blocking/index.js
-usr/lib/node_modules/npm/node_modules/npmlog/node_modules/set-blocking/package.json
usr/lib/node_modules/npm/node_modules/npmlog/package.json
+usr/lib/node_modules/npm/node_modules/number-is-nan/index.js
+usr/lib/node_modules/npm/node_modules/number-is-nan/package.json
+usr/lib/node_modules/npm/node_modules/object-assign/index.js
+usr/lib/node_modules/npm/node_modules/object-assign/package.json
usr/lib/node_modules/npm/node_modules/once/once.js
usr/lib/node_modules/npm/node_modules/once/package.json
-usr/lib/node_modules/npm/node_modules/osenv/node_modules/os-homedir/index.js
-usr/lib/node_modules/npm/node_modules/osenv/node_modules/os-homedir/package.json
-usr/lib/node_modules/npm/node_modules/osenv/node_modules/os-tmpdir/index.js
-usr/lib/node_modules/npm/node_modules/osenv/node_modules/os-tmpdir/package.json
+usr/lib/node_modules/npm/node_modules/os-homedir/index.js
+usr/lib/node_modules/npm/node_modules/os-homedir/package.json
+usr/lib/node_modules/npm/node_modules/os-tmpdir/index.js
+usr/lib/node_modules/npm/node_modules/os-tmpdir/package.json
usr/lib/node_modules/npm/node_modules/osenv/osenv.js
usr/lib/node_modules/npm/node_modules/osenv/package.json
-usr/lib/node_modules/npm/node_modules/read-package-json/node_modules/glob/common.js
-usr/lib/node_modules/npm/node_modules/read-package-json/node_modules/glob/glob.js
-usr/lib/node_modules/npm/node_modules/read-package-json/node_modules/glob/node_modules/minimatch/minimatch.js
-usr/lib/node_modules/npm/node_modules/read-package-json/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/index.js
-usr/lib/node_modules/npm/node_modules/read-package-json/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/index.js
-usr/lib/node_modules/npm/node_modules/read-package-json/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json
-usr/lib/node_modules/npm/node_modules/read-package-json/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/index.js
-usr/lib/node_modules/npm/node_modules/read-package-json/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json
-usr/lib/node_modules/npm/node_modules/read-package-json/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/package.json
-usr/lib/node_modules/npm/node_modules/read-package-json/node_modules/glob/node_modules/minimatch/package.json
-usr/lib/node_modules/npm/node_modules/read-package-json/node_modules/glob/node_modules/path-is-absolute/index.js
-usr/lib/node_modules/npm/node_modules/read-package-json/node_modules/glob/node_modules/path-is-absolute/package.json
-usr/lib/node_modules/npm/node_modules/read-package-json/node_modules/glob/package.json
-usr/lib/node_modules/npm/node_modules/read-package-json/node_modules/glob/sync.js
-usr/lib/node_modules/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/index.js
-usr/lib/node_modules/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/index.js
-usr/lib/node_modules/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/package.json
-usr/lib/node_modules/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/package.json
+usr/lib/node_modules/npm/node_modules/path-is-absolute/index.js
+usr/lib/node_modules/npm/node_modules/path-is-absolute/package.json
+usr/lib/node_modules/npm/node_modules/path-is-inside/lib/path-is-inside.js
+usr/lib/node_modules/npm/node_modules/path-is-inside/package.json
+usr/lib/node_modules/npm/node_modules/pify/index.js
+usr/lib/node_modules/npm/node_modules/pify/package.json
+usr/lib/node_modules/npm/node_modules/process-nextick-args/index.js
+usr/lib/node_modules/npm/node_modules/process-nextick-args/package.json
+usr/lib/node_modules/npm/node_modules/promise-retry/index.js
+usr/lib/node_modules/npm/node_modules/promise-retry/node_modules/retry/index.js
+usr/lib/node_modules/npm/node_modules/promise-retry/node_modules/retry/lib/retry.js
+usr/lib/node_modules/npm/node_modules/promise-retry/node_modules/retry/lib/retry_operation.js
+usr/lib/node_modules/npm/node_modules/promise-retry/node_modules/retry/package.json
+usr/lib/node_modules/npm/node_modules/promise-retry/package.json
+usr/lib/node_modules/npm/node_modules/proto-list/package.json
+usr/lib/node_modules/npm/node_modules/proto-list/proto-list.js
+usr/lib/node_modules/npm/node_modules/read-cmd-shim/index.js
+usr/lib/node_modules/npm/node_modules/read-cmd-shim/package.json
usr/lib/node_modules/npm/node_modules/read-package-json/package.json
usr/lib/node_modules/npm/node_modules/read-package-json/read-json.js
usr/lib/node_modules/npm/node_modules/readable-stream/lib/_stream_duplex.js
@@ -2595,17 +2679,6 @@ usr/lib/node_modules/npm/node_modules/readable-stream/lib/_stream_passthrough.js
usr/lib/node_modules/npm/node_modules/readable-stream/lib/_stream_readable.js
usr/lib/node_modules/npm/node_modules/readable-stream/lib/_stream_transform.js
usr/lib/node_modules/npm/node_modules/readable-stream/lib/_stream_writable.js
-usr/lib/node_modules/npm/node_modules/readable-stream/lib/internal/streams/BufferList.js
-usr/lib/node_modules/npm/node_modules/readable-stream/node_modules/buffer-shims/index.js
-usr/lib/node_modules/npm/node_modules/readable-stream/node_modules/buffer-shims/package.json
-usr/lib/node_modules/npm/node_modules/readable-stream/node_modules/core-util-is/lib/util.js
-usr/lib/node_modules/npm/node_modules/readable-stream/node_modules/core-util-is/package.json
-usr/lib/node_modules/npm/node_modules/readable-stream/node_modules/isarray/index.js
-usr/lib/node_modules/npm/node_modules/readable-stream/node_modules/isarray/package.json
-usr/lib/node_modules/npm/node_modules/readable-stream/node_modules/process-nextick-args/index.js
-usr/lib/node_modules/npm/node_modules/readable-stream/node_modules/process-nextick-args/package.json
-usr/lib/node_modules/npm/node_modules/readable-stream/node_modules/util-deprecate/node.js
-usr/lib/node_modules/npm/node_modules/readable-stream/node_modules/util-deprecate/package.json
usr/lib/node_modules/npm/node_modules/readable-stream/package.json
usr/lib/node_modules/npm/node_modules/readable-stream/readable.js
usr/lib/node_modules/npm/node_modules/request/index.js
@@ -2619,186 +2692,57 @@ usr/lib/node_modules/npm/node_modules/request/lib/oauth.js
usr/lib/node_modules/npm/node_modules/request/lib/querystring.js
usr/lib/node_modules/npm/node_modules/request/lib/redirect.js
usr/lib/node_modules/npm/node_modules/request/lib/tunnel.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/aws-sign2/index.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/aws-sign2/package.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/aws4/aws4.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/aws4/lru.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/aws4/package.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/caseless/index.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/caseless/package.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/combined-stream/lib/combined_stream.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/combined-stream/node_modules/delayed-stream/lib/delayed_stream.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/combined-stream/node_modules/delayed-stream/package.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/combined-stream/package.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/extend/index.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/extend/package.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/forever-agent/index.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/forever-agent/package.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/form-data/lib/form_data.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/form-data/lib/populate.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/form-data/node_modules/asynckit/index.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/form-data/node_modules/asynckit/lib/abort.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/form-data/node_modules/asynckit/lib/async.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/form-data/node_modules/asynckit/lib/defer.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/form-data/node_modules/asynckit/lib/iterate.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/form-data/node_modules/asynckit/lib/state.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/form-data/node_modules/asynckit/lib/terminator.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/form-data/node_modules/asynckit/package.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/form-data/node_modules/asynckit/parallel.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/form-data/node_modules/asynckit/serial.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/form-data/node_modules/asynckit/serialOrdered.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/form-data/package.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/har-validator/lib/error.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/har-validator/lib/index.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/har-validator/lib/runner.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/har-validator/lib/schemas/cache.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/har-validator/lib/schemas/cacheEntry.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/har-validator/lib/schemas/content.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/har-validator/lib/schemas/cookie.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/har-validator/lib/schemas/creator.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/har-validator/lib/schemas/entry.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/har-validator/lib/schemas/har.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/har-validator/lib/schemas/index.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/har-validator/lib/schemas/log.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/har-validator/lib/schemas/page.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/har-validator/lib/schemas/pageTimings.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/har-validator/lib/schemas/postData.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/har-validator/lib/schemas/record.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/har-validator/lib/schemas/request.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/har-validator/lib/schemas/response.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/har-validator/lib/schemas/timings.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/formats.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/index.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-function/index.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-function/package.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/index.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/node_modules/is-property/is-property.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/node_modules/is-property/package.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/package.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/jsonpointer.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/package.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/immutable.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/package.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/package.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/har-validator/node_modules/pinkie-promise/index.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/har-validator/node_modules/pinkie-promise/package.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/har-validator/package.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/hawk/lib/client.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/hawk/lib/crypto.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/hawk/lib/index.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/hawk/lib/server.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/hawk/lib/utils.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/hawk/node_modules/boom/lib/index.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/hawk/node_modules/boom/package.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/hawk/node_modules/cryptiles/lib/index.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/hawk/node_modules/cryptiles/package.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/hawk/node_modules/hoek/lib/escape.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/hawk/node_modules/hoek/lib/index.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/hawk/node_modules/hoek/package.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/hawk/node_modules/sntp/index.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/hawk/node_modules/sntp/lib/index.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/hawk/node_modules/sntp/package.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/hawk/package.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/lib/index.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/lib/parser.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/lib/signer.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/lib/utils.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/lib/verify.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/assert-plus/assert.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/assert-plus/package.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/jsprim/lib/jsprim.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/jsprim/node_modules/extsprintf/lib/extsprintf.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/jsprim/node_modules/extsprintf/package.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/jsprim/node_modules/json-schema/lib/validate.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/jsprim/node_modules/json-schema/package.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/jsprim/node_modules/verror/lib/verror.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/jsprim/node_modules/verror/package.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/jsprim/package.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/algs.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/certificate.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/dhe.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/ed-compat.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/errors.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/fingerprint.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/auto.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/openssh-cert.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/pem.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/pkcs1.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/pkcs8.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/rfc4253.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/ssh-private.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/ssh.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/x509-pem.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/x509.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/identity.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/index.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/key.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/private-key.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/signature.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/ssh-buffer.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/utils.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/asn1/lib/ber/errors.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/asn1/lib/ber/index.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/asn1/lib/ber/reader.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/asn1/lib/ber/types.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/asn1/lib/ber/writer.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/asn1/lib/index.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/asn1/package.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/assert-plus/assert.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/assert-plus/package.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/package.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/package.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/is-typedarray/index.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/is-typedarray/package.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/isstream/isstream.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/isstream/package.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/json-stringify-safe/package.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/json-stringify-safe/stringify.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/mime-types/index.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/mime-types/node_modules/mime-db/db.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/mime-types/node_modules/mime-db/index.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/mime-types/node_modules/mime-db/package.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/mime-types/package.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/oauth-sign/index.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/oauth-sign/package.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/qs/lib/formats.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/qs/lib/index.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/qs/lib/parse.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/qs/lib/stringify.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/qs/lib/utils.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/qs/package.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/stringstream/package.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/stringstream/stringstream.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/tough-cookie/lib/cookie.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/tough-cookie/lib/memstore.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/tough-cookie/lib/pathMatch.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/tough-cookie/lib/permuteDomain.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/tough-cookie/lib/pubsuffix.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/tough-cookie/lib/store.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/tough-cookie/package.json
-usr/lib/node_modules/npm/node_modules/request/node_modules/tunnel-agent/index.js
-usr/lib/node_modules/npm/node_modules/request/node_modules/tunnel-agent/package.json
usr/lib/node_modules/npm/node_modules/request/package.json
usr/lib/node_modules/npm/node_modules/request/request.js
+usr/lib/node_modules/npm/node_modules/resolve-from/index.js
+usr/lib/node_modules/npm/node_modules/resolve-from/package.json
usr/lib/node_modules/npm/node_modules/retry/index.js
usr/lib/node_modules/npm/node_modules/retry/lib/retry.js
usr/lib/node_modules/npm/node_modules/retry/lib/retry_operation.js
usr/lib/node_modules/npm/node_modules/retry/package.json
usr/lib/node_modules/npm/node_modules/rimraf/package.json
usr/lib/node_modules/npm/node_modules/rimraf/rimraf.js
+usr/lib/node_modules/npm/node_modules/safe-buffer/index.js
+usr/lib/node_modules/npm/node_modules/safe-buffer/package.json
+usr/lib/node_modules/npm/node_modules/safer-buffer/package.json
+usr/lib/node_modules/npm/node_modules/safer-buffer/safer.js
usr/lib/node_modules/npm/node_modules/semver/package.json
usr/lib/node_modules/npm/node_modules/semver/semver.js
+usr/lib/node_modules/npm/node_modules/set-blocking/index.js
+usr/lib/node_modules/npm/node_modules/set-blocking/package.json
+usr/lib/node_modules/npm/node_modules/signal-exit/index.js
+usr/lib/node_modules/npm/node_modules/signal-exit/package.json
+usr/lib/node_modules/npm/node_modules/signal-exit/signals.js
usr/lib/node_modules/npm/node_modules/slide/lib/async-map.js
usr/lib/node_modules/npm/node_modules/slide/lib/bind-actor.js
usr/lib/node_modules/npm/node_modules/slide/lib/chain.js
usr/lib/node_modules/npm/node_modules/slide/lib/slide.js
usr/lib/node_modules/npm/node_modules/slide/package.json
+usr/lib/node_modules/npm/node_modules/spdx-correct/index.js
+usr/lib/node_modules/npm/node_modules/spdx-correct/package.json
+usr/lib/node_modules/npm/node_modules/spdx-exceptions/index.json
+usr/lib/node_modules/npm/node_modules/spdx-exceptions/package.json
+usr/lib/node_modules/npm/node_modules/spdx-expression-parse/index.js
+usr/lib/node_modules/npm/node_modules/spdx-expression-parse/package.json
+usr/lib/node_modules/npm/node_modules/spdx-expression-parse/parse.js
+usr/lib/node_modules/npm/node_modules/spdx-expression-parse/scan.js
+usr/lib/node_modules/npm/node_modules/spdx-license-ids/deprecated.json
+usr/lib/node_modules/npm/node_modules/spdx-license-ids/index.json
+usr/lib/node_modules/npm/node_modules/spdx-license-ids/package.json
usr/lib/node_modules/npm/node_modules/strip-ansi/index.js
usr/lib/node_modules/npm/node_modules/strip-ansi/package.json
+usr/lib/node_modules/npm/node_modules/through/index.js
+usr/lib/node_modules/npm/node_modules/through/package.json
usr/lib/node_modules/npm/node_modules/uid-number/package.json
usr/lib/node_modules/npm/node_modules/uid-number/uid-number.js
usr/lib/node_modules/npm/node_modules/umask/index.js
usr/lib/node_modules/npm/node_modules/umask/package.json
+usr/lib/node_modules/npm/node_modules/unique-string/index.js
+usr/lib/node_modules/npm/node_modules/unique-string/package.json
+usr/lib/node_modules/npm/node_modules/update-notifier/index.js
+usr/lib/node_modules/npm/node_modules/update-notifier/package.json
+usr/lib/node_modules/npm/node_modules/util-deprecate/node.js
+usr/lib/node_modules/npm/node_modules/util-deprecate/package.json
usr/lib/node_modules/npm/node_modules/uuid/index.js
usr/lib/node_modules/npm/node_modules/uuid/lib/bytesToUuid.js
usr/lib/node_modules/npm/node_modules/uuid/lib/rng.js
@@ -2806,32 +2750,25 @@ usr/lib/node_modules/npm/node_modules/uuid/package.json
usr/lib/node_modules/npm/node_modules/uuid/v1.js
usr/lib/node_modules/npm/node_modules/uuid/v4.js
usr/lib/node_modules/npm/node_modules/validate-npm-package-license/index.js
-usr/lib/node_modules/npm/node_modules/validate-npm-package-license/node_modules/spdx-correct/index.js
-usr/lib/node_modules/npm/node_modules/validate-npm-package-license/node_modules/spdx-correct/node_modules/spdx-license-ids/package.json
-usr/lib/node_modules/npm/node_modules/validate-npm-package-license/node_modules/spdx-correct/node_modules/spdx-license-ids/spdx-license-ids.json
-usr/lib/node_modules/npm/node_modules/validate-npm-package-license/node_modules/spdx-correct/package.json
-usr/lib/node_modules/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/index.js
-usr/lib/node_modules/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/package.json
-usr/lib/node_modules/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/parser.generated.js
usr/lib/node_modules/npm/node_modules/validate-npm-package-license/package.json
usr/lib/node_modules/npm/node_modules/validate-npm-package-name/index.js
-usr/lib/node_modules/npm/node_modules/validate-npm-package-name/node_modules/builtins/builtins.json
-usr/lib/node_modules/npm/node_modules/validate-npm-package-name/node_modules/builtins/package.json
usr/lib/node_modules/npm/node_modules/validate-npm-package-name/package.json
-usr/lib/node_modules/npm/node_modules/which/node_modules/isexe/access.js
-usr/lib/node_modules/npm/node_modules/which/node_modules/isexe/index.js
-usr/lib/node_modules/npm/node_modules/which/node_modules/isexe/package.json
usr/lib/node_modules/npm/node_modules/which/package.json
usr/lib/node_modules/npm/node_modules/which/which.js
+usr/lib/node_modules/npm/node_modules/wide-align/align.js
+usr/lib/node_modules/npm/node_modules/wide-align/node_modules/string-width/index.js
+usr/lib/node_modules/npm/node_modules/wide-align/node_modules/string-width/package.json
+usr/lib/node_modules/npm/node_modules/wide-align/package.json
usr/lib/node_modules/npm/node_modules/wrappy/package.json
usr/lib/node_modules/npm/node_modules/wrappy/wrappy.js
usr/lib/node_modules/npm/node_modules/write-file-atomic/index.js
usr/lib/node_modules/npm/node_modules/write-file-atomic/package.json
+usr/lib/node_modules/npm/node_modules/xdg-basedir/index.js
+usr/lib/node_modules/npm/node_modules/xdg-basedir/package.json
+usr/lib/node_modules/npm/node_modules/yallist/iterator.js
+usr/lib/node_modules/npm/node_modules/yallist/package.json
+usr/lib/node_modules/npm/node_modules/yallist/yallist.js
usr/lib/node_modules/npm/package.json
-usr/lib/pymodules/python2.7
-usr/lib/pymodules/python2.7/.path
-usr/lib/pymodules/python2.7/ndg_httpsclient-0.3.2.egg-info/namespace_packages.txt
-usr/lib/pymodules/python2.7/python_debianbts-1.11.egg-info
usr/lib/python2.7
usr/lib/python2.7/StringIO.py
usr/lib/python2.7/StringIO.pyc
@@ -2864,69 +2801,6 @@ usr/lib/python2.7/copy.pyc
usr/lib/python2.7/copy_reg.py
usr/lib/python2.7/copy_reg.pyc
usr/lib/python2.7/dist-packages
-usr/lib/python2.7/dist-packages/pkg_resources.py
-usr/lib/python2.7/dist-packages/pkg_resources.pyc
-usr/lib/python2.7/dist-packages/pygments/__init__.py
-usr/lib/python2.7/dist-packages/pygments/__init__.pyc
-usr/lib/python2.7/dist-packages/pygments/cmdline.py
-usr/lib/python2.7/dist-packages/pygments/cmdline.pyc
-usr/lib/python2.7/dist-packages/pygments/console.py
-usr/lib/python2.7/dist-packages/pygments/console.pyc
-usr/lib/python2.7/dist-packages/pygments/filter.py
-usr/lib/python2.7/dist-packages/pygments/filter.pyc
-usr/lib/python2.7/dist-packages/pygments/filters/__init__.py
-usr/lib/python2.7/dist-packages/pygments/filters/__init__.pyc
-usr/lib/python2.7/dist-packages/pygments/formatter.py
-usr/lib/python2.7/dist-packages/pygments/formatter.pyc
-usr/lib/python2.7/dist-packages/pygments/formatters/__init__.py
-usr/lib/python2.7/dist-packages/pygments/formatters/__init__.pyc
-usr/lib/python2.7/dist-packages/pygments/formatters/_mapping.py
-usr/lib/python2.7/dist-packages/pygments/formatters/_mapping.pyc
-usr/lib/python2.7/dist-packages/pygments/formatters/html.py
-usr/lib/python2.7/dist-packages/pygments/formatters/html.pyc
-usr/lib/python2.7/dist-packages/pygments/formatters/latex.py
-usr/lib/python2.7/dist-packages/pygments/formatters/latex.pyc
-usr/lib/python2.7/dist-packages/pygments/formatters/terminal.py
-usr/lib/python2.7/dist-packages/pygments/formatters/terminal.pyc
-usr/lib/python2.7/dist-packages/pygments/lexer.py
-usr/lib/python2.7/dist-packages/pygments/lexer.pyc
-usr/lib/python2.7/dist-packages/pygments/lexers/__init__.py
-usr/lib/python2.7/dist-packages/pygments/lexers/__init__.pyc
-usr/lib/python2.7/dist-packages/pygments/lexers/_mapping.py
-usr/lib/python2.7/dist-packages/pygments/lexers/_mapping.pyc
-usr/lib/python2.7/dist-packages/pygments/lexers/css.py
-usr/lib/python2.7/dist-packages/pygments/lexers/css.pyc
-usr/lib/python2.7/dist-packages/pygments/lexers/html.py
-usr/lib/python2.7/dist-packages/pygments/lexers/html.pyc
-usr/lib/python2.7/dist-packages/pygments/lexers/javascript.py
-usr/lib/python2.7/dist-packages/pygments/lexers/javascript.pyc
-usr/lib/python2.7/dist-packages/pygments/lexers/jvm.py
-usr/lib/python2.7/dist-packages/pygments/lexers/jvm.pyc
-usr/lib/python2.7/dist-packages/pygments/lexers/ruby.py
-usr/lib/python2.7/dist-packages/pygments/lexers/ruby.pyc
-usr/lib/python2.7/dist-packages/pygments/lexers/special.py
-usr/lib/python2.7/dist-packages/pygments/lexers/special.pyc
-usr/lib/python2.7/dist-packages/pygments/modeline.py
-usr/lib/python2.7/dist-packages/pygments/modeline.pyc
-usr/lib/python2.7/dist-packages/pygments/plugin.py
-usr/lib/python2.7/dist-packages/pygments/plugin.pyc
-usr/lib/python2.7/dist-packages/pygments/regexopt.py
-usr/lib/python2.7/dist-packages/pygments/regexopt.pyc
-usr/lib/python2.7/dist-packages/pygments/style.py
-usr/lib/python2.7/dist-packages/pygments/style.pyc
-usr/lib/python2.7/dist-packages/pygments/styles/__init__.py
-usr/lib/python2.7/dist-packages/pygments/styles/__init__.pyc
-usr/lib/python2.7/dist-packages/pygments/styles/monokai.py
-usr/lib/python2.7/dist-packages/pygments/styles/monokai.pyc
-usr/lib/python2.7/dist-packages/pygments/token.py
-usr/lib/python2.7/dist-packages/pygments/token.pyc
-usr/lib/python2.7/dist-packages/pygments/unistring.py
-usr/lib/python2.7/dist-packages/pygments/unistring.pyc
-usr/lib/python2.7/dist-packages/pygments/util.py
-usr/lib/python2.7/dist-packages/pygments/util.pyc
-usr/lib/python2.7/dist-packages/python-support.pth
-usr/lib/python2.7/dist-packages/roman-2.0.0.egg-info
-usr/lib/python2.7/dist-packages/setuptools.pth
usr/lib/python2.7/email/__init__.py
usr/lib/python2.7/email/__init__.pyc
usr/lib/python2.7/email/_parseaddr.py
@@ -3057,76 +2931,66 @@ usr/lib/python2.7/weakref.py
usr/lib/python2.7/weakref.pyc
usr/lib/python2.7/zipfile.py
usr/lib/python2.7/zipfile.pyc
-usr/lib/ruby/2.1.0/cgi/util.rb
-usr/lib/ruby/2.1.0/erb.rb
-usr/lib/ruby/2.1.0/monitor.rb
-usr/lib/ruby/2.1.0/optparse.rb
-usr/lib/ruby/2.1.0/rubygems.rb
-usr/lib/ruby/2.1.0/rubygems/basic_specification.rb
-usr/lib/ruby/2.1.0/rubygems/compatibility.rb
-usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_gem.rb
-usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb
-usr/lib/ruby/2.1.0/rubygems/defaults.rb
-usr/lib/ruby/2.1.0/rubygems/deprecate.rb
-usr/lib/ruby/2.1.0/rubygems/errors.rb
-usr/lib/ruby/2.1.0/rubygems/exceptions.rb
-usr/lib/ruby/2.1.0/rubygems/platform.rb
-usr/lib/ruby/2.1.0/rubygems/requirement.rb
-usr/lib/ruby/2.1.0/rubygems/specification.rb
-usr/lib/ruby/2.1.0/rubygems/stub_specification.rb
-usr/lib/ruby/2.1.0/rubygems/util/stringio.rb
-usr/lib/ruby/2.1.0/rubygems/version.rb
-usr/lib/ruby/2.1.0/set.rb
-usr/lib/ruby/gems/2.1.0/specifications/default
-usr/lib/ruby/gems/2.1.0/specifications/default/bigdecimal-1.2.4.gemspec
-usr/lib/ruby/gems/2.1.0/specifications/default/io-console-0.4.2.gemspec
-usr/lib/ruby/gems/2.1.0/specifications/default/json-1.8.1.gemspec
-usr/lib/ruby/gems/2.1.0/specifications/default/minitest-4.7.5.gemspec
-usr/lib/ruby/gems/2.1.0/specifications/default/psych-2.0.5.gemspec
-usr/lib/ruby/gems/2.1.0/specifications/default/rake-10.1.0.gemspec
-usr/lib/ruby/gems/2.1.0/specifications/default/rdoc-4.1.0.gemspec
-usr/lib/ruby/gems/2.1.0/specifications/default/test-unit-2.1.5.0.gemspec
+usr/lib/python3.5
+usr/lib/python3.5/__pycache__/_collections_abc.cpython-35.pyc
+usr/lib/python3.5/__pycache__/_sitebuiltins.cpython-35.pyc
+usr/lib/python3.5/__pycache__/_sysconfigdata.cpython-35.pyc
+usr/lib/python3.5/__pycache__/_weakrefset.cpython-35.pyc
+usr/lib/python3.5/__pycache__/abc.cpython-35.pyc
+usr/lib/python3.5/__pycache__/codecs.cpython-35.pyc
+usr/lib/python3.5/__pycache__/genericpath.cpython-35.pyc
+usr/lib/python3.5/__pycache__/io.cpython-35.pyc
+usr/lib/python3.5/__pycache__/os.cpython-35.pyc
+usr/lib/python3.5/__pycache__/posixpath.cpython-35.pyc
+usr/lib/python3.5/__pycache__/site.cpython-35.pyc
+usr/lib/python3.5/__pycache__/stat.cpython-35.pyc
+usr/lib/python3.5/__pycache__/sysconfig.cpython-35.pyc
+usr/lib/python3.5/encodings
+usr/lib/python3.5/encodings/__pycache__/__init__.cpython-35.pyc
+usr/lib/python3.5/encodings/__pycache__/aliases.cpython-35.pyc
+usr/lib/python3.5/encodings/__pycache__/ascii.cpython-35.pyc
+usr/lib/python3.5/encodings/__pycache__/latin_1.cpython-35.pyc
+usr/lib/python3.5/encodings/__pycache__/utf_8.cpython-35.pyc
+usr/lib/python3.5/plat-x86_64-linux-gnu
+usr/lib/python3.5/plat-x86_64-linux-gnu/__pycache__/_sysconfigdata_m.cpython-35.pyc
+usr/lib/python3.5/posixpath.py
+usr/lib/python3.5/site.py
+usr/lib/python3.5/sysconfig.py
usr/lib/ruby/vendor_ruby/asciidoctor.rb
usr/lib/ruby/vendor_ruby/asciidoctor/abstract_block.rb
usr/lib/ruby/vendor_ruby/asciidoctor/abstract_node.rb
usr/lib/ruby/vendor_ruby/asciidoctor/attribute_list.rb
-usr/lib/ruby/vendor_ruby/asciidoctor/backends/_stylesheets.rb
-usr/lib/ruby/vendor_ruby/asciidoctor/backends/base_template.rb
-usr/lib/ruby/vendor_ruby/asciidoctor/backends/html5.rb
usr/lib/ruby/vendor_ruby/asciidoctor/block.rb
usr/lib/ruby/vendor_ruby/asciidoctor/callouts.rb
usr/lib/ruby/vendor_ruby/asciidoctor/cli/invoker.rb
usr/lib/ruby/vendor_ruby/asciidoctor/cli/options.rb
-usr/lib/ruby/vendor_ruby/asciidoctor/debug.rb
usr/lib/ruby/vendor_ruby/asciidoctor/document.rb
usr/lib/ruby/vendor_ruby/asciidoctor/helpers.rb
usr/lib/ruby/vendor_ruby/asciidoctor/inline.rb
-usr/lib/ruby/vendor_ruby/asciidoctor/lexer.rb
usr/lib/ruby/vendor_ruby/asciidoctor/list.rb
usr/lib/ruby/vendor_ruby/asciidoctor/path_resolver.rb
usr/lib/ruby/vendor_ruby/asciidoctor/reader.rb
-usr/lib/ruby/vendor_ruby/asciidoctor/renderer.rb
usr/lib/ruby/vendor_ruby/asciidoctor/section.rb
-usr/lib/ruby/vendor_ruby/asciidoctor/substituters.rb
usr/lib/ruby/vendor_ruby/asciidoctor/table.rb
usr/lib/ruby/vendor_ruby/asciidoctor/version.rb
usr/lib/ruby/vendor_ruby/rubygems/defaults/operating_system.rb
-usr/lib/x86_64-linux-gnu/libcrypto.so.1.0.0
+usr/lib/sudo/libsudo_util.so.0
+usr/lib/sudo/libsudo_util.so.0.0.0
+usr/lib/x86_64-linux-gnu/gconv/ISO8859-1.so
+usr/lib/x86_64-linux-gnu/gconv/gconv-modules.cache
+usr/lib/x86_64-linux-gnu/libelf-0.168.so
+usr/lib/x86_64-linux-gnu/libelf.so.1
+usr/lib/x86_64-linux-gnu/libgmodule-2.0.so.0
+usr/lib/x86_64-linux-gnu/libgmodule-2.0.so.0.5000.3
usr/lib/x86_64-linux-gnu/libgmp.so.10
-usr/lib/x86_64-linux-gnu/libgmp.so.10.2.0
-usr/lib/x86_64-linux-gnu/libruby-2.1.so.2.1
-usr/lib/x86_64-linux-gnu/libruby-2.1.so.2.1.0
-usr/lib/x86_64-linux-gnu/libssl.so.1.0.0
usr/lib/x86_64-linux-gnu/libstdc++.so.6
-usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.20
-usr/lib/x86_64-linux-gnu/ruby/2.1.0/enc/encdb.so
-usr/lib/x86_64-linux-gnu/ruby/2.1.0/enc/trans/transdb.so
-usr/lib/x86_64-linux-gnu/ruby/2.1.0/rbconfig.rb
-usr/lib/x86_64-linux-gnu/ruby/2.1.0/strscan.so
-usr/lib/x86_64-linux-gnu/ruby/2.1.0/thread.so
-usr/local/bin/caddy
+usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.22
+usr/local/bin
usr/local/bin/getPublicId
+usr/local/bin/hugo
usr/local/lib/python2.7/dist-packages
+usr/local/sbin
+usr/sbin
usr/share/git-core/templates
usr/share/git-core/templates/branches
usr/share/git-core/templates/description
@@ -3138,8 +3002,10 @@ usr/share/git-core/templates/hooks/pre-applypatch.sample
usr/share/git-core/templates/hooks/pre-commit.sample
usr/share/git-core/templates/hooks/pre-push.sample
usr/share/git-core/templates/hooks/pre-rebase.sample
+usr/share/git-core/templates/hooks/pre-receive.sample
usr/share/git-core/templates/hooks/prepare-commit-msg.sample
usr/share/git-core/templates/hooks/update.sample
usr/share/git-core/templates/info
usr/share/git-core/templates/info/exclude
-usr/share/pyshared/ndg_httpsclient-0.3.2.egg-info/namespace_packages.txt
+usr/share/zoneinfo/GMT
+usr/share/zoneinfo/GMT+0
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index d1cb56d..caa60dd 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -17,11 +17,11 @@ const pkgdef :Spk.PackageDefinition = (
# This manifest is included in your app package to tell Sandstorm
# about your app.
- appTitle = (defaultText = "Hugo"),
+ appTitle = (defaultText = "Hugo (new)"),
- appVersion = 3, # Increment this for every release.
+ appVersion = 4, # Increment this for every release.
- appMarketingVersion = (defaultText = "0.20.7-sandstorm3"),
+ appMarketingVersion = (defaultText = "0.68.3-sandstorm3"),
# Human-readable representation of appVersion. Should match the way you
# identify versions of your app in documentation and marketing.
@@ -242,6 +242,9 @@ const myCommand :Spk.Manifest.Command = (
# Note that this defines the *entire* environment seen by your app.
(key = "PATH", value = "/usr/local/bin:/usr/bin:/bin"),
(key = "SANDSTORM", value = "1"),
+ (key = "HOME", value = "/var"),
+ (key = "NODE_ENV", value = "production"),
+ (key = "NODE_DEBUG", value = "fs"),
# Export SANDSTORM=1 into the environment, so that apps running within Sandstorm
# can detect if $SANDSTORM="1" at runtime, switching UI and/or backend to use
# the app's Sandstorm-specific integration code.
diff --git a/.sandstorm/setup.sh b/.sandstorm/setup.sh
index f77fd34..657a9ea 100755
--- a/.sandstorm/setup.sh
+++ b/.sandstorm/setup.sh
@@ -5,35 +5,44 @@
set -euo pipefail
+export HUGO_VERSION=0.68.3
+export NODE_VERSION=10
+
apt-get update
-apt-get install -y git
+apt-get install -y git strace
# First, get capnproto from master and install it to
-# /usr/local/bin. This requires a C++ compiler. We opt for clang
-# because that's what Sandstorm is typically compiled with.
+# /usr/local/bin. This requires a C++ compiler. We opt for gcc-6
+# because that's what capnproto now requires.
if [ ! -e /usr/local/bin/capnp ] ; then
sudo DEBIAN_FRONTEND=noninteractive apt-get install -y -q clang autoconf pkg-config libtool
cd /tmp
- if [ ! -e capnproto ]; then git clone https://github.com/sandstorm-io/capnproto; fi
+ if [ ! -e capnproto ]; then git clone https://github.com/capnproto/capnproto; fi
cd capnproto
- git checkout f73ac9f6667d7b87c395d23f3753dde63937cf00
+ #git checkout master
+ git checkout master
cd c++
+ make clean || true
autoreconf -i
./configure
make -j2
sudo make install
fi
+rm /opt/app/sandstorm-integration/getPublicId || true
+rm -Rf /opt/app/sandstorm-integration/tmp || true
+
# Second, compile the small C++ program within
# /opt/app/sandstorm-integration.
if [ ! -e /opt/app/sandstorm-integration/getPublicId ] ; then
pushd /opt/app/sandstorm-integration
+ make clean || true
make
fi
cp /opt/app/sandstorm-integration/bin/getPublicId /usr/local/bin
-curl -sL https://deb.nodesource.com/setup_7.x | sudo -E bash -
+curl -sL https://deb.nodesource.com/setup_${NODE_VERSION}.x | sudo -E bash -
apt-get install -y nodejs
npm install -g yarn
@@ -41,16 +50,6 @@ apt-get install -y python-pip asciidoctor
pip install pygments
cd /tmp
-wget https://github.com/gohugoio/hugo/releases/download/v0.49.2/hugo_0.49.2_Linux-64bit.deb -O hugo.deb
+wget https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_${HUGO_VERSION}_Linux-64bit.deb -O hugo.deb
dpkg -i hugo.deb
rm hugo.deb
-# cd /tmp
-# wget https://storage.googleapis.com/golang/go1.8.linux-amd64.tar.gz -O go.tar.gz
-# tar xfz go.tar.gz
-# mv go /usr/local
-# rm go.tar.gz
-wget "https://caddyserver.com/download/build?os=linux&arch=amd64&features=filemanager%2Chugo" -O /tmp/caddy.tar.gz
-cd /tmp
-tar xfz caddy.tar.gz
-mv caddy /usr/local/bin
-rm caddy.tar.gz
diff --git a/Caddyfile b/Caddyfile
index 3ecc8e0..b6dd7c9 100644
--- a/Caddyfile
+++ b/Caddyfile
@@ -1,4 +1,6 @@
-127.0.0.1:8001
+127.0.0.1:8001 {
+ root /var/git
+}
errors stderr
log stdout
hugo /var/git {
diff --git a/pages/index.vue b/pages/index.vue
index ee9a78d..e60ead8 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -44,8 +44,6 @@
- Admin Interface
- Simple site changes can be made directly in the included administrative interface.
diff --git a/sandstorm-integration/getPublicId.c++ b/sandstorm-integration/getPublicId.c++
index 635cfe6..d1b6da9 100644
--- a/sandstorm-integration/getPublicId.c++
+++ b/sandstorm-integration/getPublicId.c++
@@ -48,7 +48,10 @@ namespace sandstorm {
request.setId(sessionId);
auto session = request.send().getContext().castAs();
- kj::Promise promise = session.getPublicIdRequest().send().then([](auto result) {
+ kj::Promise promise = session
+ .getPublicIdRequest()
+ .send()
+ .then([](capnp::Response&& result) {
auto publicId = result.getPublicId();
auto hostname = result.getHostname();
auto autoUrl = result.getAutoUrl();
@@ -73,3 +76,4 @@ namespace sandstorm {
} // namespace sandstorm
KJ_MAIN(sandstorm::GetPublicIdMain)
+
diff --git a/sandstorm-integration/getPublicId.zc++ b/sandstorm-integration/getPublicId.zc++
new file mode 100644
index 0000000..635cfe6
--- /dev/null
+++ b/sandstorm-integration/getPublicId.zc++
@@ -0,0 +1,75 @@
+// Sandstorm - Personal Cloud Sandbox
+// Copyright (c) 2014 Sandstorm Development Group, Inc. and contributors
+//
+
+// Hack around stdlib bug with C++14.
+#include // force libstdc++ to include its config
+#undef _GLIBCXX_HAVE_GETS // correct broken config
+// End hack.
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+namespace sandstorm {
+
+ class GetPublicIdMain {
+ public:
+ GetPublicIdMain(kj::ProcessContext& context): context(context) { }
+
+ kj::MainFunc getMain() {
+ return kj::MainBuilder(context, "GetPublicId version: 0.0.2",
+ "Runs the getPublicId command from hack-session.capnp. "
+ "Outputs the return arguments as separate lines on stdout.")
+ .expectArg("", KJ_BIND_METHOD(*this, setSessionId))
+ .callAfterParsing(KJ_BIND_METHOD(*this, run))
+ .build();
+ }
+
+ kj::MainBuilder::Validity setSessionId(kj::StringPtr id) {
+ sessionId = kj::heapString(id);
+ return true;
+ }
+
+ kj::MainBuilder::Validity run() {
+ capnp::EzRpcClient client("unix:/tmp/sandstorm-api");
+ SandstormHttpBridge::Client restorer = client.getMain();
+
+ auto request = restorer.getSessionContextRequest();
+ request.setId(sessionId);
+ auto session = request.send().getContext().castAs();
+
+ kj::Promise promise = session.getPublicIdRequest().send().then([](auto result) {
+ auto publicId = result.getPublicId();
+ auto hostname = result.getHostname();
+ auto autoUrl = result.getAutoUrl();
+ auto isDemoUser = result.getIsDemoUser();
+ kj::String msg = kj::str(publicId, "\n", hostname, "\n", autoUrl, "\n",
+ isDemoUser ? "true" : "false", "\n");
+ kj::FdOutputStream(STDOUT_FILENO).write(msg.begin(), msg.size());
+ }, [] (auto e) {
+ auto desc = e.getDescription();
+ kj::FdOutputStream(STDOUT_FILENO).write(desc.begin(), desc.size());
+ });
+
+ promise.wait(client.getWaitScope());
+ return true;
+ }
+
+ private:
+ kj::ProcessContext& context;
+ kj::String sessionId;
+ };
+
+} // namespace sandstorm
+
+KJ_MAIN(sandstorm::GetPublicIdMain)
diff --git a/sandstorm-integration/getPublicId.zzzc++ b/sandstorm-integration/getPublicId.zzzc++
new file mode 100644
index 0000000..b88824d
--- /dev/null
+++ b/sandstorm-integration/getPublicId.zzzc++
@@ -0,0 +1,83 @@
+// Sandstorm - Personal Cloud Sandbox
+// Copyright (c) 2014 Sandstorm Development Group, Inc. and contributors
+//
+
+// Hack around stdlib bug with C++14.
+#include // force libstdc++ to include its config
+#undef _GLIBCXX_HAVE_GETS // correct broken config
+// End hack.
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+namespace sandstorm {
+
+ class GetPublicIdMain {
+ public:
+ GetPublicIdMain(kj::ProcessContext& context): context(context) { }
+
+ kj::MainFunc getMain() {
+ return kj::MainBuilder(context, "GetPublicId version: 0.0.2",
+ "Runs the getPublicId command from hack-session.capnp. "
+ "Returns the ID and the host name as two lines on stdout.")
+ .expectArg("", KJ_BIND_METHOD(*this, setSessionId))
+ .callAfterParsing(KJ_BIND_METHOD(*this, run))
+ .build();
+ }
+
+ kj::MainBuilder::Validity setSessionId(kj::StringPtr id) {
+ sessionId = kj::heapString(id);
+ return true;
+ }
+
+ kj::MainBuilder::Validity run() {
+ capnp::EzRpcClient client("unix:/tmp/sandstorm-api");
+ SandstormHttpBridge::Client restorer = client.getMain();
+
+ auto request = restorer.getSessionContextRequest();
+ request.setId(sessionId);
+ auto session = request.send().getContext().castAs();
+
+ kj::Promise promise = session.getPublicIdRequest().send().then(
+ [](HackSessionContext::GetPublicIdResults::Reader result) {
+ auto publicId = result.getPublicId();
+ auto hostname = result.getHostname();
+ auto autoUrl = result.getAutoUrl();
+ kj::String msg =
+ kj::str(
+ "Your content has automatically been published at\n",
+ " ", autoUrl, "\n",
+ "You can show this content on a custom domain by adding the following\n"
+ "DNS records:\n"
+ " IN CNAME ", hostname, "\n"
+ " sandstorm-www. IN TXT ", publicId, "\n");
+ kj::FdOutputStream(STDOUT_FILENO).write(msg.begin(), msg.size());
+ }, [] (kj::Exception&& e) {
+ auto desc = e.getDescription();
+ kj::FdOutputStream(STDOUT_FILENO).write(desc.begin(), desc.size());
+ });
+
+ promise.wait(client.getWaitScope());
+ return true;
+ }
+
+ private:
+ kj::ProcessContext& context;
+ kj::String sessionId;
+ };
+
+} // namespace sandstorm
+
+KJ_MAIN(sandstorm::GetPublicIdMain)
+
+
diff --git a/server.js b/server.js
index 26a7696..5605ff3 100644
--- a/server.js
+++ b/server.js
@@ -1,9 +1,11 @@
import Nuxt from "nuxt"
import logger from "morgan"
+import fs from 'fs'
const exec = require("child_process").exec
+const execFile = require("child_process").execFile
import Express from "express"
import gitBackend from "git-http-backend"
-import httpProxy from "http-proxy"
+//import httpProxy from "http-proxy"
const spawn = require("child_process").spawn
const app = new Express()
@@ -17,17 +19,49 @@ app.set("port", port)
app.get("/publicId", (req, res) => {
const sessionId = req.headers["x-sandstorm-session-id"]
- exec(`getPublicId ${sessionId}`, (err, rv) => {
- if(err)
- return res.end(err)
- const lines = rv.split("\n")
+ let allData = ""
+ const file = `/var/publicid-${sessionId}`
+
+ const handleResult = () => {
+ const lines = allData.split("\n")
const publicId = lines[0]
const hostname = lines[1]
const domain = publicId+"."+hostname
const url = lines[2]
const isDemo = lines[3] == "true"
res.json({publicId, hostname, domain, url, isDemo})
- })
+ }
+
+ try {
+ allData = fs.readFileSync(file, 'utf8').toString()
+ } catch (e) {
+ // nothing
+ }
+
+ const lines = allData.split("\n")
+ if (lines.length >= 4) {
+ handleResult()
+ } else {
+ const gpId = spawn('getPublicId', [sessionId])
+ allData = ""
+
+ gpId.stdout.on('data', (data) => {
+ fs.appendFileSync(file, data)
+ allData += data
+ })
+
+ gpId.on('error', (err) => {
+ return res.send(err)
+ })
+
+ gpId.on('close', (code) => {
+ if (code !== 0) {
+ return res.send(code)
+ }
+
+ handleResult()
+ })
+ }
})
app.use("/git", (req, res) => {
@@ -41,12 +75,12 @@ app.use("/git", (req, res) => {
})).pipe(res)
})
-const proxy = httpProxy.createProxyServer({
- target: "http://127.0.0.1:8001/admin/",
- changeOrigin: true
-})
+//const proxy = httpProxy.createProxyServer({
+// target: "http://127.0.0.1:8001/admin/",
+// changeOrigin: true
+//})
-app.use("/admin/", (req, res) => proxy.web(req, res))
+// app.use("/admin/", (req, res) => proxy.web(req, res))
// Import and Set Nuxt.js options
let config = require("./nuxt.config.js")
@@ -60,6 +94,7 @@ app.use(nuxt.render)
if (config.dev) {
nuxt.build()
.catch((error) => {
+ console.log('whoa')
console.error(error) // eslint-disable-line no-console
process.exit(1)
})