diff --git a/conf/deployment_configs.json b/conf/deployment_configs.json index b7d14a36..4f4f4b5a 100644 --- a/conf/deployment_configs.json +++ b/conf/deployment_configs.json @@ -1571,8 +1571,8 @@ }, "numCPUs": 1, "docker": { - "active": false, - "reuse_checkpoints": true + "active": true, + "reuse_checkpoints": false }, "virtualbox": { "active": false, diff --git a/conf/scripts/docker/start_containers.sh b/conf/scripts/docker/start_containers.sh index 0bcff826..aecf9e11 100755 --- a/conf/scripts/docker/start_containers.sh +++ b/conf/scripts/docker/start_containers.sh @@ -1,30 +1,85 @@ #!/usr/bin/env bash -# Start containers +# DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG +# stop and destroy all containers +# docker stop $(docker ps -aq) +# docker rm $(docker ps -aq) +# docker system prune +# DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG -RUNNING_FOLDER=$(pwd)/data/current -rm -rf RUNNING_FOLDER +# Get network for the containers +NETWORK_NAME="$1" +NETWORK_SUBNET="$2" -# create data directories to mount data folders in containers -mkdir -p $RUNNING_FOLDER/virtuoso -mkdir -p $RUNNING_FOLDER/elasticsearch -mkdir -p $RUNNING_FOLDER/mysql -mkdir -p $RUNNING_FOLDER/mongo -#mkdir -p $RUNNING_FOLDER/redis-default -#mkdir -p $RUNNING_FOLDER/redis-social -#mkdir -p $RUNNING_FOLDER/redis-notifications +echo "Network Name: $NETWORK_NAME" + +# adjust parameters for containers if a custom subnet is being used +if [[ "$NETWORK_NAME" != "" && "$NETWORK_SUBNET" != "" ]] +then + # calculate IP addresses of the containers + ELASTICSEARCH_IP="${NETWORK_SUBNET}.1" + echo "ELASTICSEARCH_IP: $ELASTICSEARCH_IP" + + VIRTUOSO_IP="${NETWORK_SUBNET}.2" + echo "VIRTUOSO_IP: $VIRTUOSO_IP" + + MYSQL_IP="${NETWORK_SUBNET}.3" + echo "MYSQL_IP: $MYSQL_IP" + + MONGODB_IP="${NETWORK_SUBNET}.4" + echo "MONGODB_IP: $MONGODB_IP" + + NETWORK_SUBNET="${NETWORK_SUBNET}.0/25" # max 255 containers on this subnet + echo "Network Subnet: $NETWORK_SUBNET" + echo "Creating docker subnet $NETWORK_NAME with value $NETWORK_SUBNET..." + docker network rm "$NETWORK_NAME" + docker network create \ + --driver=bridge \ + --subnet="$NETWORK_SUBNET" \ + "$NETWORK_NAME" + + # set running folder with network name suffix + RUNNING_FOLDER=$(pwd)/data/$NETWORK_NAME/current + + #set container names (WITH SUBNET) + ELASTICSEARCH_CONTAINER_NAME="elasticsearch-dendro-${NETWORK_NAME}" + VIRTUOSO_CONTAINER_NAME="virtuoso-dendro-${NETWORK_NAME}" + MYSQL_CONTAINER_NAME="mysql-dendro-${NETWORK_NAME}" + MONGODB_CONTAINER_NAME="mongodb-dendro-${NETWORK_NAME}" +else + # set running folder with network name suffix + RUNNING_FOLDER=$(pwd)/data/current + #set container names + ELASTICSEARCH_CONTAINER_NAME="elasticsearch-dendro" + VIRTUOSO_CONTAINER_NAME="virtuoso-dendro" + MYSQL_CONTAINER_NAME="mysql-dendro" + MONGODB_CONTAINER_NAME="mongodb-dendro" +fi -# start containers with the volumes mounted +# create data directories to mount data folders in containers +# rm -rf "$RUNNING_FOLDER" +# mkdir -p "$RUNNING_FOLDER/virtuoso" +# mkdir -p "$RUNNING_FOLDER/elasticsearch" +# mkdir -p "$RUNNING_FOLDER/mysql" +# mkdir -p "$RUNNING_FOLDER/mongo" +# starts containers with the volumes mounted function wait_for_server_to_boot_on_port() { - local port=$1 + local ip=$1 + + if [[ $ip == "" ]]; then + ip="127.0.0.1" + fi + local port=$2 local attempts=0 local max_attempts=60 - echo "Waiting for server on port $port to boot up..." + echo "Waiting for server on $ip:$port to boot up..." - while nc 127.0.0.1 "$port" < /dev/null > /dev/null && [[ $attempts < $max_attempts ]] ; do + # curl -s $URL 2>&1 > /dev/null + # nc "$ip" "$port" < /dev/null > /dev/null + while curl -s "$ip:$port" > /dev/null && [[ $attempts < $max_attempts ]] ; do attempts=$((attempts+1)) sleep 1; echo "waiting... (${attempts}/${max_attempts})" @@ -32,16 +87,19 @@ function wait_for_server_to_boot_on_port() if (( $attempts == $max_attempts )); then - echo "Server on port $port failed to start after $max_attempts" + echo "Server on $ip:$port failed to start after $max_attempts" elif (( $attempts < $max_attempts )); then - echo "Server on port $port started successfully at attempt (${attempts}/${max_attempts})" + echo "Server on $ip:$port started successfully at attempt (${attempts}/${max_attempts})" fi } + +# checks if a container is running or not function container_running { - container_name=$1 + local container_name=$1 + local running running=$(docker inspect -f "{{.State.Running}}" "$container_name") if [[ "$running" == "true" ]] then @@ -53,93 +111,115 @@ function container_running fi } -if container_running "elasticsearch-dendro" == 0 +## ELASTICSEARCH + +echo $RUNNING_FOLDER + +printf "\n\n" +if container_running "$ELASTICSEARCH_CONTAINER_NAME" == 0 then - ( docker start elasticsearch-dendro 1> /dev/null || \ - docker pull docker.elastic.co/elasticsearch/elasticsearch:6.2.2 && \ - docker run --name elasticsearch-dendro \ - -p 9200:9200 \ - -p 9300:9300 \ - -e "discovery.type=single-node" \ - -e "http.host=0.0.0.0" \ - -e "transport.host=127.0.0.1" \ - -v "$RUNNING_FOLDER/elasticsearch:/usr/share/elasticsearch/data" \ - -d docker.elastic.co/elasticsearch/elasticsearch:6.2.2 ) && \ - echo "Container elasticsearch-dendro started." + if ! docker start "$ELASTICSEARCH_CONTAINER_NAME" + then + docker pull docker.elastic.co/elasticsearch/elasticsearch:6.2.2 + docker run \ + -p 9200:9200 \ + -p 9300:9300 \ + -e "discovery.type=single-node" \ + -e "http.host=0.0.0.0" \ + -e "transport.host=${ELASTICSEARCH_IP}" \ + -v "$RUNNING_FOLDER/elasticsearch:/usr/share/elasticsearch/data" \ + --name "$ELASTICSEARCH_CONTAINER_NAME" \ + -d docker.elastic.co/elasticsearch/elasticsearch:6.2.2 + + # --net "$NETWORK_NAME" \ + # --ip "$ELASTICSEARCH_IP" \ + + docker start "$ELASTICSEARCH_CONTAINER_NAME" && echo "Container $ELASTICSEARCH_CONTAINER_NAME started." || echo "Container $ELASTICSEARCH_CONTAINER_NAME failed to start." + fi fi -wait_for_server_to_boot_on_port 9200 -wait_for_server_to_boot_on_port 9300 +wait_for_server_to_boot_on_port "$ELASTICSEARCH_IP" 9200 +wait_for_server_to_boot_on_port "$ELASTICSEARCH_IP" 9300 +# docker ps -a -if container_running "virtuoso-dendro" == 0 +## VIRTUOSO + +printf "\n\n" +if container_running "$VIRTUOSO_CONTAINER_NAME" == 0 then - ( docker start virtuoso-dendro 1> /dev/null || \ - docker run --name virtuoso-dendro \ - -p 8890:8890 \ - -p 1111:1111 \ - -e SPARQL_UPDATE=true \ - -e "VIRT_Parameters_CheckpointSyncMode=2" \ - -e "VIRT_Parameters_PageMapCheck=1" \ - -e "VIRT_Parameters_CheckpointInterval=0" \ - -v "$RUNNING_FOLDER/virtuoso:/data" \ - -d tenforce/virtuoso:1.3.1-virtuoso7.2.4 ) && \ - echo "Container virtuoso-dendro started." + if ! docker start "$VIRTUOSO_CONTAINER_NAME" + then + docker pull tenforce/virtuoso:1.3.1-virtuoso7.2.4 + docker run \ + -p 8890:8890 \ + -p 1111:1111 \ + -e SPARQL_UPDATE=true \ + -e "VIRT_Parameters_CheckpointSyncMode=2" \ + -e "VIRT_Parameters_PageMapCheck=1" \ + -e "VIRT_Parameters_CheckpointInterval=0" \ + -v "$RUNNING_FOLDER/virtuoso:/data" \ + --name "$VIRTUOSO_CONTAINER_NAME" \ + -d tenforce/virtuoso:1.3.1-virtuoso7.2.4 + + # --net "$NETWORK_NAME" \ + # --ip "$VIRTUOSO_IP" \ + + docker start $VIRTUOSO_CONTAINER_NAME && echo "Container $VIRTUOSO_CONTAINER_NAME started." || echo "Container $VIRTUOSO_CONTAINER_NAME failed to start." + fi fi # -e "VIRT_Parameters_NumberOfBuffers=$((32*85000))" \ -wait_for_server_to_boot_on_port 8890 -wait_for_server_to_boot_on_port 1111 +wait_for_server_to_boot_on_port "$VIRTUOSO_IP" 8890 +wait_for_server_to_boot_on_port "$VIRTUOSO_IP" 1111 +# docker ps -a -if container_running "mysql-dendro" == 0 +## MYSQL + +printf "\n\n" +if container_running "$MYSQL_CONTAINER_NAME" == 0 then - ( docker start mysql-dendro 1> /dev/null || \ - docker run --name mysql-dendro \ - -p 3306:3306 \ - -e MYSQL_ROOT_PASSWORD=r00t \ - -v "$RUNNING_FOLDER/mysql:/var/lib/mysql" \ - -d mysql:8.0.3 || docker start mysql-dendro 1> /dev/null ) && \ - echo "Container mysql-dendro started." + if ! docker start "$MYSQL_CONTAINER_NAME" + then + docker pull mysql:8.0.3 + docker run \ + -p 3306:3306 \ + -e MYSQL_ROOT_PASSWORD=r00t \ + -v "$RUNNING_FOLDER/mysql:/var/lib/mysql" \ + --name "$MYSQL_CONTAINER_NAME" \ + -d mysql:8.0.3 + + # --net "$NETWORK_NAME" \ + # --ip "$MYSQL_IP" \ + + docker start $MYSQL_CONTAINER_NAME && echo "Container $MYSQL_CONTAINER_NAME started." || echo "Container $MYSQL_CONTAINER_NAME failed to start." + # "$(get_network_arguments $NETWORK_NAME $MYSQL_IP)" \ + fi fi -wait_for_server_to_boot_on_port 3306 +wait_for_server_to_boot_on_port "$MYSQL_IP" 3306 +# docker ps -a -if container_running "mongo-dendro" == 0 +## MONGODB + +printf "\n\n" +if container_running "$MONGODB_CONTAINER_NAME" == 0 then - ( docker start mongo-dendro 1> /dev/null || \ - docker run --name mongo-dendro \ - -p 27017:27017 \ - -v "$RUNNING_FOLDER/mongo:/data/db" \ - -d mongo:3.4.10 ) && \ - echo "Container mongo-dendro started." + if ! docker start "$MONGODB_CONTAINER_NAME" + then + docker pull mongo:3.4.10 + docker run \ + -p 27017:27017 \ + -v "$RUNNING_FOLDER/mongo:/data/db" \ + --name "$MONGODB_CONTAINER_NAME" \ + -d mongo:3.4.10 + + # --net "$NETWORK_NAME" \ + # --ip "$MONGODB_IP" \ + + docker start $MONGODB_CONTAINER_NAME && echo "Container $MONGODB_CONTAINER_NAME started." || echo "Container $MONGODB_CONTAINER_NAME failed to start." + fi fi -wait_for_server_to_boot_on_port 27017 - -#docker run --name redis-dendro-default \ -# -p 6781:6780 \ -# -v "$RUNNING_FOLDER/redis-default:/data" \ -# -d redis:3.2.11 || docker start redis-dendro-default || docker restart redis-dendro-default -# -#docker run --name redis-dendro-social \ -# -p 6782:6780 \ -# -v "$RUNNING_FOLDER/redis-default:/data" \ -# -d redis:3.2.11 || docker start redis-dendro-social || docker restart redis-dendro-social -# -#docker run --name redis-dendro-notifications \ -# -p 6783:6780 \ -# -v "$RUNNING_FOLDER/redis-default:/data" \ -# -d redis:3.2.11 || docker start redis-dendro-notifications || docker restartredis-dendro-notifications - -#docker ps - - -#docker run --name virtuoso-dendro \ -# -p 8890:8890 \ -# -p 1111:1111 \ -# -e SPARQL_UPDATE=true \ -# -v $RUNNING_FOLDER/virtuoso:/data \ -# -d joaorosilva/virtuoso-7.2.2-dendro || docker start virtuoso-dendro-remote - -#for elasticsearch -#-Des.network.host=0.0.0.0 +wait_for_server_to_boot_on_port "$MONGODB_IP" 27017 +# docker ps -a diff --git a/package-lock.json b/package-lock.json index a8ec0fac..80cb891b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,7 @@ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0-beta.44.tgz", "integrity": "sha512-Il19yJvy7vMFm8AVAh6OZzaFoAd0hbkeMZiX3P5HGD+z7dyI7RzndHB0dg6Urh/VAFfHtpOIzDUSxmY6coyZWQ==", "requires": { - "chalk": "2.3.2", + "chalk": "2.4.0", "esutils": "2.0.2", "js-tokens": "3.0.2" }, @@ -31,19 +31,19 @@ } }, "chalk": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz", - "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz", + "integrity": "sha512-Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw==", "requires": { "ansi-styles": "3.2.1", "escape-string-regexp": "1.0.5", - "supports-color": "5.3.0" + "supports-color": "5.4.0" } }, "supports-color": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz", - "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", "requires": { "has-flag": "3.0.0" } @@ -91,9 +91,9 @@ } }, "@types/node": { - "version": "9.6.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.1.tgz", - "integrity": "sha512-xwlHq5DXQFRpe+u6hmmNkzYk/3oxxqDp71a/AJMupOQYmxyaBetqrVMqdNlSQfbg7XTJYD8vARjf3Op06OzdtQ==" + "version": "9.6.6", + "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.6.tgz", + "integrity": "sha512-SJe0g5cZeGNDP5sD8mIX3scb+eq8LQQZ60FXiKZHipYSeEFZ5EKml+NNMiO76F74TY4PoMWlNxF/YRY40FOvZQ==" }, "JSONSelect": { "version": "0.4.0", @@ -227,9 +227,9 @@ } }, "angular": { - "version": "1.6.9", - "resolved": "https://registry.npmjs.org/angular/-/angular-1.6.9.tgz", - "integrity": "sha512-6igWH2GIsxV+J38wNWCh8oyjaZsrIPIDO35twloIUyjlF2Yit6UyLAWujHP05ma/LFxTsx4NtYibRoMNBXPR1A==" + "version": "1.6.10", + "resolved": "https://registry.npmjs.org/angular/-/angular-1.6.10.tgz", + "integrity": "sha512-PCZ5/hVdvPQiYyH0VwsPjrErPHRcITnaXxhksceOXgtJeesKHLA7KDu4X/yvcAi+1zdGgGF+9pDxkJvghXI9Wg==" }, "ansi-escapes": { "version": "3.1.0", @@ -280,17 +280,15 @@ "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" }, "braces": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.1.tgz", - "integrity": "sha512-SO5lYHA3vO6gz66erVvedSCkp7AKWdv6VcQ2N4ysXfPxdAlxAMMAdwegGGcv1Bqwm7naF1hNdk5d6AAIEHV2nQ==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", + "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "requires": { "arr-flatten": "1.1.0", "array-unique": "0.3.2", - "define-property": "1.0.0", "extend-shallow": "2.0.1", "fill-range": "4.0.0", "isobject": "3.0.1", - "kind-of": "6.0.2", "repeat-element": "1.1.2", "snapdragon": "0.8.2", "snapdragon-node": "2.1.1", @@ -298,14 +296,6 @@ "to-regex": "3.0.2" }, "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "requires": { - "is-descriptor": "1.0.2" - } - }, "extend-shallow": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", @@ -354,6 +344,42 @@ "is-extendable": "0.1.1" } }, + "is-accessor-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "is-data-descriptor": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, "is-descriptor": { "version": "0.1.6", "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", @@ -426,39 +452,29 @@ } }, "is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - } + "kind-of": "6.0.2" } }, "is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - } + "kind-of": "6.0.2" + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "requires": { + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" } }, "is-number": { @@ -496,7 +512,7 @@ "requires": { "arr-diff": "4.0.0", "array-unique": "0.3.2", - "braces": "2.3.1", + "braces": "2.3.2", "define-property": "2.0.2", "extend-shallow": "3.0.2", "extglob": "2.0.4", @@ -526,7 +542,7 @@ "buffer-crc32": "0.2.13", "glob": "7.1.2", "lodash": "4.17.5", - "readable-stream": "2.3.5", + "readable-stream": "2.3.6", "tar-stream": "1.5.5", "zip-stream": "1.2.0" } @@ -541,7 +557,7 @@ "lazystream": "1.0.0", "lodash": "4.17.5", "normalize-path": "2.1.1", - "readable-stream": "2.3.5" + "readable-stream": "2.3.6" } }, "archy": { @@ -555,7 +571,7 @@ "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=", "requires": { "delegates": "1.0.0", - "readable-stream": "2.3.5" + "readable-stream": "2.3.6" } }, "argparse": { @@ -743,9 +759,9 @@ "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=" }, "aws4": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz", - "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=" + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz", + "integrity": "sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w==" }, "babel-code-frame": { "version": "6.26.0", @@ -763,14 +779,14 @@ "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", "requires": { - "core-js": "2.5.4", + "core-js": "2.5.5", "regenerator-runtime": "0.11.1" }, "dependencies": { "core-js": { - "version": "2.5.4", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.4.tgz", - "integrity": "sha1-8si/GB8qgLkvNgEhQpzmOi8K6uA=" + "version": "2.5.5", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.5.tgz", + "integrity": "sha1-sU3ek2xkDAV5prUMq8wTLdYSfjs=" } } }, @@ -822,10 +838,41 @@ "is-descriptor": "1.0.2" } }, + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "requires": { + "kind-of": "6.0.2" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "requires": { + "kind-of": "6.0.2" + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "requires": { + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" + } + }, "isobject": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + }, + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" } } }, @@ -834,7 +881,7 @@ "resolved": "https://registry.npmjs.org/base64-stream/-/base64-stream-0.1.3.tgz", "integrity": "sha1-drA3C3ebuBbRL9QXZKa4Vz61/sM=", "requires": { - "readable-stream": "2.3.5" + "readable-stream": "2.3.6" } }, "basic-auth": { @@ -865,9 +912,9 @@ "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=" }, "better-queue": { - "version": "3.8.6", - "resolved": "https://registry.npmjs.org/better-queue/-/better-queue-3.8.6.tgz", - "integrity": "sha1-cyIL36tAOSTP+nSXIg3Th6u3OmM=", + "version": "3.8.7", + "resolved": "https://registry.npmjs.org/better-queue/-/better-queue-3.8.7.tgz", + "integrity": "sha512-OD1yiyXPwIcoicNFeV1hLf4HkmB4V60Pm+hnYsmfY2+HJO5A0nR8vFuJyTjuNxLlGWfv2a4RFq1TRHbxvQNizw==", "requires": { "better-queue-memory": "1.0.2", "node-eta": "0.9.0", @@ -908,7 +955,7 @@ "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz", "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==", "requires": { - "readable-stream": "2.3.5", + "readable-stream": "2.3.6", "safe-buffer": "5.1.1" } }, @@ -1088,13 +1135,13 @@ "requires": { "bson": "0.2.22", "kerberos": "0.0.11", - "readable-stream": "2.3.5" + "readable-stream": "2.3.6" } }, "readable-stream": { - "version": "2.3.5", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz", - "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==", + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "optional": true, "requires": { "core-util-is": "1.0.2", @@ -1102,7 +1149,7 @@ "isarray": "1.0.0", "process-nextick-args": "2.0.0", "safe-buffer": "5.1.1", - "string_decoder": "1.0.3", + "string_decoder": "1.1.1", "util-deprecate": "1.0.2" } } @@ -1350,8 +1397,8 @@ "requires": { "anymatch": "2.0.0", "async-each": "1.0.1", - "braces": "2.3.1", - "fsevents": "1.1.3", + "braces": "2.3.2", + "fsevents": "1.2.0", "glob-parent": "3.1.0", "inherits": "2.0.3", "is-binary-path": "1.0.1", @@ -1368,17 +1415,15 @@ "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" }, "braces": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.1.tgz", - "integrity": "sha512-SO5lYHA3vO6gz66erVvedSCkp7AKWdv6VcQ2N4ysXfPxdAlxAMMAdwegGGcv1Bqwm7naF1hNdk5d6AAIEHV2nQ==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", + "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "requires": { "arr-flatten": "1.1.0", "array-unique": "0.3.2", - "define-property": "1.0.0", "extend-shallow": "2.0.1", "fill-range": "4.0.0", "isobject": "3.0.1", - "kind-of": "6.0.2", "repeat-element": "1.1.2", "snapdragon": "0.8.2", "snapdragon-node": "2.1.1", @@ -1386,14 +1431,6 @@ "to-regex": "3.0.2" } }, - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "requires": { - "is-descriptor": "1.0.2" - } - }, "extend-shallow": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", @@ -1451,27 +1488,12 @@ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "requires": { "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - } } }, "isobject": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" } } }, @@ -1481,9 +1503,9 @@ "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=" }, "circular-json": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.5.1.tgz", - "integrity": "sha512-UjgcRlTAhAkLeXmDe2wK7ktwy/tgAqxiSndTIPiFZuIPLZmzHzWMwUIe9h9m/OokypG7snxCDEuwJshGBdPvaw==" + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.5.3.tgz", + "integrity": "sha512-YlxLOimeIoQGHnMe3kbf8qIV2Bj7uXLbljMPRguNT49GmSAzooNfS9EJ91rSJKbLBOOzM5agvtx0WyechZN/Hw==" }, "cjson": { "version": "0.2.1", @@ -1582,7 +1604,7 @@ "integrity": "sha512-8H7Ehijd4js+s6wuVPLjwORxD4zeuyjYugprdOXlPSqaApmL/QOy+EB/beICHVCHkGMKNh5rvihb5ov+IDw4mg==", "requires": { "aws-sign2": "0.7.0", - "aws4": "1.6.0", + "aws4": "1.7.0", "caseless": "0.12.0", "combined-stream": "1.0.6", "extend": "3.0.1", @@ -1786,61 +1808,10 @@ "is-descriptor": "0.1.6" } }, - "is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" - } - }, "isobject": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" - }, - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" } } }, @@ -2106,7 +2077,7 @@ "dev": true, "requires": { "aws-sign2": "0.6.0", - "aws4": "1.6.0", + "aws4": "1.7.0", "caseless": "0.11.0", "combined-stream": "1.0.6", "extend": "3.0.1", @@ -2272,7 +2243,7 @@ "integrity": "sha1-PAPwd2uGo239mgosl8YwfzMggv4=", "dev": true, "requires": { - "readable-stream": "2.3.5" + "readable-stream": "2.3.6" } }, "component-emitter": { @@ -2288,7 +2259,7 @@ "buffer-crc32": "0.2.13", "crc32-stream": "2.0.0", "normalize-path": "2.1.1", - "readable-stream": "2.3.5" + "readable-stream": "2.3.6" } }, "concat-map": { @@ -2303,7 +2274,7 @@ "requires": { "buffer-from": "1.0.0", "inherits": "2.0.3", - "readable-stream": "2.3.5", + "readable-stream": "2.3.6", "typedarray": "0.0.6" } }, @@ -2519,7 +2490,7 @@ "integrity": "sha1-483TtN8xaN10494/u8t7KX/pCPQ=", "requires": { "crc": "3.5.0", - "readable-stream": "2.3.5" + "readable-stream": "2.3.6" } }, "create-error-class": { @@ -2535,7 +2506,7 @@ "resolved": "https://registry.npmjs.org/cron/-/cron-1.3.0.tgz", "integrity": "sha512-K/SF7JlgMmNjcThWxkKvsHhey2EDB4CeOEWJ9aXWj3fbQJppsvTPIeyLdHfNq5IbbsMUUjRW1nr5dSO95f2E4w==", "requires": { - "moment-timezone": "0.5.14" + "moment-timezone": "0.5.16" } }, "cross-env": { @@ -2869,10 +2840,41 @@ "isobject": "3.0.1" }, "dependencies": { + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "requires": { + "kind-of": "6.0.2" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "requires": { + "kind-of": "6.0.2" + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "requires": { + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" + } + }, "isobject": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + }, + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" } } }, @@ -3113,9 +3115,9 @@ "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" }, "ejs": { - "version": "2.5.8", - "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.5.8.tgz", - "integrity": "sha512-QIDZL54fyV8MDcAsO91BMH1ft2qGGaHIJsJIA/+t+7uvXol1dm413fPcUgUb4k8F/9457rx4/KFE4XfDifrQxQ==" + "version": "2.5.9", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.5.9.tgz", + "integrity": "sha512-GJCAeDBKfREgkBtgrYSf9hQy9kTb3helv0zGdzqhM7iAkW8FA/ZF97VQDbwFiwIT8MQLLOe5VlPZOEvZAqtUAQ==" }, "elasticsearch": { "version": "14.2.2", @@ -3306,7 +3308,7 @@ "requires": { "ajv": "5.5.2", "babel-code-frame": "6.26.0", - "chalk": "2.3.2", + "chalk": "2.4.0", "concat-stream": "1.6.2", "cross-spawn": "5.1.0", "debug": "3.1.0", @@ -3360,14 +3362,14 @@ } }, "chalk": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz", - "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz", + "integrity": "sha512-Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw==", "dev": true, "requires": { "ansi-styles": "3.2.1", "escape-string-regexp": "1.0.5", - "supports-color": "5.3.0" + "supports-color": "5.4.0" } }, "esprima": { @@ -3396,9 +3398,9 @@ } }, "supports-color": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz", - "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", "dev": true, "requires": { "has-flag": "3.0.0" @@ -3442,7 +3444,7 @@ "dev": true, "requires": { "debug": "2.6.9", - "resolve": "1.6.0" + "resolve": "1.7.1" }, "dependencies": { "debug": { @@ -3455,9 +3457,9 @@ } }, "resolve": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.6.0.tgz", - "integrity": "sha512-mw7JQNu5ExIkcw4LPih0owX/TZXjD/ZUF/ZQ/pDnkw3ZKhDcZZw5klmBlj6gVMwjQ3Pz5Jgu7F3d0jcDVuEWdw==", + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz", + "integrity": "sha512-c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw==", "dev": true, "requires": { "path-parse": "1.0.5" @@ -3487,12 +3489,11 @@ } }, "eslint-plugin-import": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.10.0.tgz", - "integrity": "sha1-+gkIPVp1KI35xsfQn+EiVZhWVec=", + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.11.0.tgz", + "integrity": "sha1-Fa7qN6Z0mdhI6OmBgG1GJ7VQOBY=", "dev": true, "requires": { - "builtin-modules": "1.1.1", "contains-path": "0.1.0", "debug": "2.6.9", "doctrine": "1.5.0", @@ -3501,7 +3502,8 @@ "has": "1.0.1", "lodash": "4.17.5", "minimatch": "3.0.4", - "read-pkg-up": "2.0.0" + "read-pkg-up": "2.0.0", + "resolve": "1.7.1" }, "dependencies": { "debug": { @@ -3571,6 +3573,15 @@ "read-pkg": "2.0.0" } }, + "resolve": { + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz", + "integrity": "sha512-c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw==", + "dev": true, + "requires": { + "path-parse": "1.0.5" + } + }, "strip-bom": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", @@ -3587,14 +3598,14 @@ "requires": { "ignore": "3.3.7", "minimatch": "3.0.4", - "resolve": "1.6.0", + "resolve": "1.7.1", "semver": "5.5.0" }, "dependencies": { "resolve": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.6.0.tgz", - "integrity": "sha512-mw7JQNu5ExIkcw4LPih0owX/TZXjD/ZUF/ZQ/pDnkw3ZKhDcZZw5klmBlj6gVMwjQ3Pz5Jgu7F3d0jcDVuEWdw==", + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz", + "integrity": "sha512-c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw==", "dev": true, "requires": { "path-parse": "1.0.5" @@ -3735,16 +3746,16 @@ } }, "exceljs": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/exceljs/-/exceljs-1.1.0.tgz", - "integrity": "sha512-eHt80WhuVnbFMULnInryRHLqYpD61QpX9eOcWinsq5rDfzkgS4cdTd7XI7Wt14BoV8jAsKRuj/637x7Ieiungg==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/exceljs/-/exceljs-1.2.1.tgz", + "integrity": "sha512-zKuHNh9B4gDHjberkJFsFRJAp23fYN+BInT5d1agPlv1uuYj8/BQyUH5qFuJSpI17v0N/RErxPtIniNWYWC6Og==", "requires": { "archiver": "1.3.0", "fast-csv": "2.4.1", "jszip": "3.1.3", - "moment": "2.22.0", + "moment": "2.22.1", "node-unzip-2": "0.2.7", - "promish": "5.0.2", + "promish": "5.0.3", "sax": "1.2.4" }, "dependencies": { @@ -3758,7 +3769,7 @@ "buffer-crc32": "0.2.13", "glob": "7.1.2", "lodash": "4.17.5", - "readable-stream": "2.3.5", + "readable-stream": "2.3.6", "tar-stream": "1.5.5", "walkdir": "0.0.11", "zip-stream": "1.2.0" @@ -3934,9 +3945,9 @@ } }, "express-winston": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/express-winston/-/express-winston-2.5.0.tgz", - "integrity": "sha512-Kdgj4ZJBA2k0P7LYh/srW1LBEhvj588DAPV+lq6cVRnVwKpEX/Mt/C3LZWJrp459r5zomk10cPQMzyVtauFy/Q==", + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/express-winston/-/express-winston-2.5.1.tgz", + "integrity": "sha512-mDBfUtYNt1hibuvAKK/grxmT+X1DNcAUgKFQaicfv96+A328tK5O+mGCbV8pK5K3UCUW80r1frnNg0PZMkH1yQ==", "requires": { "chalk": "0.4.0", "lodash": "4.17.5" @@ -4139,7 +4150,7 @@ "resolved": "https://registry.npmjs.org/file-stream-rotator/-/file-stream-rotator-0.2.1.tgz", "integrity": "sha1-DW/qGpp6uiWofP0xtuJp5E6PCvI=", "requires": { - "moment": "2.22.0" + "moment": "2.22.1" } }, "filename-regex": { @@ -4437,13 +4448,13 @@ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "fsevents": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz", - "integrity": "sha512-WIr7iDkdmdbxu/Gh6eKEZJL6KPE74/5MEsf2whTOFNxbIoIixogroLdKYqB6FDav4Wavh/lZdzzd3b2KxIXC5Q==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.0.tgz", + "integrity": "sha512-ROrBIbmw4ulxmQTwYAAGyN/0xgIOAFd6gX/K3F1aGLP/K5KxkubrlGISMV5EEWEB7qtiEdE0HpaqvMMHR+Ib6w==", "optional": true, "requires": { "nan": "2.10.0", - "node-pre-gyp": "0.6.39" + "node-pre-gyp": "0.9.1" }, "dependencies": { "abbrev": { @@ -4454,7 +4465,6 @@ "ajv": { "version": "4.11.8", "bundled": true, - "optional": true, "requires": { "co": "4.6.0", "json-stable-stringify": "1.0.1" @@ -4480,28 +4490,23 @@ }, "asn1": { "version": "0.2.3", - "bundled": true, - "optional": true + "bundled": true }, "assert-plus": { "version": "0.2.0", - "bundled": true, - "optional": true + "bundled": true }, "asynckit": { "version": "0.4.0", - "bundled": true, - "optional": true + "bundled": true }, "aws-sign2": { "version": "0.6.0", - "bundled": true, - "optional": true + "bundled": true }, "aws4": { "version": "1.6.0", - "bundled": true, - "optional": true + "bundled": true }, "balanced-match": { "version": "0.4.2", @@ -4543,13 +4548,11 @@ }, "caseless": { "version": "0.12.0", - "bundled": true, - "optional": true + "bundled": true }, "co": { "version": "4.6.0", - "bundled": true, - "optional": true + "bundled": true }, "code-point-at": { "version": "1.1.0", @@ -4584,22 +4587,19 @@ "dashdash": { "version": "1.14.1", "bundled": true, - "optional": true, "requires": { "assert-plus": "1.0.0" }, "dependencies": { "assert-plus": { "version": "1.0.0", - "bundled": true, - "optional": true + "bundled": true } } }, "debug": { "version": "2.6.8", "bundled": true, - "optional": true, "requires": { "ms": "2.0.0" } @@ -4633,8 +4633,7 @@ }, "extend": { "version": "3.0.1", - "bundled": true, - "optional": true + "bundled": true }, "extsprintf": { "version": "1.0.2", @@ -4642,13 +4641,11 @@ }, "forever-agent": { "version": "0.6.1", - "bundled": true, - "optional": true + "bundled": true }, "form-data": { "version": "2.1.4", "bundled": true, - "optional": true, "requires": { "asynckit": "0.4.0", "combined-stream": "1.0.5", @@ -4672,7 +4669,6 @@ "fstream-ignore": { "version": "1.0.5", "bundled": true, - "optional": true, "requires": { "fstream": "1.0.11", "inherits": "2.0.3", @@ -4697,15 +4693,13 @@ "getpass": { "version": "0.1.7", "bundled": true, - "optional": true, "requires": { "assert-plus": "1.0.0" }, "dependencies": { "assert-plus": { "version": "1.0.0", - "bundled": true, - "optional": true + "bundled": true } } }, @@ -4727,13 +4721,11 @@ }, "har-schema": { "version": "1.0.5", - "bundled": true, - "optional": true + "bundled": true }, "har-validator": { "version": "4.2.1", "bundled": true, - "optional": true, "requires": { "ajv": "4.11.8", "har-schema": "1.0.5" @@ -4761,7 +4753,6 @@ "http-signature": { "version": "1.1.1", "bundled": true, - "optional": true, "requires": { "assert-plus": "0.2.0", "jsprim": "1.4.0", @@ -4794,8 +4785,7 @@ }, "is-typedarray": { "version": "1.0.0", - "bundled": true, - "optional": true + "bundled": true }, "isarray": { "version": "1.0.0", @@ -4803,8 +4793,7 @@ }, "isstream": { "version": "0.1.2", - "bundled": true, - "optional": true + "bundled": true }, "jodid25519": { "version": "1.0.2", @@ -4821,31 +4810,26 @@ }, "json-schema": { "version": "0.2.3", - "bundled": true, - "optional": true + "bundled": true }, "json-stable-stringify": { "version": "1.0.1", "bundled": true, - "optional": true, "requires": { "jsonify": "0.0.0" } }, "json-stringify-safe": { "version": "5.0.1", - "bundled": true, - "optional": true + "bundled": true }, "jsonify": { "version": "0.0.0", - "bundled": true, - "optional": true + "bundled": true }, "jsprim": { "version": "1.4.0", "bundled": true, - "optional": true, "requires": { "assert-plus": "1.0.0", "extsprintf": "1.0.2", @@ -4855,8 +4839,7 @@ "dependencies": { "assert-plus": { "version": "1.0.0", - "bundled": true, - "optional": true + "bundled": true } } }, @@ -4891,8 +4874,7 @@ }, "ms": { "version": "2.0.0", - "bundled": true, - "optional": true + "bundled": true }, "nan": { "version": "2.10.0", @@ -4901,21 +4883,44 @@ "optional": true }, "node-pre-gyp": { - "version": "0.6.39", - "bundled": true, + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.9.1.tgz", + "integrity": "sha1-8RwHUW3ZL4cZnbx+GDjqt81WyeA=", "optional": true, "requires": { "detect-libc": "1.0.2", - "hawk": "3.1.3", "mkdirp": "0.5.1", + "needle": "2.2.0", "nopt": "4.0.1", + "npm-packlist": "1.1.10", "npmlog": "4.1.0", "rc": "1.2.1", - "request": "2.81.0", "rimraf": "2.6.1", "semver": "5.3.0", - "tar": "2.2.1", - "tar-pack": "3.4.0" + "tar": "4.4.1" + }, + "dependencies": { + "safe-buffer": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", + "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", + "optional": true + }, + "tar": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.1.tgz", + "integrity": "sha512-O+v1r9yN4tOsvl90p5HAP4AEqbYhx4036AGMm075fH9F8Qwi3oJ+v4u50FkT/KkvywNGtwkk0zRI+8eYm1X/xg==", + "optional": true, + "requires": { + "chownr": "1.0.1", + "fs-minipass": "1.2.5", + "minipass": "2.2.4", + "minizlib": "1.1.0", + "mkdirp": "0.5.1", + "safe-buffer": "5.1.1", + "yallist": "3.0.2" + } + } } }, "nopt": { @@ -4944,8 +4949,7 @@ }, "oauth-sign": { "version": "0.8.2", - "bundled": true, - "optional": true + "bundled": true }, "object-assign": { "version": "4.1.1", @@ -4984,8 +4988,7 @@ }, "performance-now": { "version": "0.2.0", - "bundled": true, - "optional": true + "bundled": true }, "process-nextick-args": { "version": "1.0.7", @@ -4993,13 +4996,11 @@ }, "punycode": { "version": "1.4.1", - "bundled": true, - "optional": true + "bundled": true }, "qs": { "version": "6.4.0", - "bundled": true, - "optional": true + "bundled": true }, "rc": { "version": "1.2.1", @@ -5035,7 +5036,6 @@ "request": { "version": "2.81.0", "bundled": true, - "optional": true, "requires": { "aws-sign2": "0.6.0", "aws4": "1.6.0", @@ -5097,7 +5097,6 @@ "sshpk": { "version": "1.13.0", "bundled": true, - "optional": true, "requires": { "asn1": "0.2.3", "assert-plus": "1.0.0", @@ -5112,8 +5111,7 @@ "dependencies": { "assert-plus": { "version": "1.0.0", - "bundled": true, - "optional": true + "bundled": true } } }, @@ -5135,8 +5133,7 @@ }, "stringstream": { "version": "0.0.5", - "bundled": true, - "optional": true + "bundled": true }, "strip-ansi": { "version": "3.0.1", @@ -5162,7 +5159,6 @@ "tar-pack": { "version": "3.4.0", "bundled": true, - "optional": true, "requires": { "debug": "2.6.8", "fstream": "1.0.11", @@ -5177,7 +5173,6 @@ "tough-cookie": { "version": "2.3.2", "bundled": true, - "optional": true, "requires": { "punycode": "1.4.1" } @@ -5185,7 +5180,6 @@ "tunnel-agent": { "version": "0.6.0", "bundled": true, - "optional": true, "requires": { "safe-buffer": "5.0.1" } @@ -5197,8 +5191,7 @@ }, "uid-number": { "version": "0.0.6", - "bundled": true, - "optional": true + "bundled": true }, "util-deprecate": { "version": "1.0.2", @@ -5206,13 +5199,11 @@ }, "uuid": { "version": "3.0.1", - "bundled": true, - "optional": true + "bundled": true }, "verror": { "version": "1.3.6", "bundled": true, - "optional": true, "requires": { "extsprintf": "1.0.2" } @@ -5228,6 +5219,12 @@ "wrappy": { "version": "1.0.2", "bundled": true + }, + "yallist": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz", + "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=", + "optional": true } } }, @@ -5632,7 +5629,7 @@ "parse-json": "2.2.0", "pinkie-promise": "2.0.1", "read-all-stream": "3.1.0", - "readable-stream": "2.3.5", + "readable-stream": "2.3.6", "timed-out": "3.1.3", "unzip-response": "1.0.2", "url-parse-lax": "1.0.0" @@ -5643,7 +5640,7 @@ "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz", "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=", "requires": { - "readable-stream": "2.3.5" + "readable-stream": "2.3.6" } } } @@ -5757,7 +5754,7 @@ "requires": { "chalk": "1.1.3", "maxmin": "1.1.0", - "uglify-js": "3.3.18", + "uglify-js": "3.3.22", "uri-path": "1.0.0" } }, @@ -6230,7 +6227,7 @@ "domutils": "1.5.1", "entities": "1.1.1", "inherits": "2.0.3", - "readable-stream": "2.3.5" + "readable-stream": "2.3.6" } }, "http-errors": { @@ -6294,6 +6291,15 @@ "integrity": "sha512-YGG3ejvBNHRqu0559EOxxNFihD0AjpvHlC/pdGKd3X3ofe+CoJkYazwNJYTNebqpPKN+VVQbh4ZFn1DivMNuHA==", "dev": true }, + "ignore-walk": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz", + "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==", + "optional": true, + "requires": { + "minimatch": "3.0.4" + } + }, "immediate": { "version": "3.0.6", "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", @@ -6345,7 +6351,7 @@ "dev": true, "requires": { "ansi-escapes": "3.1.0", - "chalk": "2.3.2", + "chalk": "2.4.0", "cli-cursor": "2.1.0", "cli-width": "2.2.0", "external-editor": "2.2.0", @@ -6376,14 +6382,14 @@ } }, "chalk": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz", - "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz", + "integrity": "sha512-Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw==", "dev": true, "requires": { "ansi-styles": "3.2.1", "escape-string-regexp": "1.0.5", - "supports-color": "5.3.0" + "supports-color": "5.4.0" } }, "figures": { @@ -6405,9 +6411,9 @@ } }, "supports-color": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz", - "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", "dev": true, "requires": { "has-flag": "3.0.0" @@ -6461,18 +6467,11 @@ } }, "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "requires": { - "kind-of": "6.0.2" - }, - "dependencies": { - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" - } + "kind-of": "3.2.2" } }, "is-arrayish": { @@ -6508,18 +6507,11 @@ "dev": true }, "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "requires": { - "kind-of": "6.0.2" - }, - "dependencies": { - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" - } + "kind-of": "3.2.2" } }, "is-date-object": { @@ -6529,19 +6521,19 @@ "dev": true }, "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "0.1.6", + "is-data-descriptor": "0.1.4", + "kind-of": "5.1.0" }, "dependencies": { "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" } } }, @@ -6793,9 +6785,9 @@ "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" }, "isemail": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/isemail/-/isemail-3.1.1.tgz", - "integrity": "sha512-mVjAjvdPkpwXW61agT2E9AkGoegZO7SdJGCezWwxnETL58f5KwJ4vSVAMBUL5idL6rTlYAIGkX3n4suiviMLNw==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/isemail/-/isemail-3.1.2.tgz", + "integrity": "sha512-zfRhJn9rFSGhzU5tGZqepRSAj3+g6oTOHxMGGriWNJZzyLPUK8H7VHpqKntegnW8KLyGA9zwuNaCoopl40LTpg==", "requires": { "punycode": "2.1.0" } @@ -6958,7 +6950,7 @@ "requires": { "buffer-from": "1.0.0", "inherits": "2.0.3", - "readable-stream": "2.3.5", + "readable-stream": "2.3.6", "typedarray": "0.0.6" } }, @@ -7048,15 +7040,15 @@ } }, "jdbc": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/jdbc/-/jdbc-0.6.1.tgz", - "integrity": "sha512-5wfgTPWEgG10fd/Bw+mV0yvU4gxvQYdqxztgvKg0t8SieezzNL9n6d+fU1RZLyjuXK9mjfgjKHLZPHf/cTIxvg==", + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/jdbc/-/jdbc-0.6.2.tgz", + "integrity": "sha512-YDvU1ruM+6/Rjk4XcN5gfMVg8jdIWDMhJyLz3ZLM+Gu6PxeoURb5Ol2gVFhMaeNP78FPShRGq8FF6WmNrH6AwA==", "requires": { "async": "2.6.0", "java": "0.9.1", "lodash": "4.17.5", "uuid": "3.2.1", - "winston": "2.4.1" + "winston": "2.4.2" }, "dependencies": { "colors": { @@ -7065,9 +7057,9 @@ "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=" }, "winston": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/winston/-/winston-2.4.1.tgz", - "integrity": "sha512-k/+Dkzd39ZdyJHYkuaYmf4ff+7j+sCIy73UCOWHYA67/WXU+FF/Y6PF28j+Vy7qNRPHWO+dR+/+zkoQWPimPqg==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/winston/-/winston-2.4.2.tgz", + "integrity": "sha512-4S/Ad4ZfSNl8OccCLxnJmNISWcm2joa6Q0YGDxlxMzH0fgSwWsjMt+SmlNwCqdpaPg3ev1HKkMBsIiXeSUwpbA==", "requires": { "async": "1.0.0", "colors": "1.0.3", @@ -7091,7 +7083,7 @@ "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-22.4.3.tgz", "integrity": "sha512-/QqGvCDP5oZOF6PebDuLwrB2BMD8ffJv6TAGAdEVuDx1+uEgrHpSFrfrOiMRx2eJ1hgNjlQrOQEHetVwij90KA==", "requires": { - "chalk": "2.3.2", + "chalk": "2.4.0", "diff": "3.5.0", "jest-get-type": "22.4.3", "pretty-format": "22.4.3" @@ -7106,19 +7098,19 @@ } }, "chalk": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz", - "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz", + "integrity": "sha512-Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw==", "requires": { "ansi-styles": "3.2.1", "escape-string-regexp": "1.0.5", - "supports-color": "5.3.0" + "supports-color": "5.4.0" } }, "supports-color": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz", - "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", "requires": { "has-flag": "3.0.0" } @@ -7135,7 +7127,7 @@ "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-22.4.3.tgz", "integrity": "sha512-lsEHVaTnKzdAPR5t4B6OcxXo9Vy4K+kRRbG5gtddY8lBEC+Mlpvm1CJcsMESRjzUhzkz568exMV1hTB76nAKbA==", "requires": { - "chalk": "2.3.2", + "chalk": "2.4.0", "jest-get-type": "22.4.3", "pretty-format": "22.4.3" }, @@ -7149,19 +7141,19 @@ } }, "chalk": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz", - "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz", + "integrity": "sha512-Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw==", "requires": { "ansi-styles": "3.2.1", "escape-string-regexp": "1.0.5", - "supports-color": "5.3.0" + "supports-color": "5.4.0" } }, "supports-color": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz", - "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", "requires": { "has-flag": "3.0.0" } @@ -7174,7 +7166,7 @@ "integrity": "sha512-iAMeKxhB3Se5xkSjU0NndLLCHtP4n+GtCqV0bISKA5dmOXQfEbdEmYiu2qpnWBDCQdEafNDDU6Q+l6oBMd/+BA==", "requires": { "@babel/code-frame": "7.0.0-beta.44", - "chalk": "2.3.2", + "chalk": "2.4.0", "micromatch": "2.3.11", "slash": "1.0.0", "stack-utils": "1.0.1" @@ -7189,19 +7181,19 @@ } }, "chalk": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz", - "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz", + "integrity": "sha512-Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw==", "requires": { "ansi-styles": "3.2.1", "escape-string-regexp": "1.0.5", - "supports-color": "5.3.0" + "supports-color": "5.4.0" } }, "supports-color": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz", - "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", "requires": { "has-flag": "3.0.0" } @@ -7265,7 +7257,7 @@ "integrity": "sha512-z0FNlV4NGgjQN1fdtHYXf5kmgludM65fG/JlXzU6+rwkt9U5UWuXVYnXa2FpK0u6+qBuCmrm5byPNuiiddAHvQ==", "requires": { "hoek": "4.2.1", - "isemail": "3.1.1", + "isemail": "3.1.2", "topo": "2.0.2" } }, @@ -7500,9 +7492,9 @@ } }, "jsdom": { - "version": "11.7.0", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.7.0.tgz", - "integrity": "sha512-9NzSc4Iz4gN9p4uoPbBUzro21QdgL32swaWIaWS8eEVQ2I69fRJAy/MKyvlEIk0V7HtKgfMbbOKyTZUrzR2Hsw==", + "version": "11.8.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.8.0.tgz", + "integrity": "sha512-fZZSH6P8tVqYIQl0WKpZuQljPu2cW41Uj/c9omtyGwjwZCB8c82UAi7BSQs/F1FgWovmZsoU02z3k28eHp0Cdw==", "requires": { "abab": "1.0.4", "acorn": "5.5.3", @@ -7514,7 +7506,7 @@ "domexception": "1.0.1", "escodegen": "1.9.1", "html-encoding-sniffer": "1.0.2", - "left-pad": "1.2.0", + "left-pad": "1.3.0", "nwmatcher": "1.4.4", "parse5": "4.0.0", "pn": "1.1.0", @@ -7574,14 +7566,14 @@ "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" }, "json-schema-ref-parser": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/json-schema-ref-parser/-/json-schema-ref-parser-4.1.1.tgz", - "integrity": "sha512-lByoCHZ6H2zgb6NtsXIqtzQ+6Ji7iVqnrhWxsXLhF+gXmgu6E8+ErpDxCMR439MUG1nfMjWI2HAoM8l0XgSNhw==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/json-schema-ref-parser/-/json-schema-ref-parser-5.0.3.tgz", + "integrity": "sha512-RCZE9RpvMG2zY+dSSQkqHxsCYaqBYlh/u2PWWRdWMvtaH718YqR73lYu4IW4cGNxJIkUnIgTMuJtp+A1tIn4+w==", "requires": { "call-me-maybe": "1.0.1", "debug": "3.1.0", "js-yaml": "3.11.0", - "ono": "4.0.3" + "ono": "4.0.5" }, "dependencies": { "esprima": { @@ -7599,9 +7591,9 @@ } }, "ono": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/ono/-/ono-4.0.3.tgz", - "integrity": "sha512-7QIxG4UB00H7CR7fhXC/U7VhB5DK9wsYLwaYBui1JmQoXtLkhIBn3fbuk6FgAP+ctWeBsWVTM+R/bThvUZN+ww==", + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/ono/-/ono-4.0.5.tgz", + "integrity": "sha512-ZVNuV9kJbr/2tWs83I2snrYo+WIS0DISF/xUfX9p9b6GyDD6F5N9PzHjW+p/dep6IGwSYylf1HCub5I/nM0R5Q==", "requires": { "format-util": "1.0.3" } @@ -7825,7 +7817,7 @@ "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz", "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=", "requires": { - "readable-stream": "2.3.5" + "readable-stream": "2.3.6" } }, "lcid": { @@ -7842,9 +7834,9 @@ "integrity": "sha1-6w1GtUER68VhrLTECO+TY73I9+A=" }, "left-pad": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.2.0.tgz", - "integrity": "sha1-0wpzxrggHY99jnlWupYWCHpo4O4=" + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz", + "integrity": "sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==" }, "levn": { "version": "0.3.0", @@ -7894,17 +7886,15 @@ "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" }, "braces": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.1.tgz", - "integrity": "sha512-SO5lYHA3vO6gz66erVvedSCkp7AKWdv6VcQ2N4ysXfPxdAlxAMMAdwegGGcv1Bqwm7naF1hNdk5d6AAIEHV2nQ==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", + "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "requires": { "arr-flatten": "1.1.0", "array-unique": "0.3.2", - "define-property": "1.0.0", "extend-shallow": "2.0.1", "fill-range": "4.0.0", "isobject": "3.0.1", - "kind-of": "6.0.2", "repeat-element": "1.1.2", "snapdragon": "0.8.2", "snapdragon-node": "2.1.1", @@ -7912,14 +7902,6 @@ "to-regex": "3.0.2" }, "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "requires": { - "is-descriptor": "1.0.2" - } - }, "extend-shallow": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", @@ -7968,6 +7950,42 @@ "is-extendable": "0.1.1" } }, + "is-accessor-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "is-data-descriptor": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, "is-descriptor": { "version": "0.1.6", "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", @@ -8051,39 +8069,29 @@ } }, "is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - } + "kind-of": "6.0.2" } }, "is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - } + "kind-of": "6.0.2" + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "requires": { + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" } }, "is-extglob": { @@ -8134,7 +8142,7 @@ "requires": { "arr-diff": "4.0.0", "array-unique": "0.3.2", - "braces": "2.3.1", + "braces": "2.3.2", "define-property": "2.0.2", "extend-shallow": "3.0.2", "extglob": "2.0.4", @@ -8406,9 +8414,9 @@ } }, "logform": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/logform/-/logform-1.4.0.tgz", - "integrity": "sha512-1NT2VkhmDcVZD8+IHz0tEwymjEQCbY5YFHPani8t5Lo5ZO2fI2a448gIZ+kWIzk69EBfC1S1u/TZ5AjcWW/NFA==", + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/logform/-/logform-1.4.2.tgz", + "integrity": "sha512-6fk2qTAHUpUAQ6Gzlly3v8KzdCjsN9T8tMW6aRpoNYjfE9na+DY6Bg3T31j28GloqcSl2VmkvZ8t6BjOdCfP6w==", "requires": { "colors": "1.2.1", "fecha": "2.3.3" @@ -8460,11 +8468,18 @@ } }, "make-iterator": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.0.tgz", - "integrity": "sha1-V7713IXSOSO6I3ZzJNjo+PPZaUs=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz", + "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==", "requires": { - "kind-of": "3.2.2" + "kind-of": "6.0.2" + }, + "dependencies": { + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" + } } }, "map-cache": { @@ -8766,9 +8781,9 @@ "integrity": "sha1-67Opd+evHGg65v2hK1Raa6bFhT0=" }, "mocha": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.0.5.tgz", - "integrity": "sha512-3MM3UjZ5p8EJrYpG7s+29HAI9G7sTzKEe4+w37Dg0QP7qL4XGsV+Q2xet2cE37AqdgN1OtYQB6Vl98YiPV3PgA==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.1.1.tgz", + "integrity": "sha512-kKKs/H1KrMMQIEsWNxGmb4/BGsmj0dkeyotEvbrAuQ01FcWRLssUNXCEUZk6SZtyJBi6EE7SL0zDDtItw1rGhw==", "requires": { "browser-stdout": "1.3.1", "commander": "2.11.0", @@ -8778,6 +8793,7 @@ "glob": "7.1.2", "growl": "1.10.3", "he": "1.1.1", + "minimatch": "3.0.4", "mkdirp": "0.5.1", "supports-color": "4.4.0" }, @@ -8809,16 +8825,16 @@ "dev": true }, "moment": { - "version": "2.22.0", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.22.0.tgz", - "integrity": "sha512-1muXCh8jb1N/gHRbn9VDUBr0GYb8A/aVcHlII9QSB68a50spqEVLIGN6KVmCOnSvJrUhC0edGgKU5ofnGXdYdg==" + "version": "2.22.1", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.22.1.tgz", + "integrity": "sha512-shJkRTSebXvsVqk56I+lkb2latjBs8I+pc2TzWc545y2iFnSjm7Wg0QMh+ZWcdSLQyGEau5jI8ocnmkyTgr9YQ==" }, "moment-timezone": { - "version": "0.5.14", - "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.14.tgz", - "integrity": "sha1-TrOP+VOLgBCLpGekWPPtQmjM/LE=", + "version": "0.5.16", + "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.16.tgz", + "integrity": "sha512-4d1l92plNNqnMkqI/7boWNVXJvwGL2WyByl1Hxp3h/ao3HZiAqaoQY+6KBkYdiN5QtNDpndq+58ozl8W4GVoNw==", "requires": { - "moment": "2.22.0" + "moment": "2.22.1" } }, "mongodb": { @@ -8849,6 +8865,14 @@ "string_decoder": "1.0.3", "util-deprecate": "1.0.2" } + }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "requires": { + "safe-buffer": "5.1.1" + } } } }, @@ -8990,6 +9014,14 @@ "string_decoder": "1.0.3", "util-deprecate": "1.0.2" } + }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "requires": { + "safe-buffer": "5.1.1" + } } } }, @@ -9040,9 +9072,9 @@ } }, "natives": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.2.tgz", - "integrity": "sha512-5bRASydE1gu6zPOenLN043++J8xj1Ob7ArkfdYO3JN4DF5rDmG7bMoiybkTyD+GnXQEMixVeDHMzuqm6kpBmiA==" + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.3.tgz", + "integrity": "sha512-BZGSYV4YOLxzoTK73l0/s/0sH9l8SHs2ocReMH1f8JYSh5FUWu4ZrKCpJdRkWXV6HFR/pZDz7bwWOVAY07q77g==" }, "natural-compare": { "version": "1.4.0", @@ -13096,11 +13128,27 @@ } } }, - "npm-run-path": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", - "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", - "requires": { + "npm-bundled": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.3.tgz", + "integrity": "sha512-ByQ3oJ/5ETLyglU2+8dBObvhfWXX8dtPZDMePCahptliFX2iIuhyEszyFk401PZUNQH20vvdW5MLjJxkwU80Ow==", + "optional": true + }, + "npm-packlist": { + "version": "1.1.10", + "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.10.tgz", + "integrity": "sha512-AQC0Dyhzn4EiYEfIUjCdMl0JJ61I2ER9ukf/sLxJUcZHfo+VyEfz2rMJgLZSS1v30OxPQe1cN0LZA1xbcaVfWA==", + "optional": true, + "requires": { + "ignore-walk": "3.0.1", + "npm-bundled": "1.0.3" + } + }, + "npm-run-path": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", + "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", + "requires": { "path-key": "2.0.1" } }, @@ -13143,9 +13191,9 @@ "integrity": "sha512-3iuY4N5dhgMpCUrOVnuAdGrgxVqV2cJpM+XNccjR2DKOB1RUP0aA+wGXEiNziG/UKboFyGBIoKOaNlJxx8bciQ==" }, "nyc": { - "version": "11.6.0", - "resolved": "https://registry.npmjs.org/nyc/-/nyc-11.6.0.tgz", - "integrity": "sha512-ZaXCh0wmbk2aSBH2B5hZGGvK2s9aM8DIm2rVY+BG3Fx8tUS+bpJSswUVZqOD1YfCmnYRFSqgYJSr7UeeUcW0jg==", + "version": "11.7.1", + "resolved": "https://registry.npmjs.org/nyc/-/nyc-11.7.1.tgz", + "integrity": "sha512-EGePURSKUEpS1jWnEKAMhY+GWZzi7JC+f8iBDOATaOsLZW5hM/9eYx2dHGaEXa1ITvMm44CJugMksvP3NwMQMw==", "dev": true, "requires": { "archy": "1.0.0", @@ -13163,7 +13211,7 @@ "istanbul-lib-instrument": "1.10.1", "istanbul-lib-report": "1.1.3", "istanbul-lib-source-maps": "1.2.3", - "istanbul-reports": "1.3.0", + "istanbul-reports": "1.4.0", "md5-hex": "1.3.0", "merge-source-map": "1.1.0", "micromatch": "2.3.11", @@ -13254,7 +13302,7 @@ "dev": true }, "atob": { - "version": "2.0.3", + "version": "2.1.0", "bundled": true, "dev": true }, @@ -13296,7 +13344,7 @@ "bundled": true, "dev": true, "requires": { - "core-js": "2.5.3", + "core-js": "2.5.5", "regenerator-runtime": "0.11.1" } }, @@ -13324,7 +13372,7 @@ "babylon": "6.18.0", "debug": "2.6.9", "globals": "9.18.0", - "invariant": "2.2.3", + "invariant": "2.2.4", "lodash": "4.17.5" } }, @@ -13371,10 +13419,41 @@ "is-descriptor": "1.0.2" } }, + "is-accessor-descriptor": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "6.0.2" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "6.0.2" + } + }, + "is-descriptor": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "requires": { + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" + } + }, "isobject": { "version": "3.0.1", "bundled": true, "dev": true + }, + "kind-of": { + "version": "6.0.2", + "bundled": true, + "dev": true } } }, @@ -13482,61 +13561,10 @@ "is-descriptor": "0.1.6" } }, - "is-accessor-descriptor": { - "version": "0.1.6", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "bundled": true, - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-data-descriptor": { - "version": "0.1.4", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "bundled": true, - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-descriptor": { - "version": "0.1.6", - "bundled": true, - "dev": true, - "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" - } - }, "isobject": { "version": "3.0.1", "bundled": true, "dev": true - }, - "kind-of": { - "version": "5.1.0", - "bundled": true, - "dev": true } } }, @@ -13599,7 +13627,7 @@ "dev": true }, "core-js": { - "version": "2.5.3", + "version": "2.5.5", "bundled": true, "dev": true }, @@ -13652,10 +13680,41 @@ "isobject": "3.0.1" }, "dependencies": { + "is-accessor-descriptor": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "6.0.2" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "6.0.2" + } + }, + "is-descriptor": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "requires": { + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" + } + }, "isobject": { "version": "3.0.1", "bundled": true, "dev": true + }, + "kind-of": { + "version": "6.0.2", + "bundled": true, + "dev": true } } }, @@ -13992,7 +14051,7 @@ "dev": true }, "invariant": { - "version": "2.2.3", + "version": "2.2.4", "bundled": true, "dev": true, "requires": { @@ -14005,18 +14064,11 @@ "dev": true }, "is-accessor-descriptor": { - "version": "1.0.0", + "version": "0.1.6", "bundled": true, "dev": true, "requires": { - "kind-of": "6.0.2" - }, - "dependencies": { - "kind-of": { - "version": "6.0.2", - "bundled": true, - "dev": true - } + "kind-of": "3.2.2" } }, "is-arrayish": { @@ -14038,32 +14090,25 @@ } }, "is-data-descriptor": { - "version": "1.0.0", + "version": "0.1.4", "bundled": true, "dev": true, "requires": { - "kind-of": "6.0.2" - }, - "dependencies": { - "kind-of": { - "version": "6.0.2", - "bundled": true, - "dev": true - } + "kind-of": "3.2.2" } }, "is-descriptor": { - "version": "1.0.2", + "version": "0.1.6", "bundled": true, "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "0.1.6", + "is-data-descriptor": "0.1.4", + "kind-of": "5.1.0" }, "dependencies": { "kind-of": { - "version": "6.0.2", + "version": "5.1.0", "bundled": true, "dev": true } @@ -14265,7 +14310,7 @@ } }, "istanbul-reports": { - "version": "1.3.0", + "version": "1.4.0", "bundled": true, "dev": true, "requires": { @@ -14568,39 +14613,6 @@ "requires": { "is-descriptor": "0.1.6" } - }, - "is-accessor-descriptor": { - "version": "0.1.6", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "3.2.2" - } - }, - "is-data-descriptor": { - "version": "0.1.4", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "3.2.2" - } - }, - "is-descriptor": { - "version": "0.1.6", - "bundled": true, - "dev": true, - "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" - }, - "dependencies": { - "kind-of": { - "version": "5.1.0", - "bundled": true, - "dev": true - } - } } } }, @@ -15056,57 +15068,6 @@ "requires": { "is-extendable": "0.1.1" } - }, - "is-accessor-descriptor": { - "version": "0.1.6", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "bundled": true, - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-data-descriptor": { - "version": "0.1.4", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "bundled": true, - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-descriptor": { - "version": "0.1.6", - "bundled": true, - "dev": true, - "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" - } - }, - "kind-of": { - "version": "5.1.0", - "bundled": true, - "dev": true } } }, @@ -15128,10 +15089,41 @@ "is-descriptor": "1.0.2" } }, + "is-accessor-descriptor": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "6.0.2" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "6.0.2" + } + }, + "is-descriptor": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "requires": { + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" + } + }, "isobject": { "version": "3.0.1", "bundled": true, "dev": true + }, + "kind-of": { + "version": "6.0.2", + "bundled": true, + "dev": true } } }, @@ -15153,7 +15145,7 @@ "bundled": true, "dev": true, "requires": { - "atob": "2.0.3", + "atob": "2.1.0", "decode-uri-component": "0.2.0", "resolve-url": "0.2.1", "source-map-url": "0.4.0", @@ -15230,57 +15222,6 @@ "requires": { "is-descriptor": "0.1.6" } - }, - "is-accessor-descriptor": { - "version": "0.1.6", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "bundled": true, - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-data-descriptor": { - "version": "0.1.4", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "bundled": true, - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-descriptor": { - "version": "0.1.6", - "bundled": true, - "dev": true, - "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" - } - }, - "kind-of": { - "version": "5.1.0", - "bundled": true, - "dev": true } } }, @@ -15340,7 +15281,7 @@ "dev": true, "requires": { "arrify": "1.0.1", - "micromatch": "3.1.9", + "micromatch": "3.1.10", "object-assign": "4.1.1", "read-pkg-up": "1.0.1", "require-main-filename": "1.0.1" @@ -15357,17 +15298,15 @@ "dev": true }, "braces": { - "version": "2.3.1", + "version": "2.3.2", "bundled": true, "dev": true, "requires": { "arr-flatten": "1.1.0", "array-unique": "0.3.2", - "define-property": "1.0.0", "extend-shallow": "2.0.1", "fill-range": "4.0.0", "isobject": "3.0.1", - "kind-of": "6.0.2", "repeat-element": "1.1.2", "snapdragon": "0.8.2", "snapdragon-node": "2.1.1", @@ -15375,14 +15314,6 @@ "to-regex": "3.0.2" }, "dependencies": { - "define-property": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "is-descriptor": "1.0.2" - } - }, "extend-shallow": { "version": "2.0.1", "bundled": true, @@ -15415,12 +15346,48 @@ "is-descriptor": "0.1.6" } }, - "extend-shallow": { - "version": "2.0.1", + "extend-shallow": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + }, + "is-accessor-descriptor": { + "version": "0.1.6", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "bundled": true, + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "is-data-descriptor": { + "version": "0.1.4", "bundled": true, "dev": true, "requires": { - "is-extendable": "0.1.1" + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "bundled": true, + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } } }, "is-descriptor": { @@ -15495,39 +15462,29 @@ } }, "is-accessor-descriptor": { - "version": "0.1.6", + "version": "1.0.0", "bundled": true, "dev": true, "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "bundled": true, - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } + "kind-of": "6.0.2" } }, "is-data-descriptor": { - "version": "0.1.4", + "version": "1.0.0", "bundled": true, "dev": true, "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "bundled": true, - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } + "kind-of": "6.0.2" + } + }, + "is-descriptor": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "requires": { + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" } }, "is-number": { @@ -15559,13 +15516,13 @@ "dev": true }, "micromatch": { - "version": "3.1.9", + "version": "3.1.10", "bundled": true, "dev": true, "requires": { "arr-diff": "4.0.0", "array-unique": "0.3.2", - "braces": "2.3.1", + "braces": "2.3.2", "define-property": "2.0.2", "extend-shallow": "3.0.2", "extglob": "2.0.4", @@ -15945,39 +15902,6 @@ "requires": { "is-descriptor": "0.1.6" } - }, - "is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "requires": { - "kind-of": "3.2.2" - } - }, - "is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "requires": { - "kind-of": "3.2.2" - } - }, - "is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" - }, - "dependencies": { - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" - } - } } } }, @@ -16043,7 +15967,7 @@ "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=", "requires": { "for-own": "1.0.0", - "make-iterator": "1.0.0" + "make-iterator": "1.0.1" }, "dependencies": { "for-own": { @@ -16290,7 +16214,7 @@ "resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz", "integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==", "requires": { - "@types/node": "9.6.1" + "@types/node": "9.6.6" } }, "parseurl": { @@ -16602,7 +16526,7 @@ "fclone": "1.0.11", "gkt": "https://tgz.pm2.io/gkt-1.0.0.tgz", "mkdirp": "0.5.1", - "moment": "2.22.0", + "moment": "2.22.1", "needle": "2.2.0", "nssocket": "0.6.0", "pidusage": "1.2.0", @@ -16700,9 +16624,9 @@ "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=" }, "prebuild-install": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-2.5.1.tgz", - "integrity": "sha512-3DX9L6pzwc1m1ksMkW3Ky2WLgPQUBiySOfXVl3WZyAeJSyJb4wtoH9OmeRGcubAWsMlLiL8BTHbwfm/jPQE9Ag==", + "version": "2.5.3", + "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-2.5.3.tgz", + "integrity": "sha512-/rI36cN2g7vDQnKWN8Uzupi++KjyqS9iS+/fpwG4Ea8d0Pip0PQ5bshUNzVwt+/D2MRfhVAplYMMvWLqWrCF/g==", "requires": { "detect-libc": "1.0.3", "expand-template": "1.1.0", @@ -16821,9 +16745,9 @@ } }, "promish": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/promish/-/promish-5.0.2.tgz", - "integrity": "sha1-JUaobHnZFAirQOnYbIiWPqTH6bg=", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/promish/-/promish-5.0.3.tgz", + "integrity": "sha512-sdIrKZx85mPg9pcTHIZVsCcE1sc5IfLt5ICdidNyNUfrz+0G6Ko3ax1W0qTFjZvT6vGU+pz11I3ckpoBaTburg==", "requires": { "es6-promise": "3.2.1" } @@ -17271,7 +17195,7 @@ "integrity": "sha1-NcPhd/IHjveJ7kv6+kNzB06u9Po=", "requires": { "pinkie-promise": "2.0.1", - "readable-stream": "2.3.5" + "readable-stream": "2.3.6" } }, "read-last-lines": { @@ -17488,16 +17412,16 @@ } }, "readable-stream": { - "version": "2.3.5", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz", - "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==", + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "requires": { "core-util-is": "1.0.2", "inherits": "2.0.3", "isarray": "1.0.0", "process-nextick-args": "2.0.0", "safe-buffer": "5.1.1", - "string_decoder": "1.0.3", + "string_decoder": "1.1.1", "util-deprecate": "1.0.2" } }, @@ -17508,7 +17432,7 @@ "requires": { "graceful-fs": "4.1.11", "minimatch": "3.0.4", - "readable-stream": "2.3.5", + "readable-stream": "2.3.6", "set-immediate-shim": "1.0.1" } }, @@ -17627,7 +17551,7 @@ "integrity": "sha512-8H7Ehijd4js+s6wuVPLjwORxD4zeuyjYugprdOXlPSqaApmL/QOy+EB/beICHVCHkGMKNh5rvihb5ov+IDw4mg==", "requires": { "aws-sign2": "0.7.0", - "aws4": "1.6.0", + "aws4": "1.7.0", "caseless": "0.12.0", "combined-stream": "1.0.6", "extend": "3.0.1", @@ -18055,7 +17979,7 @@ "fs-copy-file-sync": "1.0.1", "nan": "2.10.0", "npmlog": "4.1.2", - "prebuild-install": "2.5.1", + "prebuild-install": "2.5.3", "semver": "5.5.0", "simple-get": "2.7.0", "tar": "4.4.1", @@ -18112,21 +18036,6 @@ "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.0.tgz", "integrity": "sha1-c0TLuLbib7J9ZrL8hvn21Zl1IcY=" }, - "simple-elasticsearch": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/simple-elasticsearch/-/simple-elasticsearch-0.2.1.tgz", - "integrity": "sha1-ZdscSP6nhjMG9ZGtaJ2ZVkAHQ6g=", - "requires": { - "qs": "0.5.6" - }, - "dependencies": { - "qs": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz", - "integrity": "sha1-MbGtBYVnZRxSaSFQa5qHk5EaA4Q=" - } - } - }, "simple-get": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-2.7.0.tgz", @@ -18269,57 +18178,6 @@ "is-extendable": "0.1.1" } }, - "is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" - } - }, - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" - }, "source-map": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", @@ -18345,10 +18203,41 @@ "is-descriptor": "1.0.2" } }, + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "requires": { + "kind-of": "6.0.2" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "requires": { + "kind-of": "6.0.2" + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "requires": { + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" + } + }, "isobject": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + }, + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" } } }, @@ -18524,14 +18413,14 @@ } }, "chalk": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz", - "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz", + "integrity": "sha512-Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw==", "dev": true, "requires": { "ansi-styles": "3.2.1", "escape-string-regexp": "1.0.5", - "supports-color": "5.3.0" + "supports-color": "5.4.0" } }, "eslint": { @@ -18542,7 +18431,7 @@ "requires": { "ajv": "5.5.2", "babel-code-frame": "6.26.0", - "chalk": "2.3.2", + "chalk": "2.4.0", "concat-stream": "1.6.2", "cross-spawn": "5.1.0", "debug": "3.1.0", @@ -18698,9 +18587,9 @@ "dev": true }, "supports-color": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz", - "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", "dev": true, "requires": { "has-flag": "3.0.0" @@ -18758,57 +18647,6 @@ "requires": { "is-descriptor": "0.1.6" } - }, - "is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" - } - }, - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" } } }, @@ -18832,7 +18670,7 @@ "resolved": "https://registry.npmjs.org/stream-meter/-/stream-meter-1.0.4.tgz", "integrity": "sha1-Uq+Vql6nYKJJFxZwTb/5D3Ov3R0=", "requires": { - "readable-stream": "2.3.5" + "readable-stream": "2.3.6" } }, "stream-rotate": { @@ -18941,9 +18779,9 @@ } }, "string_decoder": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "requires": { "safe-buffer": "5.1.1" } @@ -19043,7 +18881,7 @@ "methods": "1.1.2", "mime": "1.4.1", "qs": "6.5.1", - "readable-stream": "2.3.5" + "readable-stream": "2.3.6" }, "dependencies": { "async": { @@ -19092,7 +18930,7 @@ "multer": "0.1.8", "ono": "1.0.22", "swagger-methods": "1.0.4", - "swagger-parser": "4.0.2", + "swagger-parser": "4.1.0", "tmp": "0.0.27", "tv4": "1.3.0", "type-is": "1.6.16" @@ -19127,23 +18965,23 @@ "integrity": "sha512-xrKFLbrZ6VxRsg+M3uJozJtsEpNI/aPfZsOkoEjXw8vhAqdMIqwTYGj1f4dmUgvJvCdZhV5iArgtqXgs403ltg==" }, "swagger-parser": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/swagger-parser/-/swagger-parser-4.0.2.tgz", - "integrity": "sha512-hKslog8LhsXICJ1sMLsA8b8hQ3oUEX0457aLCFJc4zz6m8drmnCtyjbVqS5HycaKFOKVolJc2wFoe8KDPWfp4g==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/swagger-parser/-/swagger-parser-4.1.0.tgz", + "integrity": "sha512-XVa4cBnl33enMropuqwM2vJHqsDNZEK5Bl33e8OzbA4V7ZRd7XFxOtPzA59xg4Qaby4r5hJflfEknrmaTmzuIg==", "requires": { "call-me-maybe": "1.0.1", "debug": "3.1.0", - "json-schema-ref-parser": "4.1.1", - "ono": "4.0.3", + "json-schema-ref-parser": "5.0.3", + "ono": "4.0.5", "swagger-methods": "1.0.4", "swagger-schema-official": "2.0.0-bab6bed", "z-schema": "3.19.1" }, "dependencies": { "ono": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/ono/-/ono-4.0.3.tgz", - "integrity": "sha512-7QIxG4UB00H7CR7fhXC/U7VhB5DK9wsYLwaYBui1JmQoXtLkhIBn3fbuk6FgAP+ctWeBsWVTM+R/bThvUZN+ww==", + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/ono/-/ono-4.0.5.tgz", + "integrity": "sha512-ZVNuV9kJbr/2tWs83I2snrYo+WIS0DISF/xUfX9p9b6GyDD6F5N9PzHjW+p/dep6IGwSYylf1HCub5I/nM0R5Q==", "requires": { "format-util": "1.0.3" } @@ -19173,7 +19011,7 @@ "requires": { "ajv": "5.5.2", "ajv-keywords": "2.1.1", - "chalk": "2.3.2", + "chalk": "2.4.0", "lodash": "4.17.5", "slice-ansi": "1.0.0", "string-width": "2.1.1" @@ -19189,20 +19027,20 @@ } }, "chalk": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz", - "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz", + "integrity": "sha512-Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw==", "dev": true, "requires": { "ansi-styles": "3.2.1", "escape-string-regexp": "1.0.5", - "supports-color": "5.3.0" + "supports-color": "5.4.0" } }, "supports-color": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz", - "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", "dev": true, "requires": { "has-flag": "3.0.0" @@ -19260,7 +19098,7 @@ "requires": { "bl": "1.2.2", "end-of-stream": "1.4.1", - "readable-stream": "2.3.5", + "readable-stream": "2.3.6", "xtend": "4.0.1" } }, @@ -19369,7 +19207,7 @@ "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", "requires": { - "readable-stream": "2.3.5", + "readable-stream": "2.3.6", "xtend": "4.0.1" } }, @@ -19570,9 +19408,9 @@ "dev": true }, "uglify-js": { - "version": "3.3.18", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.18.tgz", - "integrity": "sha512-VhjIFv93KnTx/ntNi9yTBbfrsWnQnqUy02MT32uqU/5i2oEJ8GAEJ0AwYV206JeOmIzSjm41Ba0iXVKv6j7y9g==", + "version": "3.3.22", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.22.tgz", + "integrity": "sha512-tqw96rL6/BG+7LM5VItdhDjTQmL5zG/I0b2RqWytlgeHe2eydZHuBHdA9vuGpCDhH/ZskNGcqDhivoR2xt8RIw==", "requires": { "commander": "2.15.1", "source-map": "0.6.1" @@ -19589,7 +19427,7 @@ "resolved": "https://registry.npmjs.org/ui-router/-/ui-router-1.0.0-alpha0.tgz", "integrity": "sha1-8IYPLu8HwG2JIMHt7j9CykoU8dg=", "requires": { - "angular": "1.6.9" + "angular": "1.6.10" } }, "uid-safe": { @@ -19933,7 +19771,7 @@ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz", "integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=", "requires": { - "natives": "1.1.2" + "natives": "1.1.3" } }, "isarray": { @@ -20052,56 +19890,6 @@ "vow": "0.4.17" } }, - "vows": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/vows/-/vows-0.8.1.tgz", - "integrity": "sha1-4J6YjOWUygWgjXKrzKNOiNtVkTE=", - "requires": { - "diff": "1.0.8", - "eyes": "0.1.8", - "glob": "4.0.6" - }, - "dependencies": { - "diff": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/diff/-/diff-1.0.8.tgz", - "integrity": "sha1-NDJ2MI7Jkbe8giZ+1VvBQR+XFmY=" - }, - "glob": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-4.0.6.tgz", - "integrity": "sha1-aVxQvdTi+1xdNwsJHziNNwfikac=", - "requires": { - "graceful-fs": "3.0.11", - "inherits": "2.0.3", - "minimatch": "1.0.0", - "once": "1.4.0" - } - }, - "graceful-fs": { - "version": "3.0.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz", - "integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=", - "requires": { - "natives": "1.1.2" - } - }, - "lru-cache": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz", - "integrity": "sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=" - }, - "minimatch": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz", - "integrity": "sha1-4N0hILSeG3JM6NcUxSCCKpQ4V20=", - "requires": { - "lru-cache": "2.7.3", - "sigmund": "1.0.1" - } - } - } - }, "vxx": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/vxx/-/vxx-1.2.2.tgz", @@ -20285,27 +20073,26 @@ "integrity": "sha1-ugZWKbepJRMOFXeRCM9UCZDpjRs=" }, "winston": { - "version": "3.0.0-rc3", - "resolved": "https://registry.npmjs.org/winston/-/winston-3.0.0-rc3.tgz", - "integrity": "sha512-KPvs53IB5m6wMHAm4j5DgL8MkgfXZKjwNqzTr3IA8SijHTXeN6l8ebyR24rlCSVotuqtXhooFHvYLbA3fAViSw==", + "version": "3.0.0-rc5", + "resolved": "https://registry.npmjs.org/winston/-/winston-3.0.0-rc5.tgz", + "integrity": "sha512-BRYS7jsNkfLAqGu4dZW3kp6CmqiWKrComvfsIMYdsnpPre7g8BIw63nWRyX69vxyLYvZdszcEyxJkJmILXd/pA==", "requires": { "async": "2.6.0", "diagnostics": "1.1.0", - "isstream": "0.1.2", - "logform": "1.4.0", + "is-stream": "1.1.0", + "logform": "1.4.2", "one-time": "0.0.4", "stack-trace": "0.0.10", "triple-beam": "1.1.0", - "winston-transport": "3.0.1" + "winston-transport": "3.1.0" } }, "winston-compat": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/winston-compat/-/winston-compat-0.1.0.tgz", - "integrity": "sha512-EO4TiFrWGizbzSx0rF3jIeU4Lo2MlrtpnxOR8bKjckmlWdqDifl55nqDOqkFAFPsHRTvleD49hrBfZCWSnxwMw==", + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/winston-compat/-/winston-compat-0.1.1.tgz", + "integrity": "sha512-jX06xvtGj/4g9fySHLgx9VfD8Meh7yRuJcoqaDmaO7/SoD/meu2HmWcdwL+Tv+mpzG8M0cxgt/c+WPP6wwXKMg==", "requires": { - "cycle": "1.0.3", - "vows": "0.8.1" + "cycle": "1.0.3" } }, "winston-console-formatter": { @@ -20319,20 +20106,20 @@ } }, "winston-daily-rotate-file": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/winston-daily-rotate-file/-/winston-daily-rotate-file-3.0.1.tgz", - "integrity": "sha512-yUbP40cVxjbvyalvHO81/PnylRqpcdXRh50W240fhCmNKTzOgHJfeK2SDM5GGhBTvY1s3BfjCgHPx9zLSMjBbA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/winston-daily-rotate-file/-/winston-daily-rotate-file-3.1.2.tgz", + "integrity": "sha512-wMndBfs9N5kMKri7JoREegxD7FP+BKMVDa66qabcdJ62fZrUwl3DJnDC1QoLitKVIZQHwrC809jkax6sj2uq7g==", "requires": { "file-stream-rotator": "0.2.1", "semver": "5.5.0", "triple-beam": "1.1.0", - "winston-compat": "0.1.0" + "winston-compat": "0.1.1" } }, "winston-transport": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-3.0.1.tgz", - "integrity": "sha1-gAixXu9WYMT7P6CU1YzL0IUoxY0=" + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-3.1.0.tgz", + "integrity": "sha512-an7m67xdTagPQI7EAhP5HfN2QN+t5+beLwdA7RJi95PGtSrHKBM53mbmglGLGz2tVpF7iy8bdh6NQBMW+Aw9aw==" }, "with": { "version": "5.1.1", @@ -20460,13 +20247,13 @@ "resolved": "https://registry.npmjs.org/xlsjs/-/xlsjs-1.0.1.tgz", "integrity": "sha512-nHQw6je2wd/xcO2ZLsJ72YakfBavrTU8D4B+tGwhJQU5GNkwYlsvvADYfxVGu99R/TJUQDQojCOKPOkWZiUuTg==", "requires": { - "xlsx": "0.12.7" + "xlsx": "0.12.10" }, "dependencies": { "cfb": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/cfb/-/cfb-1.0.5.tgz", - "integrity": "sha512-z1BN+JkopTE4vYu0sx25da2ZFurcN8gUKcBpT2ThCDlNFtWBozId8AHMs4OS7jTPLCJYK30Ud7QgcioyGkkkbg==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/cfb/-/cfb-1.0.6.tgz", + "integrity": "sha512-HDWN8FEiZ5JbVZZqtlrR6K3aaC8FTO0benJrRtE93R2zY3nxNOb+Oda+fUnXFkibmY62+lUvb/Us/eDgkVWSZQ==", "requires": { "commander": "2.14.1", "printj": "1.1.2" @@ -20491,12 +20278,12 @@ } }, "xlsx": { - "version": "0.12.7", - "resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.12.7.tgz", - "integrity": "sha1-S3Z7fXHWtfVpKOnSEyMYBd+vhk4=", + "version": "0.12.10", + "resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.12.10.tgz", + "integrity": "sha1-wucb42TZDs4uCPC66RVjSDxIl/g=", "requires": { "adler-32": "1.2.0", - "cfb": "1.0.5", + "cfb": "1.0.6", "codepage": "1.12.2", "commander": "2.14.1", "crc-32": "1.2.0", @@ -20507,12 +20294,12 @@ } }, "xlsx": { - "version": "0.12.7", - "resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.12.7.tgz", - "integrity": "sha1-S3Z7fXHWtfVpKOnSEyMYBd+vhk4=", + "version": "0.12.10", + "resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.12.10.tgz", + "integrity": "sha1-wucb42TZDs4uCPC66RVjSDxIl/g=", "requires": { "adler-32": "1.2.0", - "cfb": "1.0.5", + "cfb": "1.0.6", "codepage": "1.12.2", "commander": "2.14.1", "crc-32": "1.2.0", @@ -20521,9 +20308,9 @@ }, "dependencies": { "cfb": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/cfb/-/cfb-1.0.5.tgz", - "integrity": "sha512-z1BN+JkopTE4vYu0sx25da2ZFurcN8gUKcBpT2ThCDlNFtWBozId8AHMs4OS7jTPLCJYK30Ud7QgcioyGkkkbg==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/cfb/-/cfb-1.0.6.tgz", + "integrity": "sha512-HDWN8FEiZ5JbVZZqtlrR6K3aaC8FTO0benJrRtE93R2zY3nxNOb+Oda+fUnXFkibmY62+lUvb/Us/eDgkVWSZQ==", "requires": { "commander": "2.14.1", "printj": "1.1.2" @@ -20571,7 +20358,7 @@ "integrity": "sha1-/x+TfcBi1PZ7glTYDaHAqJFCfwU=", "requires": { "async": "2.6.0", - "ejs": "2.5.8", + "ejs": "2.5.9", "node-forge": "0.7.5", "xmldom": "0.1.27", "xpath": "0.0.24" @@ -20718,7 +20505,7 @@ "archiver-utils": "1.3.0", "compress-commons": "1.2.2", "lodash": "4.17.5", - "readable-stream": "2.3.5" + "readable-stream": "2.3.6" } } } diff --git a/package.json b/package.json index b5dd6fd4..f6fdf80a 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "del": "^3.0.0", "dive": "^0.5.0", "ejs": "^2.5.7", - "elasticsearch": "^14.1.0", + "elasticsearch": "^14.2.1", "errorhandler": "^1.5.0", "etag": "^1.8.1", "excel-parser": "*", @@ -149,7 +149,6 @@ "server-destroy": "^1.0.1", "sha1": "^1.1.1", "sharp": "^0.20.1", - "simple-elasticsearch": "^0.2.1", "sleep": "^5.1.1", "slug": "^0.9.1", "stream-meter": "^1.0.4", diff --git a/public/app/js/services/window_service.js b/public/app/js/services/window_service.js index 484fe492..39879d38 100644 --- a/public/app/js/services/window_service.js +++ b/public/app/js/services/window_service.js @@ -97,8 +97,7 @@ angular.module("dendroApp.services") function guid () { - return s4() + s4() + "-" + s4() + "-" + s4() + "-" + - s4() + "-" + s4() + s4() + s4(); + return s4() + s4() + "-" + s4() + "-" + s4() + "-" + s4() + "-" + s4() + s4() + s4(); } var hiddenIFrameID = "hiddenDownloader_" + guid(); diff --git a/src/bootup/init/init_virtualbox.js b/src/bootup/init/init_virtualbox.js index 0b73b959..64ab0008 100644 --- a/src/bootup/init/init_virtualbox.js +++ b/src/bootup/init/init_virtualbox.js @@ -5,7 +5,7 @@ const VirtualBoxManager = require(Pathfinder.absPathInSrcFolder("utils/virtualbo const initVirtualBoxVM = function (app, callback) { - if (Config.virtualbox.active) + if (Config.virtualbox && Config.virtualbox.active) { try { diff --git a/src/kb/db.js b/src/kb/db.js index 37f881e0..e4698162 100644 --- a/src/kb/db.js +++ b/src/kb/db.js @@ -1029,7 +1029,8 @@ DbConnection.prototype.close = function (callback) { async.map(self.pool._pool, function (connection, cb) { - self.pool.release(connection, function(err, result){ + self.pool.release(connection, function (err, result) + { cb(null); }); }, function (err, results) diff --git a/test/utils/units/unitUtils.js b/test/utils/units/unitUtils.js index fbe30873..29adc363 100644 --- a/test/utils/units/unitUtils.js +++ b/test/utils/units/unitUtils.js @@ -190,7 +190,7 @@ exports.checkpointExists = function (checkpointIdentifier, callback) { callback(null, DockerCheckpointManager.checkpointExists(checkpointIdentifier)); } - else if (Config.virtualbox.active) + else if (Config.virtualbox && Config.virtualbox.active) { VirtualBoxManager.checkpointExists(checkpointIdentifier, callback); } @@ -226,7 +226,7 @@ exports.loadCheckpoint = function (checkpointIdentifier, callback) callback(1, "Error restoring Docker Checkpoint " + checkpointIdentifier); } } - else if (Config.virtualbox.active) + else if (Config.virtualbox && Config.virtualbox.active) { async.series([ function (callback) @@ -414,7 +414,7 @@ exports.runLoadFunctionsFromExistingCheckpointUntilUnit = function (checkpointed cb(err); }); } - else if (Config.virtualbox.active) + else if (Config.virtualbox && Config.virtualbox.active) { Logger.log("Halting app after loading databases for creating checkpoint: " + checkpointIdentifier); @@ -596,7 +596,7 @@ exports.setup = function (targetUnit, callback, forceLoad) callback(err, result); }); } - else if (Config.virtualbox.active) + else if (Config.virtualbox && Config.virtualbox.active) { exports.loadCheckpoint(checkpointIdentifier, function (err, result) {