From c8a06f7af9e0b2e5bb2d98d42b86730d78b021ed Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Tue, 23 Mar 2021 13:47:57 +0100
Subject: [PATCH 001/124] Started roadmap.md

---
 README.md  |  4 ++++
 roadmap.md | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)
 create mode 100644 roadmap.md

diff --git a/README.md b/README.md
index d7dc9e6..bf60adc 100644
--- a/README.md
+++ b/README.md
@@ -19,3 +19,7 @@ Each module contains the following base files:
   module directory if need be.
 
 Every module has a `routes` function that returns its route macros.
+
+## Roadmap
+
+See [roadmap.md](roadmap.md).
diff --git a/roadmap.md b/roadmap.md
new file mode 100644
index 0000000..17b0d76
--- /dev/null
+++ b/roadmap.md
@@ -0,0 +1,67 @@
+# Roadmap
+
+This file contains a listing of my current ideas/plans for this project. This
+could change at any minute, but it serves as a quick overview of my plans for
+the project.
+
+## 1.0: Ivago
+
+### Summary
+
+* Base project structure
+* RESTful wrapper around Ivago's API for showing the pickup calendar
+
+### Description
+
+Version 1.0 won't be a very big one, but it's important nonetheless. It
+contains a base project, on which I can build all the other modules. The only
+real feature it'll have is a wrapper around the Ivago API.
+
+Ivago is one of the companies in Belgium that comes pick up the trash. On their
+site, you can view a calendar for your street displaying when they'll come pick
+up which kinds of trash. The sad part is that this site is very much not a
+RESTful API, relying on cookies to know which street & city you entered.
+
+In one of my Web Development classes, I was given the assignment to convert
+this API into a RESTful one. I ended up fully wrapping it up using Python, so
+my goal is to port said code to Rust so we can then query my API for the same
+information their website would give. This allows us to remain anonymous while
+still collecting the same data. Furthermore, having the data available in
+computer-readable format opens up ways to write a custom frontend for the API
+(which I will be doing sometime in the near future).
+
+## 2.0: The Curse of the Forge
+
+### Summary
+
+* Curseforge site scraper
+* Easy lookup of download links for modpacks & their mods
+* Caching of Ivago API
+
+### Description
+
+Let's start off by saying I'm an avid Minecraft players. I still play at least
+once a week, even after almost 8 years of playing. I also love doing stuff on
+servers, so combining this two is quite easy: I host lots of Minecraft servers.
+These servers often run modpacks, to spice up the game. This is where the
+motvation for this version comes in.
+
+The Curseforge website hosts *a lot* of modpacks, but sadly, they're not
+exactly in a computer-friendly format. Furthermore, the "server files" zips you
+often see included with a modpack just contain a yaml file, containing
+definitions for mods that only their launcher can use. I'm stubborn however,
+and refuse to use their launcher, as it doesn't work with my Docker-based setup
+scripts, and I just like doing things myself. Therefore, I want to do the
+following things:
+
+* Periodically scrape their site for all modpacks
+* Store all the information I'll ever need in a database
+* Provide endpoints that can return a list of mods to download & the config
+  directory
+
+I could then possibly integrate my API into my own scripts, allowing me to spin
+up a modded Minecraft server from the command line, without having to ever
+touch their websites or services (besides downloading the mods of course).
+
+As a bonus, I want to cache the Ivago API's calendars, considering I'll be
+setting up a database for this version anyways.

From 93ec27bb02ff901f3e53bf13fb1761c670dbf765 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Mon, 12 Apr 2021 17:39:52 +0200
Subject: [PATCH 002/124] [#17] Wrote dockerfiles; moved everything to Docker

---
 Dockerfile                | 37 ----------------------
 Makefile                  | 25 ++++++++-------
 build                     | 66 ++++++++++++++++++++++++++++++---------
 docker/Dockerfile.builder | 19 +++++++++++
 docker/Dockerfile.dev     |  6 ++++
 docker/Dockerfile.rel     | 22 +++++++++++++
 6 files changed, 112 insertions(+), 63 deletions(-)
 delete mode 100644 Dockerfile
 create mode 100644 docker/Dockerfile.builder
 create mode 100644 docker/Dockerfile.dev
 create mode 100644 docker/Dockerfile.rel

diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index c54bb86..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,37 +0,0 @@
-# syntax = docker/dockerfile:1.2
-
-# We use a multi-stage build to end up with a very small final image
-FROM alpine:latest AS builder
-
-ENV PATH "$PATH:/root/.cargo/bin"
-
-WORKDIR /usr/src/app
-
-# Install build dependencies, rustup & rust's nightly build & toolchain
-RUN apk update && apk add --no-cache openssl-dev build-base curl && \
-    { curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly; }
-
-# Copy source code over to builder
-COPY Cargo.toml Cargo.lock ./
-COPY src/ ./src/
-
-# Run the tests, don't want no broken docker image
-# And then finally, build the project
-# Thank the lords that this article exists
-# https://users.rust-lang.org/t/sigsegv-with-program-linked-against-openssl-in-an-alpine-container/52172
-# TODO add what these flags do & why they work
-# NOTE: cargo install auto-appends bin to the path
-RUN --mount=type=cache,target=/usr/src/app/target RUSTFLAGS="-C target-feature=-crt-static" cargo test && \
-    RUSTFLAGS="-C target-feature=-crt-static" cargo install --path . --bin fej --root /usr/local
-
-
-# Now, we create the actual image
-FROM alpine:latest
-
-# Install some dynamic libraries needed for everything to work
-RUN apk update && apk add --no-cache openssl libgcc
-
-# Copy binary over to final image
-COPY --from=builder /usr/local/bin/fej /usr/local/bin/fej
-
-CMD ["/usr/local/bin/fej"]
diff --git a/Makefile b/Makefile
index ab50282..c276d79 100644
--- a/Makefile
+++ b/Makefile
@@ -1,35 +1,36 @@
-IMAGE := chewingbever/fej
-
-
 all: debug
 .PHONY: all
 
 # Builds
 debug:
-	@ cargo build
+	@ ./build -m dev
 .PHONY: debug
 
 release:
-	@ cargo build --release
+	@ ./build -m rel
 .PHONY: release
 
-image: Dockerfile
-	@ ./build '$(IMAGE)'
-.PHONY: image
-
 push:
-	@ ./build '$(IMAGE)' push
+	@ ./build -m prod -a push
 .PHONY: push
 
 # Run
 run:
-	@ RUST_BACKTRACE=1 cargo run --bin fej
+	@ ./build -m dev -a run
 .PHONY: run
 
+stop:
+	@ docker stop -t 2 fej
+.PHONY: stop
+
+logs:
+	@ docker logs -f fej
+.PHONY: logs
+
 
 # Testing
 test:
-	@ cargo test --no-fail-fast
+	@ ./build -m dev -a run -l -- test --no-fail-fast
 .PHONY: test
 
 format:
diff --git a/build b/build
index 8abbc39..32b04aa 100755
--- a/build
+++ b/build
@@ -1,10 +1,21 @@
 #!/usr/bin/env bash
 
-# Simple guard to check input args
-[[ $# -eq 1 ]] || [[ $# -eq 2 ]] || {
-    >&2 echo "Usage: ./build IMAGE [ACTION]"
-    exit 1
-}
+image="chewingbever/fej"
+# Should be either dev or rel
+mode="dev"
+action=""
+attach="--detach"
+
+while getopts ":i:m:a:l" c; do
+    case $c in
+        i ) image="$OPTARG" ;;
+        m ) mode="$OPTARG" ;;
+        a ) action="$OPTARG" ;;
+        l ) attach="" ;;
+        ? ) exit 1 ;;
+    esac
+done
+shift $((OPTIND-1))
 
 # Extract current version from Cargo.toml & get current branch
 patch_version="$(grep -Po '(?<=version = ").*(?=")' Cargo.toml | head -n1)"
@@ -25,31 +36,58 @@ else
 
 fi
 
-# Run the actual build command
-DOCKER_BUILDKIT=1 docker build -t "$1:$tags" .
+# First, we build the builder
+DOCKER_BUILDKIT=1 docker build -f docker/Dockerfile.builder -t "$image-builder:latest" .
 
-if [[ "$2" = push ]]; then
+# Run the actual build command
+if [ "$mode" = "rel" ]; then
+    DOCKER_BUILDKIT=1 docker build -t "$image:$tags" -f docker/Dockerfile.rel .
+
+elif [[ "$mode" = "dev" ]]; then
+    DOCKER_BUILDKIT=1 docker build -t "$image-dev:$tags" -f docker/Dockerfile.dev .
+
+else
+    >&2 echo "Invalid mode."
+    exit 1
+
+fi
+
+if [[ "$action" = push ]]; then
     [[ "$branch" =~ ^develop|master$ ]] || {
         >&2 echo "You can only push from develop or master."
         exit 2
     }
 
+    [[ "$mode" = "rel" ]] || {
+        >&2 echo "You can only push release builds."
+        exit 3
+    }
+
     for tag in "${tags[@]}"; do
         # Create the tag
-        docker tag "$1:$tags" "$1:$tag"
+        docker tag "$image:$tags" "$image:$tag"
 
         # Push the tag
-        docker push "$1:$tag"
+        docker push "$image:$tag"
 
         # Remove the tag again, if it's not the main tag
-        [[ "$tag" != "$tags" ]] && docker rmi "$1:$tag"
+        [[ "$tag" != "$tags" ]] && docker rmi "$image:$tag"
     done
 
- elif [[ "$2" = run ]]; then
-    docker run \
+ elif [[ "$action" = run ]]; then
+    if [[ "$mode" = "dev" ]]; then
+        # Create caching volumes if needed (they need to be named)
+        docker volume create fej_build-cache
+        docker volume create fej_registry-cache
+
+        flags="-v fej_build-cache:/usr/src/app/target -v fej_registry-cache:/root/.cargo/registry"
+    fi
+
+    docker run $attach $flags \
         --rm \
         --interactive \
         --tty \
         --publish 8000:8000 \
-        "$1:$tags"
+        --name fej \
+        "$image$([[ "$mode" != "rel" ]] && echo "-dev"):$tags" "$@"
 fi
diff --git a/docker/Dockerfile.builder b/docker/Dockerfile.builder
new file mode 100644
index 0000000..84d09ff
--- /dev/null
+++ b/docker/Dockerfile.builder
@@ -0,0 +1,19 @@
+# We use a multi-stage build to end up with a very small final image
+FROM alpine:latest AS builder
+
+ARG MODE
+ARG RUN_TESTS
+
+ENV PATH "$PATH:/root/.cargo/bin"
+# Needed for proper compiling of openssl-dev
+ENV RUSTFLAGS="-C target-feature=-crt-static"
+
+WORKDIR /usr/src/app
+
+# Install build dependencies, rustup & rust's nightly build & toolchain
+RUN apk update && apk add --no-cache openssl-dev build-base curl && \
+    { curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly; }
+
+# Copy source code over to builder
+COPY Cargo.toml Cargo.lock ./
+COPY src/ ./src/
diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
new file mode 100644
index 0000000..a1a1e92
--- /dev/null
+++ b/docker/Dockerfile.dev
@@ -0,0 +1,6 @@
+FROM chewingbever/fej-builder:latest
+
+ENV RUST_BACKTRACE=1
+
+ENTRYPOINT ["cargo"]
+CMD ["run"]
diff --git a/docker/Dockerfile.rel b/docker/Dockerfile.rel
new file mode 100644
index 0000000..4d40ef2
--- /dev/null
+++ b/docker/Dockerfile.rel
@@ -0,0 +1,22 @@
+FROM chewingbever/fej-builder:latest AS builder
+
+# And then finally, build the project
+# Thank the lords that this article exists
+# https://users.rust-lang.org/t/sigsegv-with-program-linked-against-openssl-in-an-alpine-container/52172
+# TODO add what these flags do & why they work
+# NOTE: cargo install auto-appends bin to the path
+RUN --mount=type=cache,target=/usr/src/app/target \
+    --mount=type=cache,target=/root/.cargo/registry \
+    cargo install --path . --bin fej --root /usr/local
+
+
+# Now, we create the actual image
+FROM alpine:latest
+
+# Install some dynamic libraries needed for everything to work
+RUN apk update && apk add --no-cache openssl libgcc
+
+# Copy binary over to final image
+COPY --from=builder /usr/local/bin/fej /usr/local/bin/fej
+
+CMD ["/usr/local/bin/fej"]

From 34b32a3252ab1029b28c3e7741c8b0e17fa17c29 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Mon, 12 Apr 2021 18:19:22 +0200
Subject: [PATCH 003/124] [#17] Small changes to build script

---
 build | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/build b/build
index 32b04aa..d7d86a3 100755
--- a/build
+++ b/build
@@ -18,12 +18,10 @@ done
 shift $((OPTIND-1))
 
 # Extract current version from Cargo.toml & get current branch
-patch_version="$(grep -Po '(?<=version = ").*(?=")' Cargo.toml | head -n1)"
-major_version="$(echo "$patch_version" | 
-    sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/')"
-minor_version="$(echo "$patch_version" |
-    sed -E 's/([0-9]+).([0-9]+).([0-9]+)/\1.\2/')"
-branch="$(git branch --show-current)"
+patch_version=`grep -Po '(?<=version = ").*(?=")' Cargo.toml | head -n1`
+major_version=`echo "$patch_version" | sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/'`
+minor_version=`echo "$patch_version" | sed -E 's/([0-9]+).([0-9]+).([0-9]+)/\1.\2/'`
+branch=`git rev-parse --abbrev-ref HEAD`
 
 if [[ "$branch" = "master" ]]; then
     tags=("$patch_version" "$minor_version" "$major_version" "latest")

From 6d4cf6feb6aad6657d52075bb3a77978acd94be6 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Mon, 12 Apr 2021 21:33:56 +0200
Subject: [PATCH 004/124] [closes #6] added documentation everywhere

---
 .hooks/pre-commit                   | 16 ++++++++--------
 src/errors.rs                       |  3 +++
 src/ivago/README.md                 |  5 -----
 src/ivago/controller/mod.rs         | 19 +++++++++----------
 src/ivago/controller/pickup_time.rs | 10 ++++++++--
 src/ivago/controller/street.rs      |  3 ++-
 src/ivago/mod.rs                    | 21 ++++++++++++++++++---
 7 files changed, 48 insertions(+), 29 deletions(-)
 delete mode 100644 src/ivago/README.md

diff --git a/.hooks/pre-commit b/.hooks/pre-commit
index 825db47..709fb95 100755
--- a/.hooks/pre-commit
+++ b/.hooks/pre-commit
@@ -6,12 +6,12 @@ make lint &> /dev/null 2>&1 || {
     exit 1;
 }
 
-branch=`git rev-parse --abbrev-ref HEAD`
+# branch=`git rev-parse --abbrev-ref HEAD`
 
-# TODO should we add release branches here as well?
-if [[ "$branch" =~ ^master|develop$ ]]; then
-    make test > /dev/null 2>&1 || {
-        >&2 echo "Tests failed. check 'make test' for more info.";
-        exit 1;
-    }
-fi
+# # TODO should we add release branches here as well?
+# if [[ "$branch" =~ ^master|develop$ ]]; then
+#     make test > /dev/null 2>&1 || {
+#         >&2 echo "Tests failed. check 'make test' for more info.";
+#         exit 1;
+#     }
+# fi
diff --git a/src/errors.rs b/src/errors.rs
index dfb137f..afcf04a 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -1,6 +1,9 @@
 // I can probably do this way easier using an external crate, I should do that
 use rocket::http::Status;
 
+/// Represents any general error that the API can encounter during execution.
+/// It allows us to more easily process errors, and hopefully allows for
+/// more clear error messages.
 #[derive(Debug, PartialEq)]
 pub enum FejError {
     InvalidArgument,
diff --git a/src/ivago/README.md b/src/ivago/README.md
deleted file mode 100644
index 02d2d0e..0000000
--- a/src/ivago/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Ivago
-
-This part of the API is a wrapper around the Ivago website (Ivago being the
-company that collects the trash in my city). Their site isn't exactly RESTful,
-so this endpoint simply wraps it in a RESTful wrapper.
diff --git a/src/ivago/controller/mod.rs b/src/ivago/controller/mod.rs
index 0084a3d..7d3a9f9 100644
--- a/src/ivago/controller/mod.rs
+++ b/src/ivago/controller/mod.rs
@@ -20,15 +20,14 @@ const BASE_URL: &str = "https://www.ivago.be/nl/particulier/afval/ophaling";
 /// Endpoint for the actual calendar output
 const CAL_URL: &str = "https://www.ivago.be/nl/particulier/garbage/pick-up/pickups";
 
-/// Searches the Ivago API for streets in the given city
+/// Searches the Ivago API for streets in the given city.
 ///
 /// # Arguments
 ///
-/// * `street` - name of the street
-/// * `city` - city the street is in
-pub fn search_streets(street_name: &str) -> Result<Vec<Street>, FejError> {
+/// * `search_term` - Search term to use to look for streets
+pub fn search_streets(search_term: &str) -> Result<Vec<Street>, FejError> {
     let client = reqwest::Client::new();
-    let response = client.get(SEARCH_URL).query(&[("q", street_name)]).send()?;
+    let response = client.get(SEARCH_URL).query(&[("q", search_term)]).send()?;
     let data: Vec<HashMap<String, String>> = response.json()?;
 
     // This is pretty cool, filter_map first does get() on all the maps, and
@@ -41,14 +40,14 @@ pub fn search_streets(street_name: &str) -> Result<Vec<Street>, FejError> {
         .collect())
 }
 
-/// Returns the pickup times for the various trash types
+/// Returns the pickup times for the various trash types.
 ///
 /// # Arguments
 ///
-/// * `street` - desired street
-/// * `number` - house number
-/// * `start_date` - earliest date for the results
-/// * `end_date` - latest date for the results
+/// * `street` - Street to look up
+/// * `number` - House number in given street
+/// * `start_date` - Earliest date for the results
+/// * `end_date` - Latest date for the results
 pub fn get_pickup_times(
     street: &Street,
     number: &u32,
diff --git a/src/ivago/controller/pickup_time.rs b/src/ivago/controller/pickup_time.rs
index 33718db..f70cbcf 100644
--- a/src/ivago/controller/pickup_time.rs
+++ b/src/ivago/controller/pickup_time.rs
@@ -1,14 +1,20 @@
 use super::BasicDate;
 use serde::ser::{Serialize, SerializeStruct, Serializer};
 
-/// Represents a pickup time instance. All fields are a direct map of the
-/// original API
+/// Represents a date when a pickup will occur. Label describes which type of
+/// trash will be picked up.
 pub struct PickupTime {
     date: BasicDate,
     label: String,
 }
 
 impl PickupTime {
+    /// Creates a new PickupTime instance.
+    ///
+    /// # Arguments
+    ///
+    /// * `date` - Date of pickup time
+    /// * `label` - Type of trash
     pub fn new(date: BasicDate, label: String) -> PickupTime {
         PickupTime {
             date: date,
diff --git a/src/ivago/controller/street.rs b/src/ivago/controller/street.rs
index 00f4de4..1a7cac9 100644
--- a/src/ivago/controller/street.rs
+++ b/src/ivago/controller/street.rs
@@ -4,7 +4,7 @@ use rocket::request::FromFormValue;
 use serde::ser::{Serialize, SerializeStruct, Serializer};
 use std::convert::TryFrom;
 
-/// Represents a street
+/// Represents a street in a given city
 pub struct Street {
     name: String,
     city: String,
@@ -76,6 +76,7 @@ impl<'v> FromFormValue<'v> for Street {
 mod tests {
     use super::*;
 
+    /// Tests the conversion to string
     #[test]
     fn test_to_string() {
         let street = Street::new(String::from("testname"), String::from("city"));
diff --git a/src/ivago/mod.rs b/src/ivago/mod.rs
index e4d1037..0e7bebc 100644
--- a/src/ivago/mod.rs
+++ b/src/ivago/mod.rs
@@ -9,11 +9,26 @@ pub fn routes() -> Vec<rocket::Route> {
     routes![route_search_streets, route_get_pickup_times]
 }
 
-#[get("/search?<street>")]
-pub fn route_search_streets(street: String) -> Result<Json<Vec<Street>>, Status> {
-    Ok(Json(search_streets(street.as_str())?))
+/// This route handles the Ivago search endpoint. It returns a list of streets,
+/// consisting of a street name & a city.
+///
+/// # Arguments
+///
+/// * `search_term` - Search term to use to look for streets
+#[get("/search?<search_term>")]
+pub fn route_search_streets(search_term: String) -> Result<Json<Vec<Street>>, Status> {
+    Ok(Json(search_streets(search_term.as_str())?))
 }
 
+/// Handles returning of pickup times for a specific address. It returns a list
+/// of pickup times, containing a date and a description of the trash type.
+///
+/// # Arguments
+///
+/// * `street` - Street to look up
+/// * `number` - House number in the given street
+/// * `start_date` - Earliest date that can be returned
+/// * `end_date` - Latest date that can be returned
 #[get("/?<street>&<number>&<start_date>&<end_date>")]
 pub fn route_get_pickup_times(
     street: Street,

From 552cf4bf7ba1e0892c62b756ea54b3bc8b768960 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Mon, 12 Apr 2021 22:55:52 +0200
Subject: [PATCH 005/124] Added healthcheck to release container

---
 docker/Dockerfile.builder |  5 -----
 docker/Dockerfile.rel     | 12 +++++++++++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/docker/Dockerfile.builder b/docker/Dockerfile.builder
index 84d09ff..c2fb526 100644
--- a/docker/Dockerfile.builder
+++ b/docker/Dockerfile.builder
@@ -1,12 +1,7 @@
 # We use a multi-stage build to end up with a very small final image
 FROM alpine:latest AS builder
 
-ARG MODE
-ARG RUN_TESTS
-
 ENV PATH "$PATH:/root/.cargo/bin"
-# Needed for proper compiling of openssl-dev
-ENV RUSTFLAGS="-C target-feature=-crt-static"
 
 WORKDIR /usr/src/app
 
diff --git a/docker/Dockerfile.rel b/docker/Dockerfile.rel
index 4d40ef2..e872ab1 100644
--- a/docker/Dockerfile.rel
+++ b/docker/Dockerfile.rel
@@ -1,5 +1,8 @@
 FROM chewingbever/fej-builder:latest AS builder
 
+# Needed for proper compiling of openssl-dev
+ENV RUSTFLAGS="-C target-feature=-crt-static"
+
 # And then finally, build the project
 # Thank the lords that this article exists
 # https://users.rust-lang.org/t/sigsegv-with-program-linked-against-openssl-in-an-alpine-container/52172
@@ -14,9 +17,16 @@ RUN --mount=type=cache,target=/usr/src/app/target \
 FROM alpine:latest
 
 # Install some dynamic libraries needed for everything to work
-RUN apk update && apk add --no-cache openssl libgcc
+RUN apk update && apk add --no-cache openssl libgcc curl
 
 # Copy binary over to final image
 COPY --from=builder /usr/local/bin/fej /usr/local/bin/fej
 
+HEALTHCHECK \
+    --interval=10s \
+    --timeout=5s \
+    --start-period=1s \
+    --retries=3 \
+    CMD curl -q localhost:8000
+
 CMD ["/usr/local/bin/fej"]

From 3b5f1e9cf7e59429163e879c001c12dfb3fcf3ce Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Mon, 12 Apr 2021 23:03:15 +0200
Subject: [PATCH 006/124] [#19] Small changes

---
 docker/Dockerfile.dev | 3 ++-
 src/ivago/mod.rs      | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
index a1a1e92..8ebeab3 100644
--- a/docker/Dockerfile.dev
+++ b/docker/Dockerfile.dev
@@ -1,6 +1,7 @@
 FROM chewingbever/fej-builder:latest
 
-ENV RUST_BACKTRACE=1
+ENV RUST_BACKTRACE 1
+ENV ROCKET_LOG debug
 
 ENTRYPOINT ["cargo"]
 CMD ["run"]
diff --git a/src/ivago/mod.rs b/src/ivago/mod.rs
index 0e7bebc..627e89b 100644
--- a/src/ivago/mod.rs
+++ b/src/ivago/mod.rs
@@ -15,9 +15,9 @@ pub fn routes() -> Vec<rocket::Route> {
 /// # Arguments
 ///
 /// * `search_term` - Search term to use to look for streets
-#[get("/search?<search_term>")]
-pub fn route_search_streets(search_term: String) -> Result<Json<Vec<Street>>, Status> {
-    Ok(Json(search_streets(search_term.as_str())?))
+#[get("/search?<q>")]
+pub fn route_search_streets(q: String) -> Result<Json<Vec<Street>>, Status> {
+    Ok(Json(search_streets(q.as_str())?))
 }
 
 /// Handles returning of pickup times for a specific address. It returns a list

From 4a32349c9cfac368756d47d5828d7ee34f72a068 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Tue, 13 Apr 2021 21:43:30 +0200
Subject: [PATCH 007/124] Fixed instant crash on ivago endpoint (#19)

---
 Makefile                  | 2 +-
 docker/Dockerfile.builder | 4 +++-
 docker/Dockerfile.rel     | 3 ---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index c276d79..f7eaa8e 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ all: debug
 
 # Builds
 debug:
-	@ ./build -m dev
+	@ ./build -m dev -a run build
 .PHONY: debug
 
 release:
diff --git a/docker/Dockerfile.builder b/docker/Dockerfile.builder
index c2fb526..62b986e 100644
--- a/docker/Dockerfile.builder
+++ b/docker/Dockerfile.builder
@@ -1,7 +1,9 @@
-# We use a multi-stage build to end up with a very small final image
+# Our entire toolchain runs in alpine
 FROM alpine:latest AS builder
 
 ENV PATH "$PATH:/root/.cargo/bin"
+# Needed for proper compiling of openssl-dev
+ENV RUSTFLAGS "-C target-feature=-crt-static"
 
 WORKDIR /usr/src/app
 
diff --git a/docker/Dockerfile.rel b/docker/Dockerfile.rel
index e872ab1..6b4e438 100644
--- a/docker/Dockerfile.rel
+++ b/docker/Dockerfile.rel
@@ -1,8 +1,5 @@
 FROM chewingbever/fej-builder:latest AS builder
 
-# Needed for proper compiling of openssl-dev
-ENV RUSTFLAGS="-C target-feature=-crt-static"
-
 # And then finally, build the project
 # Thank the lords that this article exists
 # https://users.rust-lang.org/t/sigsegv-with-program-linked-against-openssl-in-an-alpine-container/52172

From 760e9fa584d472c02f8532f97349ee1652d0cfe5 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Tue, 13 Apr 2021 21:56:52 +0200
Subject: [PATCH 008/124] [#19] Fixed api not working from outside container

---
 docker/Dockerfile.builder | 2 ++
 docker/Dockerfile.dev     | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker/Dockerfile.builder b/docker/Dockerfile.builder
index 62b986e..b968c5b 100644
--- a/docker/Dockerfile.builder
+++ b/docker/Dockerfile.builder
@@ -4,6 +4,8 @@ FROM alpine:latest AS builder
 ENV PATH "$PATH:/root/.cargo/bin"
 # Needed for proper compiling of openssl-dev
 ENV RUSTFLAGS "-C target-feature=-crt-static"
+# Otherwise, the debug build can't be used from the container
+ENV ROCKET_ADDRESS "0.0.0.0"
 
 WORKDIR /usr/src/app
 
diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
index 8ebeab3..9205fd4 100644
--- a/docker/Dockerfile.dev
+++ b/docker/Dockerfile.dev
@@ -1,7 +1,6 @@
 FROM chewingbever/fej-builder:latest
 
 ENV RUST_BACKTRACE 1
-ENV ROCKET_LOG debug
 
 ENTRYPOINT ["cargo"]
 CMD ["run"]

From 00926162fa1c08d2f19072124a50e9ea4989c665 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Tue, 13 Apr 2021 22:02:21 +0200
Subject: [PATCH 009/124] Updated depencies

---
 Cargo.lock | 165 ++++++++++++++++++++++++++---------------------------
 1 file changed, 82 insertions(+), 83 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 532c627..d7e99a4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -195,9 +195,9 @@ dependencies = [
 
 [[package]]
 name = "const_fn"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28b9d6de7f49e22cf97ad17fc4036ece69300032f45f78f30b4a4482cdc3f4a6"
+checksum = "076a6803b0dacd6a88cfe64deba628b01533ff5ef265687e6938280c1afd0a28"
 
 [[package]]
 name = "cookie"
@@ -438,42 +438,42 @@ checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
 
 [[package]]
 name = "futures-channel"
-version = "0.3.13"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c2dd2df839b57db9ab69c2c9d8f3e8c81984781937fe2807dc6dcf3b2ad2939"
+checksum = "ce79c6a52a299137a6013061e0cf0e688fce5d7f1bc60125f520912fdb29ec25"
 dependencies = [
  "futures-core",
 ]
 
 [[package]]
 name = "futures-core"
-version = "0.3.13"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15496a72fabf0e62bdc3df11a59a3787429221dd0710ba8ef163d6f7a9112c94"
+checksum = "098cd1c6dda6ca01650f1a37a794245eb73181d0d4d4e955e2f3c37db7af1815"
 
 [[package]]
 name = "futures-io"
-version = "0.3.13"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71c2c65c57704c32f5241c1223167c2c3294fd34ac020c807ddbe6db287ba59"
+checksum = "365a1a1fb30ea1c03a830fdb2158f5236833ac81fa0ad12fe35b29cddc35cb04"
 
 [[package]]
 name = "futures-sink"
-version = "0.3.13"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85754d98985841b7d4f5e8e6fbfa4a4ac847916893ec511a2917ccd8525b8bb3"
+checksum = "5c5629433c555de3d82861a7a4e3794a4c40040390907cfbfd7143a92a426c23"
 
 [[package]]
 name = "futures-task"
-version = "0.3.13"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa189ef211c15ee602667a6fcfe1c1fd9e07d42250d2156382820fba33c9df80"
+checksum = "ba7aa51095076f3ba6d9a1f702f74bd05ec65f555d70d2033d55ba8d69f581bc"
 
 [[package]]
 name = "futures-util"
-version = "0.3.13"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1812c7ab8aedf8d6f2701a43e1243acdbcc2b36ab26e2ad421eb99ac963d96d1"
+checksum = "3c144ad54d60f23927f0a6b6d816e4271278b64f005ad65e4e35291d2de9c025"
 dependencies = [
  "futures-core",
  "futures-io",
@@ -523,9 +523,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
 
 [[package]]
 name = "h2"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d832b01df74254fe364568d6ddc294443f61cbec82816b60904303af87efae78"
+checksum = "fc018e188373e2777d0ef2467ebff62a08e66c3f5857b23c8fbec3018210dc00"
 dependencies = [
  "bytes",
  "fnv",
@@ -577,9 +577,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7245cd7449cc792608c3c8a9eaf69bd4eabbabf802713748fd739c98b82f0747"
+checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11"
 dependencies = [
  "bytes",
  "fnv",
@@ -599,9 +599,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.3.5"
+version = "1.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "615caabe2c3160b313d52ccc905335f4ed5f10881dd63dc5699d47e90be85691"
+checksum = "bc35c995b9d93ec174cf9a27d425c7892722101e14993cd227fdb51d70cf9589"
 
 [[package]]
 name = "httpdate"
@@ -630,9 +630,9 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "0.14.4"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8e946c2b1349055e0b72ae281b238baf1a3ea7307c7e9f9d64673bdd9c26ac7"
+checksum = "8bf09f61b52cfcf4c00de50df88ae423d6c02354e385a86341133b5338630ad1"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -659,7 +659,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
 dependencies = [
  "bytes",
- "hyper 0.14.4",
+ "hyper 0.14.5",
  "native-tls",
  "tokio",
  "tokio-native-tls",
@@ -740,9 +740,9 @@ checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
 
 [[package]]
 name = "js-sys"
-version = "0.3.49"
+version = "0.3.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc15e39392125075f60c95ba416f5381ff6c3a948ff02ab12464715adf56c821"
+checksum = "2d99f9e3e84b8f67f846ef5b4cbbc3b1c29f6c759fcbce6f01aa0e73d932a24c"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -777,9 +777,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.91"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8916b1f6ca17130ec6568feccee27c156ad12037880833a3b842a823236502e7"
+checksum = "9385f66bf6105b241aa65a61cb923ef20efc665cb9f9bb50ac2f0c4b7f378d41"
 
 [[package]]
 name = "log"
@@ -1066,22 +1066,22 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 
 [[package]]
 name = "pin-project"
-version = "1.0.5"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96fa8ebb90271c4477f144354485b8068bd8f6b78b428b01ba892ca26caf0b63"
+checksum = "bc174859768806e91ae575187ada95c91a29e96a98dc5d2cd9a1fed039501ba6"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.0.5"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "758669ae3558c6f74bd2a18b41f7ac0b5a195aea6639d6a9b5e5d1ad5ba24c0b"
+checksum = "a490329918e856ed1b083f244e3bfe2d8c4f336407e4ea9e1a9f479ff09049e5"
 dependencies = [
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.26",
  "quote 1.0.9",
- "syn 1.0.64",
+ "syn 1.0.69",
 ]
 
 [[package]]
@@ -1136,9 +1136,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.24"
+version = "1.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
+checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec"
 dependencies = [
  "unicode-xid 0.2.1",
 ]
@@ -1168,7 +1168,7 @@ version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
 dependencies = [
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.26",
 ]
 
 [[package]]
@@ -1248,9 +1248,9 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.11.2"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf12057f289428dbf5c591c74bf10392e4a8003f993405a902f20117019022d4"
+checksum = "2296f2fac53979e8ccbc4a1136b25dcefd37be9ed7e4a1f6b05a6029c84ff124"
 dependencies = [
  "base64 0.13.0",
  "bytes",
@@ -1261,7 +1261,7 @@ dependencies = [
  "futures-util",
  "http",
  "http-body",
- "hyper 0.14.4",
+ "hyper 0.14.5",
  "hyper-tls",
  "ipnet",
  "js-sys",
@@ -1392,9 +1392,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "2.1.2"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d493c5f39e02dfb062cd8f33301f90f9b13b650e8c1b1d0fd75c19dd64bff69d"
+checksum = "3670b1d2fdf6084d192bc71ead7aabe6c06aa2ea3fbd9cc3ac111fa5c2b1bd84"
 dependencies = [
  "bitflags",
  "core-foundation",
@@ -1405,9 +1405,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dee48cdde5ed250b0d3252818f646e174ab414036edb884dde62d80a3ac6082d"
+checksum = "3676258fd3cfe2c9a0ec99ce3038798d847ce3e4bb17746373eb9f0f1ac16339"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -1443,9 +1443,9 @@ version = "1.0.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d"
 dependencies = [
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.26",
  "quote 1.0.9",
- "syn 1.0.64",
+ "syn 1.0.69",
 ]
 
 [[package]]
@@ -1504,11 +1504,10 @@ checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
 
 [[package]]
 name = "socket2"
-version = "0.3.19"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
+checksum = "9e3dfc207c526015c632472a77be09cf1b6e46866581aecae5cc38fb4235dea2"
 dependencies = [
- "cfg-if 1.0.0",
  "libc",
  "winapi 0.3.9",
 ]
@@ -1548,11 +1547,11 @@ version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
 dependencies = [
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.26",
  "quote 1.0.9",
  "serde",
  "serde_derive",
- "syn 1.0.64",
+ "syn 1.0.69",
 ]
 
 [[package]]
@@ -1562,13 +1561,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11"
 dependencies = [
  "base-x",
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.26",
  "quote 1.0.9",
  "serde",
  "serde_derive",
  "serde_json",
  "sha1",
- "syn 1.0.64",
+ "syn 1.0.69",
 ]
 
 [[package]]
@@ -1596,11 +1595,11 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.64"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fd9d1e9976102a03c542daa2eff1b43f9d72306342f3f8b3ed5fb8908195d6f"
+checksum = "48fe99c6bd8b1cc636890bcc071842de909d902c81ac7dab53ba33c421ab8ffb"
 dependencies = [
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.26",
  "quote 1.0.9",
  "unicode-xid 0.2.1",
 ]
@@ -1662,17 +1661,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5c3be1edfad6027c69f5491cf4cb310d1a71ecd6af742788c6ff8bced86b8fa"
 dependencies = [
  "proc-macro-hack",
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.26",
  "quote 1.0.9",
  "standback",
- "syn 1.0.64",
+ "syn 1.0.69",
 ]
 
 [[package]]
 name = "tinyvec"
-version = "1.1.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "317cca572a0e89c3ce0ca1f1bdc9369547fe318a683418e42ac8f59d14701023"
+checksum = "5b5220f05bb7de7f3f53c7c065e1199b3172696fe2db9f9c4d8ad9b4ee74c342"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -1685,9 +1684,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134af885d758d645f0f0505c9a8b3f9bf8a348fd822e112ab5248138348f1722"
+checksum = "83f0c8e7c0addab50b663055baf787d0af7f413a46e6e7fb9559a4e4db7137a5"
 dependencies = [
  "autocfg",
  "bytes",
@@ -1710,9 +1709,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.6.5"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5143d049e85af7fbc36f5454d990e62c2df705b3589f123b71f441b6b59f443f"
+checksum = "940a12c99365c31ea8dd9ba04ec1be183ffe4920102bb7122c2f515437601e8e"
 dependencies = [
  "bytes",
  "futures-core",
@@ -1792,9 +1791,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.4"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
+checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0"
 dependencies = [
  "matches",
 ]
@@ -1900,9 +1899,9 @@ checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.72"
+version = "0.2.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fe8f61dba8e5d645a4d8132dc7a0a66861ed5e1045d2c0ed940fab33bac0fbe"
+checksum = "83240549659d187488f91f33c0f8547cbfef0b2088bc470c116d1d260ef623d9"
 dependencies = [
  "cfg-if 1.0.0",
  "serde",
@@ -1912,24 +1911,24 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.72"
+version = "0.2.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "046ceba58ff062da072c7cb4ba5b22a37f00a302483f7e2a6cdc18fedbdc1fd3"
+checksum = "ae70622411ca953215ca6d06d3ebeb1e915f0f6613e3b495122878d7ebec7dae"
 dependencies = [
  "bumpalo",
  "lazy_static",
  "log 0.4.14",
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.26",
  "quote 1.0.9",
- "syn 1.0.64",
+ "syn 1.0.69",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.22"
+version = "0.4.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73157efb9af26fb564bb59a009afd1c7c334a44db171d280690d0c3faaec3468"
+checksum = "81b8b767af23de6ac18bf2168b690bed2902743ddf0fb39252e36f9e2bfc63ea"
 dependencies = [
  "cfg-if 1.0.0",
  "js-sys",
@@ -1939,9 +1938,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.72"
+version = "0.2.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ef9aa01d36cda046f797c57959ff5f3c615c9cc63997a8d545831ec7976819b"
+checksum = "3e734d91443f177bfdb41969de821e15c516931c3c3db3d318fa1b68975d0f6f"
 dependencies = [
  "quote 1.0.9",
  "wasm-bindgen-macro-support",
@@ -1949,28 +1948,28 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.72"
+version = "0.2.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96eb45c1b2ee33545a813a92dbb53856418bf7eb54ab34f7f7ff1448a5b3735d"
+checksum = "d53739ff08c8a68b0fdbcd54c372b8ab800b1449ab3c9d706503bc7dd1621b2c"
 dependencies = [
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.26",
  "quote 1.0.9",
- "syn 1.0.64",
+ "syn 1.0.69",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.72"
+version = "0.2.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7148f4696fb4960a346eaa60bbfb42a1ac4ebba21f750f75fc1375b098d5ffa"
+checksum = "d9a543ae66aa233d14bb765ed9af4a33e81b8b58d1584cf1b47ff8cd0b9e4489"
 
 [[package]]
 name = "web-sys"
-version = "0.3.49"
+version = "0.3.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59fe19d70f5dacc03f6e46777213facae5ac3801575d56ca6cbd4c93dcd12310"
+checksum = "a905d57e488fec8861446d3393670fb50d27a262344013181c2cdf9fff5481be"
 dependencies = [
  "js-sys",
  "wasm-bindgen",

From cfa0a8cf22420b90a7e34518b7b7f6b7e9ff72d6 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Tue, 13 Apr 2021 22:03:27 +0200
Subject: [PATCH 010/124] [closes #20] Switched to AGPLv3

---
 LICENSE | 143 ++++++++++++++++++++++++++------------------------------
 1 file changed, 65 insertions(+), 78 deletions(-)

diff --git a/LICENSE b/LICENSE
index f288702..0ad25db 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
 
  Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
@@ -7,17 +7,15 @@
 
                             Preamble
 
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
 
   The licenses for most software and other practical works are designed
 to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
+our General Public Licenses are intended to guarantee your freedom to
 share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
+software for all its users.
 
   When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
@@ -26,44 +24,34 @@ them if you wish), that you receive source code or can get it if you
 want it, that you can change the software or use pieces of it in new
 free programs, and that you know you can do these things.
 
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
 
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
 
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
 
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
@@ -72,7 +60,7 @@ modification follow.
 
   0. Definitions.
 
-  "This License" refers to version 3 of the GNU General Public License.
+  "This License" refers to version 3 of the GNU Affero General Public License.
 
   "Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.
@@ -549,35 +537,45 @@ to collect a royalty for further conveying from those to whom you convey
 the Program, the only way you could satisfy both those terms and this
 License would be to refrain entirely from conveying the Program.
 
-  13. Use with the GNU Affero General Public License.
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
 
   Notwithstanding any other provision of this License, you have
 permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
+under version 3 of the GNU General Public License into a single
 combined work, and to convey the resulting work.  The terms of this
 License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
 
   14. Revised Versions of this License.
 
   The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
 
   Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
+Program specifies that a certain numbered version of the GNU Affero General
 Public License "or any later version" applies to it, you have the
 option of following the terms and conditions either of that numbered
 version or of any later version published by the Free Software
 Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
+GNU Affero General Public License, you may choose any version ever published
 by the Free Software Foundation.
 
   If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
+versions of the GNU Affero General Public License can be used, that proxy's
 public statement of acceptance of a version permanently authorizes you
 to choose that version for the Program.
 
@@ -635,40 +633,29 @@ the "copyright" line and a pointer to where the full notice is found.
     Copyright (C) <year>  <name of author>
 
     This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+    GNU Affero General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
+    You should have received a copy of the GNU Affero General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
 
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
+For more information on this, and how to apply and follow the GNU AGPL, see
 <https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.

From 75ffdfdc278d0f805cb9737719811970018778c6 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Tue, 13 Apr 2021 22:05:31 +0200
Subject: [PATCH 011/124] Bumped version to 1.0.0

---
 Cargo.lock | 2 +-
 Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d7e99a4..0606bc8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -347,7 +347,7 @@ dependencies = [
 
 [[package]]
 name = "fej"
-version = "0.1.0"
+version = "1.0.0"
 dependencies = [
  "chrono",
  "chrono-tz",
diff --git a/Cargo.toml b/Cargo.toml
index 97796ac..12add75 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fej"
-version = "0.1.0"
+version = "1.0.0"
 authors = ["Jef Roosens <roosensjef@gmail.com>"]
 edition = "2018"
 

From bdd27446eb08ba3cd5888e25003169229a1d9af3 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Tue, 13 Apr 2021 22:09:50 +0200
Subject: [PATCH 012/124] Tiny fix in Makefile

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index f7eaa8e..fee2643 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ release:
 .PHONY: release
 
 push:
-	@ ./build -m prod -a push
+	@ ./build -m rel -a push
 .PHONY: push
 
 # Run

From 5f98b659029d3cf3851cbff46d4f2404d920acd2 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Tue, 13 Apr 2021 22:35:39 +0200
Subject: [PATCH 013/124] Added lots of documentation

---
 Makefile  | 30 ++++++++++++++++++++++++------
 README.md | 16 ++++++++++++++++
 2 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index fee2643..6ad1f50 100644
--- a/Makefile
+++ b/Makefile
@@ -1,48 +1,66 @@
 all: debug
 .PHONY: all
 
-# Builds
+# Builds the debug release inside the Alpine container. For build caching, two
+# volumes are used named `fej_build-cache` and `fej_registry-cache`. These
+# images are automatically created for you if they don't exist. If you
+# encounter any strange build errors, you can try removing this volumes to
+# start a completely fresh build.
 debug:
 	@ ./build -m dev -a run build
 .PHONY: debug
 
+# Builds the release version. In contrary to the debug version, this build
+# doesn't use volumes for caching, as this would require the build to happen
+# during runtime instead of during the building of the image. Instead, it uses
+# the new `--mount` feature from Buildkit. This does mean that only very recent
+# Docker engines can build the release version (in my case, at the time of
+# writing this, 20.10.5).
 release:
 	@ ./build -m rel
 .PHONY: release
 
+# This builds the release version, and pushes all relevant tags to my Docker
+# Hub repository, namely chewingbever/fej
 push:
 	@ ./build -m rel -a push
 .PHONY: push
 
-# Run
+# This builds the debug release, and runs it detached. The reason we detach the
+# container is because Rocket has a tendency to ignore ctlr-c when inside a
+# container, which gets annoying really fast.
 run:
 	@ ./build -m dev -a run
 .PHONY: run
 
+# As a workaround, we just have a stop command that stops the container.
 stop:
 	@ docker stop -t 2 fej
 .PHONY: stop
 
+# This attaches to the running container, essentially giving the same result as
+# just running `cargo run` locally.
 logs:
 	@ docker logs -f fej
 .PHONY: logs
 
-
-# Testing
+# Builds the debug version, and runs the tests (but doesn't detach).
 test:
 	@ ./build -m dev -a run -l -- test --no-fail-fast
 .PHONY: test
 
+# Runs the cargo code formatter on your code.
 format:
 	@ cargo fmt
 .PHONY: format
 
+# Lints your code. This also gets run in the pre-commit hook, basically
+# preventing you from committing badly-formatted code.
 lint:
 	@ cargo fmt -- --check
 .PHONY: lint
 
-
-# Documentation
+# This builds the documentation for the project, excluding the documentation.
 docs:
 	@ cargo doc --no-deps
 .PHONY: docs
diff --git a/README.md b/README.md
index 3f8e6f4..1961201 100644
--- a/README.md
+++ b/README.md
@@ -24,3 +24,19 @@ Every module has a `routes` function that returns its route macros.
 ## Roadmap
 
 See [roadmap.md](roadmap.md).
+
+## Development
+
+The entire toolchain runs on Alpine inside Docker. This makes building easier,
+and (hopefully) eliminates any system-specific bugs.
+
+A [Makefile wrapper](Makefile) is provided for ease of use. Do check it out, as
+all the commands are documented for your understanding ;)
+
+There's also the `build` script. This script does all the "heavy" lifting. It
+chooses which Dockerfile to build according to the given arguments, and
+generates tags for the images (useful when pushing releases). The Makefile is
+really just a wrapper around this build script, allowing you to write
+`make test` instead of `./build -m dev -a run test`.
+
+tl;dr run `make run` to run your build, and `make test` to run the tests.

From 452683f4d7360c77a81e6057b9bdf83248fa6aec Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Tue, 13 Apr 2021 23:55:22 +0200
Subject: [PATCH 014/124] Added docker images link to README

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 1961201..55d11e3 100644
--- a/README.md
+++ b/README.md
@@ -40,3 +40,7 @@ really just a wrapper around this build script, allowing you to write
 `make test` instead of `./build -m dev -a run test`.
 
 tl;dr run `make run` to run your build, and `make test` to run the tests.
+
+## Docker images
+
+The images are available [here](https://hub.docker.com/r/chewingbever/fej).

From 9ee542197dfe1586984f65000b096655a1df4edb Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Wed, 14 Apr 2021 00:00:29 +0200
Subject: [PATCH 015/124] Added kissanime to roadmap

---
 roadmap.md | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/roadmap.md b/roadmap.md
index 17b0d76..f03e4b5 100644
--- a/roadmap.md
+++ b/roadmap.md
@@ -4,7 +4,7 @@ This file contains a listing of my current ideas/plans for this project. This
 could change at any minute, but it serves as a quick overview of my plans for
 the project.
 
-## 1.0: Ivago
+## Ivago
 
 ### Summary
 
@@ -30,7 +30,7 @@ still collecting the same data. Furthermore, having the data available in
 computer-readable format opens up ways to write a custom frontend for the API
 (which I will be doing sometime in the near future).
 
-## 2.0: The Curse of the Forge
+## The Curse of the Forge
 
 ### Summary
 
@@ -65,3 +65,12 @@ touch their websites or services (besides downloading the mods of course).
 
 As a bonus, I want to cache the Ivago API's calendars, considering I'll be
 setting up a database for this version anyways.
+
+## Kissanime
+
+I like watching anime from time to time, and I've always used Kissanime for
+this. However, their sites can be quite slow, and riddled with ads from time to
+time. That's why I'd like to create a high-speed wrapper that extracts all the
+needed info from their sites, removing the need for the user to ever actually
+visit their site. The API can just act as a fast search index, complete with
+indexing of the links to the videos and everything.

From 87f2659b4800a5f9040c5363718b176e4e2284df Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Wed, 14 Apr 2021 22:00:56 +0200
Subject: [PATCH 016/124] Added temporary CORS fix

---
 src/main.rs | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/src/main.rs b/src/main.rs
index ad86d98..8b8edc7 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -3,8 +3,36 @@ extern crate rocket;
 
 use fej_lib::{catchers, ivago};
 
+// Very temporary solution for CORS
+// https://stackoverflow.com/questions/62412361/how-to-set-up-cors-or-options-for-rocket-rs
+use rocket::fairing::{Fairing, Info, Kind};
+use rocket::http::Header;
+use rocket::{Request, Response};
+
+pub struct CORS;
+
+impl Fairing for CORS {
+    fn info(&self) -> Info {
+        Info {
+            name: "Add CORS headers to responses",
+            kind: Kind::Response,
+        }
+    }
+
+    fn on_response(&self, _: &Request, response: &mut Response) {
+        response.set_header(Header::new("Access-Control-Allow-Origin", "*"));
+        response.set_header(Header::new(
+            "Access-Control-Allow-Methods",
+            "POST, GET, PATCH, OPTIONS",
+        ));
+        response.set_header(Header::new("Access-Control-Allow-Headers", "*"));
+        response.set_header(Header::new("Access-Control-Allow-Credentials", "true"));
+    }
+}
+
 fn rocket() -> rocket::Rocket {
     rocket::ignite()
+        .attach(CORS)
         .mount("/ivago", ivago::routes())
         .register(catchers![catchers::not_found])
 }

From c9b7714a47576d21c0367d44dba475f892ffe90a Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Wed, 14 Apr 2021 23:26:53 +0200
Subject: [PATCH 017/124] Bumped version

---
 Cargo.lock | 2 +-
 Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0606bc8..8ab2a9c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -347,7 +347,7 @@ dependencies = [
 
 [[package]]
 name = "fej"
-version = "1.0.0"
+version = "1.0.1"
 dependencies = [
  "chrono",
  "chrono-tz",
diff --git a/Cargo.toml b/Cargo.toml
index 12add75..83623fa 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fej"
-version = "1.0.0"
+version = "1.0.1"
 authors = ["Jef Roosens <roosensjef@gmail.com>"]
 edition = "2018"
 

From 5b515ecd91cff5bfdc0d2ec33342b0e654e2d2a1 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Thu, 15 Apr 2021 17:21:32 +0200
Subject: [PATCH 018/124] [#23] Build script now starts postgres database as
 well

---
 Makefile |  6 ++++++
 build    | 17 ++++++++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 6ad1f50..820f893 100644
--- a/Makefile
+++ b/Makefile
@@ -36,6 +36,7 @@ run:
 # As a workaround, we just have a stop command that stops the container.
 stop:
 	@ docker stop -t 2 fej
+	@ docker stop fej_db
 .PHONY: stop
 
 # This attaches to the running container, essentially giving the same result as
@@ -44,6 +45,11 @@ logs:
 	@ docker logs -f fej
 .PHONY: logs
 
+# This just starts up a shell inside the fej container
+sh:
+	@ docker exec -it fej sh
+.PHONY: sh
+
 # Builds the debug version, and runs the tests (but doesn't detach).
 test:
 	@ ./build -m dev -a run -l -- test --no-fail-fast
diff --git a/build b/build
index d7d86a3..484a8ab 100755
--- a/build
+++ b/build
@@ -72,7 +72,21 @@ if [[ "$action" = push ]]; then
         [[ "$tag" != "$tags" ]] && docker rmi "$image:$tag"
     done
 
- elif [[ "$action" = run ]]; then
+elif [[ "$action" = run ]]; then
+    # Create the network & start the database container
+    docker network create fej
+    docker volume create fej_db-data
+
+    docker run --rm \
+        --detach \
+        --name fej_db \
+        --network fej \
+        -e "POSTGRES_DB=fej" \
+        -e "POSTGRES_USER=fej" \
+        -e "POSTGRES_PASSWORD=fej" \
+        -v 'fej_db-data:/var/lib/postgresql/data' \
+        postgres:13-alpine
+
     if [[ "$mode" = "dev" ]]; then
         # Create caching volumes if needed (they need to be named)
         docker volume create fej_build-cache
@@ -87,5 +101,6 @@ if [[ "$action" = push ]]; then
         --tty \
         --publish 8000:8000 \
         --name fej \
+        --network fej \
         "$image$([[ "$mode" != "rel" ]] && echo "-dev"):$tags" "$@"
 fi

From 6954921df622bdf5cd456154c407330be7fca837 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Thu, 15 Apr 2021 17:31:45 +0200
Subject: [PATCH 019/124] [#23] Added needed env vars

---
 .env  | 1 +
 build | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 .env

diff --git a/.env b/.env
new file mode 100644
index 0000000..880c44c
--- /dev/null
+++ b/.env
@@ -0,0 +1 @@
+DATABASE_URL=postgres://fej:fej@fej_db:5432/fej
diff --git a/build b/build
index 484a8ab..962d14c 100755
--- a/build
+++ b/build
@@ -101,6 +101,7 @@ elif [[ "$action" = run ]]; then
         --tty \
         --publish 8000:8000 \
         --name fej \
+        --env-file .env \
         --network fej \
         "$image$([[ "$mode" != "rel" ]] && echo "-dev"):$tags" "$@"
 fi

From 727589b10f74c318e472bb3d02c899ff8ddcf6cb Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Thu, 15 Apr 2021 17:53:35 +0200
Subject: [PATCH 020/124] [#24] Initialized diesel project

---
 .env                                          |  3 +-
 .env.container                                |  2 ++
 Cargo.lock                                    | 33 +++++++++++++++++
 Cargo.toml                                    |  7 ++--
 build                                         |  3 +-
 diesel.toml                                   |  5 +++
 migrations/.gitkeep                           |  0
 .../down.sql                                  |  6 ++++
 .../up.sql                                    | 36 +++++++++++++++++++
 9 files changed, 88 insertions(+), 7 deletions(-)
 create mode 100644 .env.container
 create mode 100644 diesel.toml
 create mode 100644 migrations/.gitkeep
 create mode 100644 migrations/00000000000000_diesel_initial_setup/down.sql
 create mode 100644 migrations/00000000000000_diesel_initial_setup/up.sql

diff --git a/.env b/.env
index 880c44c..6e2ca99 100644
--- a/.env
+++ b/.env
@@ -1 +1,2 @@
-DATABASE_URL=postgres://fej:fej@fej_db:5432/fej
+# This file is read by diesel
+DATABASE_URL=postgres://fej:fej@localhost:5432/fej
diff --git a/.env.container b/.env.container
new file mode 100644
index 0000000..8b395fb
--- /dev/null
+++ b/.env.container
@@ -0,0 +1,2 @@
+# This file is read by the container, and therefore by fej
+DATABASE_URL=postgres://fej:fej@fej_db:5432/fej
diff --git a/Cargo.lock b/Cargo.lock
index 8ab2a9c..0006402 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -321,6 +321,29 @@ dependencies = [
  "syn 0.15.44",
 ]
 
+[[package]]
+name = "diesel"
+version = "1.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "047bfc4d5c3bd2ef6ca6f981941046113524b9a9f9a7cbdfdd7ff40f58e6f542"
+dependencies = [
+ "bitflags",
+ "byteorder",
+ "diesel_derives",
+ "pq-sys",
+]
+
+[[package]]
+name = "diesel_derives"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45f5098f628d02a7a0f68ddba586fb61e80edec3bdc1be3b921f4ceec60858d3"
+dependencies = [
+ "proc-macro2 1.0.26",
+ "quote 1.0.9",
+ "syn 1.0.69",
+]
+
 [[package]]
 name = "digest"
 version = "0.9.0"
@@ -351,6 +374,7 @@ version = "1.0.1"
 dependencies = [
  "chrono",
  "chrono-tz",
+ "diesel",
  "regex",
  "reqwest",
  "rocket",
@@ -1119,6 +1143,15 @@ version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
 
+[[package]]
+name = "pq-sys"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ac25eee5a0582f45a67e837e350d784e7003bd29a5f460796772061ca49ffda"
+dependencies = [
+ "vcpkg",
+]
+
 [[package]]
 name = "proc-macro-hack"
 version = "0.5.19"
diff --git a/Cargo.toml b/Cargo.toml
index 83623fa..f359a51 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,11 +25,8 @@ serde = "1.0.124"
 chrono = "0.4.19"
 chrono-tz = "0.5.3"
 regex = "1.4.5"
-
-[dependencies.reqwest]
-version = "0.11.2"
-default-features = true
-features = ["blocking", "json", "cookies"]
+reqwest = { version = "0.11.2", features = ["blocking", "json", "cookies"] }
+diesel = { version = "1.4.6", features = ["postgres"] }
 
 [dependencies.rocket_contrib]
 version = "0.4.7"
diff --git a/build b/build
index 962d14c..271a3d9 100755
--- a/build
+++ b/build
@@ -81,6 +81,7 @@ elif [[ "$action" = run ]]; then
         --detach \
         --name fej_db \
         --network fej \
+        -p 5432:5432 \
         -e "POSTGRES_DB=fej" \
         -e "POSTGRES_USER=fej" \
         -e "POSTGRES_PASSWORD=fej" \
@@ -101,7 +102,7 @@ elif [[ "$action" = run ]]; then
         --tty \
         --publish 8000:8000 \
         --name fej \
-        --env-file .env \
+        --env-file .env.container \
         --network fej \
         "$image$([[ "$mode" != "rel" ]] && echo "-dev"):$tags" "$@"
 fi
diff --git a/diesel.toml b/diesel.toml
new file mode 100644
index 0000000..92267c8
--- /dev/null
+++ b/diesel.toml
@@ -0,0 +1,5 @@
+# For documentation on how to configure this file,
+# see diesel.rs/guides/configuring-diesel-cli
+
+[print_schema]
+file = "src/schema.rs"
diff --git a/migrations/.gitkeep b/migrations/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/migrations/00000000000000_diesel_initial_setup/down.sql b/migrations/00000000000000_diesel_initial_setup/down.sql
new file mode 100644
index 0000000..a9f5260
--- /dev/null
+++ b/migrations/00000000000000_diesel_initial_setup/down.sql
@@ -0,0 +1,6 @@
+-- This file was automatically created by Diesel to setup helper functions
+-- and other internal bookkeeping. This file is safe to edit, any future
+-- changes will be added to existing projects as new migrations.
+
+DROP FUNCTION IF EXISTS diesel_manage_updated_at(_tbl regclass);
+DROP FUNCTION IF EXISTS diesel_set_updated_at();
diff --git a/migrations/00000000000000_diesel_initial_setup/up.sql b/migrations/00000000000000_diesel_initial_setup/up.sql
new file mode 100644
index 0000000..d68895b
--- /dev/null
+++ b/migrations/00000000000000_diesel_initial_setup/up.sql
@@ -0,0 +1,36 @@
+-- This file was automatically created by Diesel to setup helper functions
+-- and other internal bookkeeping. This file is safe to edit, any future
+-- changes will be added to existing projects as new migrations.
+
+
+
+
+-- Sets up a trigger for the given table to automatically set a column called
+-- `updated_at` whenever the row is modified (unless `updated_at` was included
+-- in the modified columns)
+--
+-- # Example
+--
+-- ```sql
+-- CREATE TABLE users (id SERIAL PRIMARY KEY, updated_at TIMESTAMP NOT NULL DEFAULT NOW());
+--
+-- SELECT diesel_manage_updated_at('users');
+-- ```
+CREATE OR REPLACE FUNCTION diesel_manage_updated_at(_tbl regclass) RETURNS VOID AS $$
+BEGIN
+    EXECUTE format('CREATE TRIGGER set_updated_at BEFORE UPDATE ON %s
+                    FOR EACH ROW EXECUTE PROCEDURE diesel_set_updated_at()', _tbl);
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE OR REPLACE FUNCTION diesel_set_updated_at() RETURNS trigger AS $$
+BEGIN
+    IF (
+        NEW IS DISTINCT FROM OLD AND
+        NEW.updated_at IS NOT DISTINCT FROM OLD.updated_at
+    ) THEN
+        NEW.updated_at := current_timestamp;
+    END IF;
+    RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;

From 81ae1a2555370da8738226946ef333d2541689bf Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Thu, 15 Apr 2021 18:05:02 +0200
Subject: [PATCH 021/124] [#24] Added first ivago migration

---
 Makefile                                           | 4 ++++
 migrations/2021-04-15-155511_ivago_search/down.sql | 2 ++
 migrations/2021-04-15-155511_ivago_search/up.sql   | 9 +++++++++
 src/schema.rs                                      | 0
 4 files changed, 15 insertions(+)
 create mode 100644 migrations/2021-04-15-155511_ivago_search/down.sql
 create mode 100644 migrations/2021-04-15-155511_ivago_search/up.sql
 create mode 100644 src/schema.rs

diff --git a/Makefile b/Makefile
index 820f893..5d8c22e 100644
--- a/Makefile
+++ b/Makefile
@@ -50,6 +50,10 @@ sh:
 	@ docker exec -it fej sh
 .PHONY: sh
 
+# Starts a psql session in the database container
+dbsh:
+	@ docker exec -it fej_db psql -U fej -d fej
+
 # Builds the debug version, and runs the tests (but doesn't detach).
 test:
 	@ ./build -m dev -a run -l -- test --no-fail-fast
diff --git a/migrations/2021-04-15-155511_ivago_search/down.sql b/migrations/2021-04-15-155511_ivago_search/down.sql
new file mode 100644
index 0000000..9d9d004
--- /dev/null
+++ b/migrations/2021-04-15-155511_ivago_search/down.sql
@@ -0,0 +1,2 @@
+-- This file should undo anything in `up.sql`
+DROP SCHEMA ivago CASCADE;
diff --git a/migrations/2021-04-15-155511_ivago_search/up.sql b/migrations/2021-04-15-155511_ivago_search/up.sql
new file mode 100644
index 0000000..f33eff1
--- /dev/null
+++ b/migrations/2021-04-15-155511_ivago_search/up.sql
@@ -0,0 +1,9 @@
+-- Your SQL goes here
+CREATE SCHEMA ivago;
+
+CREATE TABLE ivago.streets (
+    name TEXT NOT NULL,
+    city TEXT NOT NULL,
+
+    PRIMARY KEY (name, city)
+);
diff --git a/src/schema.rs b/src/schema.rs
new file mode 100644
index 0000000..e69de29

From cb78af62ba0060465d07f42493d379dce2310a1b Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Thu, 15 Apr 2021 19:26:37 +0200
Subject: [PATCH 022/124] [#26] Moved main binary to separate location

---
 Cargo.toml                   | 6 +++---
 docker/Dockerfile.dev        | 2 +-
 docker/Dockerfile.rel        | 6 +++---
 src/{ => bin/server}/main.rs | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename src/{ => bin/server}/main.rs (97%)

diff --git a/Cargo.toml b/Cargo.toml
index f359a51..46b01a1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Jef Roosens <roosensjef@gmail.com>"]
 edition = "2018"
 
 [lib]
-name = "fej_lib"
+name = "fej"
 src = "src/lib.rs"
 test = true
 bench = true
@@ -13,8 +13,8 @@ doc = true
 doctest = true
 
 [[bin]]
-name = "fej"
-src = "src/main.rs"
+name = "server"
+src = "src/bin/server/main.rs"
 test = false
 bench = false
 doc = false
diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
index 9205fd4..d2029af 100644
--- a/docker/Dockerfile.dev
+++ b/docker/Dockerfile.dev
@@ -3,4 +3,4 @@ FROM chewingbever/fej-builder:latest
 ENV RUST_BACKTRACE 1
 
 ENTRYPOINT ["cargo"]
-CMD ["run"]
+CMD ["run", "--bin", "server"]
diff --git a/docker/Dockerfile.rel b/docker/Dockerfile.rel
index 6b4e438..b64916a 100644
--- a/docker/Dockerfile.rel
+++ b/docker/Dockerfile.rel
@@ -7,7 +7,7 @@ FROM chewingbever/fej-builder:latest AS builder
 # NOTE: cargo install auto-appends bin to the path
 RUN --mount=type=cache,target=/usr/src/app/target \
     --mount=type=cache,target=/root/.cargo/registry \
-    cargo install --path . --bin fej --root /usr/local
+    cargo install --path . --root /usr/local
 
 
 # Now, we create the actual image
@@ -17,7 +17,7 @@ FROM alpine:latest
 RUN apk update && apk add --no-cache openssl libgcc curl
 
 # Copy binary over to final image
-COPY --from=builder /usr/local/bin/fej /usr/local/bin/fej
+COPY --from=builder /usr/local/bin/server /usr/local/bin/server
 
 HEALTHCHECK \
     --interval=10s \
@@ -26,4 +26,4 @@ HEALTHCHECK \
     --retries=3 \
     CMD curl -q localhost:8000
 
-CMD ["/usr/local/bin/fej"]
+CMD ["/usr/local/bin/server"]
diff --git a/src/main.rs b/src/bin/server/main.rs
similarity index 97%
rename from src/main.rs
rename to src/bin/server/main.rs
index 8b8edc7..a27e00f 100644
--- a/src/main.rs
+++ b/src/bin/server/main.rs
@@ -1,7 +1,7 @@
 #[macro_use]
 extern crate rocket;
 
-use fej_lib::{catchers, ivago};
+use fej::{catchers, ivago};
 
 // Very temporary solution for CORS
 // https://stackoverflow.com/questions/62412361/how-to-set-up-cors-or-options-for-rocket-rs

From 21e142e9a4feaaa01fe292772b262018597c2c8e Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Thu, 15 Apr 2021 19:36:42 +0200
Subject: [PATCH 023/124] [#26] Added image cleaning recipe

---
 Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 5d8c22e..f9c6456 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-all: debug
+all: debug logs
 .PHONY: all
 
 # Builds the debug release inside the Alpine container. For build caching, two
@@ -74,3 +74,7 @@ lint:
 docs:
 	@ cargo doc --no-deps
 .PHONY: docs
+
+# This recipe removes all chewingbever/fej images from your system
+clean-images:
+	@ docker images | grep '^chewingbever/fej' | sed 's/ \+/ /g' | cut -f3 -d' ' | xargs docker rmi

From 22e9dcceaf9ce028649d70038b8e702aea571a40 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Thu, 15 Apr 2021 22:46:23 +0200
Subject: [PATCH 024/124] [#26] Started writing fejctl

---
 fejctl | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100755 fejctl

diff --git a/fejctl b/fejctl
new file mode 100755
index 0000000..8f3eb74
--- /dev/null
+++ b/fejctl
@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+# This script is a helpful utility for developing fej inside Docker.
+
+# Default values
+image="chewingbever/fej"
+mode="dev"  # Should be either 'rel' or 'dev'
+action=""
+attach="--detach"
+cmd="b"
+bin="server"
+
+# Calculated variables
+patch_version=`grep -Po '(?<=version = ").*(?=")' Cargo.toml | head -n1`
+major_version=`echo "$patch_version" | sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/'`
+minor_version=`echo "$patch_version" | sed -E 's/([0-9]+).([0-9]+).([0-9]+)/\1.\2/'`
+branch=`git rev-parse --abbrev-ref HEAD`
+
+
+
+function main() {
+    # Parse the flags
+    while getopts ":i:m:a:l" c; do
+        case $c in
+            i ) image="$OPTARG" ;;
+            m ) mode="$OPTARG" ;;
+            a ) action="$OPTARG" ;;
+            l ) attach="" ;;
+            ? ) exit 1 ;;
+        esac
+    done
+    shift $((OPTIND-1))
+}
+
+main "$@"

From 0ba31bd8ba944b4bf503366654a70c16e673fff3 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Thu, 15 Apr 2021 23:59:31 +0200
Subject: [PATCH 025/124] [#26] Started fejctl

---
 fejctl | 160 ++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 136 insertions(+), 24 deletions(-)

diff --git a/fejctl b/fejctl
index 8f3eb74..17a43a0 100755
--- a/fejctl
+++ b/fejctl
@@ -1,35 +1,147 @@
 #!/usr/bin/env bash
 
-# This script is a helpful utility for developing fej inside Docker.
+image='chewingbever/fej'
 
-# Default values
-image="chewingbever/fej"
-mode="dev"  # Should be either 'rel' or 'dev'
-action=""
-attach="--detach"
-cmd="b"
-bin="server"
+# Creates the needed images
+#
+# $1: wether to build the debug or the release image (default debug)
+function create_images() {
+    # First, we build the builder
+    DOCKER_BUILDKIT=1 docker build \
+        -f docker/Dockerfile.builder \
+        -t "$image-builder:latest" .
 
-# Calculated variables
-patch_version=`grep -Po '(?<=version = ").*(?=")' Cargo.toml | head -n1`
-major_version=`echo "$patch_version" | sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/'`
-minor_version=`echo "$patch_version" | sed -E 's/([0-9]+).([0-9]+).([0-9]+)/\1.\2/'`
-branch=`git rev-parse --abbrev-ref HEAD`
+    if [[ "$1" = "rel" ]]; then
+        DOCKER_BUILDKIT=1 docker build \
+            -t "$image:latest" \
+            -f docker/Dockerfile.rel .
 
+    else
+        # Then, we create the debug image
+        DOCKER_BUILDKIT=1 docker build \
+            -t "$image:dev" \
+            -f docker/Dockerfile.dev .
+    fi
+}
 
+# Execute the debug image (must be built first)
+#
+# $@: the arguments to pass to the image (passed as arguments to cargo)
+function run_image() {
+    # Run the database image
+    docker run --rm \
+        --detach \
+        --name fej_db \
+        --network fej \
+        -p 5432:5432 \
+        -e 'POSTGRES_DB=fej' \
+        -e 'POSTGRES_USER=fej' \
+        -e 'POSTGRES_PASSWORD=fej' \
+        -v 'fej_db-data:/var/lib/postgresql/data' \
+        postgres:13-alpine
 
-function main() {
-    # Parse the flags
-    while getopts ":i:m:a:l" c; do
-        case $c in
-            i ) image="$OPTARG" ;;
-            m ) mode="$OPTARG" ;;
-            a ) action="$OPTARG" ;;
-            l ) attach="" ;;
-            ? ) exit 1 ;;
-        esac
+    # Run the binary image
+    docker run \
+        --detach \
+        --rm \
+        --interactive \
+        --tty \
+        --publish 8000:8000 \
+        --name fej \
+        --env-file .env.container \
+        --network fej \
+        -v 'fej_build-cache:/usr/src/app/target' \
+        -v 'fej_registry-cache:/root/.cargo/registry' \
+        "$image:dev" "$@"
+}
+
+# Attach to the fej container
+function logs() {
+    docker logs -f fej
+}
+
+# Builds the given binary
+#
+# $1: the binary to build
+function build() {
+    create_images
+    run_image build --bin "$1"
+    logs
+}
+
+# Runs the given binary
+#
+# $1: the binary to run
+function run() {
+    create_images
+    run_image run --bin "$1"
+    logs
+}
+
+# Runs the tests
+function tests() {
+    create_images
+    run_image test --no-fail-fast
+    logs
+}
+
+# Stops both containers
+function stop() {
+    docker stop fej_db
+    docker stop -t 0 fej
+}
+
+function run_release() {
+    echo "Not implemented"
+}
+
+# Tags & pushes the release version to Docker Hub
+function publish() {
+    branch=`git rev-parse --abbrev-ref HEAD`
+
+    if [[ "$branch" != master ]]; then
+        >&2 echo "You can only publish from master."
+        exit 2
+    fi
+
+    patch_version=`grep -Po '(?<=version = ").*(?=")' Cargo.toml | head -n1`
+    major_version=`echo "$patch_version" | sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/'`
+    minor_version=`echo "$patch_version" | sed -E 's/([0-9]+).([0-9]+).([0-9]+)/\1.\2/'`
+    tags=("latest" "$patch_version" "$minor_version" "$major_version")
+
+    for tag in "${tags[@]}"; do
+        # Create the tag
+        docker tag "$image:$tags" "$image:$tag"
+
+        # Push the tag
+        docker push "$image:$tag"
+
+        # Remove the tag again, if it's not the main tag
+        [[ "$tag" != "$tags" ]] && docker rmi "$image:$tag"
     done
-    shift $((OPTIND-1))
+
+}
+
+# Entrypoint to the script
+#
+# $1: action to perform, defaults to 'build'
+# $2: binary to use, defaults to 'server'
+function main() {
+    # Default values
+    cmd="${1:-build}"
+    bin="${2:-server}"
+
+    case $cmd in
+        b | build ) build "$bin" ;;
+        br | build-release ) create_images rel ;;
+        r | run ) run "$bin" ;;
+        rr | run-release ) run_release ;;
+        p | push | publish ) publish ;;
+        t | test ) tests ;;
+        s | stop ) stop ;;
+        p | push | publish ) publish ;;
+        * ) >&2 echo "Invalid command."; exit 1 ;;
+    esac
 }
 
 main "$@"

From 0828dd36d6b26010bb3f8b783eccf9f4fdd736b2 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Fri, 16 Apr 2021 00:06:48 +0200
Subject: [PATCH 026/124] [#26] fejctl now fully replace Makefile & build

---
 .hooks/pre-commit |   2 +-
 Makefile          |  80 ----------------------------------
 build             | 108 ----------------------------------------------
 fejctl            |  16 ++++++-
 4 files changed, 15 insertions(+), 191 deletions(-)
 delete mode 100644 Makefile
 delete mode 100755 build

diff --git a/.hooks/pre-commit b/.hooks/pre-commit
index 709fb95..6947bc7 100755
--- a/.hooks/pre-commit
+++ b/.hooks/pre-commit
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # This hook lints the code, and if we're on develop or master, also forces the tests to pass.
-make lint &> /dev/null 2>&1 || {
+./fejctl lint &> /dev/null 2>&1 || {
     >&2 echo "Format check failed, use 'make lint' for more information.";
     exit 1;
 }
diff --git a/Makefile b/Makefile
deleted file mode 100644
index f9c6456..0000000
--- a/Makefile
+++ /dev/null
@@ -1,80 +0,0 @@
-all: debug logs
-.PHONY: all
-
-# Builds the debug release inside the Alpine container. For build caching, two
-# volumes are used named `fej_build-cache` and `fej_registry-cache`. These
-# images are automatically created for you if they don't exist. If you
-# encounter any strange build errors, you can try removing this volumes to
-# start a completely fresh build.
-debug:
-	@ ./build -m dev -a run build
-.PHONY: debug
-
-# Builds the release version. In contrary to the debug version, this build
-# doesn't use volumes for caching, as this would require the build to happen
-# during runtime instead of during the building of the image. Instead, it uses
-# the new `--mount` feature from Buildkit. This does mean that only very recent
-# Docker engines can build the release version (in my case, at the time of
-# writing this, 20.10.5).
-release:
-	@ ./build -m rel
-.PHONY: release
-
-# This builds the release version, and pushes all relevant tags to my Docker
-# Hub repository, namely chewingbever/fej
-push:
-	@ ./build -m rel -a push
-.PHONY: push
-
-# This builds the debug release, and runs it detached. The reason we detach the
-# container is because Rocket has a tendency to ignore ctlr-c when inside a
-# container, which gets annoying really fast.
-run:
-	@ ./build -m dev -a run
-.PHONY: run
-
-# As a workaround, we just have a stop command that stops the container.
-stop:
-	@ docker stop -t 2 fej
-	@ docker stop fej_db
-.PHONY: stop
-
-# This attaches to the running container, essentially giving the same result as
-# just running `cargo run` locally.
-logs:
-	@ docker logs -f fej
-.PHONY: logs
-
-# This just starts up a shell inside the fej container
-sh:
-	@ docker exec -it fej sh
-.PHONY: sh
-
-# Starts a psql session in the database container
-dbsh:
-	@ docker exec -it fej_db psql -U fej -d fej
-
-# Builds the debug version, and runs the tests (but doesn't detach).
-test:
-	@ ./build -m dev -a run -l -- test --no-fail-fast
-.PHONY: test
-
-# Runs the cargo code formatter on your code.
-format:
-	@ cargo fmt
-.PHONY: format
-
-# Lints your code. This also gets run in the pre-commit hook, basically
-# preventing you from committing badly-formatted code.
-lint:
-	@ cargo fmt -- --check
-.PHONY: lint
-
-# This builds the documentation for the project, excluding the documentation.
-docs:
-	@ cargo doc --no-deps
-.PHONY: docs
-
-# This recipe removes all chewingbever/fej images from your system
-clean-images:
-	@ docker images | grep '^chewingbever/fej' | sed 's/ \+/ /g' | cut -f3 -d' ' | xargs docker rmi
diff --git a/build b/build
deleted file mode 100755
index 271a3d9..0000000
--- a/build
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/usr/bin/env bash
-
-image="chewingbever/fej"
-# Should be either dev or rel
-mode="dev"
-action=""
-attach="--detach"
-
-while getopts ":i:m:a:l" c; do
-    case $c in
-        i ) image="$OPTARG" ;;
-        m ) mode="$OPTARG" ;;
-        a ) action="$OPTARG" ;;
-        l ) attach="" ;;
-        ? ) exit 1 ;;
-    esac
-done
-shift $((OPTIND-1))
-
-# Extract current version from Cargo.toml & get current branch
-patch_version=`grep -Po '(?<=version = ").*(?=")' Cargo.toml | head -n1`
-major_version=`echo "$patch_version" | sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/'`
-minor_version=`echo "$patch_version" | sed -E 's/([0-9]+).([0-9]+).([0-9]+)/\1.\2/'`
-branch=`git rev-parse --abbrev-ref HEAD`
-
-if [[ "$branch" = "master" ]]; then
-    tags=("$patch_version" "$minor_version" "$major_version" "latest")
-
-elif [[ "$branch" = "develop" ]]; then
-    tags=("$patch_version-dev" "$minor_version-dev" "$major_version-dev" "dev")
-
-else
-    tags=("$branch")
-
-fi
-
-# First, we build the builder
-DOCKER_BUILDKIT=1 docker build -f docker/Dockerfile.builder -t "$image-builder:latest" .
-
-# Run the actual build command
-if [ "$mode" = "rel" ]; then
-    DOCKER_BUILDKIT=1 docker build -t "$image:$tags" -f docker/Dockerfile.rel .
-
-elif [[ "$mode" = "dev" ]]; then
-    DOCKER_BUILDKIT=1 docker build -t "$image-dev:$tags" -f docker/Dockerfile.dev .
-
-else
-    >&2 echo "Invalid mode."
-    exit 1
-
-fi
-
-if [[ "$action" = push ]]; then
-    [[ "$branch" =~ ^develop|master$ ]] || {
-        >&2 echo "You can only push from develop or master."
-        exit 2
-    }
-
-    [[ "$mode" = "rel" ]] || {
-        >&2 echo "You can only push release builds."
-        exit 3
-    }
-
-    for tag in "${tags[@]}"; do
-        # Create the tag
-        docker tag "$image:$tags" "$image:$tag"
-
-        # Push the tag
-        docker push "$image:$tag"
-
-        # Remove the tag again, if it's not the main tag
-        [[ "$tag" != "$tags" ]] && docker rmi "$image:$tag"
-    done
-
-elif [[ "$action" = run ]]; then
-    # Create the network & start the database container
-    docker network create fej
-    docker volume create fej_db-data
-
-    docker run --rm \
-        --detach \
-        --name fej_db \
-        --network fej \
-        -p 5432:5432 \
-        -e "POSTGRES_DB=fej" \
-        -e "POSTGRES_USER=fej" \
-        -e "POSTGRES_PASSWORD=fej" \
-        -v 'fej_db-data:/var/lib/postgresql/data' \
-        postgres:13-alpine
-
-    if [[ "$mode" = "dev" ]]; then
-        # Create caching volumes if needed (they need to be named)
-        docker volume create fej_build-cache
-        docker volume create fej_registry-cache
-
-        flags="-v fej_build-cache:/usr/src/app/target -v fej_registry-cache:/root/.cargo/registry"
-    fi
-
-    docker run $attach $flags \
-        --rm \
-        --interactive \
-        --tty \
-        --publish 8000:8000 \
-        --name fej \
-        --env-file .env.container \
-        --network fej \
-        "$image$([[ "$mode" != "rel" ]] && echo "-dev"):$tags" "$@"
-fi
diff --git a/fejctl b/fejctl
index 17a43a0..c977f79 100755
--- a/fejctl
+++ b/fejctl
@@ -132,14 +132,26 @@ function main() {
     bin="${2:-server}"
 
     case $cmd in
+        # Building
         b | build ) build "$bin" ;;
         br | build-release ) create_images rel ;;
+
+        # Running
         r | run ) run "$bin" ;;
         rr | run-release ) run_release ;;
+        s | stop ) stop ;;
+
+        # Ease of life
+        psql ) docker exec -it fej_db psql -U fej -d fej ;;
+        sh ) docker exec -it fej sh ;;
+
+        # Misc
+        docs ) cargo doc --no-deps ;;
+        format ) cargo fmt ;;
+        l | logs ) logs ;;
+        lint ) cargo fmt -- --check ;;
         p | push | publish ) publish ;;
         t | test ) tests ;;
-        s | stop ) stop ;;
-        p | push | publish ) publish ;;
         * ) >&2 echo "Invalid command."; exit 1 ;;
     esac
 }

From d19fe5c42e29af96e3be02662ca6e507b90f19b2 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Fri, 16 Apr 2021 00:32:03 +0200
Subject: [PATCH 027/124] [#26] Moved all routing to server binary

---
 .hooks/pre-commit                         |   2 +-
 src/{ => bin/server}/catchers.rs          |   0
 src/bin/server/main.rs                    |   8 +-
 src/bin/server/routes/ivago.rs            |  38 ++++++++
 src/bin/server/routes/mod.rs              |   5 +
 src/ivago/{controller => }/basic_date.rs  |   0
 src/ivago/controller/mod.rs               |  95 ------------------
 src/ivago/mod.rs                          | 112 ++++++++++++++++------
 src/ivago/{controller => }/pickup_time.rs |   0
 src/ivago/{controller => }/street.rs      |   0
 src/lib.rs                                |   4 -
 11 files changed, 130 insertions(+), 134 deletions(-)
 rename src/{ => bin/server}/catchers.rs (100%)
 create mode 100644 src/bin/server/routes/ivago.rs
 create mode 100644 src/bin/server/routes/mod.rs
 rename src/ivago/{controller => }/basic_date.rs (100%)
 delete mode 100644 src/ivago/controller/mod.rs
 rename src/ivago/{controller => }/pickup_time.rs (100%)
 rename src/ivago/{controller => }/street.rs (100%)

diff --git a/.hooks/pre-commit b/.hooks/pre-commit
index 6947bc7..fe55771 100755
--- a/.hooks/pre-commit
+++ b/.hooks/pre-commit
@@ -2,7 +2,7 @@
 
 # This hook lints the code, and if we're on develop or master, also forces the tests to pass.
 ./fejctl lint &> /dev/null 2>&1 || {
-    >&2 echo "Format check failed, use 'make lint' for more information.";
+    >&2 echo "Format check failed, use './fejctl lint' for more information.";
     exit 1;
 }
 
diff --git a/src/catchers.rs b/src/bin/server/catchers.rs
similarity index 100%
rename from src/catchers.rs
rename to src/bin/server/catchers.rs
diff --git a/src/bin/server/main.rs b/src/bin/server/main.rs
index a27e00f..3fde2c7 100644
--- a/src/bin/server/main.rs
+++ b/src/bin/server/main.rs
@@ -1,7 +1,9 @@
+#![feature(proc_macro_hygiene, decl_macro)]
+
 #[macro_use]
 extern crate rocket;
-
-use fej::{catchers, ivago};
+mod catchers;
+mod routes;
 
 // Very temporary solution for CORS
 // https://stackoverflow.com/questions/62412361/how-to-set-up-cors-or-options-for-rocket-rs
@@ -33,7 +35,7 @@ impl Fairing for CORS {
 fn rocket() -> rocket::Rocket {
     rocket::ignite()
         .attach(CORS)
-        .mount("/ivago", ivago::routes())
+        .mount("/ivago", routes::ivago())
         .register(catchers![catchers::not_found])
 }
 
diff --git a/src/bin/server/routes/ivago.rs b/src/bin/server/routes/ivago.rs
new file mode 100644
index 0000000..d8318bd
--- /dev/null
+++ b/src/bin/server/routes/ivago.rs
@@ -0,0 +1,38 @@
+use fej::ivago::{get_pickup_times, search_streets, BasicDate, PickupTime, Street};
+use rocket::http::Status;
+use rocket_contrib::json::Json;
+
+/// This route handles the Ivago search endpoint. It returns a list of streets,
+/// consisting of a street name & a city.
+///
+/// # Arguments
+///
+/// * `search_term` - Search term to use to look for streets
+#[get("/search?<q>")]
+pub fn route_search_streets(q: String) -> Result<Json<Vec<Street>>, Status> {
+    Ok(Json(search_streets(q.as_str())?))
+}
+
+/// Handles returning of pickup times for a specific address. It returns a list
+/// of pickup times, containing a date and a description of the trash type.
+///
+/// # Arguments
+///
+/// * `street` - Street to look up
+/// * `number` - House number in the given street
+/// * `start_date` - Earliest date that can be returned
+/// * `end_date` - Latest date that can be returned
+#[get("/?<street>&<number>&<start_date>&<end_date>")]
+pub fn route_get_pickup_times(
+    street: Street,
+    number: u32,
+    start_date: BasicDate,
+    end_date: BasicDate,
+) -> Result<Json<Vec<PickupTime>>, Status> {
+    Ok(Json(get_pickup_times(
+        &street,
+        &number,
+        &start_date.0,
+        &end_date.0,
+    )?))
+}
diff --git a/src/bin/server/routes/mod.rs b/src/bin/server/routes/mod.rs
new file mode 100644
index 0000000..449f82f
--- /dev/null
+++ b/src/bin/server/routes/mod.rs
@@ -0,0 +1,5 @@
+mod ivago;
+
+pub fn ivago() -> Vec<rocket::Route> {
+    routes![ivago::route_search_streets, ivago::route_get_pickup_times]
+}
diff --git a/src/ivago/controller/basic_date.rs b/src/ivago/basic_date.rs
similarity index 100%
rename from src/ivago/controller/basic_date.rs
rename to src/ivago/basic_date.rs
diff --git a/src/ivago/controller/mod.rs b/src/ivago/controller/mod.rs
deleted file mode 100644
index 7d3a9f9..0000000
--- a/src/ivago/controller/mod.rs
+++ /dev/null
@@ -1,95 +0,0 @@
-use crate::errors::FejError;
-use chrono::DateTime;
-use chrono_tz::Tz;
-use reqwest::blocking as reqwest;
-use std::collections::HashMap;
-use std::convert::{From, TryFrom};
-
-mod basic_date;
-mod pickup_time;
-mod street;
-
-pub use basic_date::BasicDate;
-pub use pickup_time::PickupTime;
-pub use street::Street;
-
-/// Endpoint for the search feature
-const SEARCH_URL: &str = "https://www.ivago.be/nl/particulier/autocomplete/garbage/streets";
-/// Endpoint for populating the initial cookies
-const BASE_URL: &str = "https://www.ivago.be/nl/particulier/afval/ophaling";
-/// Endpoint for the actual calendar output
-const CAL_URL: &str = "https://www.ivago.be/nl/particulier/garbage/pick-up/pickups";
-
-/// Searches the Ivago API for streets in the given city.
-///
-/// # Arguments
-///
-/// * `search_term` - Search term to use to look for streets
-pub fn search_streets(search_term: &str) -> Result<Vec<Street>, FejError> {
-    let client = reqwest::Client::new();
-    let response = client.get(SEARCH_URL).query(&[("q", search_term)]).send()?;
-    let data: Vec<HashMap<String, String>> = response.json()?;
-
-    // This is pretty cool, filter_map first does get() on all the maps, and
-    // then filters out any None values
-    // Then, we do the same thing for streets
-    Ok(data
-        .iter()
-        .filter_map(|m| m.get("value"))
-        .filter_map(|v| Street::try_from(v.as_str()).ok())
-        .collect())
-}
-
-/// Returns the pickup times for the various trash types.
-///
-/// # Arguments
-///
-/// * `street` - Street to look up
-/// * `number` - House number in given street
-/// * `start_date` - Earliest date for the results
-/// * `end_date` - Latest date for the results
-pub fn get_pickup_times(
-    street: &Street,
-    number: &u32,
-    start_date: &DateTime<Tz>,
-    end_date: &DateTime<Tz>,
-) -> Result<Vec<PickupTime>, FejError> {
-    let client = reqwest::Client::builder().cookie_store(true).build()?;
-
-    // This populates the cookies with the necessary values
-    client
-        .post(BASE_URL)
-        .form(&[
-            ("garbage_type", ""),
-            ("ivago_street", &String::from(street)),
-            ("number", &number.to_string()),
-            ("form_id", "garbage_address_form"),
-        ])
-        .send()?;
-
-    let response = client
-        .get(CAL_URL)
-        .query(&[
-            ("_format", "json"),
-            ("type", ""),
-            ("start", &start_date.timestamp().to_string()),
-            ("end", &end_date.timestamp().to_string()),
-        ])
-        .send()?;
-    let data: Vec<HashMap<String, String>> = response.json()?;
-
-    let mut output: Vec<PickupTime> = Vec::new();
-
-    for map in data
-        .iter()
-        .filter(|m| m.contains_key("date") && m.contains_key("label"))
-    {
-        // Because we filtered the maps in the loop, we can safely use unwrap
-        // here
-        if let Ok(date) = BasicDate::try_from(map.get("date").unwrap().as_str()) {
-            output.push(PickupTime::new(date, map.get("label").unwrap().to_string()))
-        }
-    }
-
-    Ok(output)
-}
diff --git a/src/ivago/mod.rs b/src/ivago/mod.rs
index 627e89b..7d3a9f9 100644
--- a/src/ivago/mod.rs
+++ b/src/ivago/mod.rs
@@ -1,45 +1,95 @@
-mod controller;
+use crate::errors::FejError;
+use chrono::DateTime;
+use chrono_tz::Tz;
+use reqwest::blocking as reqwest;
+use std::collections::HashMap;
+use std::convert::{From, TryFrom};
 
-use controller::{get_pickup_times, search_streets};
-use controller::{BasicDate, PickupTime, Street};
-use rocket::http::Status;
-use rocket_contrib::json::Json;
+mod basic_date;
+mod pickup_time;
+mod street;
 
-pub fn routes() -> Vec<rocket::Route> {
-    routes![route_search_streets, route_get_pickup_times]
-}
+pub use basic_date::BasicDate;
+pub use pickup_time::PickupTime;
+pub use street::Street;
 
-/// This route handles the Ivago search endpoint. It returns a list of streets,
-/// consisting of a street name & a city.
+/// Endpoint for the search feature
+const SEARCH_URL: &str = "https://www.ivago.be/nl/particulier/autocomplete/garbage/streets";
+/// Endpoint for populating the initial cookies
+const BASE_URL: &str = "https://www.ivago.be/nl/particulier/afval/ophaling";
+/// Endpoint for the actual calendar output
+const CAL_URL: &str = "https://www.ivago.be/nl/particulier/garbage/pick-up/pickups";
+
+/// Searches the Ivago API for streets in the given city.
 ///
 /// # Arguments
 ///
 /// * `search_term` - Search term to use to look for streets
-#[get("/search?<q>")]
-pub fn route_search_streets(q: String) -> Result<Json<Vec<Street>>, Status> {
-    Ok(Json(search_streets(q.as_str())?))
+pub fn search_streets(search_term: &str) -> Result<Vec<Street>, FejError> {
+    let client = reqwest::Client::new();
+    let response = client.get(SEARCH_URL).query(&[("q", search_term)]).send()?;
+    let data: Vec<HashMap<String, String>> = response.json()?;
+
+    // This is pretty cool, filter_map first does get() on all the maps, and
+    // then filters out any None values
+    // Then, we do the same thing for streets
+    Ok(data
+        .iter()
+        .filter_map(|m| m.get("value"))
+        .filter_map(|v| Street::try_from(v.as_str()).ok())
+        .collect())
 }
 
-/// Handles returning of pickup times for a specific address. It returns a list
-/// of pickup times, containing a date and a description of the trash type.
+/// Returns the pickup times for the various trash types.
 ///
 /// # Arguments
 ///
 /// * `street` - Street to look up
-/// * `number` - House number in the given street
-/// * `start_date` - Earliest date that can be returned
-/// * `end_date` - Latest date that can be returned
-#[get("/?<street>&<number>&<start_date>&<end_date>")]
-pub fn route_get_pickup_times(
-    street: Street,
-    number: u32,
-    start_date: BasicDate,
-    end_date: BasicDate,
-) -> Result<Json<Vec<PickupTime>>, Status> {
-    Ok(Json(get_pickup_times(
-        &street,
-        &number,
-        &start_date.0,
-        &end_date.0,
-    )?))
+/// * `number` - House number in given street
+/// * `start_date` - Earliest date for the results
+/// * `end_date` - Latest date for the results
+pub fn get_pickup_times(
+    street: &Street,
+    number: &u32,
+    start_date: &DateTime<Tz>,
+    end_date: &DateTime<Tz>,
+) -> Result<Vec<PickupTime>, FejError> {
+    let client = reqwest::Client::builder().cookie_store(true).build()?;
+
+    // This populates the cookies with the necessary values
+    client
+        .post(BASE_URL)
+        .form(&[
+            ("garbage_type", ""),
+            ("ivago_street", &String::from(street)),
+            ("number", &number.to_string()),
+            ("form_id", "garbage_address_form"),
+        ])
+        .send()?;
+
+    let response = client
+        .get(CAL_URL)
+        .query(&[
+            ("_format", "json"),
+            ("type", ""),
+            ("start", &start_date.timestamp().to_string()),
+            ("end", &end_date.timestamp().to_string()),
+        ])
+        .send()?;
+    let data: Vec<HashMap<String, String>> = response.json()?;
+
+    let mut output: Vec<PickupTime> = Vec::new();
+
+    for map in data
+        .iter()
+        .filter(|m| m.contains_key("date") && m.contains_key("label"))
+    {
+        // Because we filtered the maps in the loop, we can safely use unwrap
+        // here
+        if let Ok(date) = BasicDate::try_from(map.get("date").unwrap().as_str()) {
+            output.push(PickupTime::new(date, map.get("label").unwrap().to_string()))
+        }
+    }
+
+    Ok(output)
 }
diff --git a/src/ivago/controller/pickup_time.rs b/src/ivago/pickup_time.rs
similarity index 100%
rename from src/ivago/controller/pickup_time.rs
rename to src/ivago/pickup_time.rs
diff --git a/src/ivago/controller/street.rs b/src/ivago/street.rs
similarity index 100%
rename from src/ivago/controller/street.rs
rename to src/ivago/street.rs
diff --git a/src/lib.rs b/src/lib.rs
index b1e2733..761c91b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,11 +1,7 @@
 #![feature(proc_macro_hygiene, decl_macro)]
 
-#[macro_use]
-extern crate rocket;
-
 // Route modules
 pub mod ivago;
 
 // Helper modules
-pub mod catchers;
 pub mod errors;

From 4b51ee20caad1f1b155900f457c4728cbfe11f01 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Fri, 16 Apr 2021 00:36:03 +0200
Subject: [PATCH 028/124] [#26] Threw in the towel for now

---
 src/errors.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/errors.rs b/src/errors.rs
index afcf04a..730714c 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -10,6 +10,8 @@ pub enum FejError {
     FailedRequest,
 }
 
+// I'd love to move this over to the server binary, but right now, error E0117 is making that
+// imopssible
 impl From<FejError> for Status {
     fn from(err: FejError) -> Status {
         match err {

From 45c4a4e257efad0edba3d2f94149f33da591c1f8 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Fri, 16 Apr 2021 09:18:50 +0200
Subject: [PATCH 029/124] [#26] Moved lib & bin to own folders; Moved server
 tests; wrote some readmes

---
 Cargo.toml                            | 11 ++---
 README.md                             | 60 ++++++++++++++++-----------
 src/{ => fej}/errors.rs               |  0
 src/{ => fej}/ivago/basic_date.rs     |  0
 src/{ => fej}/ivago/mod.rs            |  0
 src/{ => fej}/ivago/pickup_time.rs    |  0
 src/{ => fej}/ivago/street.rs         |  0
 src/{ => fej}/lib.rs                  |  0
 src/{bin => }/server/catchers.rs      |  0
 src/{bin => }/server/main.rs          |  4 ++
 src/{bin => }/server/routes/ivago.rs  |  0
 src/{bin => }/server/routes/mod.rs    |  0
 tests/ivago.rs => src/server/tests.rs |  2 +-
 13 files changed, 46 insertions(+), 31 deletions(-)
 rename src/{ => fej}/errors.rs (100%)
 rename src/{ => fej}/ivago/basic_date.rs (100%)
 rename src/{ => fej}/ivago/mod.rs (100%)
 rename src/{ => fej}/ivago/pickup_time.rs (100%)
 rename src/{ => fej}/ivago/street.rs (100%)
 rename src/{ => fej}/lib.rs (100%)
 rename src/{bin => }/server/catchers.rs (100%)
 rename src/{bin => }/server/main.rs (97%)
 rename src/{bin => }/server/routes/ivago.rs (100%)
 rename src/{bin => }/server/routes/mod.rs (100%)
 rename tests/ivago.rs => src/server/tests.rs (93%)

diff --git a/Cargo.toml b/Cargo.toml
index 46b01a1..4081b85 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 
 [lib]
 name = "fej"
-src = "src/lib.rs"
+path = "src/fej/lib.rs"
 test = true
 bench = true
 doc = true
@@ -14,10 +14,11 @@ doctest = true
 
 [[bin]]
 name = "server"
-src = "src/bin/server/main.rs"
-test = false
-bench = false
-doc = false
+path = "src/server/main.rs"
+test = true
+bench = true
+doc = true
+doctest = true
  
 [dependencies]
 rocket = "0.4.7"
diff --git a/README.md b/README.md
index 55d11e3..15e4e03 100644
--- a/README.md
+++ b/README.md
@@ -1,25 +1,21 @@
 # Fej
 
-Fej is an API written in Rust. I started this project to learn the language,
-and really just have some fun.
+Fej is a RESTful API that does lots of different things. It started as an
+experiment to learn Rust, but has grown into a full-on passion project.
 
 ## Project Structure
 
-The folder structure follows the structure of the URLs, e.g. the route for
-`/hello/world` is found in the module `src/hello`.
+The bulk of the project consists of the main `fej` library. The `src` folder
+contains the `lib.rs` file for this library, and all other binaries import from
+this main library.
 
-Each module contains the following base files:
+All binaries can be found in [`/src/bin`](src/bin), with the biggest one being
+`server`. This is what actually runs as the Rocket.rs server. The other
+binaries (with more possibly coming) are utility tools that will most likely be
+run as cron jobs inside the containers, e.g. scrapers.
 
-* `mod.rs`: defines the modules' content, and contains the route definitions.
-  The route functions themselves only contain the functionality needed to
-  represent the data, not acquire it.
-* `controller.rs`: this file contains the actual logic of each route. If the
-  logic becomes too complicated to be contained inside a single file,
-  `controller.rs` becomes its own module folder named `controller`.
-* `tests.rs`: this contains tests for the specific module. This can also be a
-  module directory if need be.
-
-Every module has a `routes` function that returns its route macros.
+Version 1.1 also introduces the use of a database, namely
+[PostgreSQL 13](https://www.postgresql.org/).
 
 ## Roadmap
 
@@ -27,19 +23,33 @@ See [roadmap.md](roadmap.md).
 
 ## Development
 
-The entire toolchain runs on Alpine inside Docker. This makes building easier,
-and (hopefully) eliminates any system-specific bugs.
+To make development more consistent (and keep my computer a bit cleaner) I've
+decided to run the entire toolchain using Docker, with Alpine Linux base
+images. This also allows me to make really small final images. Technically,
+Docker is the only dependency you need to contribute to this project
+(not accounting for language servers etc.).
 
-A [Makefile wrapper](Makefile) is provided for ease of use. Do check it out, as
-all the commands are documented for your understanding ;)
+A [Bash script](fejctl) is provided to speed up development on the various
+binaries. It aids in starting up the containers, choosing which binary to run
+etc. A quick rundown of its most important features:
 
-There's also the `build` script. This script does all the "heavy" lifting. It
-chooses which Dockerfile to build according to the given arguments, and
-generates tags for the images (useful when pushing releases). The Makefile is
-really just a wrapper around this build script, allowing you to write
-`make test` instead of `./build -m dev -a run test`.
+```bash
+# By default, it compiles the 'server' binary (but doesn't run it)
+./fejctl
 
-tl;dr run `make run` to run your build, and `make test` to run the tests.
+# The first argument is the action you wish to perform, the second on which
+# binary (not all commands need a binary as input, so they just ignore it)
+# For example, this will run the binary called server
+./fejctl r server
+
+# This runs the tests (all commands also have their full name if you want)
+./fejctl t
+./fejctl test
+
+# These attach to the two containers
+./fejctl sh   # Opens a new root shell inside the 'fej' container
+./fejctl psql # Open a new psql shell in the fej database
+```
 
 ## Docker images
 
diff --git a/src/errors.rs b/src/fej/errors.rs
similarity index 100%
rename from src/errors.rs
rename to src/fej/errors.rs
diff --git a/src/ivago/basic_date.rs b/src/fej/ivago/basic_date.rs
similarity index 100%
rename from src/ivago/basic_date.rs
rename to src/fej/ivago/basic_date.rs
diff --git a/src/ivago/mod.rs b/src/fej/ivago/mod.rs
similarity index 100%
rename from src/ivago/mod.rs
rename to src/fej/ivago/mod.rs
diff --git a/src/ivago/pickup_time.rs b/src/fej/ivago/pickup_time.rs
similarity index 100%
rename from src/ivago/pickup_time.rs
rename to src/fej/ivago/pickup_time.rs
diff --git a/src/ivago/street.rs b/src/fej/ivago/street.rs
similarity index 100%
rename from src/ivago/street.rs
rename to src/fej/ivago/street.rs
diff --git a/src/lib.rs b/src/fej/lib.rs
similarity index 100%
rename from src/lib.rs
rename to src/fej/lib.rs
diff --git a/src/bin/server/catchers.rs b/src/server/catchers.rs
similarity index 100%
rename from src/bin/server/catchers.rs
rename to src/server/catchers.rs
diff --git a/src/bin/server/main.rs b/src/server/main.rs
similarity index 97%
rename from src/bin/server/main.rs
rename to src/server/main.rs
index 3fde2c7..58b0300 100644
--- a/src/bin/server/main.rs
+++ b/src/server/main.rs
@@ -2,6 +2,10 @@
 
 #[macro_use]
 extern crate rocket;
+
+#[cfg(test)]
+mod tests;
+
 mod catchers;
 mod routes;
 
diff --git a/src/bin/server/routes/ivago.rs b/src/server/routes/ivago.rs
similarity index 100%
rename from src/bin/server/routes/ivago.rs
rename to src/server/routes/ivago.rs
diff --git a/src/bin/server/routes/mod.rs b/src/server/routes/mod.rs
similarity index 100%
rename from src/bin/server/routes/mod.rs
rename to src/server/routes/mod.rs
diff --git a/tests/ivago.rs b/src/server/tests.rs
similarity index 93%
rename from tests/ivago.rs
rename to src/server/tests.rs
index d78501a..8871762 100644
--- a/tests/ivago.rs
+++ b/src/server/tests.rs
@@ -3,7 +3,7 @@ use rocket::http::Status;
 use rocket::local::Client;
 
 fn rocket() -> rocket::Rocket {
-    rocket::ignite().mount("/", fej_lib::ivago::routes())
+    rocket::ignite().mount("/", super::routes::ivago())
 }
 
 /// Test 404 response

From c2fa764e8002352728030e512f6f99b15b0014f6 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Fri, 16 Apr 2021 09:22:30 +0200
Subject: [PATCH 030/124] [#26] Updated README again

---
 README.md | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 15e4e03..e2573af 100644
--- a/README.md
+++ b/README.md
@@ -5,14 +5,10 @@ experiment to learn Rust, but has grown into a full-on passion project.
 
 ## Project Structure
 
-The bulk of the project consists of the main `fej` library. The `src` folder
-contains the `lib.rs` file for this library, and all other binaries import from
-this main library.
-
-All binaries can be found in [`/src/bin`](src/bin), with the biggest one being
-`server`. This is what actually runs as the Rocket.rs server. The other
-binaries (with more possibly coming) are utility tools that will most likely be
-run as cron jobs inside the containers, e.g. scrapers.
+The `src` folder contains subfolders for the various binaries and the main
+library, called `fej`. The biggest binary is called `server`, which is the
+binary that actually runs the Rocket.rs web server. All the others are utility
+programs, mostly consisting of scrapers for various services.
 
 Version 1.1 also introduces the use of a database, namely
 [PostgreSQL 13](https://www.postgresql.org/).

From 0e4eb6812164b52d77c4532ef53fbf79fe15048b Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Fri, 16 Apr 2021 09:30:25 +0200
Subject: [PATCH 031/124] [#26] Updated roadmap.md

---
 roadmap.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/roadmap.md b/roadmap.md
index f03e4b5..bfdd622 100644
--- a/roadmap.md
+++ b/roadmap.md
@@ -69,8 +69,8 @@ setting up a database for this version anyways.
 ## Kissanime
 
 I like watching anime from time to time, and I've always used Kissanime for
-this. However, their sites can be quite slow, and riddled with ads from time to
-time. That's why I'd like to create a high-speed wrapper that extracts all the
-needed info from their sites, removing the need for the user to ever actually
-visit their site. The API can just act as a fast search index, complete with
-indexing of the links to the videos and everything.
+this. However, their sites can be quite slow, and riddled with ads. That's why
+I'd like to create a high-speed wrapper that extracts all the needed info from
+their sites, removing the need for the user to ever actually visit their site.
+The API can just act as a fast search index, complete with indexing of the
+links to the videos and everything.

From 14321db3165797e6b170eace5977d7826fe6c6fd Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Fri, 16 Apr 2021 20:17:00 +0200
Subject: [PATCH 032/124] [#24] Added diesel_postgres_pool to deps

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 4081b85..886d903 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -32,4 +32,4 @@ diesel = { version = "1.4.6", features = ["postgres"] }
 [dependencies.rocket_contrib]
 version = "0.4.7"
 default-features = false
-features = ["json"]
+features = ["json", "diesel_postgres_pool"]

From d5a513482a41b48d0452449241b6d2244b4de3db Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Fri, 16 Apr 2021 20:39:09 +0200
Subject: [PATCH 033/124] [#24] First try at compiling diesel in container
 (DOESN'T WORK)

---
 Cargo.lock                | 85 +++++++++++++++++++++++++++++++++++++++
 Rocket.toml               | 11 +++++
 docker/Dockerfile.builder |  4 +-
 fejctl                    |  1 +
 4 files changed, 98 insertions(+), 3 deletions(-)
 create mode 100644 Rocket.toml

diff --git a/Cargo.lock b/Cargo.lock
index 0006402..55062dc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -331,6 +331,7 @@ dependencies = [
  "byteorder",
  "diesel_derives",
  "pq-sys",
+ "r2d2",
 ]
 
 [[package]]
@@ -741,6 +742,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "instant"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec"
+dependencies = [
+ "cfg-if 1.0.0",
+]
+
 [[package]]
 name = "iovec"
 version = "0.1.4"
@@ -805,6 +815,15 @@ version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9385f66bf6105b241aa65a61cb923ef20efc665cb9f9bb50ac2f0c4b7f378d41"
 
+[[package]]
+name = "lock_api"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a3c91c24eae6777794bb1997ad98bbb87daf92890acab859f7eaa4320333176"
+dependencies = [
+ "scopeguard",
+]
+
 [[package]]
 name = "log"
 version = "0.3.9"
@@ -1045,6 +1064,31 @@ dependencies = [
  "vcpkg",
 ]
 
+[[package]]
+name = "parking_lot"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"
+dependencies = [
+ "instant",
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018"
+dependencies = [
+ "cfg-if 1.0.0",
+ "instant",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "parse-zoneinfo"
 version = "0.3.0"
@@ -1204,6 +1248,17 @@ dependencies = [
  "proc-macro2 1.0.26",
 ]
 
+[[package]]
+name = "r2d2"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "545c5bc2b880973c9c10e4067418407a0ccaa3091781d1671d46eb35107cb26f"
+dependencies = [
+ "log 0.4.14",
+ "parking_lot",
+ "scheduled-thread-pool",
+]
+
 [[package]]
 name = "rand"
 version = "0.8.3"
@@ -1359,13 +1414,28 @@ version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d7954a707f9ca18aa74ca8c1f5d1f900f52a4dceb68e96e3112143f759cfd20e"
 dependencies = [
+ "diesel",
  "log 0.4.14",
  "notify",
+ "r2d2",
  "rocket",
+ "rocket_contrib_codegen",
  "serde",
  "serde_json",
 ]
 
+[[package]]
+name = "rocket_contrib_codegen"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30deb6dec53b91fac3538a2a3935cf13e0f462745f9f33bf27bedffbe7265b5d"
+dependencies = [
+ "devise",
+ "quote 0.6.13",
+ "version_check 0.9.3",
+ "yansi",
+]
+
 [[package]]
 name = "rocket_http"
 version = "0.4.7"
@@ -1423,6 +1493,21 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "scheduled-thread-pool"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc6f74fd1204073fa02d5d5d68bec8021be4c38690b61264b2fdb48083d0e7d7"
+dependencies = [
+ "parking_lot",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+
 [[package]]
 name = "security-framework"
 version = "2.2.0"
diff --git a/Rocket.toml b/Rocket.toml
new file mode 100644
index 0000000..2eba66c
--- /dev/null
+++ b/Rocket.toml
@@ -0,0 +1,11 @@
+[development]
+address = "localhost"
+port = 7999
+keep_alive = 5
+read_timeout = 5
+write_timeout = 5
+log = "normal"
+limits = { forms = 32768 }
+
+[global.databases]
+postgres_fej = { url = "postgres://fej:fej@fej_db:5432/fej" }
diff --git a/docker/Dockerfile.builder b/docker/Dockerfile.builder
index b968c5b..4d04e9b 100644
--- a/docker/Dockerfile.builder
+++ b/docker/Dockerfile.builder
@@ -4,13 +4,11 @@ FROM alpine:latest AS builder
 ENV PATH "$PATH:/root/.cargo/bin"
 # Needed for proper compiling of openssl-dev
 ENV RUSTFLAGS "-C target-feature=-crt-static"
-# Otherwise, the debug build can't be used from the container
-ENV ROCKET_ADDRESS "0.0.0.0"
 
 WORKDIR /usr/src/app
 
 # Install build dependencies, rustup & rust's nightly build & toolchain
-RUN apk update && apk add --no-cache openssl-dev build-base curl && \
+RUN apk update && apk add --no-cache openssl-dev build-base curl libpq && \
     { curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly; }
 
 # Copy source code over to builder
diff --git a/fejctl b/fejctl
index c977f79..acaaeee 100755
--- a/fejctl
+++ b/fejctl
@@ -52,6 +52,7 @@ function run_image() {
         --network fej \
         -v 'fej_build-cache:/usr/src/app/target' \
         -v 'fej_registry-cache:/root/.cargo/registry' \
+        -v "$PWD/Rocket.toml:/usr/src/app/Rocket.toml:ro" \
         "$image:dev" "$@"
 }
 

From fd7a3e23317d00f655cca87b1d1ba1214969af19 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Fri, 16 Apr 2021 23:20:22 +0200
Subject: [PATCH 034/124] [#24] Second attempt (failed)

---
 .dockerignore             | 3 +++
 docker/Dockerfile.builder | 5 +++--
 docker/Dockerfile.dev     | 4 +++-
 docker/entrypoint_dev.sh  | 4 ++++
 fejctl                    | 4 ++++
 5 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100755 docker/entrypoint_dev.sh

diff --git a/.dockerignore b/.dockerignore
index 614c7dd..aa9bcf8 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -6,3 +6,6 @@
 # Cargo files
 !Cargo.toml
 !Cargo.lock
+
+# Entrypoint for devop container
+!docker/entrypoint_dev.sh
diff --git a/docker/Dockerfile.builder b/docker/Dockerfile.builder
index 4d04e9b..126a302 100644
--- a/docker/Dockerfile.builder
+++ b/docker/Dockerfile.builder
@@ -8,8 +8,9 @@ ENV RUSTFLAGS "-C target-feature=-crt-static"
 WORKDIR /usr/src/app
 
 # Install build dependencies, rustup & rust's nightly build & toolchain
-RUN apk update && apk add --no-cache openssl-dev build-base curl libpq && \
-    { curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly; }
+RUN apk update && apk add --no-cache openssl-dev curl libpq libgcc musl-dev gcc && \
+    { curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly; } && \
+    rustup target add x86_64-unknown-linux-musl --toolchain nightly
 
 # Copy source code over to builder
 COPY Cargo.toml Cargo.lock ./
diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
index d2029af..7281bc3 100644
--- a/docker/Dockerfile.dev
+++ b/docker/Dockerfile.dev
@@ -2,5 +2,7 @@ FROM chewingbever/fej-builder:latest
 
 ENV RUST_BACKTRACE 1
 
-ENTRYPOINT ["cargo"]
+COPY ./docker/entrypoint_dev.sh /entrypoint.sh
+
+ENTRYPOINT ["/entrypoint.sh"]
 CMD ["run", "--bin", "server"]
diff --git a/docker/entrypoint_dev.sh b/docker/entrypoint_dev.sh
new file mode 100755
index 0000000..0838bce
--- /dev/null
+++ b/docker/entrypoint_dev.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+
+# All this file does is inject the target
+cargo "$@" --target x86_64-unknown-linux-musl
diff --git a/fejctl b/fejctl
index acaaeee..ee4cf8e 100755
--- a/fejctl
+++ b/fejctl
@@ -28,6 +28,10 @@ function create_images() {
 #
 # $@: the arguments to pass to the image (passed as arguments to cargo)
 function run_image() {
+    docker volume create fej_build-cache
+    docker volume create fej_registry-cache
+    docker volume create fej_db-data
+
     # Run the database image
     docker run --rm \
         --detach \

From f381c5b9108a09c3e612b4d2ee64ace4d1e5eb0f Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sat, 17 Apr 2021 10:12:37 +0200
Subject: [PATCH 035/124] [#24] Fixed libpq not wanting to link

---
 Rocket.toml               | 4 ++--
 docker/Dockerfile.builder | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Rocket.toml b/Rocket.toml
index 2eba66c..20ca98c 100644
--- a/Rocket.toml
+++ b/Rocket.toml
@@ -1,6 +1,6 @@
 [development]
-address = "localhost"
-port = 7999
+address = "0.0.0.0"
+port = 8000
 keep_alive = 5
 read_timeout = 5
 write_timeout = 5
diff --git a/docker/Dockerfile.builder b/docker/Dockerfile.builder
index 126a302..dc28716 100644
--- a/docker/Dockerfile.builder
+++ b/docker/Dockerfile.builder
@@ -8,7 +8,7 @@ ENV RUSTFLAGS "-C target-feature=-crt-static"
 WORKDIR /usr/src/app
 
 # Install build dependencies, rustup & rust's nightly build & toolchain
-RUN apk update && apk add --no-cache openssl-dev curl libpq libgcc musl-dev gcc && \
+RUN apk update && apk add --no-cache openssl-dev curl postgresql-dev libgcc musl-dev gcc && \
     { curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly; } && \
     rustup target add x86_64-unknown-linux-musl --toolchain nightly
 

From 5746d295564aabff2410344f278184e4bb85a28a Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sat, 17 Apr 2021 10:32:16 +0200
Subject: [PATCH 036/124] [#24] Added musl target to release builder

---
 docker/Dockerfile.rel | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docker/Dockerfile.rel b/docker/Dockerfile.rel
index b64916a..e293ccc 100644
--- a/docker/Dockerfile.rel
+++ b/docker/Dockerfile.rel
@@ -7,7 +7,10 @@ FROM chewingbever/fej-builder:latest AS builder
 # NOTE: cargo install auto-appends bin to the path
 RUN --mount=type=cache,target=/usr/src/app/target \
     --mount=type=cache,target=/root/.cargo/registry \
-    cargo install --path . --root /usr/local
+    cargo install \
+        --path . \
+        --root /usr/local \
+        --target x86_64-unknown-linux-musl
 
 
 # Now, we create the actual image

From 3a490fca353fa6d955a3d44e125bd031aeaca70c Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sat, 17 Apr 2021 10:52:55 +0200
Subject: [PATCH 037/124] [#24] Added db connection to server

---
 src/server/main.rs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/server/main.rs b/src/server/main.rs
index 58b0300..9e01983 100644
--- a/src/server/main.rs
+++ b/src/server/main.rs
@@ -2,6 +2,8 @@
 
 #[macro_use]
 extern crate rocket;
+#[macro_use]
+extern crate rocket_contrib;
 
 #[cfg(test)]
 mod tests;
@@ -14,6 +16,7 @@ mod routes;
 use rocket::fairing::{Fairing, Info, Kind};
 use rocket::http::Header;
 use rocket::{Request, Response};
+use rocket_contrib::databases::diesel;
 
 pub struct CORS;
 
@@ -36,9 +39,14 @@ impl Fairing for CORS {
     }
 }
 
+// This defines a connection to the database
+#[database("postgres_fej")]
+struct FejDbConn(diesel::PgConnection);
+
 fn rocket() -> rocket::Rocket {
     rocket::ignite()
         .attach(CORS)
+        .attach(FejDbConn::fairing())
         .mount("/ivago", routes::ivago())
         .register(catchers![catchers::not_found])
 }

From 0b2b986205dbf3c4e3aa84f80ae3db61b745b9fb Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sat, 17 Apr 2021 13:46:38 +0200
Subject: [PATCH 038/124] [#31] Debug build is now rootless

---
 docker/Dockerfile.builder | 34 ++++++++++++++++++++++++++--------
 docker/Dockerfile.dev     |  3 ++-
 docker/Dockerfile.rel     |  1 +
 fejctl                    | 29 ++++++++++++++++++++---------
 4 files changed, 49 insertions(+), 18 deletions(-)

diff --git a/docker/Dockerfile.builder b/docker/Dockerfile.builder
index dc28716..4790f7c 100644
--- a/docker/Dockerfile.builder
+++ b/docker/Dockerfile.builder
@@ -1,17 +1,35 @@
+# vim: filetype=dockerfile
 # Our entire toolchain runs in alpine
 FROM alpine:latest AS builder
 
-ENV PATH "$PATH:/root/.cargo/bin"
+ENV PATH "$PATH:/app/.cargo/bin"
 # Needed for proper compiling of openssl-dev
 ENV RUSTFLAGS "-C target-feature=-crt-static"
 
-WORKDIR /usr/src/app
+# Add the build user
+# Install dependencies
+RUN addgroup -S builder && \
+    adduser -S builder -G builder -h /app && \
+    apk update && \
+    apk add --no-cache \
+        curl \
+        gcc \
+        libgcc \
+        musl-dev \
+        openssl-dev \
+        postgresql-dev
 
-# Install build dependencies, rustup & rust's nightly build & toolchain
-RUN apk update && apk add --no-cache openssl-dev curl postgresql-dev libgcc musl-dev gcc && \
-    { curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly; } && \
-    rustup target add x86_64-unknown-linux-musl --toolchain nightly
+# Switch to the non-root user
+USER builder
+
+WORKDIR /app
+
+# Install rustup in the new user's home
+# Create mountpoints for volumes with correct permissions
+RUN { curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly; } && \
+    rustup target add x86_64-unknown-linux-musl --toolchain nightly && \
+    mkdir -p .cargo/registry target
 
 # Copy source code over to builder
-COPY Cargo.toml Cargo.lock ./
-COPY src/ ./src/
+COPY --chown=builder:builder Cargo.toml Cargo.lock ./
+COPY --chown=builder:builder src/ ./src/
diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
index 7281bc3..28004ac 100644
--- a/docker/Dockerfile.dev
+++ b/docker/Dockerfile.dev
@@ -1,8 +1,9 @@
+# vim: filetype=dockerfile
 FROM chewingbever/fej-builder:latest
 
 ENV RUST_BACKTRACE 1
 
-COPY ./docker/entrypoint_dev.sh /entrypoint.sh
+COPY --chown=builder:builder ./docker/entrypoint_dev.sh /entrypoint.sh
 
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["run", "--bin", "server"]
diff --git a/docker/Dockerfile.rel b/docker/Dockerfile.rel
index e293ccc..0fa71ad 100644
--- a/docker/Dockerfile.rel
+++ b/docker/Dockerfile.rel
@@ -1,3 +1,4 @@
+# vim: filetype=dockerfile
 FROM chewingbever/fej-builder:latest AS builder
 
 # And then finally, build the project
diff --git a/fejctl b/fejctl
index ee4cf8e..688395c 100755
--- a/fejctl
+++ b/fejctl
@@ -9,18 +9,27 @@ function create_images() {
     # First, we build the builder
     DOCKER_BUILDKIT=1 docker build \
         -f docker/Dockerfile.builder \
-        -t "$image-builder:latest" .
+        -t "$image-builder:latest" . || {
+            >&2 echo "Failed to build builder.";
+            exit 1;
+        }
 
     if [[ "$1" = "rel" ]]; then
         DOCKER_BUILDKIT=1 docker build \
             -t "$image:latest" \
-            -f docker/Dockerfile.rel .
+            -f docker/Dockerfile.rel . || {
+                >&2 echo "Failed to build release image.";
+                exit 1;
+            }
 
     else
         # Then, we create the debug image
         DOCKER_BUILDKIT=1 docker build \
             -t "$image:dev" \
-            -f docker/Dockerfile.dev .
+            -f docker/Dockerfile.dev . || {
+                >&2 echo "Failed to build debug image.";
+                exit 1;
+            }
     fi
 }
 
@@ -28,9 +37,9 @@ function create_images() {
 #
 # $@: the arguments to pass to the image (passed as arguments to cargo)
 function run_image() {
-    docker volume create fej_build-cache
-    docker volume create fej_registry-cache
-    docker volume create fej_db-data
+    docker volume create fej_build-cache > /dev/null
+    docker volume create fej_registry-cache > /dev/null
+    docker volume create fej_db-data > /dev/null
 
     # Run the database image
     docker run --rm \
@@ -54,9 +63,9 @@ function run_image() {
         --name fej \
         --env-file .env.container \
         --network fej \
-        -v 'fej_build-cache:/usr/src/app/target' \
-        -v 'fej_registry-cache:/root/.cargo/registry' \
-        -v "$PWD/Rocket.toml:/usr/src/app/Rocket.toml:ro" \
+        -v 'fej_build-cache:/app/target' \
+        -v 'fej_registry-cache:/app/.cargo/registry' \
+        -v "$PWD/Rocket.toml:/app/Rocket.toml:ro" \
         "$image:dev" "$@"
 }
 
@@ -109,6 +118,8 @@ function publish() {
         exit 2
     fi
 
+    create_images rel
+
     patch_version=`grep -Po '(?<=version = ").*(?=")' Cargo.toml | head -n1`
     major_version=`echo "$patch_version" | sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/'`
     minor_version=`echo "$patch_version" | sed -E 's/([0-9]+).([0-9]+).([0-9]+)/\1.\2/'`

From adbe6d1fb7e566af58fb433039132ec723613b4b Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sat, 17 Apr 2021 14:09:31 +0200
Subject: [PATCH 039/124] [#31] Release is now rootless (rip caching)

---
 .dockerignore         |  3 +++
 docker/Dockerfile.rel | 38 +++++++++++++++++++++++++++++---------
 2 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index aa9bcf8..41f29f5 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -9,3 +9,6 @@
 
 # Entrypoint for devop container
 !docker/entrypoint_dev.sh
+
+# Config file
+!Rocket.toml
diff --git a/docker/Dockerfile.rel b/docker/Dockerfile.rel
index 0fa71ad..2d3672c 100644
--- a/docker/Dockerfile.rel
+++ b/docker/Dockerfile.rel
@@ -6,22 +6,42 @@ FROM chewingbever/fej-builder:latest AS builder
 # https://users.rust-lang.org/t/sigsegv-with-program-linked-against-openssl-in-an-alpine-container/52172
 # TODO add what these flags do & why they work
 # NOTE: cargo install auto-appends bin to the path
-RUN --mount=type=cache,target=/usr/src/app/target \
-    --mount=type=cache,target=/root/.cargo/registry \
-    cargo install \
-        --path . \
-        --root /usr/local \
-        --target x86_64-unknown-linux-musl
+
+# RUN --mount=type=cache,mode=0777,target=/app/target \
+#     --mount=type=cache,mode=0777,target=/app/.cargo/registry \
+
+# Buildkit cache mounts really don't like it when you're not root,
+# so I guess we're building release without a cache for now
+RUN cargo install \
+    --path . \
+    --root /app/output \
+    --target x86_64-unknown-linux-musl
 
 
 # Now, we create the actual image
 FROM alpine:latest
 
 # Install some dynamic libraries needed for everything to work
-RUN apk update && apk add --no-cache openssl libgcc curl
+# Create -non-root user
+RUN apk update && \
+    apk add --no-cache \
+        curl \
+        libgcc \
+        libpq \
+        openssl && \
+    addgroup -S fej && \
+    adduser -S fej -G fej -h /app
+
+# Switch to non-root user
+USER fej:fej
 
 # Copy binary over to final image
-COPY --from=builder /usr/local/bin/server /usr/local/bin/server
+COPY --from=builder --chown=fej:fej /app/output/bin /app/bin
+
+# Embed config file inside container
+# The workdir is changed so that the config file is read properly
+WORKDIR /app
+COPY --chown=fej:fej Rocket.toml /app/Rocket.toml
 
 HEALTHCHECK \
     --interval=10s \
@@ -30,4 +50,4 @@ HEALTHCHECK \
     --retries=3 \
     CMD curl -q localhost:8000
 
-CMD ["/usr/local/bin/server"]
+CMD ["/app/bin/server"]

From 0bd09db295b96ec2dcec23fc92caf25353697f5a Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sat, 17 Apr 2021 14:19:53 +0200
Subject: [PATCH 040/124] [#31] Config file is now copied into images

---
 docker/Dockerfile.dev | 1 +
 fejctl                | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
index 28004ac..ea63e1e 100644
--- a/docker/Dockerfile.dev
+++ b/docker/Dockerfile.dev
@@ -4,6 +4,7 @@ FROM chewingbever/fej-builder:latest
 ENV RUST_BACKTRACE 1
 
 COPY --chown=builder:builder ./docker/entrypoint_dev.sh /entrypoint.sh
+COPY --chown=builder:builder ./Rocket.toml /app/Rocket.toml
 
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["run", "--bin", "server"]
diff --git a/fejctl b/fejctl
index 688395c..879419e 100755
--- a/fejctl
+++ b/fejctl
@@ -65,7 +65,6 @@ function run_image() {
         --network fej \
         -v 'fej_build-cache:/app/target' \
         -v 'fej_registry-cache:/app/.cargo/registry' \
-        -v "$PWD/Rocket.toml:/app/Rocket.toml:ro" \
         "$image:dev" "$@"
 }
 

From 65c3d616de73b65f503a5cbc3e9808477e6f26dd Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sat, 17 Apr 2021 14:43:24 +0200
Subject: [PATCH 041/124] Migrations should now run on startup

---
 .dockerignore             |  3 +++
 Cargo.toml                |  1 +
 docker/Dockerfile.builder |  1 +
 src/server/main.rs        | 19 ++++++++++++++++++-
 4 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/.dockerignore b/.dockerignore
index 41f29f5..b7c1108 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -12,3 +12,6 @@
 
 # Config file
 !Rocket.toml
+
+# Database migrations
+!migrations/
diff --git a/Cargo.toml b/Cargo.toml
index 886d903..9677304 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -28,6 +28,7 @@ chrono-tz = "0.5.3"
 regex = "1.4.5"
 reqwest = { version = "0.11.2", features = ["blocking", "json", "cookies"] }
 diesel = { version = "1.4.6", features = ["postgres"] }
+diesel_migrations = "1.4.0"
 
 [dependencies.rocket_contrib]
 version = "0.4.7"
diff --git a/docker/Dockerfile.builder b/docker/Dockerfile.builder
index 4790f7c..b4152fa 100644
--- a/docker/Dockerfile.builder
+++ b/docker/Dockerfile.builder
@@ -33,3 +33,4 @@ RUN { curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --
 # Copy source code over to builder
 COPY --chown=builder:builder Cargo.toml Cargo.lock ./
 COPY --chown=builder:builder src/ ./src/
+COPY --chown=builder:builder migrations/ ./migrations/
diff --git a/src/server/main.rs b/src/server/main.rs
index 9e01983..4267776 100644
--- a/src/server/main.rs
+++ b/src/server/main.rs
@@ -4,6 +4,8 @@
 extern crate rocket;
 #[macro_use]
 extern crate rocket_contrib;
+#[macro_use]
+extern crate diesel_migrations;
 
 #[cfg(test)]
 mod tests;
@@ -13,9 +15,10 @@ mod routes;
 
 // Very temporary solution for CORS
 // https://stackoverflow.com/questions/62412361/how-to-set-up-cors-or-options-for-rocket-rs
+use rocket::fairing::AdHoc;
 use rocket::fairing::{Fairing, Info, Kind};
 use rocket::http::Header;
-use rocket::{Request, Response};
+use rocket::{Request, Response, Rocket};
 use rocket_contrib::databases::diesel;
 
 pub struct CORS;
@@ -39,14 +42,28 @@ impl Fairing for CORS {
     }
 }
 
+// Macro from diesel_migrations that sets up migrations
+embed_migrations!();
+
 // This defines a connection to the database
 #[database("postgres_fej")]
 struct FejDbConn(diesel::PgConnection);
 
+// I'd like to thank Stackoverflow for helping me with this
+// https://stackoverflow.com/questions/61047355/how-to-run-diesel-migration-with-rocket-in-production
+fn run_db_migrations(rocket: Rocket) -> Result<Rocket, Rocket> {
+    let conn = FejDbConn::get_one(&rocket).expect("database connection");
+    match embedded_migrations::run(&*conn) {
+        Ok(()) => Ok(rocket),
+        Err(e) => Err(rocket),
+    }
+}
+
 fn rocket() -> rocket::Rocket {
     rocket::ignite()
         .attach(CORS)
         .attach(FejDbConn::fairing())
+        .attach(AdHoc::on_attach("Database Migrations", run_db_migrations))
         .mount("/ivago", routes::ivago())
         .register(catchers![catchers::not_found])
 }

From 00bf8501dd5f3e0e966ab9923f19e8be14bab1eb Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sat, 17 Apr 2021 15:10:42 +0200
Subject: [PATCH 042/124] [closes #33] Added compose file; ./fejctl rr works
 now

---
 Rocket.toml               |  5 ++++-
 docker/docker-compose.yml | 35 +++++++++++++++++++++++++++++++++++
 fejctl                    | 14 +++++++++++++-
 3 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 docker/docker-compose.yml

diff --git a/Rocket.toml b/Rocket.toml
index 20ca98c..56291e7 100644
--- a/Rocket.toml
+++ b/Rocket.toml
@@ -7,5 +7,8 @@ write_timeout = 5
 log = "normal"
 limits = { forms = 32768 }
 
-[global.databases]
+[development.databases]
 postgres_fej = { url = "postgres://fej:fej@fej_db:5432/fej" }
+
+[production.databases]
+postgres_fej = { url = "postgres://fej:fej@db:5432/fej" }
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
new file mode 100644
index 0000000..c6d6066
--- /dev/null
+++ b/docker/docker-compose.yml
@@ -0,0 +1,35 @@
+version: '2.4'
+
+services:
+    app:
+        image: 'chewingbever/fej:latest'
+        restart: 'always'
+
+        depends_on:
+            db:
+                condition: 'service_healthy'
+
+        environment:
+            - 'DATABASE_URL=postgres://fej:fej@db:5432/fej'
+
+    db:
+        image: 'postgres:13-alpine'
+        restart: 'always'
+
+        environment:
+            - 'POSTGRES_DB=fej'
+            - 'POSTGRES_USER=fej'
+            - 'POSTGRES_PASSWORD=fej'
+        healthcheck:
+            test: 'pg_isready -U fej'
+            interval: '30s'
+            timeout: '5s'
+            retries: 3
+            start_period: '0s'
+
+        volumes:
+            - 'db-data:/var/lib/postgresql/data'
+
+
+volumes:
+    db-data:
diff --git a/fejctl b/fejctl
index 879419e..b60be50 100755
--- a/fejctl
+++ b/fejctl
@@ -105,7 +105,18 @@ function stop() {
 }
 
 function run_release() {
-    echo "Not implemented"
+    docker-compose \
+        --file docker/docker-compose.yml \
+        --project-name fej-release \
+        up \
+        --detach
+}
+
+function stop_release() {
+     docker-compose \
+        --file docker/docker-compose.yml \
+        --project-name fej-release \
+        down
 }
 
 # Tags & pushes the release version to Docker Hub
@@ -155,6 +166,7 @@ function main() {
         r | run ) run "$bin" ;;
         rr | run-release ) run_release ;;
         s | stop ) stop ;;
+        sr | stop-release ) stop_release ;;
 
         # Ease of life
         psql ) docker exec -it fej_db psql -U fej -d fej ;;

From 43e26191ccd816224ce259982dcc35a1332c40e8 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sat, 17 Apr 2021 16:04:04 +0200
Subject: [PATCH 043/124] Moved development stuff to docker-compose

---
 Cargo.lock                    |  32 +++++++
 docker/Dockerfile.dev         |   1 -
 docker/docker-compose.dev.yml |  31 +++++++
 docker/docker-compose.yml     |   8 +-
 fejctl                        | 158 ++++++++++------------------------
 5 files changed, 112 insertions(+), 118 deletions(-)
 create mode 100644 docker/docker-compose.dev.yml

diff --git a/Cargo.lock b/Cargo.lock
index 55062dc..9c229ee 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -345,6 +345,16 @@ dependencies = [
  "syn 1.0.69",
 ]
 
+[[package]]
+name = "diesel_migrations"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf3cde8413353dc7f5d72fa8ce0b99a560a359d2c5ef1e5817ca731cd9008f4c"
+dependencies = [
+ "migrations_internals",
+ "migrations_macros",
+]
+
 [[package]]
 name = "digest"
 version = "0.9.0"
@@ -376,6 +386,7 @@ dependencies = [
  "chrono",
  "chrono-tz",
  "diesel",
+ "diesel_migrations",
  "regex",
  "reqwest",
  "rocket",
@@ -854,6 +865,27 @@ version = "2.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
 
+[[package]]
+name = "migrations_internals"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b4fc84e4af020b837029e017966f86a1c2d5e83e64b589963d5047525995860"
+dependencies = [
+ "diesel",
+]
+
+[[package]]
+name = "migrations_macros"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9753f12909fd8d923f75ae5c3258cae1ed3c8ec052e1b38c93c21a6d157f789c"
+dependencies = [
+ "migrations_internals",
+ "proc-macro2 1.0.26",
+ "quote 1.0.9",
+ "syn 1.0.69",
+]
+
 [[package]]
 name = "mime"
 version = "0.2.6"
diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
index ea63e1e..bac8b44 100644
--- a/docker/Dockerfile.dev
+++ b/docker/Dockerfile.dev
@@ -7,4 +7,3 @@ COPY --chown=builder:builder ./docker/entrypoint_dev.sh /entrypoint.sh
 COPY --chown=builder:builder ./Rocket.toml /app/Rocket.toml
 
 ENTRYPOINT ["/entrypoint.sh"]
-CMD ["run", "--bin", "server"]
diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml
new file mode 100644
index 0000000..bf7fb6f
--- /dev/null
+++ b/docker/docker-compose.dev.yml
@@ -0,0 +1,31 @@
+version: '2.4'
+services:
+    app:
+        build:
+            # Make sure the build context is one directory up
+            context: '..'
+            dockerfile: './docker/Dockerfile.dev'
+        image: 'chewingbever/fej:dev'
+        restart: 'no'
+
+        container_name: 'fej_app'
+        volumes:
+            - 'build-cache:/app/target'
+            - 'registry-cache:/app/.cargo/registry'
+        ports:
+            - '8000:8000'
+
+        command: "${CMD}"
+
+    db:
+        container_name: 'fej_db'
+        restart: 'no'
+
+        # the devop environment exposes the database so we can use the Diesel cli
+        ports:
+            - '5432:5432'
+
+volumes:
+    build-cache:
+    registry-cache:
+
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index c6d6066..14e90d2 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -2,13 +2,13 @@ version: '2.4'
 
 services:
     app:
+        build:
+            context: '..'
+            dockerfile: 'docker/Dockerfile.rel'
+
         image: 'chewingbever/fej:latest'
         restart: 'always'
 
-        depends_on:
-            db:
-                condition: 'service_healthy'
-
         environment:
             - 'DATABASE_URL=postgres://fej:fej@db:5432/fej'
 
diff --git a/fejctl b/fejctl
index b60be50..d55e090 100755
--- a/fejctl
+++ b/fejctl
@@ -2,121 +2,52 @@
 
 image='chewingbever/fej'
 
-# Creates the needed images
+# Small wrapper around the docker-compose command
 #
-# $1: wether to build the debug or the release image (default debug)
-function create_images() {
-    # First, we build the builder
-    DOCKER_BUILDKIT=1 docker build \
-        -f docker/Dockerfile.builder \
-        -t "$image-builder:latest" . || {
-            >&2 echo "Failed to build builder.";
-            exit 1;
-        }
+# Flags:
+# -b: build the builder
+# -r: use the release image instead
+function dc() {
+    while getopts ":br" c; do
+        case $c in
+            b ) build_builder=1 ;;
+            r ) release=1 ;;
+        esac
+    done
+    shift $((OPTIND-1))
 
-    if [[ "$1" = "rel" ]]; then
+    if [[ "$build_builder" -eq 1 ]]; then
+        # We always rebuild the builder before we run any compose command
         DOCKER_BUILDKIT=1 docker build \
-            -t "$image:latest" \
-            -f docker/Dockerfile.rel . || {
-                >&2 echo "Failed to build release image.";
+            -f docker/Dockerfile.builder \
+            -t "$image-builder:latest" . || {
+                >&2 echo "Failed to build builder.";
                 exit 1;
             }
+    fi
+
+    if [[ "$release" -eq 1 ]]; then
+        DOCKER_BUILDKIT=1 COMPOSE_DOCKER_CLI_BUILD=1 docker-compose \
+            --file docker/docker-compose.yml \
+            --project-name fej \
+            "$@"
 
     else
-        # Then, we create the debug image
-        DOCKER_BUILDKIT=1 docker build \
-            -t "$image:dev" \
-            -f docker/Dockerfile.dev . || {
-                >&2 echo "Failed to build debug image.";
-                exit 1;
-            }
+        DOCKER_BUILDKIT=1 COMPOSE_DOCKER_CLI_BUILD=1 docker-compose \
+            --file docker/docker-compose.yml \
+            --file docker/docker-compose.dev.yml \
+            --project-name fej-dev \
+            "$@"
     fi
 }
 
 # Execute the debug image (must be built first)
 #
 # $@: the arguments to pass to the image (passed as arguments to cargo)
-function run_image() {
-    docker volume create fej_build-cache > /dev/null
-    docker volume create fej_registry-cache > /dev/null
-    docker volume create fej_db-data > /dev/null
-
-    # Run the database image
-    docker run --rm \
-        --detach \
-        --name fej_db \
-        --network fej \
-        -p 5432:5432 \
-        -e 'POSTGRES_DB=fej' \
-        -e 'POSTGRES_USER=fej' \
-        -e 'POSTGRES_PASSWORD=fej' \
-        -v 'fej_db-data:/var/lib/postgresql/data' \
-        postgres:13-alpine
-
-    # Run the binary image
-    docker run \
-        --detach \
-        --rm \
-        --interactive \
-        --tty \
-        --publish 8000:8000 \
-        --name fej \
-        --env-file .env.container \
-        --network fej \
-        -v 'fej_build-cache:/app/target' \
-        -v 'fej_registry-cache:/app/.cargo/registry' \
-        "$image:dev" "$@"
-}
-
-# Attach to the fej container
-function logs() {
-    docker logs -f fej
-}
-
-# Builds the given binary
-#
-# $1: the binary to build
-function build() {
-    create_images
-    run_image build --bin "$1"
-    logs
-}
-
-# Runs the given binary
-#
-# $1: the binary to run
-function run() {
-    create_images
-    run_image run --bin "$1"
-    logs
-}
-
-# Runs the tests
-function tests() {
-    create_images
-    run_image test --no-fail-fast
-    logs
-}
-
-# Stops both containers
-function stop() {
-    docker stop fej_db
-    docker stop -t 0 fej
-}
-
-function run_release() {
-    docker-compose \
-        --file docker/docker-compose.yml \
-        --project-name fej-release \
-        up \
-        --detach
-}
-
-function stop_release() {
-     docker-compose \
-        --file docker/docker-compose.yml \
-        --project-name fej-release \
-        down
+function dcr() {
+        CMD="$@" dc -b -- up \
+            --build \
+            --detach
 }
 
 # Tags & pushes the release version to Docker Hub
@@ -128,7 +59,8 @@ function publish() {
         exit 2
     fi
 
-    create_images rel
+    # Build the release images
+    dc -br build
 
     patch_version=`grep -Po '(?<=version = ").*(?=")' Cargo.toml | head -n1`
     major_version=`echo "$patch_version" | sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/'`
@@ -159,26 +91,26 @@ function main() {
 
     case $cmd in
         # Building
-        b | build ) build "$bin" ;;
-        br | build-release ) create_images rel ;;
+        b | build ) dcr build --bin "$bin" && dc -- logs -f app ;;
+        br | build-release ) dc -br build ;;
 
         # Running
-        r | run ) run "$bin" ;;
-        rr | run-release ) run_release ;;
-        s | stop ) stop ;;
-        sr | stop-release ) stop_release ;;
+        r | run ) dcr run --bin "$bin" && dc -- logs -f app ;;
+        rr | run-release ) dc -br -- run --build --detach ;;
+        s | stop ) dc down ;;
+        sr | stop-release ) dc -r stop ;;
 
         # Ease of life
-        psql ) docker exec -it fej_db psql -U fej -d fej ;;
-        sh ) docker exec -it fej sh ;;
+        psql ) dc -- exec db psql -U fej -d fej ;;
+        sh ) dc -- exec app sh ;;
 
         # Misc
         docs ) cargo doc --no-deps ;;
         format ) cargo fmt ;;
-        l | logs ) logs ;;
+        l | logs ) dc -- logs -f app ;;
         lint ) cargo fmt -- --check ;;
         p | push | publish ) publish ;;
-        t | test ) tests ;;
+        t | test ) dc test --no-fail-fast  ;;
         * ) >&2 echo "Invalid command."; exit 1 ;;
     esac
 }

From 95f45cab76f6909a738dc128ed5f962b1cad16c9 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sat, 17 Apr 2021 17:46:16 +0200
Subject: [PATCH 044/124] Fixed strange dc behavior

---
 fejctl | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/fejctl b/fejctl
index d55e090..7ee69df 100755
--- a/fejctl
+++ b/fejctl
@@ -8,7 +8,10 @@ image='chewingbever/fej'
 # -b: build the builder
 # -r: use the release image instead
 function dc() {
+    local OPTIND c build_builder release
+
     while getopts ":br" c; do
+        echo "$c"
         case $c in
             b ) build_builder=1 ;;
             r ) release=1 ;;
@@ -52,7 +55,7 @@ function dcr() {
 
 # Tags & pushes the release version to Docker Hub
 function publish() {
-    branch=`git rev-parse --abbrev-ref HEAD`
+    local branch=`git rev-parse --abbrev-ref HEAD`
 
     if [[ "$branch" != master ]]; then
         >&2 echo "You can only publish from master."
@@ -62,10 +65,10 @@ function publish() {
     # Build the release images
     dc -br build
 
-    patch_version=`grep -Po '(?<=version = ").*(?=")' Cargo.toml | head -n1`
-    major_version=`echo "$patch_version" | sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/'`
-    minor_version=`echo "$patch_version" | sed -E 's/([0-9]+).([0-9]+).([0-9]+)/\1.\2/'`
-    tags=("latest" "$patch_version" "$minor_version" "$major_version")
+    local patch_version=`grep -Po '(?<=version = ").*(?=")' Cargo.toml | head -n1`
+    local major_version=`echo "$patch_version" | sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/'`
+    local minor_version=`echo "$patch_version" | sed -E 's/([0-9]+).([0-9]+).([0-9]+)/\1.\2/'`
+    local tags=("latest" "$patch_version" "$minor_version" "$major_version")
 
     for tag in "${tags[@]}"; do
         # Create the tag
@@ -86,8 +89,8 @@ function publish() {
 # $2: binary to use, defaults to 'server'
 function main() {
     # Default values
-    cmd="${1:-build}"
-    bin="${2:-server}"
+    local cmd="${1:-build}"
+    local bin="${2:-server}"
 
     case $cmd in
         # Building

From a072941ec3a3d7692dac98c115c6320803ca947e Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sat, 17 Apr 2021 17:48:02 +0200
Subject: [PATCH 045/124] Removed unneeded file

---
 .env.container | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 .env.container

diff --git a/.env.container b/.env.container
deleted file mode 100644
index 8b395fb..0000000
--- a/.env.container
+++ /dev/null
@@ -1,2 +0,0 @@
-# This file is read by the container, and therefore by fej
-DATABASE_URL=postgres://fej:fej@fej_db:5432/fej

From 6beca85154112bb17ad2bdb3869183fcbf6da3e1 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sat, 17 Apr 2021 18:06:31 +0200
Subject: [PATCH 046/124] Added cron as rel dependency

---
 docker/Dockerfile.rel | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker/Dockerfile.rel b/docker/Dockerfile.rel
index 2d3672c..90cefde 100644
--- a/docker/Dockerfile.rel
+++ b/docker/Dockerfile.rel
@@ -26,6 +26,7 @@ FROM alpine:latest
 RUN apk update && \
     apk add --no-cache \
         curl \
+        cron \
         libgcc \
         libpq \
         openssl && \
@@ -50,4 +51,4 @@ HEALTHCHECK \
     --retries=3 \
     CMD curl -q localhost:8000
 
-CMD ["/app/bin/server"]
+ENTRYPOINT ["/app/bin/server"]

From e62cd0bb9308af8c2c5246b10cde20b544c5639f Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sat, 17 Apr 2021 18:20:59 +0200
Subject: [PATCH 047/124] Crond now runs in container (#29)

---
 .dockerignore         | 1 +
 docker/Dockerfile.rel | 4 ++--
 docker/entrypoint.sh  | 5 +++++
 fejctl                | 3 +--
 4 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100755 docker/entrypoint.sh

diff --git a/.dockerignore b/.dockerignore
index b7c1108..29fa987 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -9,6 +9,7 @@
 
 # Entrypoint for devop container
 !docker/entrypoint_dev.sh
+!docker/entrypoint.sh
 
 # Config file
 !Rocket.toml
diff --git a/docker/Dockerfile.rel b/docker/Dockerfile.rel
index 90cefde..acb3cb4 100644
--- a/docker/Dockerfile.rel
+++ b/docker/Dockerfile.rel
@@ -26,7 +26,6 @@ FROM alpine:latest
 RUN apk update && \
     apk add --no-cache \
         curl \
-        cron \
         libgcc \
         libpq \
         openssl && \
@@ -43,6 +42,7 @@ COPY --from=builder --chown=fej:fej /app/output/bin /app/bin
 # The workdir is changed so that the config file is read properly
 WORKDIR /app
 COPY --chown=fej:fej Rocket.toml /app/Rocket.toml
+COPY ./docker/entrypoint.sh /entrypoint.sh
 
 HEALTHCHECK \
     --interval=10s \
@@ -51,4 +51,4 @@ HEALTHCHECK \
     --retries=3 \
     CMD curl -q localhost:8000
 
-ENTRYPOINT ["/app/bin/server"]
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
new file mode 100755
index 0000000..5c345c7
--- /dev/null
+++ b/docker/entrypoint.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env sh
+
+crond -b
+
+exec "/app/bin/server"
diff --git a/fejctl b/fejctl
index 7ee69df..a8fc12d 100755
--- a/fejctl
+++ b/fejctl
@@ -11,7 +11,6 @@ function dc() {
     local OPTIND c build_builder release
 
     while getopts ":br" c; do
-        echo "$c"
         case $c in
             b ) build_builder=1 ;;
             r ) release=1 ;;
@@ -99,7 +98,7 @@ function main() {
 
         # Running
         r | run ) dcr run --bin "$bin" && dc -- logs -f app ;;
-        rr | run-release ) dc -br -- run --build --detach ;;
+        rr | run-release ) dc -br -- up --build --detach && dc -r -- logs -f app ;;
         s | stop ) dc down ;;
         sr | stop-release ) dc -r stop ;;
 

From fee37420cda3675b0ac5ec6f0fd9cddebc1a9787 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sat, 17 Apr 2021 20:52:29 +0200
Subject: [PATCH 048/124] Added cronjob container (closes #29)

---
 .dockerignore             |  2 ++
 docker/Dockerfile.rel     |  5 +++--
 docker/crontab            |  1 +
 docker/docker-compose.yml | 10 ++++++++++
 docker/entrypoint.sh      |  5 -----
 5 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 docker/crontab
 delete mode 100755 docker/entrypoint.sh

diff --git a/.dockerignore b/.dockerignore
index 29fa987..a96bd42 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -16,3 +16,5 @@
 
 # Database migrations
 !migrations/
+
+!docker/crontab
diff --git a/docker/Dockerfile.rel b/docker/Dockerfile.rel
index acb3cb4..4f4c54d 100644
--- a/docker/Dockerfile.rel
+++ b/docker/Dockerfile.rel
@@ -20,9 +20,11 @@ RUN cargo install \
 
 # Now, we create the actual image
 FROM alpine:latest
+COPY ./docker/crontab /var/spool/cron/crontabs/fej
 
 # Install some dynamic libraries needed for everything to work
 # Create -non-root user
+# Change permissions for crontab file
 RUN apk update && \
     apk add --no-cache \
         curl \
@@ -42,7 +44,6 @@ COPY --from=builder --chown=fej:fej /app/output/bin /app/bin
 # The workdir is changed so that the config file is read properly
 WORKDIR /app
 COPY --chown=fej:fej Rocket.toml /app/Rocket.toml
-COPY ./docker/entrypoint.sh /entrypoint.sh
 
 HEALTHCHECK \
     --interval=10s \
@@ -51,4 +52,4 @@ HEALTHCHECK \
     --retries=3 \
     CMD curl -q localhost:8000
 
-ENTRYPOINT ["/entrypoint.sh"]
+ENTRYPOINT ["/app/bin/server"]
diff --git a/docker/crontab b/docker/crontab
new file mode 100644
index 0000000..16fbbcd
--- /dev/null
+++ b/docker/crontab
@@ -0,0 +1 @@
+# This'll be filled up later
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 14e90d2..4e1f9fb 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -12,6 +12,16 @@ services:
         environment:
             - 'DATABASE_URL=postgres://fej:fej@db:5432/fej'
 
+    cron:
+        image: 'chewingbever/fej:latest'
+        restart: 'always'
+
+        environment:
+            - 'DATABASE_URL=postgres://fej:fej@db:5432/fej'
+        
+        entrypoint: 'crond -f'
+        user: 'root'
+
     db:
         image: 'postgres:13-alpine'
         restart: 'always'
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
deleted file mode 100755
index 5c345c7..0000000
--- a/docker/entrypoint.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env sh
-
-crond -b
-
-exec "/app/bin/server"

From 2c8f1ac601a55974f7fd49c9abdcec037751128c Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sat, 17 Apr 2021 20:59:54 +0200
Subject: [PATCH 049/124] Removed unneeded healthcheck

---
 docker/docker-compose.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 4e1f9fb..55c5990 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -16,11 +16,13 @@ services:
         image: 'chewingbever/fej:latest'
         restart: 'always'
 
-        environment:
-            - 'DATABASE_URL=postgres://fej:fej@db:5432/fej'
-        
         entrypoint: 'crond -f'
         user: 'root'
+        healthcheck:
+            disable: true
+
+        environment:
+            - 'DATABASE_URL=postgres://fej:fej@db:5432/fej'
 
     db:
         image: 'postgres:13-alpine'

From a0e55e4830f00ef4b890afe92b16b9674e0dab9c Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sat, 17 Apr 2021 21:39:29 +0200
Subject: [PATCH 050/124] Removed cron container from debug build

---
 docker/docker-compose.override.yml | 14 ++++++++++++++
 docker/docker-compose.yml          | 13 -------------
 fejctl                             |  3 ++-
 3 files changed, 16 insertions(+), 14 deletions(-)
 create mode 100644 docker/docker-compose.override.yml

diff --git a/docker/docker-compose.override.yml b/docker/docker-compose.override.yml
new file mode 100644
index 0000000..88c3a22
--- /dev/null
+++ b/docker/docker-compose.override.yml
@@ -0,0 +1,14 @@
+version: '2.4'
+
+services:
+    cron:
+        image: 'chewingbever/fej:latest'
+        restart: 'always'
+
+        entrypoint: 'crond -f'
+        user: 'root'
+        healthcheck:
+            disable: true
+
+        environment:
+            - 'DATABASE_URL=postgres://fej:fej@db:5432/fej'
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 55c5990..f2a19e0 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -12,18 +12,6 @@ services:
         environment:
             - 'DATABASE_URL=postgres://fej:fej@db:5432/fej'
 
-    cron:
-        image: 'chewingbever/fej:latest'
-        restart: 'always'
-
-        entrypoint: 'crond -f'
-        user: 'root'
-        healthcheck:
-            disable: true
-
-        environment:
-            - 'DATABASE_URL=postgres://fej:fej@db:5432/fej'
-
     db:
         image: 'postgres:13-alpine'
         restart: 'always'
@@ -42,6 +30,5 @@ services:
         volumes:
             - 'db-data:/var/lib/postgresql/data'
 
-
 volumes:
     db-data:
diff --git a/fejctl b/fejctl
index a8fc12d..6701343 100755
--- a/fejctl
+++ b/fejctl
@@ -31,6 +31,7 @@ function dc() {
     if [[ "$release" -eq 1 ]]; then
         DOCKER_BUILDKIT=1 COMPOSE_DOCKER_CLI_BUILD=1 docker-compose \
             --file docker/docker-compose.yml \
+            --file docker/docker-compose.override.yml \
             --project-name fej \
             "$@"
 
@@ -112,7 +113,7 @@ function main() {
         l | logs ) dc -- logs -f app ;;
         lint ) cargo fmt -- --check ;;
         p | push | publish ) publish ;;
-        t | test ) dc test --no-fail-fast  ;;
+        t | test ) dcr -- test --no-fail-fast && dc -- logs -f app ;;
         * ) >&2 echo "Invalid command."; exit 1 ;;
     esac
 }

From 95564e81119a4bc937476dee60521306d5348cfa Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sat, 17 Apr 2021 21:44:20 +0200
Subject: [PATCH 051/124] Updated deps; bumped version

---
 Cargo.lock | 40 ++++++++++++++++++++--------------------
 Cargo.toml |  2 +-
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9c229ee..acb8e84 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -195,9 +195,9 @@ dependencies = [
 
 [[package]]
 name = "const_fn"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "076a6803b0dacd6a88cfe64deba628b01533ff5ef265687e6938280c1afd0a28"
+checksum = "402da840495de3f976eaefc3485b7f5eb5b0bf9761f9a47be27fe975b3b8c2ec"
 
 [[package]]
 name = "cookie"
@@ -233,7 +233,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3818dfca4b0cb5211a659bbcbb94225b7127407b2b135e650d717bfb78ab10d3"
 dependencies = [
  "cookie 0.14.4",
- "idna 0.2.2",
+ "idna 0.2.3",
  "log 0.4.14",
  "publicsuffix",
  "serde",
@@ -381,7 +381,7 @@ dependencies = [
 
 [[package]]
 name = "fej"
-version = "1.0.1"
+version = "1.0.2"
 dependencies = [
  "chrono",
  "chrono-tz",
@@ -635,9 +635,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.3.6"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc35c995b9d93ec174cf9a27d425c7892722101e14993cd227fdb51d70cf9589"
+checksum = "4a1ce40d6fc9764887c2fdc7305c3dcc429ba11ff981c1509416afd5697e4437"
 
 [[package]]
 name = "httpdate"
@@ -714,9 +714,9 @@ dependencies = [
 
 [[package]]
 name = "idna"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89829a5d69c23d348314a7ac337fe39173b61149a9864deabd260983aed48c21"
+checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
 dependencies = [
  "matches",
  "unicode-bidi",
@@ -997,9 +997,9 @@ dependencies = [
 
 [[package]]
 name = "notify"
-version = "4.0.15"
+version = "4.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80ae4a7688d1fab81c5bf19c64fc8db920be8d519ce6336ed4e7efe024724dbd"
+checksum = "2599080e87c9bd051ddb11b10074f4da7b1223298df65d4c2ec5bcf309af1533"
 dependencies = [
  "bitflags",
  "filetime",
@@ -1166,18 +1166,18 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 
 [[package]]
 name = "pin-project"
-version = "1.0.6"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc174859768806e91ae575187ada95c91a29e96a98dc5d2cd9a1fed039501ba6"
+checksum = "c7509cc106041c40a4518d2af7a61530e1eed0e6285296a3d8c5472806ccc4a4"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.0.6"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a490329918e856ed1b083f244e3bfe2d8c4f336407e4ea9e1a9f479ff09049e5"
+checksum = "48c950132583b500556b1efd71d45b319029f2b71518d979fcc208e16b42426f"
 dependencies = [
  "proc-macro2 1.0.26",
  "quote 1.0.9",
@@ -1258,7 +1258,7 @@ version = "1.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95b4ce31ff0a27d93c8de1849cf58162283752f065a90d508f1105fa6c9a213f"
 dependencies = [
- "idna 0.2.2",
+ "idna 0.2.3",
  "url 2.2.1",
 ]
 
@@ -1333,9 +1333,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9"
+checksum = "8270314b5ccceb518e7e578952f0b72b88222d02e8f77f5ecf7abbb673539041"
 dependencies = [
  "bitflags",
 ]
@@ -1997,16 +1997,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ccd964113622c8e9322cfac19eb1004a07e636c545f325da085d5cdde6f1f8b"
 dependencies = [
  "form_urlencoded",
- "idna 0.2.2",
+ "idna 0.2.3",
  "matches",
  "percent-encoding 2.1.0",
 ]
 
 [[package]]
 name = "vcpkg"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb"
+checksum = "cbdbff6266a24120518560b5dc983096efb98462e51d0d68169895b237be3e5d"
 
 [[package]]
 name = "version_check"
diff --git a/Cargo.toml b/Cargo.toml
index 9677304..4d1dd7e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fej"
-version = "1.0.1"
+version = "1.0.2"
 authors = ["Jef Roosens <roosensjef@gmail.com>"]
 edition = "2018"
 

From 91985a1710f395d313a22d19cf2ff030df7ff41b Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sat, 17 Apr 2021 22:39:22 +0200
Subject: [PATCH 052/124] [#28] Switched search_streets to database

---
 diesel.toml                                   |  2 +-
 .../2021-04-15-155511_ivago_search/down.sql   |  2 +-
 .../2021-04-15-155511_ivago_search/up.sql     |  5 +--
 src/fej/errors.rs                             |  8 +++++
 src/fej/ivago/mod.rs                          | 33 ++++++++++++-------
 src/fej/ivago/street.rs                       |  2 ++
 src/fej/lib.rs                                |  5 ++-
 src/fej/schema.rs                             |  6 ++++
 src/schema.rs                                 |  0
 src/server/main.rs                            |  2 +-
 src/server/routes/ivago.rs                    |  5 +--
 11 files changed, 48 insertions(+), 22 deletions(-)
 create mode 100644 src/fej/schema.rs
 delete mode 100644 src/schema.rs

diff --git a/diesel.toml b/diesel.toml
index 92267c8..779714e 100644
--- a/diesel.toml
+++ b/diesel.toml
@@ -2,4 +2,4 @@
 # see diesel.rs/guides/configuring-diesel-cli
 
 [print_schema]
-file = "src/schema.rs"
+file = "src/fej/schema.rs"
diff --git a/migrations/2021-04-15-155511_ivago_search/down.sql b/migrations/2021-04-15-155511_ivago_search/down.sql
index 9d9d004..a5beedb 100644
--- a/migrations/2021-04-15-155511_ivago_search/down.sql
+++ b/migrations/2021-04-15-155511_ivago_search/down.sql
@@ -1,2 +1,2 @@
 -- This file should undo anything in `up.sql`
-DROP SCHEMA ivago CASCADE;
+DROP table ivago_streets;
diff --git a/migrations/2021-04-15-155511_ivago_search/up.sql b/migrations/2021-04-15-155511_ivago_search/up.sql
index f33eff1..d4928af 100644
--- a/migrations/2021-04-15-155511_ivago_search/up.sql
+++ b/migrations/2021-04-15-155511_ivago_search/up.sql
@@ -1,7 +1,4 @@
--- Your SQL goes here
-CREATE SCHEMA ivago;
-
-CREATE TABLE ivago.streets (
+CREATE TABLE ivago_streets (
     name TEXT NOT NULL,
     city TEXT NOT NULL,
 
diff --git a/src/fej/errors.rs b/src/fej/errors.rs
index 730714c..3174b92 100644
--- a/src/fej/errors.rs
+++ b/src/fej/errors.rs
@@ -8,6 +8,7 @@ use rocket::http::Status;
 pub enum FejError {
     InvalidArgument,
     FailedRequest,
+    DatabaseError,
 }
 
 // I'd love to move this over to the server binary, but right now, error E0117 is making that
@@ -17,6 +18,7 @@ impl From<FejError> for Status {
         match err {
             FejError::InvalidArgument => Status::BadRequest,
             FejError::FailedRequest => Status::InternalServerError,
+            FejError::DatabaseError => Status::InternalServerError,
         }
     }
 }
@@ -33,3 +35,9 @@ impl From<chrono::ParseError> for FejError {
         FejError::InvalidArgument
     }
 }
+
+impl From<diesel::result::Error> for FejError {
+    fn from(_: diesel::result::Error) -> FejError {
+        FejError::DatabaseError
+    }
+}
diff --git a/src/fej/ivago/mod.rs b/src/fej/ivago/mod.rs
index 7d3a9f9..5879cef 100644
--- a/src/fej/ivago/mod.rs
+++ b/src/fej/ivago/mod.rs
@@ -1,6 +1,9 @@
 use crate::errors::FejError;
+use crate::schema::ivago_streets::dsl::*;
 use chrono::DateTime;
 use chrono_tz::Tz;
+use diesel::prelude::*;
+use diesel::PgConnection;
 use reqwest::blocking as reqwest;
 use std::collections::HashMap;
 use std::convert::{From, TryFrom};
@@ -25,19 +28,25 @@ const CAL_URL: &str = "https://www.ivago.be/nl/particulier/garbage/pick-up/picku
 /// # Arguments
 ///
 /// * `search_term` - Search term to use to look for streets
-pub fn search_streets(search_term: &str) -> Result<Vec<Street>, FejError> {
-    let client = reqwest::Client::new();
-    let response = client.get(SEARCH_URL).query(&[("q", search_term)]).send()?;
-    let data: Vec<HashMap<String, String>> = response.json()?;
+// pub fn search_streets(search_term: &str) -> Result<Vec<Street>, FejError> {
+//     let client = reqwest::Client::new();
+//     let response = client.get(SEARCH_URL).query(&[("q", search_term)]).send()?;
+//     let data: Vec<HashMap<String, String>> = response.json()?;
 
-    // This is pretty cool, filter_map first does get() on all the maps, and
-    // then filters out any None values
-    // Then, we do the same thing for streets
-    Ok(data
-        .iter()
-        .filter_map(|m| m.get("value"))
-        .filter_map(|v| Street::try_from(v.as_str()).ok())
-        .collect())
+//     // This is pretty cool, filter_map first does get() on all the maps, and
+//     // then filters out any None values
+//     // Then, we do the same thing for streets
+//     Ok(data
+//         .iter()
+//         .filter_map(|m| m.get("value"))
+//         .filter_map(|v| Street::try_from(v.as_str()).ok())
+//         .collect())
+// }
+pub fn search_streets(db_con: &PgConnection, search_term: &str) -> Result<Vec<Street>, FejError> {
+    Ok(ivago_streets
+        .filter(name.like(search_term))
+        .or_filter(city.like(search_term))
+        .load(db_con)?)
 }
 
 /// Returns the pickup times for the various trash types.
diff --git a/src/fej/ivago/street.rs b/src/fej/ivago/street.rs
index 1a7cac9..a4da4b5 100644
--- a/src/fej/ivago/street.rs
+++ b/src/fej/ivago/street.rs
@@ -1,3 +1,4 @@
+use diesel::Queryable;
 use regex::Regex;
 use rocket::http::RawStr;
 use rocket::request::FromFormValue;
@@ -5,6 +6,7 @@ use serde::ser::{Serialize, SerializeStruct, Serializer};
 use std::convert::TryFrom;
 
 /// Represents a street in a given city
+#[derive(Queryable)]
 pub struct Street {
     name: String,
     city: String,
diff --git a/src/fej/lib.rs b/src/fej/lib.rs
index 761c91b..f84d5d6 100644
--- a/src/fej/lib.rs
+++ b/src/fej/lib.rs
@@ -1,7 +1,10 @@
-#![feature(proc_macro_hygiene, decl_macro)]
+#[macro_use]
+extern crate diesel;
 
 // Route modules
 pub mod ivago;
 
 // Helper modules
 pub mod errors;
+
+pub mod schema;
diff --git a/src/fej/schema.rs b/src/fej/schema.rs
new file mode 100644
index 0000000..3fe23f2
--- /dev/null
+++ b/src/fej/schema.rs
@@ -0,0 +1,6 @@
+table! {
+    ivago_streets (name, city) {
+        name -> Text,
+        city -> Text,
+    }
+}
diff --git a/src/schema.rs b/src/schema.rs
deleted file mode 100644
index e69de29..0000000
diff --git a/src/server/main.rs b/src/server/main.rs
index 4267776..aa9de11 100644
--- a/src/server/main.rs
+++ b/src/server/main.rs
@@ -47,7 +47,7 @@ embed_migrations!();
 
 // This defines a connection to the database
 #[database("postgres_fej")]
-struct FejDbConn(diesel::PgConnection);
+pub struct FejDbConn(diesel::PgConnection);
 
 // I'd like to thank Stackoverflow for helping me with this
 // https://stackoverflow.com/questions/61047355/how-to-run-diesel-migration-with-rocket-in-production
diff --git a/src/server/routes/ivago.rs b/src/server/routes/ivago.rs
index d8318bd..a9b9336 100644
--- a/src/server/routes/ivago.rs
+++ b/src/server/routes/ivago.rs
@@ -1,3 +1,4 @@
+use crate::FejDbConn;
 use fej::ivago::{get_pickup_times, search_streets, BasicDate, PickupTime, Street};
 use rocket::http::Status;
 use rocket_contrib::json::Json;
@@ -9,8 +10,8 @@ use rocket_contrib::json::Json;
 ///
 /// * `search_term` - Search term to use to look for streets
 #[get("/search?<q>")]
-pub fn route_search_streets(q: String) -> Result<Json<Vec<Street>>, Status> {
-    Ok(Json(search_streets(q.as_str())?))
+pub fn route_search_streets(db_conn: FejDbConn, q: String) -> Result<Json<Vec<Street>>, Status> {
+    Ok(Json(search_streets(&db_conn.0, q.as_str())?))
 }
 
 /// Handles returning of pickup times for a specific address. It returns a list

From 0877cc590cd671916192495f0eb92cf1b83af811 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sat, 17 Apr 2021 22:44:15 +0200
Subject: [PATCH 053/124] [#28] Moved db stuff to own module

---
 src/fej/ivago/db.rs        | 12 ++++++++++++
 src/fej/ivago/mod.rs       | 34 +++++++++++++---------------------
 src/server/main.rs         |  2 +-
 src/server/routes/ivago.rs |  3 ++-
 4 files changed, 28 insertions(+), 23 deletions(-)
 create mode 100644 src/fej/ivago/db.rs

diff --git a/src/fej/ivago/db.rs b/src/fej/ivago/db.rs
new file mode 100644
index 0000000..43f94e9
--- /dev/null
+++ b/src/fej/ivago/db.rs
@@ -0,0 +1,12 @@
+use super::Street;
+use crate::errors::FejError;
+use crate::schema::ivago_streets::dsl::*;
+use diesel::prelude::*;
+use diesel::PgConnection;
+
+pub fn search_streets(db_con: &PgConnection, search_term: &str) -> Result<Vec<Street>, FejError> {
+    Ok(ivago_streets
+        .filter(name.like(search_term))
+        .or_filter(city.like(search_term))
+        .load(db_con)?)
+}
diff --git a/src/fej/ivago/mod.rs b/src/fej/ivago/mod.rs
index 5879cef..a6d8295 100644
--- a/src/fej/ivago/mod.rs
+++ b/src/fej/ivago/mod.rs
@@ -1,14 +1,12 @@
 use crate::errors::FejError;
-use crate::schema::ivago_streets::dsl::*;
 use chrono::DateTime;
 use chrono_tz::Tz;
-use diesel::prelude::*;
-use diesel::PgConnection;
 use reqwest::blocking as reqwest;
 use std::collections::HashMap;
 use std::convert::{From, TryFrom};
 
 mod basic_date;
+pub mod db;
 mod pickup_time;
 mod street;
 
@@ -28,25 +26,19 @@ const CAL_URL: &str = "https://www.ivago.be/nl/particulier/garbage/pick-up/picku
 /// # Arguments
 ///
 /// * `search_term` - Search term to use to look for streets
-// pub fn search_streets(search_term: &str) -> Result<Vec<Street>, FejError> {
-//     let client = reqwest::Client::new();
-//     let response = client.get(SEARCH_URL).query(&[("q", search_term)]).send()?;
-//     let data: Vec<HashMap<String, String>> = response.json()?;
+pub fn search_streets(search_term: &str) -> Result<Vec<Street>, FejError> {
+    let client = reqwest::Client::new();
+    let response = client.get(SEARCH_URL).query(&[("q", search_term)]).send()?;
+    let data: Vec<HashMap<String, String>> = response.json()?;
 
-//     // This is pretty cool, filter_map first does get() on all the maps, and
-//     // then filters out any None values
-//     // Then, we do the same thing for streets
-//     Ok(data
-//         .iter()
-//         .filter_map(|m| m.get("value"))
-//         .filter_map(|v| Street::try_from(v.as_str()).ok())
-//         .collect())
-// }
-pub fn search_streets(db_con: &PgConnection, search_term: &str) -> Result<Vec<Street>, FejError> {
-    Ok(ivago_streets
-        .filter(name.like(search_term))
-        .or_filter(city.like(search_term))
-        .load(db_con)?)
+    // This is pretty cool, filter_map first does get() on all the maps, and
+    // then filters out any None values
+    // Then, we do the same thing for streets
+    Ok(data
+        .iter()
+        .filter_map(|m| m.get("value"))
+        .filter_map(|v| Street::try_from(v.as_str()).ok())
+        .collect())
 }
 
 /// Returns the pickup times for the various trash types.
diff --git a/src/server/main.rs b/src/server/main.rs
index aa9de11..0e84ff8 100644
--- a/src/server/main.rs
+++ b/src/server/main.rs
@@ -55,7 +55,7 @@ fn run_db_migrations(rocket: Rocket) -> Result<Rocket, Rocket> {
     let conn = FejDbConn::get_one(&rocket).expect("database connection");
     match embedded_migrations::run(&*conn) {
         Ok(()) => Ok(rocket),
-        Err(e) => Err(rocket),
+        Err(_) => Err(rocket),
     }
 }
 
diff --git a/src/server/routes/ivago.rs b/src/server/routes/ivago.rs
index a9b9336..e8c0a9e 100644
--- a/src/server/routes/ivago.rs
+++ b/src/server/routes/ivago.rs
@@ -1,5 +1,6 @@
 use crate::FejDbConn;
-use fej::ivago::{get_pickup_times, search_streets, BasicDate, PickupTime, Street};
+use fej::ivago::db::search_streets;
+use fej::ivago::{get_pickup_times, BasicDate, PickupTime, Street};
 use rocket::http::Status;
 use rocket_contrib::json::Json;
 

From 85611e2d5929afdfb7c9c21f71f08f81166bef41 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sat, 17 Apr 2021 23:20:41 +0200
Subject: [PATCH 054/124] [#28] Added basic ivago scraper

---
 Cargo.toml              |  8 ++++++++
 src/fej/ivago/db.rs     |  4 ++--
 src/fej/ivago/street.rs |  6 ++++--
 src/populate_ivago.rs   | 19 +++++++++++++++++++
 4 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 src/populate_ivago.rs

diff --git a/Cargo.toml b/Cargo.toml
index 4d1dd7e..4274991 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,6 +19,14 @@ test = true
 bench = true
 doc = true
 doctest = true
+
+[[bin]]
+name = "populate_ivago"
+path = "src/populate_ivago.rs"
+test = false
+bench = false
+doc = false
+doctest = false
  
 [dependencies]
 rocket = "0.4.7"
diff --git a/src/fej/ivago/db.rs b/src/fej/ivago/db.rs
index 43f94e9..6ba3174 100644
--- a/src/fej/ivago/db.rs
+++ b/src/fej/ivago/db.rs
@@ -6,7 +6,7 @@ use diesel::PgConnection;
 
 pub fn search_streets(db_con: &PgConnection, search_term: &str) -> Result<Vec<Street>, FejError> {
     Ok(ivago_streets
-        .filter(name.like(search_term))
-        .or_filter(city.like(search_term))
+        .filter(name.ilike(format!("%{}%", search_term)))
+        .or_filter(city.ilike(format!("%{}%", search_term)))
         .load(db_con)?)
 }
diff --git a/src/fej/ivago/street.rs b/src/fej/ivago/street.rs
index a4da4b5..2f30f06 100644
--- a/src/fej/ivago/street.rs
+++ b/src/fej/ivago/street.rs
@@ -1,4 +1,5 @@
-use diesel::Queryable;
+use crate::schema::ivago_streets;
+use diesel::{Insertable, Queryable};
 use regex::Regex;
 use rocket::http::RawStr;
 use rocket::request::FromFormValue;
@@ -6,7 +7,8 @@ use serde::ser::{Serialize, SerializeStruct, Serializer};
 use std::convert::TryFrom;
 
 /// Represents a street in a given city
-#[derive(Queryable)]
+#[derive(Queryable, Insertable)]
+#[table_name = "ivago_streets"]
 pub struct Street {
     name: String,
     city: String,
diff --git a/src/populate_ivago.rs b/src/populate_ivago.rs
new file mode 100644
index 0000000..9dfc876
--- /dev/null
+++ b/src/populate_ivago.rs
@@ -0,0 +1,19 @@
+use diesel::{insert_into, Connection, PgConnection, RunQueryDsl};
+use fej::ivago::search_streets;
+use fej::schema::ivago_streets::dsl::*;
+
+const ABC: &str = "abcdefghijklmnopqrstuvwxyz";
+
+fn main() {
+    let database_url = std::env::var("DATABASE_URL").expect("DATABASE_URL must be set");
+
+    let db_conn = PgConnection::establish(&database_url)
+        .expect(&format!("Error connecting to {}", database_url));
+
+    // Doing this linearly is good enough I'd say
+    for c in ABC.chars() {
+        if let Ok(streets) = search_streets(&c.to_string()) {
+            insert_into(ivago_streets).values(streets).execute(&db_conn);
+        }
+    }
+}

From ecec03134ad4205505055e6f9386150006fa0ab4 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sat, 17 Apr 2021 23:29:32 +0200
Subject: [PATCH 055/124] Added populate_ivago to crontab

---
 docker/crontab | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker/crontab b/docker/crontab
index 16fbbcd..1a9b072 100644
--- a/docker/crontab
+++ b/docker/crontab
@@ -1 +1,2 @@
-# This'll be filled up later
+# Runs the ivago scraper
+*/30 * * * * /app/bin/populate_ivago

From bf8a0ae666f24d132c0ace8810b696f20f2680e7 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@whitesourcesoftware.com>
Date: Tue, 20 Apr 2021 08:00:45 +0000
Subject: [PATCH 056/124] Add renovate.json

---
 renovate.json | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 renovate.json

diff --git a/renovate.json b/renovate.json
new file mode 100644
index 0000000..7190a60
--- /dev/null
+++ b/renovate.json
@@ -0,0 +1,3 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json"
+}

From b93d7713725f5cb9ddf9563e537324b0b31de3c3 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@whitesourcesoftware.com>
Date: Tue, 20 Apr 2021 09:09:25 +0000
Subject: [PATCH 057/124] Update Rust crate reqwest to 0.11.3

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 4274991..c3e5c06 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -34,7 +34,7 @@ serde = "1.0.124"
 chrono = "0.4.19"
 chrono-tz = "0.5.3"
 regex = "1.4.5"
-reqwest = { version = "0.11.2", features = ["blocking", "json", "cookies"] }
+reqwest = { version = "0.11.3", features = ["blocking", "json", "cookies"] }
 diesel = { version = "1.4.6", features = ["postgres"] }
 diesel_migrations = "1.4.0"
 

From 26ec8b4eba64992cb1cf398f2e53ab09f4befa71 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@whitesourcesoftware.com>
Date: Tue, 20 Apr 2021 09:09:29 +0000
Subject: [PATCH 058/124] Update Rust crate serde to 1.0.125

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 4274991..8737109 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -30,7 +30,7 @@ doctest = false
  
 [dependencies]
 rocket = "0.4.7"
-serde = "1.0.124"
+serde = "1.0.125"
 chrono = "0.4.19"
 chrono-tz = "0.5.3"
 regex = "1.4.5"

From 00820765273ce86b3cd8c9f00d656ccfd6c6c595 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@whitesourcesoftware.com>
Date: Thu, 22 Apr 2021 22:04:08 +0000
Subject: [PATCH 059/124] Update Rust crate regex to 1.4.6

---
 Cargo.lock | 4 ++--
 Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index acb8e84..1d51c09 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1342,9 +1342,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.4.5"
+version = "1.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19"
+checksum = "2a26af418b574bd56588335b3a3659a65725d4e636eb1016c2f9e3b38c7cc759"
 dependencies = [
  "aho-corasick",
  "memchr",
diff --git a/Cargo.toml b/Cargo.toml
index cf11ad9..97668d2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -33,7 +33,7 @@ rocket = "0.4.7"
 serde = "1.0.125"
 chrono = "0.4.19"
 chrono-tz = "0.5.3"
-regex = "1.4.5"
+regex = "1.4.6"
 reqwest = { version = "0.11.3", features = ["blocking", "json", "cookies"] }
 diesel = { version = "1.4.6", features = ["postgres"] }
 diesel_migrations = "1.4.0"

From 9e428b18821ca2f6d791c46cc34b01cd4ff69ea8 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sat, 24 Apr 2021 00:20:20 +0200
Subject: [PATCH 060/124] Added test .drone.yml

---
 .drone.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .drone.yml

diff --git a/.drone.yml b/.drone.yml
new file mode 100644
index 0000000..0627887
--- /dev/null
+++ b/.drone.yml
@@ -0,0 +1,5 @@
+pipeline:
+    first-test:
+        image: alpine
+        commands:
+            - echo "woodpecker is very cool"

From 62738354a0f44107e3fd0c71b0f27c7466260677 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sat, 24 Apr 2021 00:27:43 +0200
Subject: [PATCH 061/124] Just a commit

---
 .drone.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.drone.yml b/.drone.yml
index 0627887..01d2202 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3,3 +3,4 @@ pipeline:
         image: alpine
         commands:
             - echo "woodpecker is very cool"
+

From 0abfaca967b0e7bae408ee41c841ce4f464c6b3c Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sat, 24 Apr 2021 09:33:42 +0200
Subject: [PATCH 062/124] Added test cicd job

---
 .drone.yml                | 6 ------
 .woodpecker.yml           | 5 +++++
 docker/Dockerfile.builder | 7 +------
 docker/Dockerfile.dev     | 4 ++++
 docker/Dockerfile.rel     | 6 +++++-
 5 files changed, 15 insertions(+), 13 deletions(-)
 delete mode 100644 .drone.yml
 create mode 100644 .woodpecker.yml

diff --git a/.drone.yml b/.drone.yml
deleted file mode 100644
index 01d2202..0000000
--- a/.drone.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-pipeline:
-    first-test:
-        image: alpine
-        commands:
-            - echo "woodpecker is very cool"
-
diff --git a/.woodpecker.yml b/.woodpecker.yml
new file mode 100644
index 0000000..2703d03
--- /dev/null
+++ b/.woodpecker.yml
@@ -0,0 +1,5 @@
+pipeline:
+    test:
+        image: chewingbever/fej-builder:latest
+        commands:
+            - cargo test
diff --git a/docker/Dockerfile.builder b/docker/Dockerfile.builder
index b4152fa..d50e8e4 100644
--- a/docker/Dockerfile.builder
+++ b/docker/Dockerfile.builder
@@ -1,6 +1,6 @@
 # vim: filetype=dockerfile
 # Our entire toolchain runs in alpine
-FROM alpine:latest AS builder
+FROM alpine:3.13.5 AS builder
 
 ENV PATH "$PATH:/app/.cargo/bin"
 # Needed for proper compiling of openssl-dev
@@ -29,8 +29,3 @@ WORKDIR /app
 RUN { curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly; } && \
     rustup target add x86_64-unknown-linux-musl --toolchain nightly && \
     mkdir -p .cargo/registry target
-
-# Copy source code over to builder
-COPY --chown=builder:builder Cargo.toml Cargo.lock ./
-COPY --chown=builder:builder src/ ./src/
-COPY --chown=builder:builder migrations/ ./migrations/
diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
index bac8b44..7aa9d09 100644
--- a/docker/Dockerfile.dev
+++ b/docker/Dockerfile.dev
@@ -3,6 +3,10 @@ FROM chewingbever/fej-builder:latest
 
 ENV RUST_BACKTRACE 1
 
+# Copy source code over to builder
+COPY --chown=builder:builder Cargo.toml Cargo.lock ./
+COPY --chown=builder:builder src/ ./src/
+COPY --chown=builder:builder migrations/ ./migrations/
 COPY --chown=builder:builder ./docker/entrypoint_dev.sh /entrypoint.sh
 COPY --chown=builder:builder ./Rocket.toml /app/Rocket.toml
 
diff --git a/docker/Dockerfile.rel b/docker/Dockerfile.rel
index 4f4c54d..79bd7bb 100644
--- a/docker/Dockerfile.rel
+++ b/docker/Dockerfile.rel
@@ -1,6 +1,10 @@
 # vim: filetype=dockerfile
 FROM chewingbever/fej-builder:latest AS builder
 
+COPY --chown=builder:builder Cargo.toml Cargo.lock ./
+COPY --chown=builder:builder src/ ./src/
+COPY --chown=builder:builder migrations/ ./migrations/
+
 # And then finally, build the project
 # Thank the lords that this article exists
 # https://users.rust-lang.org/t/sigsegv-with-program-linked-against-openssl-in-an-alpine-container/52172
@@ -19,7 +23,7 @@ RUN cargo install \
 
 
 # Now, we create the actual image
-FROM alpine:latest
+FROM alpine:3.12.5
 COPY ./docker/crontab /var/spool/cron/crontabs/fej
 
 # Install some dynamic libraries needed for everything to work

From 3bdf79e824d2f13efdaff6d97d8e930ea0336bf9 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sat, 24 Apr 2021 09:47:28 +0200
Subject: [PATCH 063/124] Made builder root again

---
 docker/Dockerfile.builder | 10 ++--------
 fejctl                    | 23 +++++++++++++----------
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/docker/Dockerfile.builder b/docker/Dockerfile.builder
index d50e8e4..1073062 100644
--- a/docker/Dockerfile.builder
+++ b/docker/Dockerfile.builder
@@ -2,7 +2,7 @@
 # Our entire toolchain runs in alpine
 FROM alpine:3.13.5 AS builder
 
-ENV PATH "$PATH:/app/.cargo/bin"
+ENV PATH "$PATH:/root/.cargo/bin"
 # Needed for proper compiling of openssl-dev
 ENV RUSTFLAGS "-C target-feature=-crt-static"
 
@@ -19,13 +19,7 @@ RUN addgroup -S builder && \
         openssl-dev \
         postgresql-dev
 
-# Switch to the non-root user
-USER builder
-
-WORKDIR /app
-
 # Install rustup in the new user's home
 # Create mountpoints for volumes with correct permissions
 RUN { curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly; } && \
-    rustup target add x86_64-unknown-linux-musl --toolchain nightly && \
-    mkdir -p .cargo/registry target
+    rustup target add x86_64-unknown-linux-musl --toolchain nightly
diff --git a/fejctl b/fejctl
index 6701343..6f5c8a9 100755
--- a/fejctl
+++ b/fejctl
@@ -18,16 +18,6 @@ function dc() {
     done
     shift $((OPTIND-1))
 
-    if [[ "$build_builder" -eq 1 ]]; then
-        # We always rebuild the builder before we run any compose command
-        DOCKER_BUILDKIT=1 docker build \
-            -f docker/Dockerfile.builder \
-            -t "$image-builder:latest" . || {
-                >&2 echo "Failed to build builder.";
-                exit 1;
-            }
-    fi
-
     if [[ "$release" -eq 1 ]]; then
         DOCKER_BUILDKIT=1 COMPOSE_DOCKER_CLI_BUILD=1 docker-compose \
             --file docker/docker-compose.yml \
@@ -53,6 +43,18 @@ function dcr() {
             --detach
 }
 
+# Publish the builder image
+function publish_builder() {
+    DOCKER_BUILDKIT=1 docker build \
+        -f docker/Dockerfile.builder \
+        -t "$image-builder:latest" . || {
+        >&2 echo "Failed to build builder.";
+            exit 1;
+        }
+
+    docker push "$image-builder:latest"
+}
+
 # Tags & pushes the release version to Docker Hub
 function publish() {
     local branch=`git rev-parse --abbrev-ref HEAD`
@@ -113,6 +115,7 @@ function main() {
         l | logs ) dc -- logs -f app ;;
         lint ) cargo fmt -- --check ;;
         p | push | publish ) publish ;;
+        pb ) publish_builder ;;
         t | test ) dcr -- test --no-fail-fast && dc -- logs -f app ;;
         * ) >&2 echo "Invalid command."; exit 1 ;;
     esac

From caa92377f6087ee2b8231a2c79faaff5bef27839 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@whitesourcesoftware.com>
Date: Sat, 24 Apr 2021 08:03:09 +0000
Subject: [PATCH 064/124] Update alpine Docker tag to v3.13.5

---
 docker/Dockerfile.rel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/Dockerfile.rel b/docker/Dockerfile.rel
index 79bd7bb..4bffeae 100644
--- a/docker/Dockerfile.rel
+++ b/docker/Dockerfile.rel
@@ -23,7 +23,7 @@ RUN cargo install \
 
 
 # Now, we create the actual image
-FROM alpine:3.12.5
+FROM alpine:3.13.5
 COPY ./docker/crontab /var/spool/cron/crontabs/fej
 
 # Install some dynamic libraries needed for everything to work

From 77e04d5b6bf844c520e91ede382fc2264f3bad23 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sat, 24 Apr 2021 12:44:53 +0200
Subject: [PATCH 065/124] Added cicd restriction [CI SKIP]

---
 .woodpecker.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 2703d03..78e9241 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,5 +1,9 @@
 pipeline:
     test:
         image: chewingbever/fej-builder:latest
+        # Always update the builder image
+        pull: true
         commands:
             - cargo test
+
+branches: [ master, develop ]

From 687632a7045d03d3bec2da87d81961d08196e96f Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Thu, 29 Apr 2021 09:58:29 +0200
Subject: [PATCH 066/124] [#44] Added frontend source code

---
 web/.env                          |   1 +
 web/.env.production               |   1 +
 web/.gitignore                    |   5 +++
 web/README.md                     |  27 ++++++++++++++++
 web/index.html                    |  13 ++++++++
 web/package.json                  |  20 ++++++++++++
 web/public/favicon.ico            | Bin 0 -> 4286 bytes
 web/src/App.vue                   |  27 ++++++++++++++++
 web/src/api/ivago.ts              |  32 ++++++++++++++++++
 web/src/assets/logo.png           | Bin 0 -> 6849 bytes
 web/src/components/HelloWorld.vue |  51 +++++++++++++++++++++++++++++
 web/src/components/Home.vue       |  13 ++++++++
 web/src/components/Ivago.vue      |  52 ++++++++++++++++++++++++++++++
 web/src/components/Nav.vue        |  43 ++++++++++++++++++++++++
 web/src/main.ts                   |   8 +++++
 web/src/router.ts                 |  21 ++++++++++++
 web/src/shims-vue.d.ts            |   5 +++
 web/tsconfig.json                 |  15 +++++++++
 web/vite.config.ts                |   7 ++++
 19 files changed, 341 insertions(+)
 create mode 100644 web/.env
 create mode 100644 web/.env.production
 create mode 100644 web/.gitignore
 create mode 100644 web/README.md
 create mode 100644 web/index.html
 create mode 100644 web/package.json
 create mode 100644 web/public/favicon.ico
 create mode 100644 web/src/App.vue
 create mode 100644 web/src/api/ivago.ts
 create mode 100644 web/src/assets/logo.png
 create mode 100644 web/src/components/HelloWorld.vue
 create mode 100644 web/src/components/Home.vue
 create mode 100644 web/src/components/Ivago.vue
 create mode 100644 web/src/components/Nav.vue
 create mode 100644 web/src/main.ts
 create mode 100644 web/src/router.ts
 create mode 100644 web/src/shims-vue.d.ts
 create mode 100644 web/tsconfig.json
 create mode 100644 web/vite.config.ts

diff --git a/web/.env b/web/.env
new file mode 100644
index 0000000..88668b6
--- /dev/null
+++ b/web/.env
@@ -0,0 +1 @@
+VITE_ENDPOINT=http://localhost:8000
diff --git a/web/.env.production b/web/.env.production
new file mode 100644
index 0000000..cf6e652
--- /dev/null
+++ b/web/.env.production
@@ -0,0 +1 @@
+VITE_ENDPOINT=https://fej.roosens.me/api
diff --git a/web/.gitignore b/web/.gitignore
new file mode 100644
index 0000000..d451ff1
--- /dev/null
+++ b/web/.gitignore
@@ -0,0 +1,5 @@
+node_modules
+.DS_Store
+dist
+dist-ssr
+*.local
diff --git a/web/README.md b/web/README.md
new file mode 100644
index 0000000..a797a27
--- /dev/null
+++ b/web/README.md
@@ -0,0 +1,27 @@
+# Vue 3 + Typescript + Vite
+
+This template should help get you started developing with Vue 3 and Typescript in Vite.
+
+## Recommended IDE Setup
+
+[VSCode](https://code.visualstudio.com/) + [Vetur](https://marketplace.visualstudio.com/items?itemName=octref.vetur). Make sure to enable `vetur.experimental.templateInterpolationService` in settings!
+
+### If Using `<script setup>`
+
+[`<script setup>`](https://github.com/vuejs/rfcs/pull/227) is a feature that is currently in RFC stage. To get proper IDE support for the syntax, use [Volar](https://marketplace.visualstudio.com/items?itemName=johnsoncodehk.volar) instead of Vetur (and disable Vetur).
+
+## Type Support For `.vue` Imports in TS
+
+Since TypeScript cannot handle type information for `.vue` imports, they are shimmed to be a generic Vue component type by default. In most cases this is fine if you don't really care about component prop types outside of templates. However, if you wish to get actual prop types in `.vue` imports (for example to get props validation when using manual `h(...)` calls), you can use the following:
+
+### If Using Volar
+
+Run `Volar: Switch TS Plugin on/off` from VSCode command palette.
+
+### If Using Vetur
+
+1. Install and add `@vuedx/typescript-plugin-vue` to the [plugins section](https://www.typescriptlang.org/tsconfig#plugins) in `tsconfig.json`
+2. Delete `src/shims-vue.d.ts` as it is no longer needed to provide module info to Typescript
+3. Open `src/main.ts` in VSCode
+4. Open the VSCode command palette
+5. Search and run "Select TypeScript version" -> "Use workspace version"
diff --git a/web/index.html b/web/index.html
new file mode 100644
index 0000000..11603f8
--- /dev/null
+++ b/web/index.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" href="/favicon.ico" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Vite App</title>
+  </head>
+  <body>
+    <div id="app"></div>
+    <script type="module" src="/src/main.ts"></script>
+  </body>
+</html>
diff --git a/web/package.json b/web/package.json
new file mode 100644
index 0000000..ae1647d
--- /dev/null
+++ b/web/package.json
@@ -0,0 +1,20 @@
+{
+  "name": "fej-frontend",
+  "version": "0.0.0",
+  "scripts": {
+    "dev": "vite",
+    "build": "vue-tsc --noEmit && vite build",
+    "serve": "vite preview"
+  },
+  "dependencies": {
+    "vue": "^3.0.5",
+    "vue-router": "^4.0.6"
+  },
+  "devDependencies": {
+    "@vitejs/plugin-vue": "^1.2.1",
+    "@vue/compiler-sfc": "^3.0.5",
+    "typescript": "^4.1.3",
+    "vite": "^2.2.1",
+    "vue-tsc": "^0.0.25"
+  }
+}
diff --git a/web/public/favicon.ico b/web/public/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..df36fcfb72584e00488330b560ebcf34a41c64c2
GIT binary patch
literal 4286
zcmds*O-Phc6o&64GDVCEQHxsW(p4>LW*W<827=Unuo8sGpRux(DN@jWP-e29Wl%wj
zY84_aq9}^Am9-cWTD5GGEo#+5Fi2wX_P*bo+xO!)p*7B;iKlbFd(U~_d(U?#hLj56
zPhFkj-|A6~Qk#@g^#D^U0XT1cu=c-vu1+SElX9NR;kzAUV(q0|dl0|%h|dI$%VICy
zJnu2^L*Te9JrJMGh%-P79CL0}dq92RGU6gI{v2~|)p}sG5x0U*z<8U;Ij*hB9z?ei
z@g6Xq-pDoPl=MANPiR7%172VA%r)kev<ISBgE$F{SFy+(=9Z)f)De0Se}ZDZW}Z3B
zElCeVrw;K0Fdl_Cg=gZOFXXc3pL)Q05CAuT+XucQ<8g~3dteP~|7s7c6QYP;fy;mF
zMN;>tV-_5H*QJKFmd;8yA$98zCxBZYXTNZ#QFk2(TX0;Y2dt&WitL#$96|gJY=3xX
zpCoi|YNzgO3R`f@IiEeSmKrPSf#h#Qd<$%Ej^RIeeYfsxhPMOG`S`Pz8q``=511zm
zAm)MX5AV^5xIWPyEu7u>qYs?pn$I4nL9J!=K=SGlKLXpE<5x+2cDTXq?brj?n6sp=
zphe9;_JHf40^9~}9i08r{XM$7HB!`{Ys~TK0kx<}ZQng`UPvH*11|q7&l9?@FQz;8
zx!=3<4seY*%=OlbCbcae?<QnEgvj4i?s}Yk=qA2z`-^*<eK3c)MS4JOdbsTQEOa0)
z0NWqlna2rzs>5^V_}*K>Uo6ZWV8mTyE^B=DKy7-sdLYkR5Z?paTgK-zyIkKjIcpyO
z{+uIt&YSa_$QnN_@t~L014dyK(fOOo+W*MIxbA6Ndgr=Y!f#Tokqv}n<7-9qfHkc3
z=>a|HWqcX8fzQCT=dqVbogRq!-S>H%yA{1w#2Pn;=e>JiEj7Hl;zdt-2f+j2%DeVD
zsW0Ab)ZK@0cIW%W7<X*Er!BfRbvU93$DH%#v6dRt^6HBxz1xBNHx=$&_Gv<&J}Ljk
zJN<Fzx(`Oe@KgQ0F$<14=XV#WK`o#6Ku>z}H{&~yGhn~D;aiP4=;m-HCo`BEI+Kd6
z={Xwx{T<?%b6i9IjI)Ls)S{-*mq<@~R{?$}ZKjf;^k75i_}(2MXt}^SEBVg7AI@28
zo_uPg2V)_e-`2Ois=PYoe%9u*n9({PFR)OnHJPi{dNx>Kx<YG`4QQ>D#iCLfl2<BD
h7L=-;Q>vQGDitKtN>z|-AdCN|$jTFDg0m3O`WLD4_s#$S

literal 0
HcmV?d00001

diff --git a/web/src/App.vue b/web/src/App.vue
new file mode 100644
index 0000000..ca4df88
--- /dev/null
+++ b/web/src/App.vue
@@ -0,0 +1,27 @@
+<template>
+    <Nav />    
+    <router-view />
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue'
+import Nav from './components/Nav.vue'
+
+export default defineComponent({
+    name: 'App',
+    components: {
+        Nav,
+    },
+})
+</script>
+
+<style>
+#app {
+    font-family: Avenir, Helvetica, Arial, sans-serif;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+    text-align: center;
+    color: #2c3e50;
+    margin-top: 60px;
+}
+</style>
diff --git a/web/src/api/ivago.ts b/web/src/api/ivago.ts
new file mode 100644
index 0000000..662e531
--- /dev/null
+++ b/web/src/api/ivago.ts
@@ -0,0 +1,32 @@
+export class Street {
+    name: string;
+    city: string; 
+
+    constructor(name: string, city: string) {
+        this.name = name;
+        this.city = city;
+    }
+}
+
+export class Ivago {
+    base_url: string;
+
+    constructor(url: string) {
+        this.base_url = url;
+    }
+
+    async search(search_term: string): Promise<Street[]> {
+        var r = await fetch(`${this.base_url}/ivago/search?` + new URLSearchParams({
+            q: search_term,
+        }));
+
+        if (!r.ok) {
+            return Promise.reject();
+        }
+
+        var json = await r.json();
+
+        return json.map((o: {name: string, city: string}) => new Street(o.name, o.city));
+    }
+}
+
diff --git a/web/src/assets/logo.png b/web/src/assets/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3d2503fc2a44b5053b0837ebea6e87a2d339a43
GIT binary patch
literal 6849
zcmaKRcUV(fvo}bjDT-7nLI_nlK}sT_69H+`qzVWDA|yaU?}j417wLi^B1KB1SLsC&
zL0ag7$U(XW5YR7p&Ux?s<Na=)C)s<=p5LrlQ`Vj}i8j!?Lr2R_OGZXUr=_WGNV*Q3
zf2k=+zm;ZH`J@Y*r-qrQk(;BZj~xa<rsClC5CPOe**PH$5q1uK9)k!4GBOHYq_LT&
znXV4h-VG&gcg`d3i*hHS$;cFxeBJHrT@aqYhX^Mm8V1^F=>P$d4lvMt8C^+TcQu4F
zQqv!UF!I+kw)c0jhd6+g6oCr9P?7)?!qX1ui*iL{p}sKCAGuJ{{W)0z1pLF|=>h}&
zt(2Lr0Z`2ig8<5i%Zk}cO5Fm=LByqGWaS`oqChZdEFmc`0hSb#gg|Aap^{+WKOYcj
zHjINK)KDG%&s?Mt4CL(T=?;~U@bU2x_mLKN!#GJuK_CzbNw5SMEJorG!}_5;?R>@1
zSl)jns3WlU7^J%=(hUtfmuUCU&C3%8B5C^f5>W2Cy8jW3#{Od{lF1}|?c61##3dzA
zsPlFG;l_FzBK}8>|H_Ru_H#!_7$UH4UKo3lKOA}g1(R&|e@}GINYVzX?q=_WLZCgh
z)L|eJMce`D0EIwgRaNETDsr+?vQknSGAi=7H00r`QnI%oQnFxm`G2umXso9l+8*&Q
z7WqF|$p49js$mdzo^BXpH#gURy=UO;=IMrYc5?@+sR4y_?d*~0^YP7d+y0{}0)zBM
zIKVM(DBvICK#~7N0a+PY6)7;u=dutmNqK3AlsrUU9U`d;msiucB_|8|2kY=(7XA;G
zwDA8AR)VCA#JOkxm#6<Fk;3Qv_CIk;8vG~n5ol7lV@Ppr$`vO}M#g$eOI^j-clMjL
zOPuv5uLtX1JFT#MwySH_RJ4r>oHNS^YVuOU;8p$N)2{`;oF|rQ?B~K$%rHDxXs+_G
zF5|-uqHZvSzq}L;5Kcy_P+x0${33}Ofb6+TX&=y;;PkEOpz%<lxjl%Ocl~M2y2lP|
zbFM`Z-*dEp9W{5_I?FqgKOqcjrGzul_KvvA0B9o^)C&!8LQLB95vnvr20|)KwER)3
zg@AiPX~4f9{zIy9K63eeK%_eUy<Xj$!il}`M9Aai_i>+_bCw_<t<K-?r^}*l>{<&~
zeLV|!bP%l1qxywfVr9Z9JI+++EO^x>ZuCK);=$VIG1`kxK8F2M8AdC$iOe3cj<EWM
zKtfCf^Zg1tRdj=Xm)|^7J1pa)+-CDvXj&R?416f(tgg8|WBR8cdxDx?*Yn+_9!KKY
zYfc;GQgX!L+9q}en#aZ8FKqby@Ji7SuT!4)GFKidFyC9wMywvB3c%^>1fo(ce4l-9
z7*zKy3={MixvUk=enQE;ED~7tv%qh&3lR<0m??@w{ILF|e#QOyPkFYK!&Up7xWNtL
zOW%1QMC<3o;G9_S1;NkPB6bqbCOjeztEc6TsBM<(q9((JKiH{01+Ud=uw9B@{;(JJ
z-DxI2*{pMq`q1RQc;V8@gYAY44Z!%#W~M9pRxI(R?SJ7<UU2Y^EpY^fzuq-h_rtLL
zw8{`NN~<)$oMx`|^gGr>sy7em=Z5DbuDlr@*q|25V)($-f}9c#?D%dU^RS<(wz?{P
zFFHtCab*!rl(~j@0(Nadvwg8q|4!}L^>d?0al6}Rrv9$0M#^&@zjbfJy_n!%mVHK4
z6pLRIQ^Uq~dnyy$`ay51Us6WaP%&O;@49m&{G3z7xV3dLtt1VTOMYl3UW~Rm{Eq4m
zF?Zl_v;?7EFx1_+#WFUXxcK78IV)FO>42@cm@}2I%pVbZqQ}3;p;sDIm&knay03a^
zn$5}Q$G!@fTwD$e(x-~aWP0h+4N<q|;xEwzsU+0W)#|>Rz$Kln<bW)%U3n>O_H2c<
z(XX#lPuW_%H#Q+c&(nRyX1-Ia<yTsbNAz3PBfuh9@JU{>dKR-%$4FYC0fsCmL9ky3
zKpxyjd^JFR+vg2!=HWf}2Z?@Td`0EG`kU?{8zKrvtsm)|7>pPk9nu@2^z96aU2<#`
z2QhvH5w&V;wER?mopu+nqu*n8p~(%Q<o-E#HMmv_6Lr(S<y?zXl02$twV54+g=p_C
zbPW!;qljHcIPw~aX95_u!itzF%xKBH?y!MCRe^`1V@8<G!;_`~Q-@-mUm7r`3Jc*<
zW|jM!A9`X|osT!srEU-27h+^5j<OqNPj-EFHPokG&HB5WAG01lt!13`S9niUI^dz+
zrPE=GX-SXL@wqVGe*HT?V{#O~&~?uH#PoV2h;Vj@x`#d8)T&F})!(j^f1!z+l?Jjx
zylKosI<}}<nHbsk7I?v<<vXs6tPoozmJ}avD&{J7$vR$!Ni~Q@;tH>kwSs&*0eJwa
zMXR05`OSFpfyRb!<VB&Y0bEEVE$hSNXH(0mbzS-;?|O<AG)<R8gmLSuf>Y_+H@O%Y
z0=K^y6B8Gcbl?SA)qMP3Z+=C(?8zL@=74R=EVnE?vY!1BQy2@q*RUgRx4yJ$k}MnL
zs!?74QciNb-LcG*&o<9=DSL>1n}ZNd)w1z3-0Pd^4ED1{qd=9|!!N?xnXjM!EuylY
z5=!H>&hSofh8V?Jofyd!h`xDI1fYAuV(sZwwN~{$a}MX^=+0TH*SFp$vyxmUv7C*W
zv^3Gl0+eTFgBi3FVD;$nhcp)ka*4gSskYIqQ&+M}xP9yLAkWzBI^I%zR^l1e?bW_6
zIn{mo{dD=)9@V?s^fa55jh78rP*Ze<3`tRCN4*mpO$@7a^*2B*7N_|A(Ve2VB|)_o
z$=#_=aBkhe(ifX}MLT()@5?<tMQW)|T904`EDIN{(*~?7PZ%vrUEuUf@Om1Lh8V<U
zqvVYpe+tw_sKHyj#O-VCO5S%E1lshLO74De`Gk2E(7WE#<PpDtbvmnFnSOqG1oI3d
zYC<jZo_G~2KIE6{8;7bJFfC?E4zS>OV+~7cXC3r!%{QJxriXo9I%*3q4KT4Xxzyd{
z9;_%=W%q!Vw$Z7F3lUnY+1HZ*lO;4;VR2+i4+D(m#01OYq|L_fbnT;KN<^dkkCwtd
zF7n+O7KvAw8c`JUh6LmeIrk4`F3o|AagKSMK3))_5Cv~y2Bb2!Ibg9BO7Vkz?pAYX
zoI=B}+$R22&IL`NCYUYjrdhwjnM<dIpta11b@>x_v=-Qcx-jmtN>!Zqf|n1^SWrHy
zK|MwJ?Z#^>)rfT5YSY{qjZ&`Fjd;^vv&gF-Yj6$9-Dy$<6zeP4s+78gS2|t%Z309b
z0^fp~ue_}i`U9j!<|qF92_3oB09NqgAoehQ`)<)dSfKoJl_A6Ec#*Mx9Cpd-p#$Ez
z={AM*r-bQs6*z$!*V<pNyBZpFi*F}aPuOZk!oD1sov}{rrxFZa@)!5H(|DKR-T0B*
zk=XmkSgqtSP+yWN@0aMgOdP>A4|QE7bf@-4vb?Q+pPKLkY2{yKsw{&udv_2v8{Dbd
zm~8VAv!G~s)`O3|Q6vFUV%8%+?ZSVUa(;fhPNg#vab@J*9XE4#D%)$UU-T5`fwjz!
z6&gA^`OGu6aUk{l*h9eB?opVdrHK>Q@U>&JQ_2pR%}TyOXGq_6s56_`U(WoOaAb+K
zXQr#6H}>a-GYs9^bG<C4b$CvneP46N2fi^kmcJjoTXRGgd^g1b&uQ5spV5+b#%y`#
zrU;H~D)utn!YWIi=j;?C-zcJ^D5xZF+#(?rMdp;)?KT1xBnMkmoV;zh&S;rXW6QQx
zWTQ2K14`6wG0eo+=1oSxjIHJc9Zkw+()XT69~5<`ZtDM}Z2bxUwYy3m%<I&~-0+^1
zYtu2vJf--MIxlG~PPDn;z8t5-=$6>P2Y&hSP5gEtW+GVC4=wy0wQk=~%CSXj=GH6q
z-T#s!BV`xZVxm{~jr_ezYRpqqIcXC=Oq`b{lu`Rt(IYr4B91hhVC?yg{ol4WUr3v9
zOAk2LG>CIECZ-WIs0$N}F#eoIUEtZudc7DPYIjzGqDLWk_A4#(<oDDN)6%Ctygl~O
zyPZcr9YCj-jDP7@YK23SJG!MDFZ1)E9`{R$R<J$u)%oUM9#k)$atlYczfhesFXL-4
zvsoG-9l@uTA8QI2Z$HsSvPZlMpB!@DV{4Bs(b)t!a<<4O@H~uuN{fO$vY>LgacooD
z2K4IWs@N`Bddm-{%oy}!k0^i6Yh)uJ1S*90>|bm3TOZxcV|ywHUb(+CeX-o1|LTZM
zwU>dY3R&U)T(}5#Neh?-CWT~@{6Ke@sI)uSuzoah8COy)w)B)aslJmp`WUcjdia-0
zl2Y}&L~XfA`uYQboAJ1;J{XLhYjH){cObH3FDva+^8ioOQy%Z=xyjGLmWMrzfFoH;
zEi3AG`_v+%)&lDJE;iJWJDI@-X9K5O)LD~j*PBe(wu+|%ar~C+LK1+-+lK<ll>=t#
z+Xc+J7qp~5q=B~rD!x78)?1+KUIbYr^5rcl&tB-cTtj+e%{gpZZ4G~6r15+d|J(ky
zjg@@UzMW0k9@S#W(1H{u;Nq(7llJbq;;4t$awM;l&(2s+$l!Ay9^Ge|34CVhr7|BG
z?dAR83smef^frq9V(OH+a+ki#q&-7TkWfFM=5bsGbU(8mC;>QTCWL5ydz9s6k@?+V
zcjiH`VI=59P-(-DWXZ~5DH>B^_H~;4$)KUhnmGo*G!Tq8^LjfUDO)lASN*=#AY_yS
zqW9UX(VOCO&p@kHdUUgsBO0KhXxn1sprK5h8}+>IhX(nSXZKwlNsjk^M|RAaqmCZB
zHBol<PMLlw!1W2AX{4`0(aI-^)x1d_zq-0U*e!X=g^kk>OHYBas@&{PT=R+?d8pZu
zUHfyucQ`(umXSW7o?HQ3H21M`ZJal+%*)SH1B1j6rxTlG3hx1IGJN^M7{$j(9V;MZ
zRKybgVuxKo#XVM+?*yTy{W+XHaU5Jbt-UG33x{u(N-2wmw;zzPH&4DE103HV@ER86
z|FZEmQb|&1s5#`$4!Cm}&`^{(4V}OP$bk`}v6q6rm;P!H)W|2i^e{7lTk2W@jo_9q
z*aw|U7#+g59Fv(5qI`#O-qPj#@_P>PC#I(GSp3DLv7x-dmYK=C7lPF8a)bxb=@)B1
zUZ`EqpXV2dR}B&r`uM}N(TS99ZT0UB%IN|0H%DcVO#T%L_chrgn#m6%x4KE*IMfjX
zJ%4veCEqbXZ`H`F_+fELMC@wuy_ch%t*+Z+1I}wN#C+dRrf2X{1C8=yZ_%Pt6wL_~
zZ2NN-hXOT4P4n$QFO7yYHS-4wF1Xfr-meG9Pn;uK51?hfel`d38k{W)F*|gJLT2#T
z<~>spMu4(mul-8Q3*pf=N4DcI)zzjqAgbE2eOT7~&f1W3VsdD44Ffe;3mJp-V@8UC
z)|qnPc12o~$X-+U@L_lWqv-RtvB~%hLF($%Ew5w>^NR82qC_0F<zVqs?Raxz=2A>B
z)=hP1-OEx?lLi#jnLzH}a;Nvr@JDO-zQWd}#k^an$Kwml;MrD&)sC5b`s0ZkVyPkb
zt}-jOq^%_9>YZe7Y}PhW{a)c39G`kg(P4@kxjcYfgB4XOOcmezdUI7j-!gs7oAo2o
zx(Ph{G+YZ`a%~kzK!HTAA5NXE-7vOFRr5oqY$rH>WI6SFvWmahFav!CfRMM3%8J&c
z*p+%|-fNS_@QrFr(at!JY9jCg9F-%5{nb5Bo~z@Y9m&SHYV`49GAJjA5h~h4(G!Se
zZmK{Bo7ivCfvl}@A-ptkFGcWXAzj3xfl{evi-OG(TaCn1FAHxRc{}B|x+Ua1D=I6M
z!C^ZIvK6aS_c&(=OQDZfm>O`Nxsw{ta&yiYPA~@e#c%N>>#rq)k6Aru-qD4(D^v)y
z*>Rs;YUbD1S8^D(ps6Jbj0K3wJw>L4m)0e(6Pee3Y?gy9i0^bZO?$*sv+xKV?WBlh
zAp*;v6w!a8;A7sLB*g-^<$Z4L7|5jXxxP1}hQZ<55f9<^KJ>^mKlWSGaLcO0=$jem
zWyZkRwe~u{{tU63DlCaS9$Y4CP4f?+wwa(&1ou)b>72yd<aYLC-(YWFHR=3p2C;o@
zP>rFvm`R<qZaNijJ?9e0Ao@J0FQbg1c%wi*X&vhQIV{0-tqBevRs?R)1sbxUT&}HJ
z*KdKSzTFX7&Aa4>j-0`kBJgK@nd(*Eh!(NC{F-@=FnF&Y!q`7){YsLLHf0_B6aHc#
z>WIuHTyJwIH{BJ4)2RtEauC7Yq7Cytc|S<m;S)8!_N`GikUqEGHdRcGU-QPEbp3se
zE7LrqZLNv81NNuz!tDCc*XEM9tD}O}AA<wr-O|Mp0pzPgSb{6jitn>)4^*t8Va3HR
zg=~sN^tp9re@w=GTx$;zOWMjcg-7X3Wk^N$n;&Kf1RgVG2}2L-(0o)54C509C&77i
zrjSi{X*WV=%C17((N^6R4Ya*4#6s_L99RtQ>m(%#nQ#wrRC8Y%yxkH;d!MdY+Tw@r
zjpSnK`;C-U{ATcgaxoEpP0Gf+tx);buOM<s@Z}LbUcXA@TIG=Q@myo%l9hl^&h34x
zu6;dv<5;?t)>lK=01D|J+ROu37qc*rD(w`#O=3*O*w9?biwNoq3WN1`&Wp8TvKj3C
z3HR9ssH7a&Vr<6waJrU<Uz3;wi7<=4xfd1VLN$2P7x}BBS2io@ltlrnmzyIDtt<yX
zAPcqxp4#$=Z%yky_m)4l_cnk`*u)Ahtuv8K{6vhAKMH6ow@c&kpm#&qGLE(Nu?A^>
zdLg!ieYz%U^bmpn%;(V%%ugMk92&?_XX1K@mwnVSE6!&%P%Wdi7_h`CpScvspMx?N
zQUR>oadnG17#hNc$pkTp+9<O}Jes}mOYA)lX@8ntoYG-_HA4-;x|^l1dmnFbnH;3A
zo7RmzjAt!StB&)wt}}Vz$Tx7{+QOd#U@!|=V-Oy>lW+MBKHRZ~7<Tp{OpB;sNJVcO
zP9gJmH&Z2nt++Wk^~d|9`p`s~@#e4h2h+!@-1=fBDgb_osGReiQgZ>4XWUryd)4yd
zj98$%XmIL4(9OnoeO5Fnyn&fpQ9b0h4e6EHHw*l68j;>(ya`g^S&y2{O8U>1*>4zR
zq*WSI_2o$CHQ?x0!wl9bpx|Cm2+kFMR)oMud1%n2=qn5nE&t@Fgr#=Zv2?}wtEz^T
z9rrj=?I<GKR}2`GsAAn<o<uOC`pid<%}8(c`p&zgnk&0rnZ{7Rb)^0-DfYcASTQ0s
zKO0S&yqP5xyM1crewennx~2nl$+FH?k$&4izqT?3*7J(SmJOw`dZb5FYs=|K5XN*~
z@!QVYGRE&)UH{eRL^>H*qI5{G@Rn&}^Z{+TW}mQe<Ew(X_9Cg%_)${IZP(Sf(i}}#
zbP^Uyd)|N;rJ4rvPkN0$CN?X?Bu3o`sBkNx9e)Hk<|kZoor>b9=8b<_a`&Cm#n%n~
zU47MvCBsdXFB1+adOO)03+nczfWa#vwk<X*p?NEOGFg@VXR_YfNi3ZWGup*ZMYLrd
zivdVFWx1f#$rH$D0S;+?%}dLVO}~LftMC3)E?;ORtVD#gO@_oLGdOsk#uT@)CP$RI
z#-#zp;&|vD_rYnvw~2N0Wp+nQ+xVJ$IH9kk(&N_Uad`)ORc-o<^o9v_z)$2HD4jGQ
zI}WMPN93Rji|(>#r{o{dF)QWya9v2nv43Zp3%Ps}($lA02*_g25t;|T{A5snSY?3A
zrRQ~(Ygh_ebltHo1VC<XI}!-0hb>bJb*eOAr;4cnlXLvI>*$-#AVsGg6B1r7@;g^L
zFlJ_th0vxO7;-opU@WA<a+$A0VKV&CD~?Y9W`bM2k~*P|j8E*2CoV8)Cu!IV5;k=`
zm0lA9424u4MQ;9hkajM?rCu<5Nio0ru*d*6!O7wLB^>Fe;<}?!2q?RBrFK5U{<mA*
z;WN^+Hz{=MA9j{=Q!Qyy7=i0XTx(4nT94X=`8CIvSzRT*3@ox%j?(gLc30~Knc##R
z`(0eGu62$+sd#-(+!IS_v$FsA^Q8gK0r%Y15^&Pc`)3fzUE9X{;k8eN8;R}9b;E)`
zT8R>*ai@NLKZ^};Ul}beukveh?TQn;$%9=R+DX07m82gP$=}Uo_%&ngV`}Hyv8g{u
z3SWzTGV|cwQuFIs7ZDOqO_fGf8Q`8MwL}eUp>q?4eqCmOTcwQuXtQckPy|4F1on8l
zP*h>d+cH#XQf|+6c|S{7SF(Lg>bR~l(0uY?O{OEVlaxa5@e%T&xju=o1`=OD#qc16
zSvyH*my(dcp6~VqR;o(#@m44Lug@~_qw+HA=mS#Z^<V!az}@c{ARa+_X}NO~a$=9p
za)_Ly?(LOnFWV{rQbS?1K7hP~fC?!$z}<pP%6*k1O(nj^MX2}V?0EMJUI;+4&As(@
zxYB>4reBy8iV?H~I;{LQWk3aKK8$bLRyt$g?-<xQqj`npk`D=fcL`B%EgjfC99(LE
z!z(C4-ap+uQYSIckaE<2uA^ag^t_eaYn_Jfq@U?vzOdv%t*)||aVad7PZ((`gpV!x
rZ$0M!)qwuD?ff?h#CY04MnNVFTnmG)-+p%fr;?V2o_dw4E$;sThR3J6

literal 0
HcmV?d00001

diff --git a/web/src/components/HelloWorld.vue b/web/src/components/HelloWorld.vue
new file mode 100644
index 0000000..12f05c8
--- /dev/null
+++ b/web/src/components/HelloWorld.vue
@@ -0,0 +1,51 @@
+<template>
+    <h1>Fej Frontend</h1>
+
+    <input id="street" type="text" placeholder="street" v-model="street" />
+    <button :onClick="onSubmit">Search</button>
+
+    <ul>
+        <li v-for="res in results">{{res.name}} ({{res.city}})</li>
+    </ul>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue'
+import { Street, Ivago } from '../api/ivago'
+
+export default defineComponent({
+    name: 'HelloWorld',
+    data() {
+        return {
+            street: "",
+            results: [] as Street[],
+        }
+    },
+    methods: {
+        onSubmit() {
+            new Ivago(import.meta.env.VITE_ENDPOINT as string).search(this.$data.street)
+                .then(res => {
+                    this.$data.results = res;
+                });
+        }
+    }
+})
+</script>
+
+<style scoped>
+a {
+  color: #42b983;
+}
+
+label {
+  margin: 0 0.5em;
+  font-weight: bold;
+}
+
+code {
+  background-color: #eee;
+  padding: 2px 4px;
+  border-radius: 4px;
+  color: #304455;
+}
+</style>
diff --git a/web/src/components/Home.vue b/web/src/components/Home.vue
new file mode 100644
index 0000000..f5cc87a
--- /dev/null
+++ b/web/src/components/Home.vue
@@ -0,0 +1,13 @@
+<template>
+    <h1>Fej</h1>
+    <p>Welcome to Fej, my frontend/backend combo.</p>
+    <p>If you can see this, the cicd worked!</p>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue'
+
+export default defineComponent({
+    name: 'Home',
+})
+</script>
diff --git a/web/src/components/Ivago.vue b/web/src/components/Ivago.vue
new file mode 100644
index 0000000..923f85c
--- /dev/null
+++ b/web/src/components/Ivago.vue
@@ -0,0 +1,52 @@
+<template>
+    <h1>Ivago</h1>
+    <input v-model="query" v-on:keyup.enter="search" type="text" placeholder="Street..." />
+    <div id="scroll-list">
+        <ul v-if="msg === ''">
+            <li v-for="item in items">{{ item.name }}</li>
+        </ul>
+        <p v-else>{{ msg }}</p>
+    </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue'
+import { Street, Ivago } from '../api/ivago'
+
+export default defineComponent({
+    name: 'Ivago',
+    data() {
+        return {
+            items: [] as Street[],
+            msg: "",
+            query: "",
+        }
+    },
+    methods: {
+        search() {
+            this.items = []
+            this.msg = "Loading..."
+
+            if (this.query === "") {
+                this.msg = ""
+                return
+            }
+
+            new Ivago(import.meta.env.VITE_ENDPOINT as string)
+                .search(this.query)
+                .then((res: Street[]) => {
+                    this.items = res
+                    this.msg = ""
+                })
+        }
+    }
+})
+</script>
+
+<style scoped>
+#scroll-list {
+    height: 200px;
+    overflow: hidden;
+    overflow-y: auto;
+}
+</style>
diff --git a/web/src/components/Nav.vue b/web/src/components/Nav.vue
new file mode 100644
index 0000000..fcf9c26
--- /dev/null
+++ b/web/src/components/Nav.vue
@@ -0,0 +1,43 @@
+<template>
+    <div id="menu-wrapper">
+        <nav id="menu">
+            <router-link to="/">Home</router-link>
+            <router-link to="/ivago">Ivago</router-link>
+        </nav>
+    </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue'
+
+export default defineComponent({
+    name: 'Nav',
+})
+
+</script>
+
+<style scoped>
+#menu-wrapper {
+    position: fixed;
+    left: 0;
+    top: 0;
+    height: 100%;
+    width: 150px;
+    background-color: #242624;
+    text-align: center;
+}
+
+#menu {
+    margin: 20px;
+}
+
+#menu > a {
+    display: block;
+    width: 100%;
+    color: #5f635f;
+    text-decoration: none;
+}
+#menu > a:hover {
+    color: #c2ccc1;
+}
+</style>
diff --git a/web/src/main.ts b/web/src/main.ts
new file mode 100644
index 0000000..af7463e
--- /dev/null
+++ b/web/src/main.ts
@@ -0,0 +1,8 @@
+import { createApp } from 'vue';
+import App from './App.vue';
+import router from './router';
+
+const app = createApp(App)
+app.use(router)
+
+app.mount('#app')
diff --git a/web/src/router.ts b/web/src/router.ts
new file mode 100644
index 0000000..2d7fa58
--- /dev/null
+++ b/web/src/router.ts
@@ -0,0 +1,21 @@
+import { createWebHistory, createRouter } from "vue-router";
+import Home from './components/Home.vue';
+import Ivago from './components/Ivago.vue';
+
+const routes = [
+    {
+        path: "/",
+        component: Home,
+    },
+    {
+        path: "/ivago",
+        component: Ivago,
+    },
+];
+
+const router = createRouter({
+    history: createWebHistory(),
+    routes,
+});
+
+export default router;
diff --git a/web/src/shims-vue.d.ts b/web/src/shims-vue.d.ts
new file mode 100644
index 0000000..ac1ded7
--- /dev/null
+++ b/web/src/shims-vue.d.ts
@@ -0,0 +1,5 @@
+declare module '*.vue' {
+  import { DefineComponent } from 'vue'
+  const component: DefineComponent<{}, {}, any>
+  export default component
+}
diff --git a/web/tsconfig.json b/web/tsconfig.json
new file mode 100644
index 0000000..e754e65
--- /dev/null
+++ b/web/tsconfig.json
@@ -0,0 +1,15 @@
+{
+  "compilerOptions": {
+    "target": "esnext",
+    "module": "esnext",
+    "moduleResolution": "node",
+    "strict": true,
+    "jsx": "preserve",
+    "sourceMap": true,
+    "resolveJsonModule": true,
+    "esModuleInterop": true,
+    "lib": ["esnext", "dom"],
+    "types": ["vite/client"]
+  },
+  "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue"]
+}
diff --git a/web/vite.config.ts b/web/vite.config.ts
new file mode 100644
index 0000000..315212d
--- /dev/null
+++ b/web/vite.config.ts
@@ -0,0 +1,7 @@
+import { defineConfig } from 'vite'
+import vue from '@vitejs/plugin-vue'
+
+// https://vitejs.dev/config/
+export default defineConfig({
+  plugins: [vue()]
+})

From 0055667877b0b94c288e7628eff8ddf4968aa565 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Thu, 29 Apr 2021 10:02:44 +0200
Subject: [PATCH 067/124] [#44] [#44] Added proper Node.js gitignore

---
 web/.gitignore | 133 +++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 129 insertions(+), 4 deletions(-)

diff --git a/web/.gitignore b/web/.gitignore
index d451ff1..04459e4 100644
--- a/web/.gitignore
+++ b/web/.gitignore
@@ -1,5 +1,130 @@
-node_modules
-.DS_Store
+# Created by https://www.toptal.com/developers/gitignore/api/node
+# Edit at https://www.toptal.com/developers/gitignore?templates=node
+
+### Node ###
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# TypeScript v1 declaration files
+typings/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional stylelint cache
+.stylelintcache
+
+# Microbundle cache
+.rpt2_cache/
+.rts2_cache_cjs/
+.rts2_cache_es/
+.rts2_cache_umd/
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+.env.test
+.env*.local
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+.parcel-cache
+
+# Next.js build output
+.next
+
+# Nuxt.js build / generate output
+.nuxt
 dist
-dist-ssr
-*.local
+
+# Storybook build outputs
+.out
+.storybook-out
+storybook-static
+
+# rollup.js default build output
+dist/
+
+# Gatsby files
+.cache/
+# Comment in the public line in if your project uses Gatsby and not Next.js
+# https://nextjs.org/blog/next-9-1#public-directory-support
+# public
+
+# vuepress build output
+.vuepress/dist
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# TernJS port file
+.tern-port
+
+# Stores VSCode versions used for testing VSCode extensions
+.vscode-test
+
+# Temporary folders
+tmp/
+temp/
+
+# End of https://www.toptal.com/developers/gitignore/api/node

From 628a918682afd68702efb6807fa2c484a36a7d6d Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Thu, 29 Apr 2021 10:23:07 +0200
Subject: [PATCH 068/124] [#44] Fej can now easily startup a Vite development
 server

---
 fejctl | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/fejctl b/fejctl
index 6f5c8a9..57f7443 100755
--- a/fejctl
+++ b/fejctl
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 image='chewingbever/fej'
+web_dir='web'
 
 # Small wrapper around the docker-compose command
 #
@@ -98,10 +99,12 @@ function main() {
         # Building
         b | build ) dcr build --bin "$bin" && dc -- logs -f app ;;
         br | build-release ) dc -br build ;;
+        bf | build-frontend ) cd "$web_dir" && yarn run build ;;
 
         # Running
         r | run ) dcr run --bin "$bin" && dc -- logs -f app ;;
         rr | run-release ) dc -br -- up --build --detach && dc -r -- logs -f app ;;
+        rf | run-frontend ) dcr run --bin server && cd "$web_dir" && yarn run dev ;;
         s | stop ) dc down ;;
         sr | stop-release ) dc -r stop ;;
 

From e0ac8ddd240f28056e753498eb0f41ed95323771 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Thu, 29 Apr 2021 10:45:42 +0200
Subject: [PATCH 069/124] [#44] [#44] Release container now builds & packages
 frontend as well

---
 .dockerignore         | 32 +++++++++++++++++++++++++++-----
 docker/Dockerfile.rel | 17 ++++++++++++++---
 2 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index a96bd42..b143673 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,20 +1,42 @@
 *
 
-# Source code
+# =====BACKEND=====
+## Source code
 !src/
 
-# Cargo files
+## Cargo files
 !Cargo.toml
 !Cargo.lock
 
-# Entrypoint for devop container
+## Entrypoint for devop container
 !docker/entrypoint_dev.sh
 !docker/entrypoint.sh
 
-# Config file
+## Config file
 !Rocket.toml
 
-# Database migrations
+## Database migrations
 !migrations/
 
+## Crontab for release container
 !docker/crontab
+
+
+# =====FRONTEND=====
+## Source code
+!web/src/
+
+## Public assets
+!web/public/
+!web/index.html
+
+## Production env file
+!web/.env.production
+
+## Package manager stuff
+!web/package.json
+!web/yarn.lock
+
+## Project configs
+!web/tsconfig.json
+!web/vite.config.ts
diff --git a/docker/Dockerfile.rel b/docker/Dockerfile.rel
index 4bffeae..a01d343 100644
--- a/docker/Dockerfile.rel
+++ b/docker/Dockerfile.rel
@@ -1,5 +1,5 @@
 # vim: filetype=dockerfile
-FROM chewingbever/fej-builder:latest AS builder
+FROM chewingbever/fej-builder:latest AS backend-builder
 
 COPY --chown=builder:builder Cargo.toml Cargo.lock ./
 COPY --chown=builder:builder src/ ./src/
@@ -22,6 +22,16 @@ RUN cargo install \
     --target x86_64-unknown-linux-musl
 
 
+FROM node:15-alpine3.13 AS frontend-builder
+
+COPY ./web /app
+WORKDIR /app
+
+# Build the frontend
+RUN yarn install && \
+    yarn run build
+
+
 # Now, we create the actual image
 FROM alpine:3.13.5
 COPY ./docker/crontab /var/spool/cron/crontabs/fej
@@ -41,8 +51,9 @@ RUN apk update && \
 # Switch to non-root user
 USER fej:fej
 
-# Copy binary over to final image
-COPY --from=builder --chown=fej:fej /app/output/bin /app/bin
+# Copy binary & frontend over to final image
+COPY --from=backend-builder --chown=fej:fej /app/output/bin /app/bin
+COPY --from=frontend-builder --chown=fej:fej /app/dist /app/dist
 
 # Embed config file inside container
 # The workdir is changed so that the config file is read properly

From 5a95ee5270db5a7cbbb88282b564cbaeb61701c9 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Thu, 29 Apr 2021 11:34:35 +0200
Subject: [PATCH 070/124] [#44] Added frontend hosting using feature

---
 Cargo.toml            |  6 +++++-
 docker/Dockerfile.rel |  3 ++-
 src/server/main.rs    | 17 ++++++++++++++---
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 97668d2..cf6db71 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,6 +4,10 @@ version = "1.0.2"
 authors = ["Jef Roosens <roosensjef@gmail.com>"]
 edition = "2018"
 
+[features]
+# Enables hosting of the frontend
+frontend = []
+
 [lib]
 name = "fej"
 path = "src/fej/lib.rs"
@@ -41,4 +45,4 @@ diesel_migrations = "1.4.0"
 [dependencies.rocket_contrib]
 version = "0.4.7"
 default-features = false
-features = ["json", "diesel_postgres_pool"]
+features = ["json", "diesel_postgres_pool", "serve"]
diff --git a/docker/Dockerfile.rel b/docker/Dockerfile.rel
index a01d343..5a17f05 100644
--- a/docker/Dockerfile.rel
+++ b/docker/Dockerfile.rel
@@ -19,7 +19,8 @@ COPY --chown=builder:builder migrations/ ./migrations/
 RUN cargo install \
     --path . \
     --root /app/output \
-    --target x86_64-unknown-linux-musl
+    --target x86_64-unknown-linux-musl \
+    --features frontend
 
 
 FROM node:15-alpine3.13 AS frontend-builder
diff --git a/src/server/main.rs b/src/server/main.rs
index 0e84ff8..2a5bd2f 100644
--- a/src/server/main.rs
+++ b/src/server/main.rs
@@ -20,6 +20,8 @@ use rocket::fairing::{Fairing, Info, Kind};
 use rocket::http::Header;
 use rocket::{Request, Response, Rocket};
 use rocket_contrib::databases::diesel;
+#[cfg(feature = "frontend")]
+use rocket_contrib::serve::StaticFiles;
 
 pub struct CORS;
 
@@ -60,12 +62,21 @@ fn run_db_migrations(rocket: Rocket) -> Result<Rocket, Rocket> {
 }
 
 fn rocket() -> rocket::Rocket {
-    rocket::ignite()
+    // This needs to be muted for the frontend feature
+    let mut rocket = rocket::ignite()
         .attach(CORS)
         .attach(FejDbConn::fairing())
         .attach(AdHoc::on_attach("Database Migrations", run_db_migrations))
-        .mount("/ivago", routes::ivago())
-        .register(catchers![catchers::not_found])
+        .mount("/api/ivago", routes::ivago()) // /api being hardcoded is temporary
+        .register(catchers![catchers::not_found]);
+
+    // TODO make all of this not hard-coded
+    #[cfg(feature = "frontend")]
+    {
+        rocket = rocket.mount("/", StaticFiles::from("/app/dist"));
+    }
+
+    rocket
 }
 
 fn main() {

From 28bb959c1227fac5f4a88d2455174bd9f8ad649f Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Thu, 29 Apr 2021 11:37:35 +0200
Subject: [PATCH 071/124] [#44] Fixed development .env file

---
 web/.env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/.env b/web/.env
index 88668b6..18f38c1 100644
--- a/web/.env
+++ b/web/.env
@@ -1 +1 @@
-VITE_ENDPOINT=http://localhost:8000
+VITE_ENDPOINT=http://localhost:8000/api

From d2ad0591f6f2b62880157fa9989c1253699623a5 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Thu, 29 Apr 2021 11:43:53 +0200
Subject: [PATCH 072/124] [#44] Added some stuff to cicd file

---
 .woodpecker.yml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 78e9241..6199967 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,9 +1,18 @@
 pipeline:
-    test:
+    build-frontend:
+        image: node:15-alpine3.13
+        pull: true
+        commands:
+            - cd web && yarn install
+            - cd web && yarn run build
+
+    test-backend:
         image: chewingbever/fej-builder:latest
         # Always update the builder image
         pull: true
         commands:
             - cargo test
 
+    # TODO build dev & rel image, deploy these images
+
 branches: [ master, develop ]

From f27775910f72cc1669eca112c97acae1c005bc8a Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Fri, 30 Apr 2021 00:24:19 +0200
Subject: [PATCH 073/124] Simplified Ivago API wrapper in frontend

---
 web/index.html               |  2 +-
 web/src/api/ivago.ts         | 38 ++++++++++++------------------------
 web/src/components/Ivago.vue |  5 ++---
 3 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/web/index.html b/web/index.html
index 11603f8..f6a2ff1 100644
--- a/web/index.html
+++ b/web/index.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <link rel="icon" href="/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite App</title>
+    <title>Fej</title>
   </head>
   <body>
     <div id="app"></div>
diff --git a/web/src/api/ivago.ts b/web/src/api/ivago.ts
index 662e531..3d9375d 100644
--- a/web/src/api/ivago.ts
+++ b/web/src/api/ivago.ts
@@ -1,32 +1,18 @@
-export class Street {
-    name: string;
-    city: string; 
-
-    constructor(name: string, city: string) {
-        this.name = name;
-        this.city = city;
-    }
+export interface Street {
+    name: string
+    city: string
 }
 
-export class Ivago {
-    base_url: string;
+export async function search(search_term: string): Promise<Street[]> {
+    var base_url = import.meta.env.VITE_ENDPOINT as string
 
-    constructor(url: string) {
-        this.base_url = url;
+    var r = await fetch(`${base_url}/ivago/search?` + new URLSearchParams({
+        q: search_term,
+    }))
+
+    if (!r.ok) {
+        return Promise.reject()
     }
 
-    async search(search_term: string): Promise<Street[]> {
-        var r = await fetch(`${this.base_url}/ivago/search?` + new URLSearchParams({
-            q: search_term,
-        }));
-
-        if (!r.ok) {
-            return Promise.reject();
-        }
-
-        var json = await r.json();
-
-        return json.map((o: {name: string, city: string}) => new Street(o.name, o.city));
-    }
+    return r.json()
 }
-
diff --git a/web/src/components/Ivago.vue b/web/src/components/Ivago.vue
index 923f85c..77c6042 100644
--- a/web/src/components/Ivago.vue
+++ b/web/src/components/Ivago.vue
@@ -11,7 +11,7 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue'
-import { Street, Ivago } from '../api/ivago'
+import { Street, search } from '../api/ivago'
 
 export default defineComponent({
     name: 'Ivago',
@@ -32,8 +32,7 @@ export default defineComponent({
                 return
             }
 
-            new Ivago(import.meta.env.VITE_ENDPOINT as string)
-                .search(this.query)
+            search(this.query)
                 .then((res: Street[]) => {
                     this.items = res
                     this.msg = ""

From 8e3425749fb24bc3a5a997afa9b24f428eee66af Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@whitesourcesoftware.com>
Date: Fri, 30 Apr 2021 08:00:41 +0000
Subject: [PATCH 074/124] Update node Docker tag to v16

---
 docker/Dockerfile.rel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/Dockerfile.rel b/docker/Dockerfile.rel
index 5a17f05..ae0d597 100644
--- a/docker/Dockerfile.rel
+++ b/docker/Dockerfile.rel
@@ -23,7 +23,7 @@ RUN cargo install \
     --features frontend
 
 
-FROM node:15-alpine3.13 AS frontend-builder
+FROM node:16-alpine3.13 AS frontend-builder
 
 COPY ./web /app
 WORKDIR /app

From e5b872acdf3261d50e8bb3ae0116635beb33e07e Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@whitesourcesoftware.com>
Date: Sat, 1 May 2021 01:05:14 +0000
Subject: [PATCH 075/124] Update Rust crate regex to 1.5.1

---
 Cargo.lock | 16 ++++++++--------
 Cargo.toml |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1d51c09..9227ea6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -58,9 +58,9 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "0.7.15"
+version = "0.7.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
+checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
 dependencies = [
  "memchr",
 ]
@@ -861,9 +861,9 @@ checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
 
 [[package]]
 name = "memchr"
-version = "2.3.4"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
+checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc"
 
 [[package]]
 name = "migrations_internals"
@@ -1342,9 +1342,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.4.6"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a26af418b574bd56588335b3a3659a65725d4e636eb1016c2f9e3b38c7cc759"
+checksum = "a068b905b8cb93815aa3069ae48653d90f382308aebd1d33d940ac1f1d771e2d"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1353,9 +1353,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.23"
+version = "0.6.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548"
+checksum = "00efb87459ba4f6fb2169d20f68565555688e1250ee6825cdf6254f8b48fafb2"
 
 [[package]]
 name = "remove_dir_all"
diff --git a/Cargo.toml b/Cargo.toml
index cf6db71..1cea30b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -37,7 +37,7 @@ rocket = "0.4.7"
 serde = "1.0.125"
 chrono = "0.4.19"
 chrono-tz = "0.5.3"
-regex = "1.4.6"
+regex = "1.5.1"
 reqwest = { version = "0.11.3", features = ["blocking", "json", "cookies"] }
 diesel = { version = "1.4.6", features = ["postgres"] }
 diesel_migrations = "1.4.0"

From 1cf009c2121913bae6613bc91acc0acd53ab532f Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@whitesourcesoftware.com>
Date: Sat, 1 May 2021 12:01:46 +0000
Subject: [PATCH 076/124] Update Rust crate regex to 1.5.2

---
 Cargo.lock | 4 ++--
 Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9227ea6..3d45634 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1342,9 +1342,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.5.1"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a068b905b8cb93815aa3069ae48653d90f382308aebd1d33d940ac1f1d771e2d"
+checksum = "1efb2352a0f4d4b128f734b5c44c79ff80117351138733f12f982fe3e2b13343"
 dependencies = [
  "aho-corasick",
  "memchr",
diff --git a/Cargo.toml b/Cargo.toml
index 1cea30b..d7c4dce 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -37,7 +37,7 @@ rocket = "0.4.7"
 serde = "1.0.125"
 chrono = "0.4.19"
 chrono-tz = "0.5.3"
-regex = "1.5.1"
+regex = "1.5.2"
 reqwest = { version = "0.11.3", features = ["blocking", "json", "cookies"] }
 diesel = { version = "1.4.6", features = ["postgres"] }
 diesel_migrations = "1.4.0"

From e67616baa1021c1775aa6574d227e690f63a3a2c Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sat, 1 May 2021 19:09:58 +0200
Subject: [PATCH 077/124] [#58] Added ESLint & ran formatter

---
 web/.eslintrc.yml                 | 15 +++++++++++++++
 web/package.json                  | 12 +++++++++++-
 web/src/App.vue                   |  6 +++---
 web/src/api/ivago.ts              |  8 ++++----
 web/src/components/HelloWorld.vue | 12 ++++++------
 web/src/components/Home.vue       |  2 +-
 web/src/components/Ivago.vue      | 22 +++++++++++-----------
 web/src/components/Nav.vue        |  2 +-
 web/src/main.ts                   |  6 +++---
 web/src/router.ts                 | 24 ++++++++++++------------
 10 files changed, 67 insertions(+), 42 deletions(-)
 create mode 100644 web/.eslintrc.yml

diff --git a/web/.eslintrc.yml b/web/.eslintrc.yml
new file mode 100644
index 0000000..e43938d
--- /dev/null
+++ b/web/.eslintrc.yml
@@ -0,0 +1,15 @@
+env:
+    browser: true
+    es2021: true
+extends:
+    - 'plugin:vue/essential'
+    - standard
+parserOptions:
+    ecmaVersion: 12
+    parser: '@typescript-eslint/parser'
+    sourceType: module
+plugins:
+    - vue
+    - '@typescript-eslint'
+rules:
+    indent: ["error", 4]
diff --git a/web/package.json b/web/package.json
index ae1647d..3bbe454 100644
--- a/web/package.json
+++ b/web/package.json
@@ -4,15 +4,25 @@
   "scripts": {
     "dev": "vite",
     "build": "vue-tsc --noEmit && vite build",
-    "serve": "vite preview"
+    "serve": "vite preview",
+    "lint": "eslint \"src/**\"",
+    "format": "eslint --fix \"src/**\""
   },
   "dependencies": {
     "vue": "^3.0.5",
     "vue-router": "^4.0.6"
   },
   "devDependencies": {
+    "@typescript-eslint/eslint-plugin": "^4.22.0",
+    "@typescript-eslint/parser": "^4.22.0",
     "@vitejs/plugin-vue": "^1.2.1",
     "@vue/compiler-sfc": "^3.0.5",
+    "eslint": "^7.25.0",
+    "eslint-config-standard": "^16.0.2",
+    "eslint-plugin-import": "^2.22.1",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-promise": "^4.3.1",
+    "eslint-plugin-vue": "^7.9.0",
     "typescript": "^4.1.3",
     "vite": "^2.2.1",
     "vue-tsc": "^0.0.25"
diff --git a/web/src/App.vue b/web/src/App.vue
index ca4df88..f19b1c3 100644
--- a/web/src/App.vue
+++ b/web/src/App.vue
@@ -1,5 +1,5 @@
 <template>
-    <Nav />    
+    <Nav />
     <router-view />
 </template>
 
@@ -10,8 +10,8 @@ import Nav from './components/Nav.vue'
 export default defineComponent({
     name: 'App',
     components: {
-        Nav,
-    },
+        Nav
+    }
 })
 </script>
 
diff --git a/web/src/api/ivago.ts b/web/src/api/ivago.ts
index 3d9375d..4c01856 100644
--- a/web/src/api/ivago.ts
+++ b/web/src/api/ivago.ts
@@ -3,11 +3,11 @@ export interface Street {
     city: string
 }
 
-export async function search(search_term: string): Promise<Street[]> {
-    var base_url = import.meta.env.VITE_ENDPOINT as string
+export async function search (search_term: string): Promise<Street[]> {
+    const base_url = import.meta.env.VITE_ENDPOINT as string
 
-    var r = await fetch(`${base_url}/ivago/search?` + new URLSearchParams({
-        q: search_term,
+    const r = await fetch(`${base_url}/ivago/search?` + new URLSearchParams({
+        q: search_term
     }))
 
     if (!r.ok) {
diff --git a/web/src/components/HelloWorld.vue b/web/src/components/HelloWorld.vue
index 12f05c8..1ddbac8 100644
--- a/web/src/components/HelloWorld.vue
+++ b/web/src/components/HelloWorld.vue
@@ -15,18 +15,18 @@ import { Street, Ivago } from '../api/ivago'
 
 export default defineComponent({
     name: 'HelloWorld',
-    data() {
+    data () {
         return {
-            street: "",
-            results: [] as Street[],
+            street: '',
+            results: [] as Street[]
         }
     },
     methods: {
-        onSubmit() {
+        onSubmit () {
             new Ivago(import.meta.env.VITE_ENDPOINT as string).search(this.$data.street)
                 .then(res => {
-                    this.$data.results = res;
-                });
+                    this.$data.results = res
+                })
         }
     }
 })
diff --git a/web/src/components/Home.vue b/web/src/components/Home.vue
index f5cc87a..cdb41ed 100644
--- a/web/src/components/Home.vue
+++ b/web/src/components/Home.vue
@@ -8,6 +8,6 @@
 import { defineComponent } from 'vue'
 
 export default defineComponent({
-    name: 'Home',
+    name: 'Home'
 })
 </script>
diff --git a/web/src/components/Ivago.vue b/web/src/components/Ivago.vue
index 77c6042..be2779b 100644
--- a/web/src/components/Ivago.vue
+++ b/web/src/components/Ivago.vue
@@ -3,7 +3,7 @@
     <input v-model="query" v-on:keyup.enter="search" type="text" placeholder="Street..." />
     <div id="scroll-list">
         <ul v-if="msg === ''">
-            <li v-for="item in items">{{ item.name }}</li>
+            <li v-for="item in items">{{ item.name }} ({{ item.city }})</li>
         </ul>
         <p v-else>{{ msg }}</p>
     </div>
@@ -11,31 +11,31 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue'
-import { Street, search } from '../api/ivago'
+import { Street, search as ivago_search } from '../api/ivago'
 
 export default defineComponent({
     name: 'Ivago',
-    data() {
+    data () {
         return {
             items: [] as Street[],
-            msg: "",
-            query: "",
+            msg: '',
+            query: ''
         }
     },
     methods: {
-        search() {
+        search () {
             this.items = []
-            this.msg = "Loading..."
+            this.msg = 'Loading...'
 
-            if (this.query === "") {
-                this.msg = ""
+            if (this.query === '') {
+                this.msg = ''
                 return
             }
 
-            search(this.query)
+            ivago_search(this.query)
                 .then((res: Street[]) => {
                     this.items = res
-                    this.msg = ""
+                    this.msg = ''
                 })
         }
     }
diff --git a/web/src/components/Nav.vue b/web/src/components/Nav.vue
index fcf9c26..1686589 100644
--- a/web/src/components/Nav.vue
+++ b/web/src/components/Nav.vue
@@ -11,7 +11,7 @@
 import { defineComponent } from 'vue'
 
 export default defineComponent({
-    name: 'Nav',
+    name: 'Nav'
 })
 
 </script>
diff --git a/web/src/main.ts b/web/src/main.ts
index af7463e..daff2db 100644
--- a/web/src/main.ts
+++ b/web/src/main.ts
@@ -1,6 +1,6 @@
-import { createApp } from 'vue';
-import App from './App.vue';
-import router from './router';
+import { createApp } from 'vue'
+import App from './App.vue'
+import router from './router'
 
 const app = createApp(App)
 app.use(router)
diff --git a/web/src/router.ts b/web/src/router.ts
index 2d7fa58..2668326 100644
--- a/web/src/router.ts
+++ b/web/src/router.ts
@@ -1,21 +1,21 @@
-import { createWebHistory, createRouter } from "vue-router";
-import Home from './components/Home.vue';
-import Ivago from './components/Ivago.vue';
+import { createWebHistory, createRouter } from 'vue-router'
+import Home from './components/Home.vue'
+import Ivago from './components/Ivago.vue'
 
 const routes = [
     {
-        path: "/",
-        component: Home,
+        path: '/',
+        component: Home
     },
     {
-        path: "/ivago",
-        component: Ivago,
-    },
-];
+        path: '/ivago',
+        component: Ivago
+    }
+]
 
 const router = createRouter({
     history: createWebHistory(),
-    routes,
-});
+    routes
+})
 
-export default router;
+export default router

From 39ad811429da5935bcc813b93bdb7e07d4b2df46 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@whitesourcesoftware.com>
Date: Sat, 1 May 2021 18:00:28 +0000
Subject: [PATCH 078/124] Update dependency vue-tsc to ^0.0.26

---
 web/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/package.json b/web/package.json
index 3bbe454..740439c 100644
--- a/web/package.json
+++ b/web/package.json
@@ -25,6 +25,6 @@
     "eslint-plugin-vue": "^7.9.0",
     "typescript": "^4.1.3",
     "vite": "^2.2.1",
-    "vue-tsc": "^0.0.25"
+    "vue-tsc": "^0.0.26"
   }
 }

From 9f31c697774295a80c09481a2e6f675bd4b71c68 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@whitesourcesoftware.com>
Date: Sat, 1 May 2021 18:00:34 +0000
Subject: [PATCH 079/124] Update dependency eslint-plugin-promise to v5

---
 web/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/package.json b/web/package.json
index 3bbe454..e37101c 100644
--- a/web/package.json
+++ b/web/package.json
@@ -21,7 +21,7 @@
     "eslint-config-standard": "^16.0.2",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^4.3.1",
+    "eslint-plugin-promise": "^5.0.0",
     "eslint-plugin-vue": "^7.9.0",
     "typescript": "^4.1.3",
     "vite": "^2.2.1",

From 6532fbebb116a1630a36f2b0a2e82e1d2a541981 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sat, 1 May 2021 21:11:13 +0200
Subject: [PATCH 080/124] Fixed frontend linter

---
 web/package.json     | 4 ++--
 web/src/api/ivago.ts | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/web/package.json b/web/package.json
index e19388b..0534f03 100644
--- a/web/package.json
+++ b/web/package.json
@@ -5,8 +5,8 @@
     "dev": "vite",
     "build": "vue-tsc --noEmit && vite build",
     "serve": "vite preview",
-    "lint": "eslint \"src/**\"",
-    "format": "eslint --fix \"src/**\""
+    "lint": "eslint --ext .js,.vue src",
+    "format": "yarn run lint --fix"
   },
   "dependencies": {
     "vue": "^3.0.5",
diff --git a/web/src/api/ivago.ts b/web/src/api/ivago.ts
index 4c01856..7fa15a4 100644
--- a/web/src/api/ivago.ts
+++ b/web/src/api/ivago.ts
@@ -3,11 +3,11 @@ export interface Street {
     city: string
 }
 
-export async function search (search_term: string): Promise<Street[]> {
-    const base_url = import.meta.env.VITE_ENDPOINT as string
+export async function search (searchTerm: string): Promise<Street[]> {
+    const baseURL = import.meta.env.VITE_ENDPOINT as string
 
-    const r = await fetch(`${base_url}/ivago/search?` + new URLSearchParams({
-        q: search_term
+    const r = await fetch(`${baseURL}/ivago/search?` + new URLSearchParams({
+        q: searchTerm
     }))
 
     if (!r.ok) {

From 1da94c5211daa394dbaa7ca9e1edb2c20b1ea08e Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sat, 1 May 2021 21:22:12 +0200
Subject: [PATCH 081/124] Fixed eslint errors

---
 web/src/App.vue                   |  6 ++--
 web/src/components/HelloWorld.vue | 51 -------------------------------
 web/src/components/Home.vue       |  8 +++--
 web/src/components/Ivago.vue      | 28 +++++++++++------
 4 files changed, 28 insertions(+), 65 deletions(-)
 delete mode 100644 web/src/components/HelloWorld.vue

diff --git a/web/src/App.vue b/web/src/App.vue
index f19b1c3..f629716 100644
--- a/web/src/App.vue
+++ b/web/src/App.vue
@@ -1,6 +1,8 @@
 <template>
-    <Nav />
-    <router-view />
+    <div>
+        <Nav />
+        <router-view />
+    </div>
 </template>
 
 <script lang="ts">
diff --git a/web/src/components/HelloWorld.vue b/web/src/components/HelloWorld.vue
deleted file mode 100644
index 1ddbac8..0000000
--- a/web/src/components/HelloWorld.vue
+++ /dev/null
@@ -1,51 +0,0 @@
-<template>
-    <h1>Fej Frontend</h1>
-
-    <input id="street" type="text" placeholder="street" v-model="street" />
-    <button :onClick="onSubmit">Search</button>
-
-    <ul>
-        <li v-for="res in results">{{res.name}} ({{res.city}})</li>
-    </ul>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue'
-import { Street, Ivago } from '../api/ivago'
-
-export default defineComponent({
-    name: 'HelloWorld',
-    data () {
-        return {
-            street: '',
-            results: [] as Street[]
-        }
-    },
-    methods: {
-        onSubmit () {
-            new Ivago(import.meta.env.VITE_ENDPOINT as string).search(this.$data.street)
-                .then(res => {
-                    this.$data.results = res
-                })
-        }
-    }
-})
-</script>
-
-<style scoped>
-a {
-  color: #42b983;
-}
-
-label {
-  margin: 0 0.5em;
-  font-weight: bold;
-}
-
-code {
-  background-color: #eee;
-  padding: 2px 4px;
-  border-radius: 4px;
-  color: #304455;
-}
-</style>
diff --git a/web/src/components/Home.vue b/web/src/components/Home.vue
index cdb41ed..181d6e9 100644
--- a/web/src/components/Home.vue
+++ b/web/src/components/Home.vue
@@ -1,7 +1,9 @@
 <template>
-    <h1>Fej</h1>
-    <p>Welcome to Fej, my frontend/backend combo.</p>
-    <p>If you can see this, the cicd worked!</p>
+    <div>
+        <h1>Fej</h1>
+        <p>Welcome to Fej, my frontend/backend combo.</p>
+        <p>If you can see this, the cicd worked!</p>
+    </div>
 </template>
 
 <script lang="ts">
diff --git a/web/src/components/Ivago.vue b/web/src/components/Ivago.vue
index be2779b..bd0766d 100644
--- a/web/src/components/Ivago.vue
+++ b/web/src/components/Ivago.vue
@@ -1,17 +1,27 @@
 <template>
-    <h1>Ivago</h1>
-    <input v-model="query" v-on:keyup.enter="search" type="text" placeholder="Street..." />
-    <div id="scroll-list">
-        <ul v-if="msg === ''">
-            <li v-for="item in items">{{ item.name }} ({{ item.city }})</li>
-        </ul>
-        <p v-else>{{ msg }}</p>
+    <div>
+        <h1>Ivago</h1>
+        <input
+            v-model="query"
+            v-on:keyup.enter="search"
+            type="text"
+            placeholder="Street..." />
+        <div id="scroll-list">
+            <ul v-if="msg === ''">
+                <li
+                    v-for="item in items"
+                    v-bind:key="`${item.name} (${item.city})`" >
+                    {{ item.name }} ({{ item.city }})
+                </li>
+            </ul>
+            <p v-else>{{ msg }}</p>
+        </div>
     </div>
 </template>
 
 <script lang="ts">
 import { defineComponent } from 'vue'
-import { Street, search as ivago_search } from '../api/ivago'
+import { Street, search as ivagoSearch } from '../api/ivago'
 
 export default defineComponent({
     name: 'Ivago',
@@ -32,7 +42,7 @@ export default defineComponent({
                 return
             }
 
-            ivago_search(this.query)
+            ivagoSearch(this.query)
                 .then((res: Street[]) => {
                     this.items = res
                     this.msg = ''

From 9946aaf001fbc57feb67b73343023dc3e168ad79 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sat, 1 May 2021 21:24:16 +0200
Subject: [PATCH 082/124] Added frontend linting to cicd

---
 .woodpecker.yml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 6199967..dd11cb5 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -6,13 +6,19 @@ pipeline:
             - cd web && yarn install
             - cd web && yarn run build
 
-    test-backend:
-        image: chewingbever/fej-builder:latest
-        # Always update the builder image
-        pull: true
+    lint-frontend:
+        image: node:15-alpine3.13
         commands:
-            - cargo test
+            - cd web && yarn run lint
+
+    # Backend cicd jobs are disabled until we can figure out a way to cache stuff
+    # test-backend:
+    #     image: chewingbever/fej-builder:latest
+    #     # Always update the builder image
+    #     pull: true
+    #     commands:
+    #         - cargo test
 
     # TODO build dev & rel image, deploy these images
 
-branches: [ master, develop ]
+# branches: [ master, develop ]

From 92a08a17afbd033b76b928de15392585f83a3766 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sat, 1 May 2021 21:29:17 +0200
Subject: [PATCH 083/124] Hopefully fixed dumb ci mistake

---
 .woodpecker.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index dd11cb5..9e9f12c 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -3,13 +3,15 @@ pipeline:
         image: node:15-alpine3.13
         pull: true
         commands:
-            - cd web && yarn install
-            - cd web && yarn run build
+            - cd web
+            - yarn install
+            - yarn run build
 
     lint-frontend:
         image: node:15-alpine3.13
         commands:
-            - cd web && yarn run lint
+            - cd web
+            - yarn run lint
 
     # Backend cicd jobs are disabled until we can figure out a way to cache stuff
     # test-backend:

From fd6b3ed134fc15a01734f02f8cb825e199224695 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sat, 1 May 2021 21:34:41 +0200
Subject: [PATCH 084/124] Added yarn.lock file

---
 web/yarn.lock | 2026 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 2026 insertions(+)
 create mode 100644 web/yarn.lock

diff --git a/web/yarn.lock b/web/yarn.lock
new file mode 100644
index 0000000..d8ba55e
--- /dev/null
+++ b/web/yarn.lock
@@ -0,0 +1,2026 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@babel/code-frame@7.12.11":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
+  integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==
+  dependencies:
+    "@babel/highlight" "^7.10.4"
+
+"@babel/helper-validator-identifier@^7.14.0":
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz#d26cad8a47c65286b15df1547319a5d0bcf27288"
+  integrity sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==
+
+"@babel/highlight@^7.10.4":
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.0.tgz#3197e375711ef6bf834e67d0daec88e4f46113cf"
+  integrity sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.14.0"
+    chalk "^2.0.0"
+    js-tokens "^4.0.0"
+
+"@babel/parser@^7.12.0", "@babel/parser@^7.13.9":
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.0.tgz#2f0ebfed92bcddcc8395b91f1895191ce2760380"
+  integrity sha512-AHbfoxesfBALg33idaTBVUkLnfXtsgvJREf93p4p0Lwsz4ppfE7g1tpEXVm4vrxUcH4DVhAa9Z1m1zqf9WUC7Q==
+
+"@babel/types@^7.12.0", "@babel/types@^7.13.0":
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.0.tgz#3fc3fc74e0cdad878182e5f66cc6bcab1915a802"
+  integrity sha512-O2LVLdcnWplaGxiPBz12d0HcdN8QdxdsWYhz5LSeuukV/5mn2xUUc3gBeU4QBYPJ18g/UToe8F532XJ608prmg==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.14.0"
+    to-fast-properties "^2.0.0"
+
+"@eslint/eslintrc@^0.4.0":
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.0.tgz#99cc0a0584d72f1df38b900fb062ba995f395547"
+  integrity sha512-2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog==
+  dependencies:
+    ajv "^6.12.4"
+    debug "^4.1.1"
+    espree "^7.3.0"
+    globals "^12.1.0"
+    ignore "^4.0.6"
+    import-fresh "^3.2.1"
+    js-yaml "^3.13.1"
+    minimatch "^3.0.4"
+    strip-json-comments "^3.1.1"
+
+"@nodelib/fs.scandir@2.1.4":
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69"
+  integrity sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==
+  dependencies:
+    "@nodelib/fs.stat" "2.0.4"
+    run-parallel "^1.1.9"
+
+"@nodelib/fs.stat@2.0.4", "@nodelib/fs.stat@^2.0.2":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz#a3f2dd61bab43b8db8fa108a121cfffe4c676655"
+  integrity sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==
+
+"@nodelib/fs.walk@^1.2.3":
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz#cce9396b30aa5afe9e3756608f5831adcb53d063"
+  integrity sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==
+  dependencies:
+    "@nodelib/fs.scandir" "2.1.4"
+    fastq "^1.6.0"
+
+"@types/json-schema@^7.0.3":
+  version "7.0.7"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad"
+  integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==
+
+"@types/json5@^0.0.29":
+  version "0.0.29"
+  resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
+  integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
+
+"@typescript-eslint/eslint-plugin@^4.22.0":
+  version "4.22.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.22.0.tgz#3d5f29bb59e61a9dba1513d491b059e536e16dbc"
+  integrity sha512-U8SP9VOs275iDXaL08Ln1Fa/wLXfj5aTr/1c0t0j6CdbOnxh+TruXu1p4I0NAvdPBQgoPjHsgKn28mOi0FzfoA==
+  dependencies:
+    "@typescript-eslint/experimental-utils" "4.22.0"
+    "@typescript-eslint/scope-manager" "4.22.0"
+    debug "^4.1.1"
+    functional-red-black-tree "^1.0.1"
+    lodash "^4.17.15"
+    regexpp "^3.0.0"
+    semver "^7.3.2"
+    tsutils "^3.17.1"
+
+"@typescript-eslint/experimental-utils@4.22.0":
+  version "4.22.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.22.0.tgz#68765167cca531178e7b650a53456e6e0bef3b1f"
+  integrity sha512-xJXHHl6TuAxB5AWiVrGhvbGL8/hbiCQ8FiWwObO3r0fnvBdrbWEDy1hlvGQOAWc6qsCWuWMKdVWlLAEMpxnddg==
+  dependencies:
+    "@types/json-schema" "^7.0.3"
+    "@typescript-eslint/scope-manager" "4.22.0"
+    "@typescript-eslint/types" "4.22.0"
+    "@typescript-eslint/typescript-estree" "4.22.0"
+    eslint-scope "^5.0.0"
+    eslint-utils "^2.0.0"
+
+"@typescript-eslint/parser@^4.22.0":
+  version "4.22.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.22.0.tgz#e1637327fcf796c641fe55f73530e90b16ac8fe8"
+  integrity sha512-z/bGdBJJZJN76nvAY9DkJANYgK3nlRstRRi74WHm3jjgf2I8AglrSY+6l7ogxOmn55YJ6oKZCLLy+6PW70z15Q==
+  dependencies:
+    "@typescript-eslint/scope-manager" "4.22.0"
+    "@typescript-eslint/types" "4.22.0"
+    "@typescript-eslint/typescript-estree" "4.22.0"
+    debug "^4.1.1"
+
+"@typescript-eslint/scope-manager@4.22.0":
+  version "4.22.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.22.0.tgz#ed411545e61161a8d702e703a4b7d96ec065b09a"
+  integrity sha512-OcCO7LTdk6ukawUM40wo61WdeoA7NM/zaoq1/2cs13M7GyiF+T4rxuA4xM+6LeHWjWbss7hkGXjFDRcKD4O04Q==
+  dependencies:
+    "@typescript-eslint/types" "4.22.0"
+    "@typescript-eslint/visitor-keys" "4.22.0"
+
+"@typescript-eslint/types@4.22.0":
+  version "4.22.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.22.0.tgz#0ca6fde5b68daf6dba133f30959cc0688c8dd0b6"
+  integrity sha512-sW/BiXmmyMqDPO2kpOhSy2Py5w6KvRRsKZnV0c4+0nr4GIcedJwXAq+RHNK4lLVEZAJYFltnnk1tJSlbeS9lYA==
+
+"@typescript-eslint/typescript-estree@4.22.0":
+  version "4.22.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.0.tgz#b5d95d6d366ff3b72f5168c75775a3e46250d05c"
+  integrity sha512-TkIFeu5JEeSs5ze/4NID+PIcVjgoU3cUQUIZnH3Sb1cEn1lBo7StSV5bwPuJQuoxKXlzAObjYTilOEKRuhR5yg==
+  dependencies:
+    "@typescript-eslint/types" "4.22.0"
+    "@typescript-eslint/visitor-keys" "4.22.0"
+    debug "^4.1.1"
+    globby "^11.0.1"
+    is-glob "^4.0.1"
+    semver "^7.3.2"
+    tsutils "^3.17.1"
+
+"@typescript-eslint/visitor-keys@4.22.0":
+  version "4.22.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.0.tgz#169dae26d3c122935da7528c839f42a8a42f6e47"
+  integrity sha512-nnMu4F+s4o0sll6cBSsTeVsT4cwxB7zECK3dFxzEjPBii9xLpq4yqqsy/FU5zMfan6G60DKZSCXAa3sHJZrcYw==
+  dependencies:
+    "@typescript-eslint/types" "4.22.0"
+    eslint-visitor-keys "^2.0.0"
+
+"@vitejs/plugin-vue@^1.2.1":
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-1.2.2.tgz#b0038fc11b9099f4cd01fcbf0ee419adda417b52"
+  integrity sha512-5BI2WFfs/Z0pAV4S/IQf1oH3bmFYlL5ATMBHgTt1Lf7hAnfpNd5oUAAs6hZPfk3QhvyUQgtk0rJBlabwNFcBJQ==
+
+"@vue/compiler-core@3.0.11":
+  version "3.0.11"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.0.11.tgz#5ef579e46d7b336b8735228758d1c2c505aae69a"
+  integrity sha512-6sFj6TBac1y2cWCvYCA8YzHJEbsVkX7zdRs/3yK/n1ilvRqcn983XvpBbnN3v4mZ1UiQycTvOiajJmOgN9EVgw==
+  dependencies:
+    "@babel/parser" "^7.12.0"
+    "@babel/types" "^7.12.0"
+    "@vue/shared" "3.0.11"
+    estree-walker "^2.0.1"
+    source-map "^0.6.1"
+
+"@vue/compiler-dom@3.0.11":
+  version "3.0.11"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.0.11.tgz#b15fc1c909371fd671746020ba55b5dab4a730ee"
+  integrity sha512-+3xB50uGeY5Fv9eMKVJs2WSRULfgwaTJsy23OIltKgMrynnIj8hTYY2UL97HCoz78aDw1VDXdrBQ4qepWjnQcw==
+  dependencies:
+    "@vue/compiler-core" "3.0.11"
+    "@vue/shared" "3.0.11"
+
+"@vue/compiler-sfc@^3.0.5":
+  version "3.0.11"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.0.11.tgz#cd8ca2154b88967b521f5ad3b10f5f8b6b665679"
+  integrity sha512-7fNiZuCecRleiyVGUWNa6pn8fB2fnuJU+3AGjbjl7r1P5wBivfl02H4pG+2aJP5gh2u+0wXov1W38tfWOphsXw==
+  dependencies:
+    "@babel/parser" "^7.13.9"
+    "@babel/types" "^7.13.0"
+    "@vue/compiler-core" "3.0.11"
+    "@vue/compiler-dom" "3.0.11"
+    "@vue/compiler-ssr" "3.0.11"
+    "@vue/shared" "3.0.11"
+    consolidate "^0.16.0"
+    estree-walker "^2.0.1"
+    hash-sum "^2.0.0"
+    lru-cache "^5.1.1"
+    magic-string "^0.25.7"
+    merge-source-map "^1.1.0"
+    postcss "^8.1.10"
+    postcss-modules "^4.0.0"
+    postcss-selector-parser "^6.0.4"
+    source-map "^0.6.1"
+
+"@vue/compiler-ssr@3.0.11":
+  version "3.0.11"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.0.11.tgz#ac5a05fd1257412fa66079c823d8203b6a889a13"
+  integrity sha512-66yUGI8SGOpNvOcrQybRIhl2M03PJ+OrDPm78i7tvVln86MHTKhM3ERbALK26F7tXl0RkjX4sZpucCpiKs3MnA==
+  dependencies:
+    "@vue/compiler-dom" "3.0.11"
+    "@vue/shared" "3.0.11"
+
+"@vue/reactivity@3.0.11":
+  version "3.0.11"
+  resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.0.11.tgz#07b588349fd05626b17f3500cbef7d4bdb4dbd0b"
+  integrity sha512-SKM3YKxtXHBPMf7yufXeBhCZ4XZDKP9/iXeQSC8bBO3ivBuzAi4aZi0bNoeE2IF2iGfP/AHEt1OU4ARj4ao/Xw==
+  dependencies:
+    "@vue/shared" "3.0.11"
+
+"@vue/runtime-core@3.0.11":
+  version "3.0.11"
+  resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.0.11.tgz#c52dfc6acf3215493623552c1c2919080c562e44"
+  integrity sha512-87XPNwHfz9JkmOlayBeCCfMh9PT2NBnv795DSbi//C/RaAnc/bGZgECjmkD7oXJ526BZbgk9QZBPdFT8KMxkAg==
+  dependencies:
+    "@vue/reactivity" "3.0.11"
+    "@vue/shared" "3.0.11"
+
+"@vue/runtime-dom@3.0.11":
+  version "3.0.11"
+  resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.0.11.tgz#7a552df21907942721feb6961c418e222a699337"
+  integrity sha512-jm3FVQESY3y2hKZ2wlkcmFDDyqaPyU3p1IdAX92zTNeCH7I8zZ37PtlE1b9NlCtzV53WjB4TZAYh9yDCMIEumA==
+  dependencies:
+    "@vue/runtime-core" "3.0.11"
+    "@vue/shared" "3.0.11"
+    csstype "^2.6.8"
+
+"@vue/shared@3.0.11":
+  version "3.0.11"
+  resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.0.11.tgz#20d22dd0da7d358bb21c17f9bde8628152642c77"
+  integrity sha512-b+zB8A2so8eCE0JsxjL24J7vdGl8rzPQ09hZNhystm+KqSbKcAej1A+Hbva1rCMmTTqA+hFnUSDc5kouEo0JzA==
+
+acorn-jsx@^5.2.0, acorn-jsx@^5.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b"
+  integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==
+
+acorn@^7.1.1, acorn@^7.4.0:
+  version "7.4.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
+  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
+
+ajv@^6.10.0, ajv@^6.12.4:
+  version "6.12.6"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
+  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
+ajv@^8.0.1:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.2.0.tgz#c89d3380a784ce81b2085f48811c4c101df4c602"
+  integrity sha512-WSNGFuyWd//XO8n/m/EaOlNLtO0yL8EXT/74LqT4khdhpZjP7lkj/kT5uwRmGitKEVp/Oj7ZUHeGfPtgHhQ5CA==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    json-schema-traverse "^1.0.0"
+    require-from-string "^2.0.2"
+    uri-js "^4.2.2"
+
+ansi-colors@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
+  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
+
+ansi-regex@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
+  integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
+
+ansi-styles@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
+  dependencies:
+    color-convert "^1.9.0"
+
+ansi-styles@^4.0.0, ansi-styles@^4.1.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
+  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
+  dependencies:
+    color-convert "^2.0.1"
+
+argparse@^1.0.7:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
+  dependencies:
+    sprintf-js "~1.0.2"
+
+array-includes@^3.1.1:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.3.tgz#c7f619b382ad2afaf5326cddfdc0afc61af7690a"
+  integrity sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.18.0-next.2"
+    get-intrinsic "^1.1.1"
+    is-string "^1.0.5"
+
+array-union@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
+  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
+
+array.prototype.flat@^1.2.3:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz#6ef638b43312bd401b4c6199fdec7e2dc9e9a123"
+  integrity sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg==
+  dependencies:
+    call-bind "^1.0.0"
+    define-properties "^1.1.3"
+    es-abstract "^1.18.0-next.1"
+
+astral-regex@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
+  integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
+
+balanced-match@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
+
+big-integer@^1.6.17:
+  version "1.6.48"
+  resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.48.tgz#8fd88bd1632cba4a1c8c3e3d7159f08bb95b4b9e"
+  integrity sha512-j51egjPa7/i+RdiRuJbPdJ2FIUYYPhvYLjzoYbcMMm62ooO6F94fETG4MTs46zPAF9Brs04OajboA/qTGuz78w==
+
+big.js@^5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
+  integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
+
+binary@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/binary/-/binary-0.3.0.tgz#9f60553bc5ce8c3386f3b553cff47462adecaa79"
+  integrity sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk=
+  dependencies:
+    buffers "~0.1.1"
+    chainsaw "~0.1.0"
+
+bluebird@^3.7.2:
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
+  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
+
+bluebird@~3.4.1:
+  version "3.4.7"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3"
+  integrity sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM=
+
+brace-expansion@^1.1.7:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+  dependencies:
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
+
+braces@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  dependencies:
+    fill-range "^7.0.1"
+
+buffer-indexof-polyfill@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.2.tgz#d2732135c5999c64b277fcf9b1abe3498254729c"
+  integrity sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A==
+
+buffers@~0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/buffers/-/buffers-0.1.1.tgz#b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb"
+  integrity sha1-skV5w77U1tOWru5tmorn9Ugqt7s=
+
+call-bind@^1.0.0, call-bind@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
+  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
+  dependencies:
+    function-bind "^1.1.1"
+    get-intrinsic "^1.0.2"
+
+callsites@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
+  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
+
+chainsaw@~0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/chainsaw/-/chainsaw-0.1.0.tgz#5eab50b28afe58074d0d58291388828b5e5fbc98"
+  integrity sha1-XqtQsor+WAdNDVgpE4iCi15fvJg=
+  dependencies:
+    traverse ">=0.3.0 <0.4"
+
+chalk@^2.0.0:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
+chalk@^4.0.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad"
+  integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+color-convert@^1.9.0:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
+  dependencies:
+    color-name "1.1.3"
+
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+  dependencies:
+    color-name "~1.1.4"
+
+color-name@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+
+color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
+colorette@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
+  integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+
+consolidate@^0.16.0:
+  version "0.16.0"
+  resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.16.0.tgz#a11864768930f2f19431660a65906668f5fbdc16"
+  integrity sha512-Nhl1wzCslqXYTJVDyJCu3ODohy9OfBMB5uD2BiBTzd7w+QY0lBzafkR8y8755yMYHAaMD4NuzbAw03/xzfw+eQ==
+  dependencies:
+    bluebird "^3.7.2"
+
+contains-path@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a"
+  integrity sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=
+
+core-util-is@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+
+cross-spawn@^7.0.2:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
+  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  dependencies:
+    path-key "^3.1.0"
+    shebang-command "^2.0.0"
+    which "^2.0.1"
+
+cssesc@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
+  integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
+
+csstype@^2.6.8:
+  version "2.6.17"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.17.tgz#4cf30eb87e1d1a005d8b6510f95292413f6a1c0e"
+  integrity sha512-u1wmTI1jJGzCJzWndZo8mk4wnPTZd1eOIYTYvuEyOQGfmDl3TrabCCfKnOC86FZwW/9djqTl933UF/cS425i9A==
+
+debug@^2.6.9:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
+  dependencies:
+    ms "2.0.0"
+
+debug@^4.0.1, debug@^4.1.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
+  integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
+  dependencies:
+    ms "2.1.2"
+
+deep-is@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
+  integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
+
+define-properties@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
+  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
+  dependencies:
+    object-keys "^1.0.12"
+
+dir-glob@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
+  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
+  dependencies:
+    path-type "^4.0.0"
+
+doctrine@1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
+  integrity sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=
+  dependencies:
+    esutils "^2.0.2"
+    isarray "^1.0.0"
+
+doctrine@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
+  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
+  dependencies:
+    esutils "^2.0.2"
+
+duplexer2@~0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
+  integrity sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=
+  dependencies:
+    readable-stream "^2.0.2"
+
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+
+emojis-list@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
+  integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
+
+enquirer@^2.3.5:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
+  integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
+  dependencies:
+    ansi-colors "^4.1.1"
+
+error-ex@^1.2.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
+  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
+  dependencies:
+    is-arrayish "^0.2.1"
+
+es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2:
+  version "1.18.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0.tgz#ab80b359eecb7ede4c298000390bc5ac3ec7b5a4"
+  integrity sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==
+  dependencies:
+    call-bind "^1.0.2"
+    es-to-primitive "^1.2.1"
+    function-bind "^1.1.1"
+    get-intrinsic "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.2"
+    is-callable "^1.2.3"
+    is-negative-zero "^2.0.1"
+    is-regex "^1.1.2"
+    is-string "^1.0.5"
+    object-inspect "^1.9.0"
+    object-keys "^1.1.1"
+    object.assign "^4.1.2"
+    string.prototype.trimend "^1.0.4"
+    string.prototype.trimstart "^1.0.4"
+    unbox-primitive "^1.0.0"
+
+es-to-primitive@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
+  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
+  dependencies:
+    is-callable "^1.1.4"
+    is-date-object "^1.0.1"
+    is-symbol "^1.0.2"
+
+esbuild@^0.9.3:
+  version "0.9.7"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.9.7.tgz#ea0d639cbe4b88ec25fbed4d6ff00c8d788ef70b"
+  integrity sha512-VtUf6aQ89VTmMLKrWHYG50uByMF4JQlVysb8dmg6cOgW8JnFCipmz7p+HNBl+RR3LLCuBxFGVauAe2wfnF9bLg==
+
+escape-string-regexp@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+
+eslint-config-standard@^16.0.2:
+  version "16.0.2"
+  resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-16.0.2.tgz#71e91727ac7a203782d0a5ca4d1c462d14e234f6"
+  integrity sha512-fx3f1rJDsl9bY7qzyX8SAtP8GBSk6MfXFaTfaGgk12aAYW4gJSyRm7dM790L6cbXv63fvjY4XeSzXnb4WM+SKw==
+
+eslint-import-resolver-node@^0.3.4:
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717"
+  integrity sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==
+  dependencies:
+    debug "^2.6.9"
+    resolve "^1.13.1"
+
+eslint-module-utils@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz#579ebd094f56af7797d19c9866c9c9486629bfa6"
+  integrity sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==
+  dependencies:
+    debug "^2.6.9"
+    pkg-dir "^2.0.0"
+
+eslint-plugin-es@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz#75a7cdfdccddc0589934aeeb384175f221c57893"
+  integrity sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==
+  dependencies:
+    eslint-utils "^2.0.0"
+    regexpp "^3.0.0"
+
+eslint-plugin-import@^2.22.1:
+  version "2.22.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz#0896c7e6a0cf44109a2d97b95903c2bb689d7702"
+  integrity sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw==
+  dependencies:
+    array-includes "^3.1.1"
+    array.prototype.flat "^1.2.3"
+    contains-path "^0.1.0"
+    debug "^2.6.9"
+    doctrine "1.5.0"
+    eslint-import-resolver-node "^0.3.4"
+    eslint-module-utils "^2.6.0"
+    has "^1.0.3"
+    minimatch "^3.0.4"
+    object.values "^1.1.1"
+    read-pkg-up "^2.0.0"
+    resolve "^1.17.0"
+    tsconfig-paths "^3.9.0"
+
+eslint-plugin-node@^11.1.0:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz#c95544416ee4ada26740a30474eefc5402dc671d"
+  integrity sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==
+  dependencies:
+    eslint-plugin-es "^3.0.0"
+    eslint-utils "^2.0.0"
+    ignore "^5.1.1"
+    minimatch "^3.0.4"
+    resolve "^1.10.1"
+    semver "^6.1.0"
+
+eslint-plugin-promise@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-5.1.0.tgz#fb2188fb734e4557993733b41aa1a688f46c6f24"
+  integrity sha512-NGmI6BH5L12pl7ScQHbg7tvtk4wPxxj8yPHH47NvSmMtFneC077PSeY3huFj06ZWZvtbfxSPt3RuOQD5XcR4ng==
+
+eslint-plugin-vue@^7.9.0:
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.9.0.tgz#f8e83a2a908f4c43fc8304f5401d4ff671f3d560"
+  integrity sha512-2Q0qQp5+5h+pZvJKCbG1/jCRUYrdgAz5BYKGyTlp2NU8mx09u3Hp7PsH6d5qef6ojuPoCXMnrbbDxeoplihrSw==
+  dependencies:
+    eslint-utils "^2.1.0"
+    natural-compare "^1.4.0"
+    semver "^7.3.2"
+    vue-eslint-parser "^7.6.0"
+
+eslint-scope@^5.0.0, eslint-scope@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
+  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
+  dependencies:
+    esrecurse "^4.3.0"
+    estraverse "^4.1.1"
+
+eslint-utils@^2.0.0, eslint-utils@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
+  integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
+  dependencies:
+    eslint-visitor-keys "^1.1.0"
+
+eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
+  integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
+
+eslint-visitor-keys@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
+  integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
+
+eslint@^7.25.0:
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.25.0.tgz#1309e4404d94e676e3e831b3a3ad2b050031eb67"
+  integrity sha512-TVpSovpvCNpLURIScDRB6g5CYu/ZFq9GfX2hLNIV4dSBKxIWojeDODvYl3t0k0VtMxYeR8OXPCFE5+oHMlGfhw==
+  dependencies:
+    "@babel/code-frame" "7.12.11"
+    "@eslint/eslintrc" "^0.4.0"
+    ajv "^6.10.0"
+    chalk "^4.0.0"
+    cross-spawn "^7.0.2"
+    debug "^4.0.1"
+    doctrine "^3.0.0"
+    enquirer "^2.3.5"
+    eslint-scope "^5.1.1"
+    eslint-utils "^2.1.0"
+    eslint-visitor-keys "^2.0.0"
+    espree "^7.3.1"
+    esquery "^1.4.0"
+    esutils "^2.0.2"
+    file-entry-cache "^6.0.1"
+    functional-red-black-tree "^1.0.1"
+    glob-parent "^5.0.0"
+    globals "^13.6.0"
+    ignore "^4.0.6"
+    import-fresh "^3.0.0"
+    imurmurhash "^0.1.4"
+    is-glob "^4.0.0"
+    js-yaml "^3.13.1"
+    json-stable-stringify-without-jsonify "^1.0.1"
+    levn "^0.4.1"
+    lodash "^4.17.21"
+    minimatch "^3.0.4"
+    natural-compare "^1.4.0"
+    optionator "^0.9.1"
+    progress "^2.0.0"
+    regexpp "^3.1.0"
+    semver "^7.2.1"
+    strip-ansi "^6.0.0"
+    strip-json-comments "^3.1.0"
+    table "^6.0.4"
+    text-table "^0.2.0"
+    v8-compile-cache "^2.0.3"
+
+espree@^6.2.1:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz#77fc72e1fd744a2052c20f38a5b575832e82734a"
+  integrity sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==
+  dependencies:
+    acorn "^7.1.1"
+    acorn-jsx "^5.2.0"
+    eslint-visitor-keys "^1.1.0"
+
+espree@^7.3.0, espree@^7.3.1:
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6"
+  integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==
+  dependencies:
+    acorn "^7.4.0"
+    acorn-jsx "^5.3.1"
+    eslint-visitor-keys "^1.3.0"
+
+esprima@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
+
+esquery@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
+  integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==
+  dependencies:
+    estraverse "^5.1.0"
+
+esrecurse@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
+  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
+  dependencies:
+    estraverse "^5.2.0"
+
+estraverse@^4.1.1:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
+  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
+
+estraverse@^5.1.0, estraverse@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
+  integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==
+
+estree-walker@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac"
+  integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==
+
+esutils@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
+  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
+
+fast-deep-equal@^3.1.1:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
+  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
+
+fast-glob@^3.1.1:
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661"
+  integrity sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.0"
+    merge2 "^1.3.0"
+    micromatch "^4.0.2"
+    picomatch "^2.2.1"
+
+fast-json-stable-stringify@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
+
+fast-levenshtein@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
+
+fastq@^1.6.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.0.tgz#bb9fb955a07130a918eb63c1f5161cc32a5d0858"
+  integrity sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==
+  dependencies:
+    reusify "^1.0.4"
+
+file-entry-cache@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
+  integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
+  dependencies:
+    flat-cache "^3.0.4"
+
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  dependencies:
+    to-regex-range "^5.0.1"
+
+find-up@^2.0.0, find-up@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
+  integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
+  dependencies:
+    locate-path "^2.0.0"
+
+flat-cache@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
+  integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==
+  dependencies:
+    flatted "^3.1.0"
+    rimraf "^3.0.2"
+
+flatted@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz#c4b489e80096d9df1dfc97c79871aea7c617c469"
+  integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+
+fsevents@~2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
+  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
+
+fstream@^1.0.12:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045"
+  integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==
+  dependencies:
+    graceful-fs "^4.1.2"
+    inherits "~2.0.0"
+    mkdirp ">=0.5 0"
+    rimraf "2"
+
+function-bind@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
+
+functional-red-black-tree@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
+  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
+
+generic-names@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/generic-names/-/generic-names-2.0.1.tgz#f8a378ead2ccaa7a34f0317b05554832ae41b872"
+  integrity sha512-kPCHWa1m9wGG/OwQpeweTwM/PYiQLrUIxXbt/P4Nic3LbGjCP0YwrALHW1uNLKZ0LIMg+RF+XRlj2ekT9ZlZAQ==
+  dependencies:
+    loader-utils "^1.1.0"
+
+get-intrinsic@^1.0.2, get-intrinsic@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
+  integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
+  dependencies:
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+
+glob-parent@^5.0.0, glob-parent@^5.1.0:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
+  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
+  dependencies:
+    is-glob "^4.0.1"
+
+glob@^7.1.3:
+  version "7.1.6"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
+  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+globals@^12.1.0:
+  version "12.4.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8"
+  integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==
+  dependencies:
+    type-fest "^0.8.1"
+
+globals@^13.6.0:
+  version "13.8.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.8.0.tgz#3e20f504810ce87a8d72e55aecf8435b50f4c1b3"
+  integrity sha512-rHtdA6+PDBIjeEvA91rpqzEvk/k3/i7EeNQiryiWuJH0Hw9cpyJMAt2jtbAwUaRdhD+573X4vWw6IcjKPasi9Q==
+  dependencies:
+    type-fest "^0.20.2"
+
+globby@^11.0.1:
+  version "11.0.3"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.3.tgz#9b1f0cb523e171dd1ad8c7b2a9fb4b644b9593cb"
+  integrity sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg==
+  dependencies:
+    array-union "^2.1.0"
+    dir-glob "^3.0.1"
+    fast-glob "^3.1.1"
+    ignore "^5.1.4"
+    merge2 "^1.3.0"
+    slash "^3.0.0"
+
+graceful-fs@^4.1.2, graceful-fs@^4.2.2:
+  version "4.2.6"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"
+  integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==
+
+has-bigints@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
+  integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==
+
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
+
+has-symbols@^1.0.1, has-symbols@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
+  integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
+
+has@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
+  dependencies:
+    function-bind "^1.1.1"
+
+hash-sum@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/hash-sum/-/hash-sum-2.0.0.tgz#81d01bb5de8ea4a214ad5d6ead1b523460b0b45a"
+  integrity sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==
+
+hosted-git-info@^2.1.4:
+  version "2.8.9"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
+  integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
+
+icss-replace-symbols@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
+  integrity sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=
+
+icss-utils@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae"
+  integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==
+
+ignore@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
+  integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
+
+ignore@^5.1.1, ignore@^5.1.4:
+  version "5.1.8"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
+  integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
+
+import-fresh@^3.0.0, import-fresh@^3.2.1:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
+  integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
+  dependencies:
+    parent-module "^1.0.0"
+    resolve-from "^4.0.0"
+
+imurmurhash@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2, inherits@~2.0.0, inherits@~2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+
+is-arrayish@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
+
+is-bigint@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.1.tgz#6923051dfcbc764278540b9ce0e6b3213aa5ebc2"
+  integrity sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg==
+
+is-boolean-object@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.0.tgz#e2aaad3a3a8fca34c28f6eee135b156ed2587ff0"
+  integrity sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==
+  dependencies:
+    call-bind "^1.0.0"
+
+is-callable@^1.1.4, is-callable@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e"
+  integrity sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==
+
+is-core-module@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.3.0.tgz#d341652e3408bca69c4671b79a0954a3d349f887"
+  integrity sha512-xSphU2KG9867tsYdLD4RWQ1VqdFl4HTO9Thf3I/3dLEfr0dbPTWKsuCKrgqMljg4nPE+Gq0VCnzT3gr0CyBmsw==
+  dependencies:
+    has "^1.0.3"
+
+is-date-object@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"
+  integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==
+
+is-extglob@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
+is-glob@^4.0.0, is-glob@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
+  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
+  dependencies:
+    is-extglob "^2.1.1"
+
+is-negative-zero@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
+  integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==
+
+is-number-object@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz#36ac95e741cf18b283fc1ddf5e83da798e3ec197"
+  integrity sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==
+
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
+is-regex@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.2.tgz#81c8ebde4db142f2cf1c53fc86d6a45788266251"
+  integrity sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==
+  dependencies:
+    call-bind "^1.0.2"
+    has-symbols "^1.0.1"
+
+is-string@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"
+  integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==
+
+is-symbol@^1.0.2, is-symbol@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937"
+  integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==
+  dependencies:
+    has-symbols "^1.0.1"
+
+isarray@^1.0.0, isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
+
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+
+js-tokens@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
+
+js-yaml@^3.13.1:
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
+  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
+json-schema-traverse@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
+
+json-schema-traverse@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
+  integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
+
+json-stable-stringify-without-jsonify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
+  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
+
+json5@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
+  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+  dependencies:
+    minimist "^1.2.0"
+
+levn@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
+  integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==
+  dependencies:
+    prelude-ls "^1.2.1"
+    type-check "~0.4.0"
+
+listenercount@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/listenercount/-/listenercount-1.0.1.tgz#84c8a72ab59c4725321480c975e6508342e70937"
+  integrity sha1-hMinKrWcRyUyFIDJdeZQg0LnCTc=
+
+load-json-file@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
+  integrity sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=
+  dependencies:
+    graceful-fs "^4.1.2"
+    parse-json "^2.2.0"
+    pify "^2.0.0"
+    strip-bom "^3.0.0"
+
+loader-utils@^1.1.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
+  integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
+  dependencies:
+    big.js "^5.2.2"
+    emojis-list "^3.0.0"
+    json5 "^1.0.1"
+
+locate-path@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
+  integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=
+  dependencies:
+    p-locate "^2.0.0"
+    path-exists "^3.0.0"
+
+lodash.camelcase@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
+  integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY=
+
+lodash.clonedeep@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
+  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
+
+lodash.flatten@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
+  integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=
+
+lodash.truncate@^4.4.2:
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
+  integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=
+
+lodash@^4.17.15, lodash@^4.17.21:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
+
+lru-cache@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
+  dependencies:
+    yallist "^3.0.2"
+
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
+  dependencies:
+    yallist "^4.0.0"
+
+magic-string@^0.25.7:
+  version "0.25.7"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051"
+  integrity sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==
+  dependencies:
+    sourcemap-codec "^1.4.4"
+
+merge-source-map@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz#2fdde7e6020939f70906a68f2d7ae685e4c8c646"
+  integrity sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==
+  dependencies:
+    source-map "^0.6.1"
+
+merge2@^1.3.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
+  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
+
+micromatch@^4.0.2:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
+  integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
+  dependencies:
+    braces "^3.0.1"
+    picomatch "^2.2.3"
+
+minimatch@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
+  dependencies:
+    brace-expansion "^1.1.7"
+
+minimist@^1.2.0, minimist@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+
+"mkdirp@>=0.5 0":
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
+  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
+  dependencies:
+    minimist "^1.2.5"
+
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
+
+ms@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
+nanoid@^3.1.22:
+  version "3.1.22"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.22.tgz#b35f8fb7d151990a8aebd5aa5015c03cf726f844"
+  integrity sha512-/2ZUaJX2ANuLtTvqTlgqBQNJoQO398KyJgZloL0PZkC0dpysjncRUPsFe3DUPzz/y3h+u7C46np8RMuvF3jsSQ==
+
+natural-compare@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
+
+normalize-package-data@^2.3.2:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
+  integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
+  dependencies:
+    hosted-git-info "^2.1.4"
+    resolve "^1.10.0"
+    semver "2 || 3 || 4 || 5"
+    validate-npm-package-license "^3.0.1"
+
+object-inspect@^1.9.0:
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.2.tgz#b6385a3e2b7cae0b5eafcf90cddf85d128767f30"
+  integrity sha512-gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA==
+
+object-keys@^1.0.12, object-keys@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
+
+object.assign@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
+  integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
+  dependencies:
+    call-bind "^1.0.0"
+    define-properties "^1.1.3"
+    has-symbols "^1.0.1"
+    object-keys "^1.1.1"
+
+object.values@^1.1.1:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.3.tgz#eaa8b1e17589f02f698db093f7c62ee1699742ee"
+  integrity sha512-nkF6PfDB9alkOUxpf1HNm/QlkeW3SReqL5WXeBLpEJJnlPSvRaDQpW3gQTksTN3fgJX4hL42RzKyOin6ff3tyw==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.18.0-next.2"
+    has "^1.0.3"
+
+once@^1.3.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+  dependencies:
+    wrappy "1"
+
+optionator@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
+  integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
+  dependencies:
+    deep-is "^0.1.3"
+    fast-levenshtein "^2.0.6"
+    levn "^0.4.1"
+    prelude-ls "^1.2.1"
+    type-check "^0.4.0"
+    word-wrap "^1.2.3"
+
+p-limit@^1.1.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
+  integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
+  dependencies:
+    p-try "^1.0.0"
+
+p-locate@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
+  integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=
+  dependencies:
+    p-limit "^1.1.0"
+
+p-try@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
+  integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
+
+parent-module@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
+  integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
+  dependencies:
+    callsites "^3.0.0"
+
+parse-json@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
+  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
+  dependencies:
+    error-ex "^1.2.0"
+
+path-exists@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
+
+path-is-absolute@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+
+path-key@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
+  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
+
+path-parse@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
+  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
+
+path-type@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
+  integrity sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=
+  dependencies:
+    pify "^2.0.0"
+
+path-type@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
+  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
+
+picomatch@^2.2.1, picomatch@^2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz#465547f359ccc206d3c48e46a1bcb89bf7ee619d"
+  integrity sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==
+
+pify@^2.0.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
+
+pkg-dir@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
+  integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=
+  dependencies:
+    find-up "^2.1.0"
+
+postcss-modules-extract-imports@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d"
+  integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==
+
+postcss-modules-local-by-default@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c"
+  integrity sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==
+  dependencies:
+    icss-utils "^5.0.0"
+    postcss-selector-parser "^6.0.2"
+    postcss-value-parser "^4.1.0"
+
+postcss-modules-scope@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06"
+  integrity sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==
+  dependencies:
+    postcss-selector-parser "^6.0.4"
+
+postcss-modules-values@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c"
+  integrity sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==
+  dependencies:
+    icss-utils "^5.0.0"
+
+postcss-modules@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules/-/postcss-modules-4.0.0.tgz#2bc7f276ab88f3f1b0fadf6cbd7772d43b5f3b9b"
+  integrity sha512-ghS/ovDzDqARm4Zj6L2ntadjyQMoyJmi0JkLlYtH2QFLrvNlxH5OAVRPWPeKilB0pY7SbuhO173KOWkPAxRJcw==
+  dependencies:
+    generic-names "^2.0.1"
+    icss-replace-symbols "^1.1.0"
+    lodash.camelcase "^4.3.0"
+    postcss-modules-extract-imports "^3.0.0"
+    postcss-modules-local-by-default "^4.0.0"
+    postcss-modules-scope "^3.0.0"
+    postcss-modules-values "^4.0.0"
+    string-hash "^1.1.1"
+
+postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.5.tgz#042d74e137db83e6f294712096cb413f5aa612c4"
+  integrity sha512-aFYPoYmXbZ1V6HZaSvat08M97A8HqO6Pjz+PiNpw/DhuRrC72XWAdp3hL6wusDCN31sSmcZyMGa2hZEuX+Xfhg==
+  dependencies:
+    cssesc "^3.0.0"
+    util-deprecate "^1.0.2"
+
+postcss-value-parser@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
+  integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
+
+postcss@^8.1.10, postcss@^8.2.1:
+  version "8.2.13"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.13.tgz#dbe043e26e3c068e45113b1ed6375d2d37e2129f"
+  integrity sha512-FCE5xLH+hjbzRdpbRb1IMCvPv9yZx2QnDarBEYSN0N0HYk+TcXsEhwdFcFb+SRWOKzKGErhIEbBK2ogyLdTtfQ==
+  dependencies:
+    colorette "^1.2.2"
+    nanoid "^3.1.22"
+    source-map "^0.6.1"
+
+prelude-ls@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
+  integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
+
+process-nextick-args@~2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
+  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
+
+progress@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
+  integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
+
+punycode@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+
+queue-microtask@^1.2.2:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
+  integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
+
+read-pkg-up@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
+  integrity sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=
+  dependencies:
+    find-up "^2.0.0"
+    read-pkg "^2.0.0"
+
+read-pkg@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
+  integrity sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=
+  dependencies:
+    load-json-file "^2.0.0"
+    normalize-package-data "^2.3.2"
+    path-type "^2.0.0"
+
+readable-stream@^2.0.2, readable-stream@~2.3.6:
+  version "2.3.7"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
+  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~2.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.1.1"
+    util-deprecate "~1.0.1"
+
+regexpp@^3.0.0, regexpp@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"
+  integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==
+
+require-from-string@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
+  integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
+
+resolve-from@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
+  integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
+
+resolve@^1.10.0, resolve@^1.10.1, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.19.0:
+  version "1.20.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
+  integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
+  dependencies:
+    is-core-module "^2.2.0"
+    path-parse "^1.0.6"
+
+reusify@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
+  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
+
+rimraf@2:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
+  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
+  dependencies:
+    glob "^7.1.3"
+
+rimraf@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+  dependencies:
+    glob "^7.1.3"
+
+rollup@^2.38.5:
+  version "2.46.0"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.46.0.tgz#8cacf89d2ee31a34755f1af40a665168f592b829"
+  integrity sha512-qPGoUBNl+Z8uNu0z7pD3WPTABWRbcOwIrO/5ccDJzmrtzn0LVf6Lj91+L5CcWhXl6iWf23FQ6m8Jkl2CmN1O7Q==
+  optionalDependencies:
+    fsevents "~2.3.1"
+
+run-parallel@^1.1.9:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
+  integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
+  dependencies:
+    queue-microtask "^1.2.2"
+
+safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+
+"semver@2 || 3 || 4 || 5":
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+
+semver@^6.1.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+
+semver@^7.2.1, semver@^7.3.2:
+  version "7.3.5"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
+  integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
+  dependencies:
+    lru-cache "^6.0.0"
+
+setimmediate@~1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
+  integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
+
+shebang-command@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
+  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
+  dependencies:
+    shebang-regex "^3.0.0"
+
+shebang-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
+  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
+
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
+
+slice-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
+  integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==
+  dependencies:
+    ansi-styles "^4.0.0"
+    astral-regex "^2.0.0"
+    is-fullwidth-code-point "^3.0.0"
+
+source-map@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
+
+sourcemap-codec@^1.4.4:
+  version "1.4.8"
+  resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
+  integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
+
+spdx-correct@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
+  integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==
+  dependencies:
+    spdx-expression-parse "^3.0.0"
+    spdx-license-ids "^3.0.0"
+
+spdx-exceptions@^2.1.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
+  integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
+
+spdx-expression-parse@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
+  integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
+  dependencies:
+    spdx-exceptions "^2.1.0"
+    spdx-license-ids "^3.0.0"
+
+spdx-license-ids@^3.0.0:
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65"
+  integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==
+
+sprintf-js@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
+
+string-hash@^1.1.1:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/string-hash/-/string-hash-1.1.3.tgz#e8aafc0ac1855b4666929ed7dd1275df5d6c811b"
+  integrity sha1-6Kr8CsGFW0Zmkp7X3RJ1311sgRs=
+
+string-width@^4.2.0:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"
+  integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.0"
+
+string.prototype.trimend@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
+  integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+
+string.prototype.trimstart@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"
+  integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+
+string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+  dependencies:
+    safe-buffer "~5.1.0"
+
+strip-ansi@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
+  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
+  dependencies:
+    ansi-regex "^5.0.0"
+
+strip-bom@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
+
+strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
+  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
+
+supports-color@^5.3.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
+  dependencies:
+    has-flag "^3.0.0"
+
+supports-color@^7.1.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
+  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
+  dependencies:
+    has-flag "^4.0.0"
+
+table@^6.0.4:
+  version "6.6.0"
+  resolved "https://registry.yarnpkg.com/table/-/table-6.6.0.tgz#905654b79df98d9e9a973de1dd58682532c40e8e"
+  integrity sha512-iZMtp5tUvcnAdtHpZTWLPF0M7AgiQsURR2DwmxnJwSy8I3+cY+ozzVvYha3BOLG2TB+L0CqjIz+91htuj6yCXg==
+  dependencies:
+    ajv "^8.0.1"
+    lodash.clonedeep "^4.5.0"
+    lodash.flatten "^4.4.0"
+    lodash.truncate "^4.4.2"
+    slice-ansi "^4.0.0"
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+
+text-table@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
+  integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
+
+to-fast-properties@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
+  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
+
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  dependencies:
+    is-number "^7.0.0"
+
+"traverse@>=0.3.0 <0.4":
+  version "0.3.9"
+  resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.3.9.tgz#717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9"
+  integrity sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=
+
+tsconfig-paths@^3.9.0:
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b"
+  integrity sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==
+  dependencies:
+    "@types/json5" "^0.0.29"
+    json5 "^1.0.1"
+    minimist "^1.2.0"
+    strip-bom "^3.0.0"
+
+tslib@^1.8.1:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
+  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
+
+tsutils@^3.17.1:
+  version "3.21.0"
+  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
+  integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
+  dependencies:
+    tslib "^1.8.1"
+
+type-check@^0.4.0, type-check@~0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
+  integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
+  dependencies:
+    prelude-ls "^1.2.1"
+
+type-fest@^0.20.2:
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
+  integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
+
+type-fest@^0.8.1:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
+  integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
+
+typescript@^4.1.3:
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.4.tgz#8610b59747de028fda898a8aef0e103f156d0961"
+  integrity sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==
+
+unbox-primitive@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471"
+  integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==
+  dependencies:
+    function-bind "^1.1.1"
+    has-bigints "^1.0.1"
+    has-symbols "^1.0.2"
+    which-boxed-primitive "^1.0.2"
+
+unzipper@0.10.11:
+  version "0.10.11"
+  resolved "https://registry.yarnpkg.com/unzipper/-/unzipper-0.10.11.tgz#0b4991446472cbdb92ee7403909f26c2419c782e"
+  integrity sha512-+BrAq2oFqWod5IESRjL3S8baohbevGcVA+teAIOYWM3pDVdseogqbzhhvvmiyQrUNKFUnDMtELW3X8ykbyDCJw==
+  dependencies:
+    big-integer "^1.6.17"
+    binary "~0.3.0"
+    bluebird "~3.4.1"
+    buffer-indexof-polyfill "~1.0.0"
+    duplexer2 "~0.1.4"
+    fstream "^1.0.12"
+    graceful-fs "^4.2.2"
+    listenercount "~1.0.1"
+    readable-stream "~2.3.6"
+    setimmediate "~1.0.4"
+
+uri-js@^4.2.2:
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
+  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
+  dependencies:
+    punycode "^2.1.0"
+
+util-deprecate@^1.0.2, util-deprecate@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+
+v8-compile-cache@^2.0.3:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
+  integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
+
+validate-npm-package-license@^3.0.1:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
+  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
+  dependencies:
+    spdx-correct "^3.0.0"
+    spdx-expression-parse "^3.0.0"
+
+vite@^2.2.1:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-2.2.3.tgz#1acbdfa56ac00e00e7ccb6988f63f130c2f99dbb"
+  integrity sha512-PtjyBL4GtACM+uT5q5hi2+AlMBbb6YI2b2bam6QI8ZdZt4FezseF0yZHQx0G+b3po9jIJ/GS5N9gc5Yq9Rue7g==
+  dependencies:
+    esbuild "^0.9.3"
+    postcss "^8.2.1"
+    resolve "^1.19.0"
+    rollup "^2.38.5"
+  optionalDependencies:
+    fsevents "~2.3.1"
+
+vue-eslint-parser@^7.6.0:
+  version "7.6.0"
+  resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.6.0.tgz#01ea1a2932f581ff244336565d712801f8f72561"
+  integrity sha512-QXxqH8ZevBrtiZMZK0LpwaMfevQi9UL7lY6Kcp+ogWHC88AuwUPwwCIzkOUc1LR4XsYAt/F9yHXAB/QoD17QXA==
+  dependencies:
+    debug "^4.1.1"
+    eslint-scope "^5.0.0"
+    eslint-visitor-keys "^1.1.0"
+    espree "^6.2.1"
+    esquery "^1.4.0"
+    lodash "^4.17.15"
+
+vue-router@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-4.0.6.tgz#91750db507d26642f225b0ec6064568e5fe448d6"
+  integrity sha512-Y04llmK2PyaESj+N33VxLjGCUDuv9t4q2OpItEGU7POZiuQZaugV6cJpE6Qm1sVFtxufodLKN2y2dQl9nk0Reg==
+
+vue-tsc@^0.0.26:
+  version "0.0.26"
+  resolved "https://registry.yarnpkg.com/vue-tsc/-/vue-tsc-0.0.26.tgz#3d4b2ad64ba4fd972a5a40b342ac1e9f8d9d814a"
+  integrity sha512-UtHrHPBp7mAFN0GfsPYUPWROCGAQMl/HYTGOJy5ufPzCMt5h0kS2HOgfj4qbLSUzuYsfBqTxEj2unuNrlbbvxA==
+  dependencies:
+    unzipper "0.10.11"
+
+vue@^3.0.5:
+  version "3.0.11"
+  resolved "https://registry.yarnpkg.com/vue/-/vue-3.0.11.tgz#c82f9594cbf4dcc869241d4c8dd3e08d9a8f4b5f"
+  integrity sha512-3/eUi4InQz8MPzruHYSTQPxtM3LdZ1/S/BvaU021zBnZi0laRUyH6pfuE4wtUeLvI8wmUNwj5wrZFvbHUXL9dw==
+  dependencies:
+    "@vue/compiler-dom" "3.0.11"
+    "@vue/runtime-dom" "3.0.11"
+    "@vue/shared" "3.0.11"
+
+which-boxed-primitive@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
+  integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==
+  dependencies:
+    is-bigint "^1.0.1"
+    is-boolean-object "^1.1.0"
+    is-number-object "^1.0.4"
+    is-string "^1.0.5"
+    is-symbol "^1.0.3"
+
+which@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
+  dependencies:
+    isexe "^2.0.0"
+
+word-wrap@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
+  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+
+yallist@^3.0.2:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
+  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
+
+yallist@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==

From 3f5c0d038b490d97e32ddfda42ed21d47687cb78 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sat, 1 May 2021 21:40:46 +0200
Subject: [PATCH 085/124] Added backend linting job

---
 .woodpecker.yml     | 7 +++++++
 migrations/.gitkeep | 0
 2 files changed, 7 insertions(+)
 delete mode 100644 migrations/.gitkeep

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 9e9f12c..bb42d39 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -13,6 +13,13 @@ pipeline:
             - cd web
             - yarn run lint
 
+    # This doesn't require compiling anything
+    lint-backend:
+        image: chewingbever/fej-builder:latest
+        pull: true
+        commands:
+            - cargo fmt -- --check
+
     # Backend cicd jobs are disabled until we can figure out a way to cache stuff
     # test-backend:
     #     image: chewingbever/fej-builder:latest
diff --git a/migrations/.gitkeep b/migrations/.gitkeep
deleted file mode 100644
index e69de29..0000000

From 472f890a988176b879275bb9305af504ce7060c0 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sat, 1 May 2021 22:06:36 +0200
Subject: [PATCH 086/124] Added job to deploy builder

---
 .woodpecker.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index bb42d39..94ba6bc 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,4 +1,14 @@
 pipeline:
+    publish-builder:
+        image: plugins/docker
+        repo: chewingbever/fej-builder
+        dockerfile: docker/Dockerfile.builder
+        tag: [ latest ]
+        secrets: [ docker_username, docker_password ]
+        when:
+            branch: develop
+            event: push
+
     build-frontend:
         image: node:15-alpine3.13
         pull: true

From 3bbc90ad6004f8fe2fe5b42fc1cfaf2c7455221d Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sat, 1 May 2021 22:09:23 +0200
Subject: [PATCH 087/124] Changed order of pipeline

---
 .woodpecker.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 94ba6bc..b8c42a7 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,14 +1,4 @@
 pipeline:
-    publish-builder:
-        image: plugins/docker
-        repo: chewingbever/fej-builder
-        dockerfile: docker/Dockerfile.builder
-        tag: [ latest ]
-        secrets: [ docker_username, docker_password ]
-        when:
-            branch: develop
-            event: push
-
     build-frontend:
         image: node:15-alpine3.13
         pull: true
@@ -30,6 +20,16 @@ pipeline:
         commands:
             - cargo fmt -- --check
 
+    publish-builder:
+        image: plugins/docker
+        repo: chewingbever/fej-builder
+        dockerfile: docker/Dockerfile.builder
+        tag: [ latest ]
+        secrets: [ docker_username, docker_password ]
+        when:
+            branch: develop
+            event: push
+
     # Backend cicd jobs are disabled until we can figure out a way to cache stuff
     # test-backend:
     #     image: chewingbever/fej-builder:latest

From 336ff25249ae080fb0cef93e7c63f43e26a671bb Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sat, 1 May 2021 22:49:05 +0200
Subject: [PATCH 088/124] Disabled builder publish for now

---
 .woodpecker.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index b8c42a7..45bb910 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -20,15 +20,15 @@ pipeline:
         commands:
             - cargo fmt -- --check
 
-    publish-builder:
-        image: plugins/docker
-        repo: chewingbever/fej-builder
-        dockerfile: docker/Dockerfile.builder
-        tag: [ latest ]
-        secrets: [ docker_username, docker_password ]
-        when:
-            branch: develop
-            event: push
+    # publish-builder:
+    #     image: plugins/docker
+    #     repo: chewingbever/fej-builder
+    #     dockerfile: docker/Dockerfile.builder
+    #     tag: [ latest ]
+    #     secrets: [ docker_username, docker_password ]
+    #     when:
+    #         branch: develop
+    #         event: push
 
     # Backend cicd jobs are disabled until we can figure out a way to cache stuff
     # test-backend:

From 5725b91c61d8b020ac28e37c9b5e6abd0aeb750a Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@whitesourcesoftware.com>
Date: Sun, 2 May 2021 01:03:26 +0000
Subject: [PATCH 089/124] Update Rust crate regex to 1.5.3

---
 Cargo.lock | 8 ++++----
 Cargo.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3d45634..16b16ef 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1342,9 +1342,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.5.2"
+version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1efb2352a0f4d4b128f734b5c44c79ff80117351138733f12f982fe3e2b13343"
+checksum = "ce5f1ceb7f74abbce32601642fcf8e8508a8a8991e0621c7d750295b9095702b"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1353,9 +1353,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.24"
+version = "0.6.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00efb87459ba4f6fb2169d20f68565555688e1250ee6825cdf6254f8b48fafb2"
+checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
 
 [[package]]
 name = "remove_dir_all"
diff --git a/Cargo.toml b/Cargo.toml
index d7c4dce..78d47b3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -37,7 +37,7 @@ rocket = "0.4.7"
 serde = "1.0.125"
 chrono = "0.4.19"
 chrono-tz = "0.5.3"
-regex = "1.5.2"
+regex = "1.5.3"
 reqwest = { version = "0.11.3", features = ["blocking", "json", "cookies"] }
 diesel = { version = "1.4.6", features = ["postgres"] }
 diesel_migrations = "1.4.0"

From f9da125b4a75b99f0f38d9c2676b3254470edbdd Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sun, 2 May 2021 16:12:05 +0200
Subject: [PATCH 090/124] Added .editorconfig file

---
 .editorconfig | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..a84985f
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,7 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = false
+indent_style = space
+indent_size = 4

From d7ee53e62c5c330d2941343c53df04c28c281e8a Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@whitesourcesoftware.com>
Date: Sun, 2 May 2021 22:02:21 +0000
Subject: [PATCH 091/124] Update dependency vue-tsc to ^0.1.0

---
 web/package.json |    2 +-
 web/yarn.lock    | 1960 +++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 1848 insertions(+), 114 deletions(-)

diff --git a/web/package.json b/web/package.json
index 0534f03..cdc6b59 100644
--- a/web/package.json
+++ b/web/package.json
@@ -25,6 +25,6 @@
     "eslint-plugin-vue": "^7.9.0",
     "typescript": "^4.1.3",
     "vite": "^2.2.1",
-    "vue-tsc": "^0.0.26"
+    "vue-tsc": "^0.1.0"
   }
 }
diff --git a/web/yarn.lock b/web/yarn.lock
index d8ba55e..6e69f58 100644
--- a/web/yarn.lock
+++ b/web/yarn.lock
@@ -23,12 +23,12 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.12.0", "@babel/parser@^7.13.9":
+"@babel/parser@^7.12.0", "@babel/parser@^7.13.9", "@babel/parser@^7.6.0", "@babel/parser@^7.9.6":
   version "7.14.0"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.0.tgz#2f0ebfed92bcddcc8395b91f1895191ce2760380"
   integrity sha512-AHbfoxesfBALg33idaTBVUkLnfXtsgvJREf93p4p0Lwsz4ppfE7g1tpEXVm4vrxUcH4DVhAa9Z1m1zqf9WUC7Q==
 
-"@babel/types@^7.12.0", "@babel/types@^7.13.0":
+"@babel/types@^7.12.0", "@babel/types@^7.13.0", "@babel/types@^7.6.1", "@babel/types@^7.9.6":
   version "7.14.0"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.0.tgz#3fc3fc74e0cdad878182e5f66cc6bcab1915a802"
   integrity sha512-O2LVLdcnWplaGxiPBz12d0HcdN8QdxdsWYhz5LSeuukV/5mn2xUUc3gBeU4QBYPJ18g/UToe8F532XJ608prmg==
@@ -36,6 +36,25 @@
     "@babel/helper-validator-identifier" "^7.14.0"
     to-fast-properties "^2.0.0"
 
+"@emmetio/abbreviation@^2.2.2":
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/@emmetio/abbreviation/-/abbreviation-2.2.2.tgz#746762fd9e7a8c2ea604f580c62e3cfe250e6989"
+  integrity sha512-TtE/dBnkTCct8+LntkqVrwqQao6EnPAs1YN3cUgxOxTaBlesBCY37ROUAVZrRlG64GNnVShdl/b70RfAI3w5lw==
+  dependencies:
+    "@emmetio/scanner" "^1.0.0"
+
+"@emmetio/css-abbreviation@^2.1.4":
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/@emmetio/css-abbreviation/-/css-abbreviation-2.1.4.tgz#90362e8a1122ce3b76f6c3157907d30182f53f54"
+  integrity sha512-qk9L60Y+uRtM5CPbB0y+QNl/1XKE09mSO+AhhSauIfr2YOx/ta3NJw2d8RtCFxgzHeRqFRr8jgyzThbu+MZ4Uw==
+  dependencies:
+    "@emmetio/scanner" "^1.0.0"
+
+"@emmetio/scanner@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@emmetio/scanner/-/scanner-1.0.0.tgz#065b2af6233fe7474d44823e3deb89724af42b5f"
+  integrity sha512-8HqW8EVqjnCmWXVpqAOZf+EGESdkR27odcMMMGefgKXtar00SoYNSryGv//TELI4T3QFsECo78p+0lmalk/CFA==
+
 "@eslint/eslintrc@^0.4.0":
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.0.tgz#99cc0a0584d72f1df38b900fb062ba995f395547"
@@ -72,6 +91,137 @@
     "@nodelib/fs.scandir" "2.1.4"
     fastq "^1.6.0"
 
+"@sindresorhus/is@^0.14.0":
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
+  integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
+
+"@starptech/expression-parser@^0.10.0":
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/@starptech/expression-parser/-/expression-parser-0.10.0.tgz#5fa4d2fd0b36cd14a1f4ac3dcb176d123f9d9e37"
+  integrity sha512-HcNE5lqbBd0CNMArErVboWZ9PyJ8Hqp0VGnLJXkA3e38r6/VjhFa2pcsoJQGQiiuHj6napSMr3s+Gc34WUGhzw==
+
+"@starptech/hast-util-from-webparser@^0.10.0":
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/@starptech/hast-util-from-webparser/-/hast-util-from-webparser-0.10.0.tgz#c3ad63eaefb8dd07b5bdf62ff5971893e865b75a"
+  integrity sha512-ebBrqxnkk4uhOkYXi0EMsHLrUrpGUjAMGz++04HPZmZYfpEZjaHxF3VmhfTWnS6u8SGUtsDPMQ+RxHSvrsNxZg==
+  dependencies:
+    "@starptech/prettyhtml-hastscript" "^0.10.0"
+    "@starptech/webparser" "^0.10.0"
+    property-information "^5.1.0"
+
+"@starptech/prettyhtml-formatter@^0.10.0":
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/@starptech/prettyhtml-formatter/-/prettyhtml-formatter-0.10.0.tgz#5b064e48df45743179dcedd27e09ba6ac2ddeb20"
+  integrity sha512-AEpBQTRHhgB9NmQZNXINo/ObavGLATEvS41MgiJljsiSHzfUX3ltOPLI2fy9VfDB3E76mjUqIfmEQ/v5lJ5Cfw==
+  dependencies:
+    "@starptech/expression-parser" "^0.10.0"
+    "@starptech/prettyhtml-hast-to-html" "^0.10.0"
+    "@starptech/rehype-minify-whitespace" "^0.10.0"
+    "@starptech/rehype-webparser" "^0.10.0"
+    "@starptech/webparser" "^0.10.0"
+    hast-util-is-element "^1.0.3"
+    hast-util-to-string "^1.0.2"
+    html-void-elements "^1.0.4"
+    html-whitespace-sensitive-tag-names "^1.0.1"
+    is-hidden "^1.1.2"
+    prettier "^1.18.2"
+    repeat-string "^1.6.1"
+    to-vfile "^6.0.0"
+    unified "^7.1.0"
+    unist-util-find "^1.0.1"
+    unist-util-is "^2.1.3"
+    unist-util-visit-parents "^2.1.2"
+    xtend "^4.0.1"
+
+"@starptech/prettyhtml-hast-to-html@^0.10.0":
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/@starptech/prettyhtml-hast-to-html/-/prettyhtml-hast-to-html-0.10.0.tgz#82397cdd751a737fac68d66da23f2b3a63800040"
+  integrity sha512-TAbm1q6bCBl13i8FbY/1eHMnTHWr/kLM5RcOD1S6F3T12DwhMwcqagMzqPQc4tT1DmyLzGWY8SA/p3HrB0iPcg==
+  dependencies:
+    ccount "^1.0.4"
+    comma-separated-tokens "^1.0.7"
+    hast-util-is-element "^1.0.3"
+    hast-util-whitespace "^1.0.3"
+    html-void-elements "^1.0.4"
+    html-whitespace-sensitive-tag-names "^1.0.1"
+    property-information "^5.1.0"
+    repeat-string "^1.6.1"
+    space-separated-tokens "^1.1.4"
+    stringify-entities "^2.0.0"
+    unist-util-is "^2.1.3"
+    xtend "^4.0.1"
+
+"@starptech/prettyhtml-hastscript@^0.10.0":
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/@starptech/prettyhtml-hastscript/-/prettyhtml-hastscript-0.10.0.tgz#135ae23286e00b725f40398c5c4d5c956ba34fc6"
+  integrity sha512-oSZB/CXRagbJ1UAGihSsdDcvHIGa+ivdVVmljWtJDqO5+FfFn9utzCw/QI9NAV3m9cgFWRdW/6TkXwbdPrIQ4A==
+  dependencies:
+    comma-separated-tokens "^1.0.7"
+    hast-util-parse-selector "^2.2.2"
+    property-information "^5.1.0"
+    space-separated-tokens "^1.1.4"
+
+"@starptech/prettyhtml-sort-attributes@^0.10.0":
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/@starptech/prettyhtml-sort-attributes/-/prettyhtml-sort-attributes-0.10.0.tgz#7b8c901a6d1f36468082284f2996b4f1a2b4ea21"
+  integrity sha512-ctsjmEEsxzW4dzMOIwYRWQvqfilgdGFaZn+lIxiNuPJIL4V4ZpgQhT96Us5BQcalHYQqQsKF+nRelCWFhd67IQ==
+  dependencies:
+    hast-util-has-property "^1.0.3"
+    unist-util-visit "^1.4.1"
+
+"@starptech/prettyhtml@^0.10.0":
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/@starptech/prettyhtml/-/prettyhtml-0.10.0.tgz#87814b291f104a5349aff5b93476b30c6a9b6bce"
+  integrity sha512-d79qc81gX5oyiv0Ioz82NEMnO/waltC7HAOlZ8r/es/zPuRilWMRo5ZCV00/80ZsQ0MiCIuhAnvUcg7rVzFDLg==
+  dependencies:
+    "@starptech/prettyhtml-formatter" "^0.10.0"
+    "@starptech/prettyhtml-sort-attributes" "^0.10.0"
+    "@starptech/rehype-webparser" "^0.10.0"
+    "@starptech/webparser" "^0.10.0"
+    meow "^5.0.0"
+    prettier "^1.18.2"
+    rehype-sort-attribute-values "^2.0.1"
+    unified "^7.1.0"
+    unified-engine "^6.0.1"
+    update-notifier "^3.0.0"
+    vfile "^4.0.1"
+    vfile-reporter "^6.0.0"
+
+"@starptech/rehype-minify-whitespace@^0.10.0":
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/@starptech/rehype-minify-whitespace/-/rehype-minify-whitespace-0.10.0.tgz#48b15009d9dcc4539e1a03e3b8555ba5b0208947"
+  integrity sha512-11k2dW0ju2hMuSfQ9znXqeCjyBtkfY7BRoyPjDLiVCsGIlqM2JpZhx46sFTF3JJOsJz9pr2HQ8Cvf4oTt9hgvg==
+  dependencies:
+    collapse-white-space "^1.0.5"
+    hast-util-embedded "^1.0.4"
+    hast-util-has-property "^1.0.3"
+    hast-util-is-body-ok-link "^1.0.2"
+    hast-util-is-element "^1.0.3"
+    html-whitespace-sensitive-tag-names "^1.0.1"
+    unist-util-is "^2.1.3"
+    unist-util-modify-children "^1.1.4"
+
+"@starptech/rehype-webparser@^0.10.0":
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/@starptech/rehype-webparser/-/rehype-webparser-0.10.0.tgz#a23d18812fbca3d416b010c3054162dfde3ed358"
+  integrity sha512-1CPMVKrgXjKnehAouQBa2wWkikR6jD+BZ+8/v1RDH1S1a293fOzItU63W3VIx4zv3n0iMgrTWeeyfpk/9cT4LQ==
+  dependencies:
+    "@starptech/hast-util-from-webparser" "^0.10.0"
+    "@starptech/webparser" "^0.10.0"
+
+"@starptech/webparser@^0.10.0":
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/@starptech/webparser/-/webparser-0.10.0.tgz#cb1269865086e2a7178492fa9add44d468fbd7d9"
+  integrity sha512-vA/p1LTVfuK8dP+EhBglMS7ll3dZahBjnvjwUiJ8NNUCqH5pSAj3tcRtOG3k7k1Wx1hWHJpGgZVj0VNQIo99bA==
+
+"@szmarczak/http-timer@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"
+  integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==
+  dependencies:
+    defer-to-connect "^1.0.1"
+
 "@types/json-schema@^7.0.3":
   version "7.0.7"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad"
@@ -82,6 +232,32 @@
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
   integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
 
+"@types/node@*":
+  version "15.0.1"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.1.tgz#ef34dea0881028d11398be5bf4e856743e3dc35a"
+  integrity sha512-TMkXt0Ck1y0KKsGr9gJtWGjttxlZnnvDtphxUOSd0bfaR6Q1jle+sPvrzNR1urqYTWMinoKvjKfXUGsumaO1PA==
+
+"@types/unist@*", "@types/unist@^2.0.0", "@types/unist@^2.0.2":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz#9c088679876f374eb5983f150d4787aa6fb32d7e"
+  integrity sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==
+
+"@types/vfile-message@*":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@types/vfile-message/-/vfile-message-2.0.0.tgz#690e46af0fdfc1f9faae00cd049cc888957927d5"
+  integrity sha512-GpTIuDpb9u4zIO165fUy9+fXcULdD8HFRNli04GehoMVbeNq7D6OBnqSmg3lxZnC+UvgUhEWKxdKiwYUkGltIw==
+  dependencies:
+    vfile-message "*"
+
+"@types/vfile@^3.0.0":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@types/vfile/-/vfile-3.0.2.tgz#19c18cd232df11ce6fa6ad80259bc86c366b09b9"
+  integrity sha512-b3nLFGaGkJ9rzOcuXRfHkZMdjsawuDD0ENL9fzTophtBg8FJHSGbH7daXkEpcwy3v7Xol3pAvsmlYyFhR4pqJw==
+  dependencies:
+    "@types/node" "*"
+    "@types/unist" "*"
+    "@types/vfile-message" "*"
+
 "@typescript-eslint/eslint-plugin@^4.22.0":
   version "4.22.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.22.0.tgz#3d5f29bb59e61a9dba1513d491b059e536e16dbc"
@@ -157,6 +333,46 @@
   resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-1.2.2.tgz#b0038fc11b9099f4cd01fcbf0ee419adda417b52"
   integrity sha512-5BI2WFfs/Z0pAV4S/IQf1oH3bmFYlL5ATMBHgTt1Lf7hAnfpNd5oUAAs6hZPfk3QhvyUQgtk0rJBlabwNFcBJQ==
 
+"@volar/code-gen@^0.25.0":
+  version "0.25.0"
+  resolved "https://registry.yarnpkg.com/@volar/code-gen/-/code-gen-0.25.0.tgz#c6a4f6b79ca4b9fdd8eceb139c91cb587ed328a9"
+  integrity sha512-C4BtqXBEUOvnmpbTzJkWc5Lxhu72RFgAq0PtBS09OGRfUPPhQ2WlToIBFYCa6Gjz/tB37TdLE3oh6Doh3OXGfQ==
+  dependencies:
+    "@volar/shared" "^0.25.0"
+    "@volar/source-map" "^0.25.0"
+
+"@volar/html2pug@^0.25.0":
+  version "0.25.0"
+  resolved "https://registry.yarnpkg.com/@volar/html2pug/-/html2pug-0.25.0.tgz#f44ed3c5bd4d77e4d792c4e1da8bdeb6ef419149"
+  integrity sha512-IfnapnGi1Oxm1J/Y9XDFeBxYIG+tbCQ8mM8L0/rXDz+vhe7bvWf35I9e1JXVnnBZfVFzw8UJPm6NTPaE4eS2hQ==
+  dependencies:
+    domelementtype "^2.2.0"
+    domhandler "^4.2.0"
+    htmlparser2 "^6.1.0"
+    pug "^3.0.2"
+
+"@volar/shared@^0.25.0":
+  version "0.25.0"
+  resolved "https://registry.yarnpkg.com/@volar/shared/-/shared-0.25.0.tgz#58f5cf4f069817d34b74360cca438ed7dc8b96f9"
+  integrity sha512-O+7splFEcujRZXqbb3rljA9OtvvvY6B2v9lBnl2Iyt7IdCOOV9LMPLC7w9KrUpFyYG76Na/4NT8VEt1eiJw9yg==
+  dependencies:
+    upath "^2.0.1"
+    vscode-languageserver "^7.1.0-next.4"
+
+"@volar/source-map@^0.25.0":
+  version "0.25.0"
+  resolved "https://registry.yarnpkg.com/@volar/source-map/-/source-map-0.25.0.tgz#4c004cfbe8c23cdb11369cd85d6b834fe74ae184"
+  integrity sha512-whMo2gOoeCu0z8GjX3e2BNxcWw2031kJNYhxJGDMOUmrHKjZlW8B2XJQlwHgZm/0qGVbShw8Y6QytwZtpx/T8g==
+  dependencies:
+    "@volar/shared" "^0.25.0"
+
+"@volar/transforms@^0.25.0":
+  version "0.25.0"
+  resolved "https://registry.yarnpkg.com/@volar/transforms/-/transforms-0.25.0.tgz#c6ca37799c7aac16af35f97a3a3879838bfe4816"
+  integrity sha512-KRkVc8UBg99NOcZjuvbb1pU3cAzBosz10vVcItb+2s7kqLtZVNsa6Aypiko21X9urND8+oGYqqi9zLvI0+Ebqg==
+  dependencies:
+    "@volar/shared" "^0.25.0"
+
 "@vue/compiler-core@3.0.11":
   version "3.0.11"
   resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.0.11.tgz#5ef579e46d7b336b8735228758d1c2c505aae69a"
@@ -168,7 +384,7 @@
     estree-walker "^2.0.1"
     source-map "^0.6.1"
 
-"@vue/compiler-dom@3.0.11":
+"@vue/compiler-dom@3.0.11", "@vue/compiler-dom@^3.0.11":
   version "3.0.11"
   resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.0.11.tgz#b15fc1c909371fd671746020ba55b5dab4a730ee"
   integrity sha512-+3xB50uGeY5Fv9eMKVJs2WSRULfgwaTJsy23OIltKgMrynnIj8hTYY2UL97HCoz78aDw1VDXdrBQ4qepWjnQcw==
@@ -176,7 +392,7 @@
     "@vue/compiler-core" "3.0.11"
     "@vue/shared" "3.0.11"
 
-"@vue/compiler-sfc@^3.0.5":
+"@vue/compiler-sfc@^3.0.11", "@vue/compiler-sfc@^3.0.5":
   version "3.0.11"
   resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.0.11.tgz#cd8ca2154b88967b521f5ad3b10f5f8b6b665679"
   integrity sha512-7fNiZuCecRleiyVGUWNa6pn8fB2fnuJU+3AGjbjl7r1P5wBivfl02H4pG+2aJP5gh2u+0wXov1W38tfWOphsXw==
@@ -206,7 +422,7 @@
     "@vue/compiler-dom" "3.0.11"
     "@vue/shared" "3.0.11"
 
-"@vue/reactivity@3.0.11":
+"@vue/reactivity@3.0.11", "@vue/reactivity@^3.0.11":
   version "3.0.11"
   resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.0.11.tgz#07b588349fd05626b17f3500cbef7d4bdb4dbd0b"
   integrity sha512-SKM3YKxtXHBPMf7yufXeBhCZ4XZDKP9/iXeQSC8bBO3ivBuzAi4aZi0bNoeE2IF2iGfP/AHEt1OU4ARj4ao/Xw==
@@ -230,7 +446,7 @@
     "@vue/shared" "3.0.11"
     csstype "^2.6.8"
 
-"@vue/shared@3.0.11":
+"@vue/shared@3.0.11", "@vue/shared@^3.0.11":
   version "3.0.11"
   resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.0.11.tgz#20d22dd0da7d358bb21c17f9bde8628152642c77"
   integrity sha512-b+zB8A2so8eCE0JsxjL24J7vdGl8rzPQ09hZNhystm+KqSbKcAej1A+Hbva1rCMmTTqA+hFnUSDc5kouEo0JzA==
@@ -265,11 +481,28 @@ ajv@^8.0.1:
     require-from-string "^2.0.2"
     uri-js "^4.2.2"
 
+ansi-align@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.0.tgz#b536b371cf687caaef236c18d3e21fe3797467cb"
+  integrity sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==
+  dependencies:
+    string-width "^3.0.0"
+
 ansi-colors@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
   integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
 
+ansi-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
+
+ansi-regex@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
+  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
+
 ansi-regex@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
@@ -296,6 +529,11 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
+array-find-index@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
+  integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=
+
 array-includes@^3.1.1:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.3.tgz#c7f619b382ad2afaf5326cddfdc0afc61af7690a"
@@ -307,6 +545,11 @@ array-includes@^3.1.1:
     get-intrinsic "^1.1.1"
     is-string "^1.0.5"
 
+array-iterate@^1.0.0:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/array-iterate/-/array-iterate-1.1.4.tgz#add1522e9dd9749bb41152d08b845bd08d6af8b7"
+  integrity sha512-sNRaPGh9nnmdC8Zf+pT3UqP8rnWj5Hf9wiFGsX3wUQ2yVSIhO2ShFwCoceIPpB41QF6i2OEmrHmCo36xronCVA==
+
 array-union@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
@@ -321,43 +564,66 @@ array.prototype.flat@^1.2.3:
     define-properties "^1.1.3"
     es-abstract "^1.18.0-next.1"
 
+arrify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+  integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
+
+asap@~2.0.3:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+  integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
+
+assert-never@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/assert-never/-/assert-never-1.2.1.tgz#11f0e363bf146205fb08193b5c7b90f4d1cf44fe"
+  integrity sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw==
+
 astral-regex@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
   integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
 
+babel-walk@3.0.0-canary-5:
+  version "3.0.0-canary-5"
+  resolved "https://registry.yarnpkg.com/babel-walk/-/babel-walk-3.0.0-canary-5.tgz#f66ecd7298357aee44955f235a6ef54219104b11"
+  integrity sha512-GAwkz0AihzY5bkwIY5QDR+LvsRQgB/B+1foMPvi0FZPMl5fjD7ICiznUiBdLYMH1QYe6vqu4gWYytZOccLouFw==
+  dependencies:
+    "@babel/types" "^7.9.6"
+
+bail@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.5.tgz#b6fa133404a392cbc1f8c4bf63f5953351e7a776"
+  integrity sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==
+
 balanced-match@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
-big-integer@^1.6.17:
-  version "1.6.48"
-  resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.48.tgz#8fd88bd1632cba4a1c8c3e3d7159f08bb95b4b9e"
-  integrity sha512-j51egjPa7/i+RdiRuJbPdJ2FIUYYPhvYLjzoYbcMMm62ooO6F94fETG4MTs46zPAF9Brs04OajboA/qTGuz78w==
-
 big.js@^5.2.2:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
   integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
 
-binary@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/binary/-/binary-0.3.0.tgz#9f60553bc5ce8c3386f3b553cff47462adecaa79"
-  integrity sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk=
-  dependencies:
-    buffers "~0.1.1"
-    chainsaw "~0.1.0"
-
 bluebird@^3.7.2:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
-bluebird@~3.4.1:
-  version "3.4.7"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3"
-  integrity sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM=
+boxen@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/boxen/-/boxen-3.2.0.tgz#fbdff0de93636ab4450886b6ff45b92d098f45eb"
+  integrity sha512-cU4J/+NodM3IHdSL2yN8bqYqnmlBTidDR4RC7nJs61ZmtGz8VZzM3HLQX0zY5mrSmPtR3xWwsq2jOUQqFZN8+A==
+  dependencies:
+    ansi-align "^3.0.0"
+    camelcase "^5.3.1"
+    chalk "^2.4.2"
+    cli-boxes "^2.2.0"
+    string-width "^3.0.0"
+    term-size "^1.2.0"
+    type-fest "^0.3.0"
+    widest-line "^2.0.0"
 
 brace-expansion@^1.1.7:
   version "1.1.11"
@@ -374,15 +640,23 @@ braces@^3.0.1:
   dependencies:
     fill-range "^7.0.1"
 
-buffer-indexof-polyfill@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.2.tgz#d2732135c5999c64b277fcf9b1abe3498254729c"
-  integrity sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A==
+buffer-from@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
+  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
 
-buffers@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/buffers/-/buffers-0.1.1.tgz#b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb"
-  integrity sha1-skV5w77U1tOWru5tmorn9Ugqt7s=
+cacheable-request@^6.0.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912"
+  integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==
+  dependencies:
+    clone-response "^1.0.2"
+    get-stream "^5.1.0"
+    http-cache-semantics "^4.0.0"
+    keyv "^3.0.0"
+    lowercase-keys "^2.0.0"
+    normalize-url "^4.1.0"
+    responselike "^1.0.2"
 
 call-bind@^1.0.0, call-bind@^1.0.2:
   version "1.0.2"
@@ -397,14 +671,31 @@ callsites@^3.0.0:
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
-chainsaw@~0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/chainsaw/-/chainsaw-0.1.0.tgz#5eab50b28afe58074d0d58291388828b5e5fbc98"
-  integrity sha1-XqtQsor+WAdNDVgpE4iCi15fvJg=
+camelcase-keys@^4.0.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-4.2.0.tgz#a2aa5fb1af688758259c32c141426d78923b9b77"
+  integrity sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=
   dependencies:
-    traverse ">=0.3.0 <0.4"
+    camelcase "^4.1.0"
+    map-obj "^2.0.0"
+    quick-lru "^1.0.0"
 
-chalk@^2.0.0:
+camelcase@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
+  integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
+
+camelcase@^5.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
+
+ccount@^1.0.4:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.1.0.tgz#246687debb6014735131be8abab2d93898f8d043"
+  integrity sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg==
+
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -421,6 +712,45 @@ chalk@^4.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
+character-entities-html4@^1.0.0:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-1.1.4.tgz#0e64b0a3753ddbf1fdc044c5fd01d0199a02e125"
+  integrity sha512-HRcDxZuZqMx3/a+qrzxdBKBPUpxWEq9xw2OPZ3a/174ihfrQKVsFhqtthBInFy1zZ9GgZyFXOatNujm8M+El3g==
+
+character-entities-legacy@^1.0.0:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1"
+  integrity sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==
+
+character-parser@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/character-parser/-/character-parser-2.2.0.tgz#c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0"
+  integrity sha1-x84o821LzZdE5f/CxfzeHHMmH8A=
+  dependencies:
+    is-regex "^1.0.3"
+
+ci-info@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
+  integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
+
+cli-boxes@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f"
+  integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==
+
+clone-response@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
+  integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=
+  dependencies:
+    mimic-response "^1.0.0"
+
+collapse-white-space@^1.0.5:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.6.tgz#e63629c0016665792060dbbeb79c42239d2c5287"
+  integrity sha512-jEovNnrhMuqyCcjfEJA56v0Xq8SkIoPKDyaHahwo3POf4qcSXqMYuwNcOTzp74vTsR9Tn08z4MxWqAhcekogkQ==
+
 color-convert@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
@@ -450,11 +780,38 @@ colorette@^1.2.2:
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
   integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
 
+comma-separated-tokens@^1.0.7:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-1.0.8.tgz#632b80b6117867a158f1080ad498b2fbe7e3f5ea"
+  integrity sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw==
+
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
+concat-stream@^1.5.1:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
+  dependencies:
+    buffer-from "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^2.2.2"
+    typedarray "^0.0.6"
+
+configstore@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/configstore/-/configstore-4.0.0.tgz#5933311e95d3687efb592c528b922d9262d227e7"
+  integrity sha512-CmquAXFBocrzaSM8mtGPMM/HiWmyIpr4CcJl/rgY2uCObZ/S7cKU0silxslqJejl+t/T9HS8E0PUNQD81JGUEQ==
+  dependencies:
+    dot-prop "^4.1.0"
+    graceful-fs "^4.1.2"
+    make-dir "^1.0.0"
+    unique-string "^1.0.0"
+    write-file-atomic "^2.0.0"
+    xdg-basedir "^3.0.0"
+
 consolidate@^0.16.0:
   version "0.16.0"
   resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.16.0.tgz#a11864768930f2f19431660a65906668f5fbdc16"
@@ -462,6 +819,14 @@ consolidate@^0.16.0:
   dependencies:
     bluebird "^3.7.2"
 
+constantinople@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/constantinople/-/constantinople-4.0.1.tgz#0def113fa0e4dc8de83331a5cf79c8b325213151"
+  integrity sha512-vCrqcSIq4//Gx74TXXCGnHpulY1dskqLTFGDmhrGxzeXL8lF8kvXv6mpNWlJj1uD4DW23D4ljAqbY4RRaaUZIw==
+  dependencies:
+    "@babel/parser" "^7.6.0"
+    "@babel/types" "^7.6.1"
+
 contains-path@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a"
@@ -472,6 +837,15 @@ core-util-is@~1.0.0:
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
   integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
+cross-spawn@^5.0.1:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
+  integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=
+  dependencies:
+    lru-cache "^4.0.1"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
 cross-spawn@^7.0.2:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
@@ -481,6 +855,11 @@ cross-spawn@^7.0.2:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
+crypto-random-string@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
+  integrity sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=
+
 cssesc@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
@@ -491,6 +870,13 @@ csstype@^2.6.8:
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.17.tgz#4cf30eb87e1d1a005d8b6510f95292413f6a1c0e"
   integrity sha512-u1wmTI1jJGzCJzWndZo8mk4wnPTZd1eOIYTYvuEyOQGfmDl3TrabCCfKnOC86FZwW/9djqTl933UF/cS425i9A==
 
+currently-unhandled@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
+  integrity sha1-mI3zP+qxke95mmE2nddsF635V+o=
+  dependencies:
+    array-find-index "^1.0.1"
+
 debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
@@ -498,6 +884,13 @@ debug@^2.6.9:
   dependencies:
     ms "2.0.0"
 
+debug@^3.1.0:
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
+  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
+  dependencies:
+    ms "^2.1.1"
+
 debug@^4.0.1, debug@^4.1.1:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
@@ -505,11 +898,41 @@ debug@^4.0.1, debug@^4.1.1:
   dependencies:
     ms "2.1.2"
 
+decamelize-keys@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
+  integrity sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=
+  dependencies:
+    decamelize "^1.1.0"
+    map-obj "^1.0.0"
+
+decamelize@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
+
+decompress-response@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
+  integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=
+  dependencies:
+    mimic-response "^1.0.0"
+
+deep-extend@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
+  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
+
 deep-is@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
   integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
 
+defer-to-connect@^1.0.1:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591"
+  integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==
+
 define-properties@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
@@ -539,12 +962,65 @@ doctrine@^3.0.0:
   dependencies:
     esutils "^2.0.2"
 
-duplexer2@~0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
-  integrity sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=
+doctypes@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/doctypes/-/doctypes-1.1.0.tgz#ea80b106a87538774e8a3a4a5afe293de489e0a9"
+  integrity sha1-6oCxBqh1OHdOijpKWv4pPeSJ4Kk=
+
+dom-serializer@^1.0.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.1.tgz#d845a1565d7c041a95e5dab62184ab41e3a519be"
+  integrity sha512-Pv2ZluG5ife96udGgEDovOOOA5UELkltfJpnIExPrAk1LTvecolUGn6lIaoLh86d83GiB86CjzciMd9BuRB71Q==
   dependencies:
-    readable-stream "^2.0.2"
+    domelementtype "^2.0.1"
+    domhandler "^4.0.0"
+    entities "^2.0.0"
+
+domelementtype@^2.0.1, domelementtype@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57"
+  integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==
+
+domhandler@^4.0.0, domhandler@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.0.tgz#f9768a5f034be60a89a27c2e4d0f74eba0d8b059"
+  integrity sha512-zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA==
+  dependencies:
+    domelementtype "^2.2.0"
+
+domutils@^2.5.2:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.6.0.tgz#2e15c04185d43fb16ae7057cb76433c6edb938b7"
+  integrity sha512-y0BezHuy4MDYxh6OvolXYsH+1EMGmFbwv5FKW7ovwMG6zTPWqNPq3WF9ayZssFq+UlKdffGLbOEaghNdaOm1WA==
+  dependencies:
+    dom-serializer "^1.0.1"
+    domelementtype "^2.2.0"
+    domhandler "^4.2.0"
+
+dot-prop@^4.1.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.1.tgz#45884194a71fc2cda71cbb4bceb3a4dd2f433ba4"
+  integrity sha512-l0p4+mIuJIua0mhxGoh4a+iNL9bmeK5DvnSVQa6T0OhrVmaEa1XScX5Etc673FePCJOArq/4Pa2cLGODUWTPOQ==
+  dependencies:
+    is-obj "^1.0.0"
+
+duplexer3@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
+  integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=
+
+emmet@^2.3.0:
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/emmet/-/emmet-2.3.4.tgz#5ba0d7a5569a68c7697dfa890c772e4f3179d123"
+  integrity sha512-3IqSwmO+N2ZGeuhDyhV/TIOJFUbkChi53bcasSNRE7Yd+4eorbbYz4e53TpMECt38NtYkZNupQCZRlwdAYA42A==
+  dependencies:
+    "@emmetio/abbreviation" "^2.2.2"
+    "@emmetio/css-abbreviation" "^2.1.4"
+
+emoji-regex@^7.0.1:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
+  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
 
 emoji-regex@^8.0.0:
   version "8.0.0"
@@ -556,6 +1032,13 @@ emojis-list@^3.0.0:
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
   integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
 
+end-of-stream@^1.1.0:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
+  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
+  dependencies:
+    once "^1.4.0"
+
 enquirer@^2.3.5:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
@@ -563,7 +1046,12 @@ enquirer@^2.3.5:
   dependencies:
     ansi-colors "^4.1.1"
 
-error-ex@^1.2.0:
+entities@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
+  integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
+
+error-ex@^1.2.0, error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
   integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
@@ -811,6 +1299,24 @@ esutils@^2.0.2:
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
+execa@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
+  integrity sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=
+  dependencies:
+    cross-spawn "^5.0.1"
+    get-stream "^3.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
+extend@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
+
 fast-deep-equal@^3.1.1:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
@@ -845,6 +1351,13 @@ fastq@^1.6.0:
   dependencies:
     reusify "^1.0.4"
 
+fault@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/fault/-/fault-1.0.4.tgz#eafcfc0a6d214fc94601e170df29954a4f842f13"
+  integrity sha512-CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA==
+  dependencies:
+    format "^0.2.0"
+
 file-entry-cache@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
@@ -879,6 +1392,16 @@ flatted@^3.1.0:
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz#c4b489e80096d9df1dfc97c79871aea7c617c469"
   integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==
 
+fn-name@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fn-name/-/fn-name-2.0.1.tgz#5214d7537a4d06a4a301c0cc262feb84188002e7"
+  integrity sha1-UhTXU3pNBqSjAcDMJi/rhBiAAuc=
+
+format@^0.2.0:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/format/-/format-0.2.2.tgz#d6170107e9efdc4ed30c9dc39016df942b5cb58b"
+  integrity sha1-1hcBB+nv3E7TDJ3DkBbflCtctYs=
+
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
@@ -889,16 +1412,6 @@ fsevents@~2.3.1:
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
   integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
 
-fstream@^1.0.12:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045"
-  integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==
-  dependencies:
-    graceful-fs "^4.1.2"
-    inherits "~2.0.0"
-    mkdirp ">=0.5 0"
-    rimraf "2"
-
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
@@ -925,6 +1438,25 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.1:
     has "^1.0.3"
     has-symbols "^1.0.1"
 
+get-stream@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
+  integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
+
+get-stream@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
+  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
+  dependencies:
+    pump "^3.0.0"
+
+get-stream@^5.1.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
+  integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
+  dependencies:
+    pump "^3.0.0"
+
 glob-parent@^5.0.0, glob-parent@^5.1.0:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
@@ -932,7 +1464,7 @@ glob-parent@^5.0.0, glob-parent@^5.1.0:
   dependencies:
     is-glob "^4.0.1"
 
-glob@^7.1.3:
+glob@^7.0.3, glob@^7.1.3:
   version "7.1.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
   integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
@@ -944,6 +1476,13 @@ glob@^7.1.3:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+global-dirs@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445"
+  integrity sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=
+  dependencies:
+    ini "^1.3.4"
+
 globals@^12.1.0:
   version "12.4.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8"
@@ -970,7 +1509,24 @@ globby@^11.0.1:
     merge2 "^1.3.0"
     slash "^3.0.0"
 
-graceful-fs@^4.1.2, graceful-fs@^4.2.2:
+got@^9.6.0:
+  version "9.6.0"
+  resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85"
+  integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==
+  dependencies:
+    "@sindresorhus/is" "^0.14.0"
+    "@szmarczak/http-timer" "^1.1.2"
+    cacheable-request "^6.0.0"
+    decompress-response "^3.3.0"
+    duplexer3 "^0.1.4"
+    get-stream "^4.1.0"
+    lowercase-keys "^1.0.1"
+    mimic-response "^1.0.1"
+    p-cancelable "^1.0.0"
+    to-readable-stream "^1.0.0"
+    url-parse-lax "^3.0.0"
+
+graceful-fs@^4.1.11, graceful-fs@^4.1.2:
   version "4.2.6"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"
   integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==
@@ -995,6 +1551,11 @@ has-symbols@^1.0.1, has-symbols@^1.0.2:
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
   integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
 
+has-yarn@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77"
+  integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==
+
 has@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
@@ -1007,11 +1568,76 @@ hash-sum@^2.0.0:
   resolved "https://registry.yarnpkg.com/hash-sum/-/hash-sum-2.0.0.tgz#81d01bb5de8ea4a214ad5d6ead1b523460b0b45a"
   integrity sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==
 
+hast-util-embedded@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/hast-util-embedded/-/hast-util-embedded-1.0.6.tgz#ea7007323351cc43e19e1d6256b7cde66ad1aa03"
+  integrity sha512-JQMW+TJe0UAIXZMjCJ4Wf6ayDV9Yv3PBDPsHD4ExBpAspJ6MOcCX+nzVF+UJVv7OqPcg852WEMSHQPoRA+FVSw==
+  dependencies:
+    hast-util-is-element "^1.1.0"
+
+hast-util-has-property@^1.0.0, hast-util-has-property@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/hast-util-has-property/-/hast-util-has-property-1.0.4.tgz#9f137565fad6082524b382c1e7d7d33ca5059f36"
+  integrity sha512-ghHup2voGfgFoHMGnaLHOjbYFACKrRh9KFttdCzMCbFoBMJXiNi2+XTrPP8+q6cDJM/RSqlCfVWrjp1H201rZg==
+
+hast-util-is-body-ok-link@^1.0.2:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/hast-util-is-body-ok-link/-/hast-util-is-body-ok-link-1.0.4.tgz#49ab2fad52ef04fe70adcbc95c9fc3a6358c32be"
+  integrity sha512-mFblNpLvFbD8dG2Nw5dJBYZkxIHeph1JAh5yr4huI7T5m8cV0zaXNiqzKPX/JdjA+tIDF7c33u9cxK132KRjyQ==
+  dependencies:
+    hast-util-has-property "^1.0.0"
+    hast-util-is-element "^1.0.0"
+
+hast-util-is-element@^1.0.0, hast-util-is-element@^1.0.3, hast-util-is-element@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/hast-util-is-element/-/hast-util-is-element-1.1.0.tgz#3b3ed5159a2707c6137b48637fbfe068e175a425"
+  integrity sha512-oUmNua0bFbdrD/ELDSSEadRVtWZOf3iF6Lbv81naqsIV99RnSCieTbWuWCY8BAeEfKJTKl0gRdokv+dELutHGQ==
+
+hast-util-parse-selector@^2.2.2:
+  version "2.2.5"
+  resolved "https://registry.yarnpkg.com/hast-util-parse-selector/-/hast-util-parse-selector-2.2.5.tgz#d57c23f4da16ae3c63b3b6ca4616683313499c3a"
+  integrity sha512-7j6mrk/qqkSehsM92wQjdIgWM2/BW61u/53G6xmC8i1OmEdKLHbk419QKQUjz6LglWsfqoiHmyMRkP1BGjecNQ==
+
+hast-util-to-string@^1.0.2:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/hast-util-to-string/-/hast-util-to-string-1.0.4.tgz#9b24c114866bdb9478927d7e9c36a485ac728378"
+  integrity sha512-eK0MxRX47AV2eZ+Lyr18DCpQgodvaS3fAQO2+b9Two9F5HEoRPhiUMNzoXArMJfZi2yieFzUBMRl3HNJ3Jus3w==
+
+hast-util-whitespace@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/hast-util-whitespace/-/hast-util-whitespace-1.0.4.tgz#e4fe77c4a9ae1cb2e6c25e02df0043d0164f6e41"
+  integrity sha512-I5GTdSfhYfAPNztx2xJRQpG8cuDSNt599/7YUn7Gx/WxNMsG+a835k97TDkFgk123cwjfwINaZknkKkphx/f2A==
+
 hosted-git-info@^2.1.4:
   version "2.8.9"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
   integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
 
+html-void-elements@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/html-void-elements/-/html-void-elements-1.0.5.tgz#ce9159494e86d95e45795b166c2021c2cfca4483"
+  integrity sha512-uE/TxKuyNIcx44cIWnjr/rfIATDH7ZaOMmstu0CwhFG1Dunhlp4OC6/NMbhiwoq5BpW0ubi303qnEk/PZj614w==
+
+html-whitespace-sensitive-tag-names@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/html-whitespace-sensitive-tag-names/-/html-whitespace-sensitive-tag-names-1.0.3.tgz#60325c5bd331048d14ced6bac419c89d76cc9dd8"
+  integrity sha512-GX1UguduCBEAEo1hjFxc2Bz04/sDq0ACNyT7LsuoDcPfXYI3nS0NRPp3dyazLJyVUMp3GPBB56i/0Zr6CqD2PQ==
+
+htmlparser2@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7"
+  integrity sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==
+  dependencies:
+    domelementtype "^2.0.1"
+    domhandler "^4.0.0"
+    domutils "^2.5.2"
+    entities "^2.0.0"
+
+http-cache-semantics@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
+  integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
+
 icss-replace-symbols@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
@@ -1022,6 +1648,11 @@ icss-utils@^5.0.0:
   resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae"
   integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==
 
+ignore@^3.2.0:
+  version "3.3.10"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
+  integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==
+
 ignore@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
@@ -1040,11 +1671,21 @@ import-fresh@^3.0.0, import-fresh@^3.2.1:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
 
+import-lazy@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
+  integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=
+
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
   integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
 
+indent-string@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
+  integrity sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=
+
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
@@ -1053,11 +1694,29 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@~2.0.0, inherits@~2.0.3:
+inherits@2, inherits@^2.0.3, inherits@~2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
+ini@^1.3.4, ini@~1.3.0:
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
+  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
+
+is-alphabetical@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.4.tgz#9e7d6b94916be22153745d184c298cbf986a686d"
+  integrity sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==
+
+is-alphanumerical@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz#7eb9a2431f855f6b1ef1a78e326df515696c4dbf"
+  integrity sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==
+  dependencies:
+    is-alphabetical "^1.0.0"
+    is-decimal "^1.0.0"
+
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
@@ -1075,11 +1734,23 @@ is-boolean-object@^1.1.0:
   dependencies:
     call-bind "^1.0.0"
 
+is-buffer@^2.0.0:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191"
+  integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==
+
 is-callable@^1.1.4, is-callable@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e"
   integrity sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==
 
+is-ci@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
+  integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==
+  dependencies:
+    ci-info "^2.0.0"
+
 is-core-module@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.3.0.tgz#d341652e3408bca69c4671b79a0954a3d349f887"
@@ -1092,11 +1763,34 @@ is-date-object@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"
   integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==
 
+is-decimal@^1.0.0, is-decimal@^1.0.2:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5"
+  integrity sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==
+
+is-empty@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/is-empty/-/is-empty-1.2.0.tgz#de9bb5b278738a05a0b09a57e1fb4d4a341a9f6b"
+  integrity sha1-3pu1snhzigWgsJpX4ftNSjQan2s=
+
+is-expression@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-expression/-/is-expression-4.0.0.tgz#c33155962abf21d0afd2552514d67d2ec16fd2ab"
+  integrity sha512-zMIXX63sxzG3XrkHkrAPvm/OVZVSCPNkwMHU8oTX7/U3AL78I0QXCEICXUM13BIa8TYGZ68PiTKfQz3yaTNr4A==
+  dependencies:
+    acorn "^7.1.1"
+    object-assign "^4.1.1"
+
 is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
+is-fullwidth-code-point@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
+
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
@@ -1109,11 +1803,34 @@ is-glob@^4.0.0, is-glob@^4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
+is-hexadecimal@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7"
+  integrity sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==
+
+is-hidden@^1.0.1, is-hidden@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/is-hidden/-/is-hidden-1.1.3.tgz#82e84cc7dbfffae42424d72037f80417f3b5e103"
+  integrity sha512-FFzhGKA9h59OFxeaJl0W5ILTYetI8WsdqdofKr69uLKZdV6hbDKxj8vkpG3L9uS/6Q/XYh1tkXm6xwRGFweETA==
+
+is-installed-globally@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz#0dfd98f5a9111716dd535dda6492f67bf3d25a80"
+  integrity sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=
+  dependencies:
+    global-dirs "^0.1.0"
+    is-path-inside "^1.0.0"
+
 is-negative-zero@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
   integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==
 
+is-npm@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-3.0.0.tgz#ec9147bfb629c43f494cf67936a961edec7e8053"
+  integrity sha512-wsigDr1Kkschp2opC4G3yA6r9EgVA6NjRpWzIi9axXqeIaAATPRJc4uLujXe3Nd9uO8KoDyA4MD6aZSeXTADhA==
+
 is-number-object@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz#36ac95e741cf18b283fc1ddf5e83da798e3ec197"
@@ -1124,7 +1841,34 @@ is-number@^7.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
-is-regex@^1.1.2:
+is-obj@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
+  integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
+
+is-object@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.2.tgz#a56552e1c665c9e950b4a025461da87e72f86fcf"
+  integrity sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==
+
+is-path-inside@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
+  integrity sha1-jvW33lBDej/cprToZe96pVy0gDY=
+  dependencies:
+    path-is-inside "^1.0.1"
+
+is-plain-obj@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+  integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
+
+is-promise@^2.0.0:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1"
+  integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==
+
+is-regex@^1.0.3, is-regex@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.2.tgz#81c8ebde4db142f2cf1c53fc86d6a45788266251"
   integrity sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==
@@ -1132,6 +1876,11 @@ is-regex@^1.1.2:
     call-bind "^1.0.2"
     has-symbols "^1.0.1"
 
+is-stream@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
+
 is-string@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"
@@ -1144,6 +1893,11 @@ is-symbol@^1.0.2, is-symbol@^1.0.3:
   dependencies:
     has-symbols "^1.0.1"
 
+is-yarn-global@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232"
+  integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==
+
 isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
@@ -1154,12 +1908,17 @@ isexe@^2.0.0:
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
+js-stringify@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/js-stringify/-/js-stringify-1.0.2.tgz#1736fddfd9724f28a3682adc6230ae7e4e9679db"
+  integrity sha1-Fzb939lyTyijaCrcYjCufk6Weds=
+
 js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@^3.13.1:
+js-yaml@^3.13.1, js-yaml@^3.6.1:
   version "3.14.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
   integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
@@ -1167,6 +1926,16 @@ js-yaml@^3.13.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
+json-buffer@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
+  integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=
+
+json-parse-better-errors@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
+  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
+
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
@@ -1189,6 +1958,38 @@ json5@^1.0.1:
   dependencies:
     minimist "^1.2.0"
 
+jsonc-parser@^2.3.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.3.1.tgz#59549150b133f2efacca48fe9ce1ec0659af2342"
+  integrity sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg==
+
+jsonc-parser@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.0.0.tgz#abdd785701c7e7eaca8a9ec8cf070ca51a745a22"
+  integrity sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==
+
+jstransformer@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/jstransformer/-/jstransformer-1.0.0.tgz#ed8bf0921e2f3f1ed4d5c1a44f68709ed24722c3"
+  integrity sha1-7Yvwkh4vPx7U1cGkT2hwntJHIsM=
+  dependencies:
+    is-promise "^2.0.0"
+    promise "^7.0.1"
+
+keyv@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9"
+  integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==
+  dependencies:
+    json-buffer "3.0.0"
+
+latest-version@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face"
+  integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==
+  dependencies:
+    package-json "^6.3.0"
+
 levn@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
@@ -1197,11 +1998,6 @@ levn@^0.4.1:
     prelude-ls "^1.2.1"
     type-check "~0.4.0"
 
-listenercount@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/listenercount/-/listenercount-1.0.1.tgz#84c8a72ab59c4725321480c975e6508342e70937"
-  integrity sha1-hMinKrWcRyUyFIDJdeZQg0LnCTc=
-
 load-json-file@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
@@ -1212,6 +2008,24 @@ load-json-file@^2.0.0:
     pify "^2.0.0"
     strip-bom "^3.0.0"
 
+load-json-file@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
+  integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs=
+  dependencies:
+    graceful-fs "^4.1.2"
+    parse-json "^4.0.0"
+    pify "^3.0.0"
+    strip-bom "^3.0.0"
+
+load-plugin@^2.0.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/load-plugin/-/load-plugin-2.3.1.tgz#8024739afb4aa04de1e602e15e5b1a678c443d00"
+  integrity sha512-dYB1lbwqHgPTrruy9glukCu8Ya9vzj6TMfouCtj2H/GuJ+8syioisgKTBPxnCi6m8K8jINKfTOxOHngFkUYqHw==
+  dependencies:
+    npm-prefix "^1.2.0"
+    resolve-from "^5.0.0"
+
 loader-utils@^1.1.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
@@ -1244,6 +2058,11 @@ lodash.flatten@^4.4.0:
   resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
   integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=
 
+lodash.iteratee@^4.5.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/lodash.iteratee/-/lodash.iteratee-4.7.0.tgz#be4177db289a8ccc3c0990f1db26b5b22fc1554c"
+  integrity sha1-vkF32yiajMw8CZDx2ya1si/BVUw=
+
 lodash.truncate@^4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
@@ -1254,6 +2073,32 @@ lodash@^4.17.15, lodash@^4.17.21:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
+loud-rejection@^1.0.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
+  integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=
+  dependencies:
+    currently-unhandled "^0.4.1"
+    signal-exit "^3.0.0"
+
+lowercase-keys@^1.0.0, lowercase-keys@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
+  integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
+
+lowercase-keys@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
+  integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==
+
+lru-cache@^4.0.1:
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
+  integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
+  dependencies:
+    pseudomap "^1.0.2"
+    yallist "^2.1.2"
+
 lru-cache@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
@@ -1275,6 +2120,38 @@ magic-string@^0.25.7:
   dependencies:
     sourcemap-codec "^1.4.4"
 
+make-dir@^1.0.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
+  integrity sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==
+  dependencies:
+    pify "^3.0.0"
+
+map-obj@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
+  integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
+
+map-obj@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-2.0.0.tgz#a65cd29087a92598b8791257a523e021222ac1f9"
+  integrity sha1-plzSkIepJZi4eRJXpSPgISIqwfk=
+
+meow@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/meow/-/meow-5.0.0.tgz#dfc73d63a9afc714a5e371760eb5c88b91078aa4"
+  integrity sha512-CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig==
+  dependencies:
+    camelcase-keys "^4.0.0"
+    decamelize-keys "^1.0.0"
+    loud-rejection "^1.0.0"
+    minimist-options "^3.0.1"
+    normalize-package-data "^2.3.4"
+    read-pkg-up "^3.0.0"
+    redent "^2.0.0"
+    trim-newlines "^2.0.0"
+    yargs-parser "^10.0.0"
+
 merge-source-map@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz#2fdde7e6020939f70906a68f2d7ae685e4c8c646"
@@ -1295,6 +2172,11 @@ micromatch@^4.0.2:
     braces "^3.0.1"
     picomatch "^2.2.3"
 
+mimic-response@^1.0.0, mimic-response@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
+  integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
+
 minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
@@ -1302,18 +2184,19 @@ minimatch@^3.0.4:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist@^1.2.0, minimist@^1.2.5:
+minimist-options@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-3.0.2.tgz#fba4c8191339e13ecf4d61beb03f070103f3d954"
+  integrity sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==
+  dependencies:
+    arrify "^1.0.1"
+    is-plain-obj "^1.1.0"
+
+minimist@^1.2.0:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
-"mkdirp@>=0.5 0":
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
-  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
-  dependencies:
-    minimist "^1.2.5"
-
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -1324,6 +2207,11 @@ ms@2.1.2:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
+ms@^2.1.1:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
+
 nanoid@^3.1.22:
   version "3.1.22"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.22.tgz#b35f8fb7d151990a8aebd5aa5015c03cf726f844"
@@ -1334,7 +2222,7 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
-normalize-package-data@^2.3.2:
+normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
   integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
@@ -1344,6 +2232,32 @@ normalize-package-data@^2.3.2:
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
+normalize-url@^4.1.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.0.tgz#453354087e6ca96957bd8f5baf753f5982142129"
+  integrity sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==
+
+npm-prefix@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/npm-prefix/-/npm-prefix-1.2.0.tgz#e619455f7074ba54cc66d6d0d37dd9f1be6bcbc0"
+  integrity sha1-5hlFX3B0ulTMZtbQ033Z8b5ry8A=
+  dependencies:
+    rc "^1.1.0"
+    shellsubstitute "^1.1.0"
+    untildify "^2.1.0"
+
+npm-run-path@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
+  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
+  dependencies:
+    path-key "^2.0.0"
+
+object-assign@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
+
 object-inspect@^1.9.0:
   version "1.10.2"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.2.tgz#b6385a3e2b7cae0b5eafcf90cddf85d128767f30"
@@ -1374,7 +2288,7 @@ object.values@^1.1.1:
     es-abstract "^1.18.0-next.2"
     has "^1.0.3"
 
-once@^1.3.0:
+once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
@@ -1393,6 +2307,21 @@ optionator@^0.9.1:
     type-check "^0.4.0"
     word-wrap "^1.2.3"
 
+os-homedir@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
+
+p-cancelable@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
+  integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==
+
+p-finally@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
+
 p-limit@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
@@ -1412,6 +2341,16 @@ p-try@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
   integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
 
+package-json@^6.3.0:
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0"
+  integrity sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==
+  dependencies:
+    got "^9.6.0"
+    registry-auth-token "^4.0.0"
+    registry-url "^5.0.0"
+    semver "^6.2.0"
+
 parent-module@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
@@ -1426,6 +2365,14 @@ parse-json@^2.2.0:
   dependencies:
     error-ex "^1.2.0"
 
+parse-json@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
+  integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=
+  dependencies:
+    error-ex "^1.3.1"
+    json-parse-better-errors "^1.0.1"
+
 path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
@@ -1436,6 +2383,16 @@ path-is-absolute@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
+path-is-inside@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
+  integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
+
+path-key@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
+
 path-key@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
@@ -1453,6 +2410,13 @@ path-type@^2.0.0:
   dependencies:
     pify "^2.0.0"
 
+path-type@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
+  integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
+  dependencies:
+    pify "^3.0.0"
+
 path-type@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
@@ -1468,6 +2432,11 @@ pify@^2.0.0:
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
   integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
 
+pify@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
+
 pkg-dir@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
@@ -1544,6 +2513,16 @@ prelude-ls@^1.2.1:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
+prepend-http@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
+  integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
+
+prettier@^1.16.4, prettier@^1.18.2:
+  version "1.19.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
+  integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
+
 process-nextick-args@~2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
@@ -1554,6 +2533,141 @@ progress@^2.0.0:
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
+promise@^7.0.1:
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
+  integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
+  dependencies:
+    asap "~2.0.3"
+
+property-information@^5.1.0:
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/property-information/-/property-information-5.6.0.tgz#61675545fb23002f245c6540ec46077d4da3ed69"
+  integrity sha512-YUHSPk+A30YPv+0Qf8i9Mbfe/C0hdPXk1s1jPVToV8pk8BQtpw10ct89Eo7OWkutrwqvT0eicAxlOg3dOAu8JA==
+  dependencies:
+    xtend "^4.0.0"
+
+pseudomap@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
+  integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
+
+pug-attrs@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pug-attrs/-/pug-attrs-3.0.0.tgz#b10451e0348165e31fad1cc23ebddd9dc7347c41"
+  integrity sha512-azINV9dUtzPMFQktvTXciNAfAuVh/L/JCl0vtPCwvOA21uZrC08K/UnmrL+SXGEVc1FwzjW62+xw5S/uaLj6cA==
+  dependencies:
+    constantinople "^4.0.1"
+    js-stringify "^1.0.2"
+    pug-runtime "^3.0.0"
+
+pug-beautify@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/pug-beautify/-/pug-beautify-0.1.1.tgz#df7fbc70ee80c18a6422dffab2fe508188cdcc18"
+  integrity sha1-33+8cO6AwYpkIt/6sv5QgYjNzBg=
+
+pug-code-gen@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/pug-code-gen/-/pug-code-gen-3.0.2.tgz#ad190f4943133bf186b60b80de483100e132e2ce"
+  integrity sha512-nJMhW16MbiGRiyR4miDTQMRWDgKplnHyeLvioEJYbk1RsPI3FuA3saEP8uwnTb2nTJEKBU90NFVWJBk4OU5qyg==
+  dependencies:
+    constantinople "^4.0.1"
+    doctypes "^1.1.0"
+    js-stringify "^1.0.2"
+    pug-attrs "^3.0.0"
+    pug-error "^2.0.0"
+    pug-runtime "^3.0.0"
+    void-elements "^3.1.0"
+    with "^7.0.0"
+
+pug-error@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pug-error/-/pug-error-2.0.0.tgz#5c62173cb09c34de2a2ce04f17b8adfec74d8ca5"
+  integrity sha512-sjiUsi9M4RAGHktC1drQfCr5C5eriu24Lfbt4s+7SykztEOwVZtbFk1RRq0tzLxcMxMYTBR+zMQaG07J/btayQ==
+
+pug-filters@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/pug-filters/-/pug-filters-4.0.0.tgz#d3e49af5ba8472e9b7a66d980e707ce9d2cc9b5e"
+  integrity sha512-yeNFtq5Yxmfz0f9z2rMXGw/8/4i1cCFecw/Q7+D0V2DdtII5UvqE12VaZ2AY7ri6o5RNXiweGH79OCq+2RQU4A==
+  dependencies:
+    constantinople "^4.0.1"
+    jstransformer "1.0.0"
+    pug-error "^2.0.0"
+    pug-walk "^2.0.0"
+    resolve "^1.15.1"
+
+pug-lexer@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/pug-lexer/-/pug-lexer-5.0.1.tgz#ae44628c5bef9b190b665683b288ca9024b8b0d5"
+  integrity sha512-0I6C62+keXlZPZkOJeVam9aBLVP2EnbeDw3An+k0/QlqdwH6rv8284nko14Na7c0TtqtogfWXcRoFE4O4Ff20w==
+  dependencies:
+    character-parser "^2.2.0"
+    is-expression "^4.0.0"
+    pug-error "^2.0.0"
+
+pug-linker@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/pug-linker/-/pug-linker-4.0.0.tgz#12cbc0594fc5a3e06b9fc59e6f93c146962a7708"
+  integrity sha512-gjD1yzp0yxbQqnzBAdlhbgoJL5qIFJw78juN1NpTLt/mfPJ5VgC4BvkoD3G23qKzJtIIXBbcCt6FioLSFLOHdw==
+  dependencies:
+    pug-error "^2.0.0"
+    pug-walk "^2.0.0"
+
+pug-load@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pug-load/-/pug-load-3.0.0.tgz#9fd9cda52202b08adb11d25681fb9f34bd41b662"
+  integrity sha512-OCjTEnhLWZBvS4zni/WUMjH2YSUosnsmjGBB1An7CsKQarYSWQ0GCVyd4eQPMFJqZ8w9xgs01QdiZXKVjk92EQ==
+  dependencies:
+    object-assign "^4.1.1"
+    pug-walk "^2.0.0"
+
+pug-parser@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/pug-parser/-/pug-parser-6.0.0.tgz#a8fdc035863a95b2c1dc5ebf4ecf80b4e76a1260"
+  integrity sha512-ukiYM/9cH6Cml+AOl5kETtM9NR3WulyVP2y4HOU45DyMim1IeP/OOiyEWRr6qk5I5klpsBnbuHpwKmTx6WURnw==
+  dependencies:
+    pug-error "^2.0.0"
+    token-stream "1.0.0"
+
+pug-runtime@^3.0.0, pug-runtime@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/pug-runtime/-/pug-runtime-3.0.1.tgz#f636976204723f35a8c5f6fad6acda2a191b83d7"
+  integrity sha512-L50zbvrQ35TkpHwv0G6aLSuueDRwc/97XdY8kL3tOT0FmhgG7UypU3VztfV/LATAvmUfYi4wNxSajhSAeNN+Kg==
+
+pug-strip-comments@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pug-strip-comments/-/pug-strip-comments-2.0.0.tgz#f94b07fd6b495523330f490a7f554b4ff876303e"
+  integrity sha512-zo8DsDpH7eTkPHCXFeAk1xZXJbyoTfdPlNR0bK7rpOMuhBYb0f5qUVCO1xlsitYd3w5FQTK7zpNVKb3rZoUrrQ==
+  dependencies:
+    pug-error "^2.0.0"
+
+pug-walk@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pug-walk/-/pug-walk-2.0.0.tgz#417aabc29232bb4499b5b5069a2b2d2a24d5f5fe"
+  integrity sha512-yYELe9Q5q9IQhuvqsZNwA5hfPkMJ8u92bQLIMcsMxf/VADjNtEYptU+inlufAFYcWdHlwNfZOEnOOQrZrcyJCQ==
+
+pug@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/pug/-/pug-3.0.2.tgz#f35c7107343454e43bc27ae0ff76c731b78ea535"
+  integrity sha512-bp0I/hiK1D1vChHh6EfDxtndHji55XP/ZJKwsRqrz6lRia6ZC2OZbdAymlxdVFwd1L70ebrVJw4/eZ79skrIaw==
+  dependencies:
+    pug-code-gen "^3.0.2"
+    pug-filters "^4.0.0"
+    pug-lexer "^5.0.1"
+    pug-linker "^4.0.0"
+    pug-load "^3.0.0"
+    pug-parser "^6.0.0"
+    pug-runtime "^3.0.1"
+    pug-strip-comments "^2.0.0"
+
+pump@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
 punycode@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
@@ -1564,6 +2678,21 @@ queue-microtask@^1.2.2:
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
   integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
 
+quick-lru@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"
+  integrity sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=
+
+rc@^1.1.0, rc@^1.2.8:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
+  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
+  dependencies:
+    deep-extend "^0.6.0"
+    ini "~1.3.0"
+    minimist "^1.2.0"
+    strip-json-comments "~2.0.1"
+
 read-pkg-up@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
@@ -1572,6 +2701,14 @@ read-pkg-up@^2.0.0:
     find-up "^2.0.0"
     read-pkg "^2.0.0"
 
+read-pkg-up@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
+  integrity sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=
+  dependencies:
+    find-up "^2.0.0"
+    read-pkg "^3.0.0"
+
 read-pkg@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
@@ -1581,7 +2718,16 @@ read-pkg@^2.0.0:
     normalize-package-data "^2.3.2"
     path-type "^2.0.0"
 
-readable-stream@^2.0.2, readable-stream@~2.3.6:
+read-pkg@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
+  integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=
+  dependencies:
+    load-json-file "^4.0.0"
+    normalize-package-data "^2.3.2"
+    path-type "^3.0.0"
+
+readable-stream@^2.2.2:
   version "2.3.7"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
   integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@@ -1594,11 +2740,52 @@ readable-stream@^2.0.2, readable-stream@~2.3.6:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
+redent@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/redent/-/redent-2.0.0.tgz#c1b2007b42d57eb1389079b3c8333639d5e1ccaa"
+  integrity sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=
+  dependencies:
+    indent-string "^3.0.0"
+    strip-indent "^2.0.0"
+
 regexpp@^3.0.0, regexpp@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"
   integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==
 
+registry-auth-token@^4.0.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250"
+  integrity sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==
+  dependencies:
+    rc "^1.2.8"
+
+registry-url@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009"
+  integrity sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==
+  dependencies:
+    rc "^1.2.8"
+
+rehype-sort-attribute-values@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/rehype-sort-attribute-values/-/rehype-sort-attribute-values-2.0.1.tgz#2bb66a50e58f986368af14e9664fc720298da7d5"
+  integrity sha512-DitR4wnEvYQEFU8pRPwldGMGW76LM29fvz8s7oTYMwZBMSqNFtBr8eAts/I55LODCQm6b4jzdgFQ+/c6v7RmdA==
+  dependencies:
+    hast-util-is-element "^1.0.0"
+    unist-util-visit "^1.1.0"
+    x-is-array "^0.1.0"
+
+repeat-string@^1.5.0, repeat-string@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
+
+replace-ext@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"
+  integrity sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=
+
 require-from-string@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
@@ -1609,7 +2796,12 @@ resolve-from@^4.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
-resolve@^1.10.0, resolve@^1.10.1, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.19.0:
+resolve-from@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
+  integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
+
+resolve@^1.10.0, resolve@^1.10.1, resolve@^1.13.1, resolve@^1.15.1, resolve@^1.17.0, resolve@^1.19.0:
   version "1.20.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
   integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
@@ -1617,18 +2809,18 @@ resolve@^1.10.0, resolve@^1.10.1, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.1
     is-core-module "^2.2.0"
     path-parse "^1.0.6"
 
+responselike@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
+  integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=
+  dependencies:
+    lowercase-keys "^1.0.0"
+
 reusify@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
-rimraf@2:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
-  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
-  dependencies:
-    glob "^7.1.3"
-
 rimraf@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
@@ -1655,12 +2847,19 @@ safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-"semver@2 || 3 || 4 || 5":
+semver-diff@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"
+  integrity sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=
+  dependencies:
+    semver "^5.0.3"
+
+"semver@2 || 3 || 4 || 5", semver@^5.0.3:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-semver@^6.1.0:
+semver@^6.1.0, semver@^6.2.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
@@ -1672,10 +2871,12 @@ semver@^7.2.1, semver@^7.3.2:
   dependencies:
     lru-cache "^6.0.0"
 
-setimmediate@~1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
-  integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
+shebang-command@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
+  dependencies:
+    shebang-regex "^1.0.0"
 
 shebang-command@^2.0.0:
   version "2.0.0"
@@ -1684,11 +2885,26 @@ shebang-command@^2.0.0:
   dependencies:
     shebang-regex "^3.0.0"
 
+shebang-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
+
 shebang-regex@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
+shellsubstitute@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/shellsubstitute/-/shellsubstitute-1.2.0.tgz#e4f702a50c518b0f6fe98451890d705af29b6b70"
+  integrity sha1-5PcCpQxRiw9v6YRRiQ1wWvKba3A=
+
+signal-exit@^3.0.0, signal-exit@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
+  integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
+
 slash@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
@@ -1713,6 +2929,11 @@ sourcemap-codec@^1.4.4:
   resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
   integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
 
+space-separated-tokens@^1.1.4:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-1.1.5.tgz#85f32c3d10d9682007e917414ddc5c26d1aa6899"
+  integrity sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA==
+
 spdx-correct@^3.0.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
@@ -1749,7 +2970,24 @@ string-hash@^1.1.1:
   resolved "https://registry.yarnpkg.com/string-hash/-/string-hash-1.1.3.tgz#e8aafc0ac1855b4666929ed7dd1275df5d6c811b"
   integrity sha1-6Kr8CsGFW0Zmkp7X3RJ1311sgRs=
 
-string-width@^4.2.0:
+string-width@^2.0.0, string-width@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^4.0.0"
+
+string-width@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
+  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
+  dependencies:
+    emoji-regex "^7.0.1"
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^5.1.0"
+
+string-width@^4.0.0, string-width@^4.2.0:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"
   integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==
@@ -1781,6 +3019,31 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
+stringify-entities@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/stringify-entities/-/stringify-entities-2.0.0.tgz#fa7ca6614b355fb6c28448140a20c4ede7462827"
+  integrity sha512-fqqhZzXyAM6pGD9lky/GOPq6V4X0SeTAFBl0iXb/BzOegl40gpf/bV3QQP7zULNYvjr6+Dx8SCaDULjVoOru0A==
+  dependencies:
+    character-entities-html4 "^1.0.0"
+    character-entities-legacy "^1.0.0"
+    is-alphanumerical "^1.0.0"
+    is-decimal "^1.0.2"
+    is-hexadecimal "^1.0.0"
+
+strip-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
+  dependencies:
+    ansi-regex "^3.0.0"
+
+strip-ansi@^5.1.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
+  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
+  dependencies:
+    ansi-regex "^4.1.0"
+
 strip-ansi@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
@@ -1793,18 +3056,40 @@ strip-bom@^3.0.0:
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
   integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
 
+strip-eof@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
+
+strip-indent@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
+  integrity sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=
+
 strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
-supports-color@^5.3.0:
+strip-json-comments@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
+
+supports-color@^5.0.0, supports-color@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
   integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
   dependencies:
     has-flag "^3.0.0"
 
+supports-color@^6.0.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
+  integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
+  dependencies:
+    has-flag "^3.0.0"
+
 supports-color@^7.1.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
@@ -1825,6 +3110,13 @@ table@^6.0.4:
     string-width "^4.2.0"
     strip-ansi "^6.0.0"
 
+term-size@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69"
+  integrity sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=
+  dependencies:
+    execa "^0.7.0"
+
 text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
@@ -1835,6 +3127,11 @@ to-fast-properties@^2.0.0:
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
   integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
 
+to-readable-stream@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771"
+  integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==
+
 to-regex-range@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
@@ -1842,10 +3139,36 @@ to-regex-range@^5.0.1:
   dependencies:
     is-number "^7.0.0"
 
-"traverse@>=0.3.0 <0.4":
-  version "0.3.9"
-  resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.3.9.tgz#717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9"
-  integrity sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=
+to-vfile@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/to-vfile/-/to-vfile-4.0.0.tgz#465ade5fc2b9e97e6c80b854d378a5d0f4b5d04a"
+  integrity sha512-Y7EDM+uoU8TZxF5ej2mUR0dLO4qbuuNRnJKxEht2QJWEq2421pyG1D1x8YxPKmyTc6nHh7Td/jLGFxYo+9vkLA==
+  dependencies:
+    is-buffer "^2.0.0"
+    vfile "^3.0.0"
+
+to-vfile@^6.0.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/to-vfile/-/to-vfile-6.1.0.tgz#5f7a3f65813c2c4e34ee1f7643a5646344627699"
+  integrity sha512-BxX8EkCxOAZe+D/ToHdDsJcVI4HqQfmw0tCkp31zf3dNP/XWIAjU4CmeuSwsSoOzOTqHPOL0KUzyZqJplkD0Qw==
+  dependencies:
+    is-buffer "^2.0.0"
+    vfile "^4.0.0"
+
+token-stream@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/token-stream/-/token-stream-1.0.0.tgz#cc200eab2613f4166d27ff9afc7ca56d49df6eb4"
+  integrity sha1-zCAOqyYT9BZtJ/+a/HylbUnfbrQ=
+
+trim-newlines@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-2.0.0.tgz#b403d0b91be50c331dfc4b82eeceb22c3de16d20"
+  integrity sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=
+
+trough@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406"
+  integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==
 
 tsconfig-paths@^3.9.0:
   version "3.9.0"
@@ -1881,11 +3204,26 @@ type-fest@^0.20.2:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
   integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
 
+type-fest@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.3.1.tgz#63d00d204e059474fe5e1b7c011112bbd1dc29e1"
+  integrity sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==
+
 type-fest@^0.8.1:
   version "0.8.1"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
   integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
 
+typedarray@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
+
+typescript-vscode-sh-plugin@^0.6.14:
+  version "0.6.14"
+  resolved "https://registry.yarnpkg.com/typescript-vscode-sh-plugin/-/typescript-vscode-sh-plugin-0.6.14.tgz#a81031b502f6346a26ea49ce082438c3e353bb38"
+  integrity sha512-AkNlRBbI6K7gk29O92qthNSvc6jjmNQ6isVXoYxkFwPa8D04tIv2SOPd+sd+mNpso4tNdL2gy7nVtrd5yFqvlA==
+
 typescript@^4.1.3:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.4.tgz#8610b59747de028fda898a8aef0e103f156d0961"
@@ -1901,21 +3239,139 @@ unbox-primitive@^1.0.0:
     has-symbols "^1.0.2"
     which-boxed-primitive "^1.0.2"
 
-unzipper@0.10.11:
-  version "0.10.11"
-  resolved "https://registry.yarnpkg.com/unzipper/-/unzipper-0.10.11.tgz#0b4991446472cbdb92ee7403909f26c2419c782e"
-  integrity sha512-+BrAq2oFqWod5IESRjL3S8baohbevGcVA+teAIOYWM3pDVdseogqbzhhvvmiyQrUNKFUnDMtELW3X8ykbyDCJw==
+unified-engine@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/unified-engine/-/unified-engine-6.0.1.tgz#22236f1d253a6d07b6605eca83a2bcce08fc6f05"
+  integrity sha512-iDJYH82TgcezQA4IZzhCNJQx7vBsGk4h9s4Q7Fscrb3qcPsxBqVrVNYez2W3sBVTxuU1bFAhyRpA6ba/R4j93A==
   dependencies:
-    big-integer "^1.6.17"
-    binary "~0.3.0"
-    bluebird "~3.4.1"
-    buffer-indexof-polyfill "~1.0.0"
-    duplexer2 "~0.1.4"
-    fstream "^1.0.12"
-    graceful-fs "^4.2.2"
-    listenercount "~1.0.1"
-    readable-stream "~2.3.6"
-    setimmediate "~1.0.4"
+    concat-stream "^1.5.1"
+    debug "^3.1.0"
+    fault "^1.0.0"
+    fn-name "^2.0.1"
+    glob "^7.0.3"
+    ignore "^3.2.0"
+    is-empty "^1.0.0"
+    is-hidden "^1.0.1"
+    is-object "^1.0.1"
+    js-yaml "^3.6.1"
+    load-plugin "^2.0.0"
+    parse-json "^4.0.0"
+    to-vfile "^4.0.0"
+    trough "^1.0.0"
+    unist-util-inspect "^4.1.2"
+    vfile-reporter "^5.0.0"
+    vfile-statistics "^1.1.0"
+    x-is-string "^0.1.0"
+    xtend "^4.0.1"
+
+unified@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/unified/-/unified-7.1.0.tgz#5032f1c1ee3364bd09da12e27fdd4a7553c7be13"
+  integrity sha512-lbk82UOIGuCEsZhPj8rNAkXSDXd6p0QLzIuSsCdxrqnqU56St4eyOB+AlXsVgVeRmetPTYydIuvFfpDIed8mqw==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    "@types/vfile" "^3.0.0"
+    bail "^1.0.0"
+    extend "^3.0.0"
+    is-plain-obj "^1.1.0"
+    trough "^1.0.0"
+    vfile "^3.0.0"
+    x-is-string "^0.1.0"
+
+unique-string@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a"
+  integrity sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=
+  dependencies:
+    crypto-random-string "^1.0.0"
+
+unist-util-find@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/unist-util-find/-/unist-util-find-1.0.2.tgz#4d5b01a69fca2a382ad4f55f9865e402129ecf56"
+  integrity sha512-ft06UDYzqi9o9RmGP0sZWI/zvLLQiBW2/MD+rW6mDqbOWDcmknGX9orQPspfuGRYWr8eSJAmfsBcvOpfGRJseA==
+  dependencies:
+    lodash.iteratee "^4.5.0"
+    unist-util-visit "^1.1.0"
+
+unist-util-inspect@^4.1.2:
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/unist-util-inspect/-/unist-util-inspect-4.1.4.tgz#fefc4794445d0f79bffea7a2421c6f556e73a37c"
+  integrity sha512-7xxyvKiZ1SC9vL5qrMqKub1T31gRHfau4242F69CcaOrXt//5PmRVOmDZ36UAEgiT+tZWzmQmbNZn+mVtnR9HQ==
+  dependencies:
+    is-empty "^1.0.0"
+
+unist-util-is@^2.1.3:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-2.1.3.tgz#459182db31f4742fceaea88d429693cbf0043d20"
+  integrity sha512-4WbQX2iwfr/+PfM4U3zd2VNXY+dWtZsN1fLnWEi2QQXA4qyDYAZcDMfXUX0Cu6XZUHHAO9q4nyxxLT4Awk1qUA==
+
+unist-util-is@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-3.0.0.tgz#d9e84381c2468e82629e4a5be9d7d05a2dd324cd"
+  integrity sha512-sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A==
+
+unist-util-modify-children@^1.1.4:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/unist-util-modify-children/-/unist-util-modify-children-1.1.6.tgz#1587130ca0ab5c56155fa60837ff524c3fbfbfaa"
+  integrity sha512-TOA6W9QLil+BrHqIZNR4o6IA5QwGOveMbnQxnWYq+7EFORx9vz/CHrtzF36zWrW61E2UKw7sM1KPtIgeceVwXw==
+  dependencies:
+    array-iterate "^1.0.0"
+
+unist-util-stringify-position@^1.0.0, unist-util-stringify-position@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-1.1.2.tgz#3f37fcf351279dcbca7480ab5889bb8a832ee1c6"
+  integrity sha512-pNCVrk64LZv1kElr0N1wPiHEUoXNVFERp+mlTg/s9R5Lwg87f9bM/3sQB99w+N9D/qnM9ar3+AKDBwo/gm/iQQ==
+
+unist-util-stringify-position@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz#cce3bfa1cdf85ba7375d1d5b17bdc4cada9bd9da"
+  integrity sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==
+  dependencies:
+    "@types/unist" "^2.0.2"
+
+unist-util-visit-parents@^2.0.0, unist-util-visit-parents@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-2.1.2.tgz#25e43e55312166f3348cae6743588781d112c1e9"
+  integrity sha512-DyN5vD4NE3aSeB+PXYNKxzGsfocxp6asDc2XXE3b0ekO2BaRUpBicbbUygfSvYfUz1IkmjFR1YF7dPklraMZ2g==
+  dependencies:
+    unist-util-is "^3.0.0"
+
+unist-util-visit@^1.1.0, unist-util-visit@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-1.4.1.tgz#4724aaa8486e6ee6e26d7ff3c8685960d560b1e3"
+  integrity sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==
+  dependencies:
+    unist-util-visit-parents "^2.0.0"
+
+untildify@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/untildify/-/untildify-2.1.0.tgz#17eb2807987f76952e9c0485fc311d06a826a2e0"
+  integrity sha1-F+soB5h/dpUunASF/DEdBqgmouA=
+  dependencies:
+    os-homedir "^1.0.0"
+
+upath@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/upath/-/upath-2.0.1.tgz#50c73dea68d6f6b990f51d279ce6081665d61a8b"
+  integrity sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w==
+
+update-notifier@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-3.0.1.tgz#78ecb68b915e2fd1be9f767f6e298ce87b736250"
+  integrity sha512-grrmrB6Zb8DUiyDIaeRTBCkgISYUgETNe7NglEbVsrLWXeESnlCSP50WfRSj/GmzMPl6Uchj24S/p80nP/ZQrQ==
+  dependencies:
+    boxen "^3.0.0"
+    chalk "^2.0.1"
+    configstore "^4.0.0"
+    has-yarn "^2.1.0"
+    import-lazy "^2.1.0"
+    is-ci "^2.0.0"
+    is-installed-globally "^0.1.0"
+    is-npm "^3.0.0"
+    is-yarn-global "^0.3.0"
+    latest-version "^5.0.0"
+    semver-diff "^2.0.0"
+    xdg-basedir "^3.0.0"
 
 uri-js@^4.2.2:
   version "4.4.1"
@@ -1924,6 +3380,13 @@ uri-js@^4.2.2:
   dependencies:
     punycode "^2.1.0"
 
+url-parse-lax@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
+  integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=
+  dependencies:
+    prepend-http "^2.0.0"
+
 util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
@@ -1942,6 +3405,75 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
+vfile-message@*, vfile-message@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.4.tgz#5b43b88171d409eae58477d13f23dd41d52c371a"
+  integrity sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    unist-util-stringify-position "^2.0.0"
+
+vfile-message@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-1.1.1.tgz#5833ae078a1dfa2d96e9647886cd32993ab313e1"
+  integrity sha512-1WmsopSGhWt5laNir+633LszXvZ+Z/lxveBf6yhGsqnQIhlhzooZae7zV6YVM1Sdkw68dtAW3ow0pOdPANugvA==
+  dependencies:
+    unist-util-stringify-position "^1.1.1"
+
+vfile-reporter@^5.0.0:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/vfile-reporter/-/vfile-reporter-5.1.2.tgz#80f1db5cbe8f9c12f2f30cce3e2cd18353a48519"
+  integrity sha512-b15sTuss1wOPWVlyWOvu+n6wGJ/eTYngz3uqMLimQvxZ+Q5oFQGYZZP1o3dR9sk58G5+wej0UPCZSwQBX/mzrQ==
+  dependencies:
+    repeat-string "^1.5.0"
+    string-width "^2.0.0"
+    supports-color "^5.0.0"
+    unist-util-stringify-position "^2.0.0"
+    vfile-sort "^2.1.2"
+    vfile-statistics "^1.1.0"
+
+vfile-reporter@^6.0.0:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/vfile-reporter/-/vfile-reporter-6.0.2.tgz#cbddaea2eec560f27574ce7b7b269822c191a676"
+  integrity sha512-GN2bH2gs4eLnw/4jPSgfBjo+XCuvnX9elHICJZjVD4+NM0nsUrMTvdjGY5Sc/XG69XVTgLwj7hknQVc6M9FukA==
+  dependencies:
+    repeat-string "^1.5.0"
+    string-width "^4.0.0"
+    supports-color "^6.0.0"
+    unist-util-stringify-position "^2.0.0"
+    vfile-sort "^2.1.2"
+    vfile-statistics "^1.1.0"
+
+vfile-sort@^2.1.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/vfile-sort/-/vfile-sort-2.2.2.tgz#720fe067ce156aba0b411a01bb0dc65596aa1190"
+  integrity sha512-tAyUqD2R1l/7Rn7ixdGkhXLD3zsg+XLAeUDUhXearjfIcpL1Hcsj5hHpCoy/gvfK/Ws61+e972fm0F7up7hfYA==
+
+vfile-statistics@^1.1.0:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/vfile-statistics/-/vfile-statistics-1.1.4.tgz#b99fd15ecf0f44ba088cc973425d666cb7a9f245"
+  integrity sha512-lXhElVO0Rq3frgPvFBwahmed3X03vjPF8OcjKMy8+F1xU/3Q3QU3tKEDp743SFtb74PdF0UWpxPvtOP0GCLheA==
+
+vfile@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/vfile/-/vfile-3.0.1.tgz#47331d2abe3282424f4a4bb6acd20a44c4121803"
+  integrity sha512-y7Y3gH9BsUSdD4KzHsuMaCzRjglXN0W2EcMf0gpvu6+SbsGhMje7xDc8AEoeXy6mIwCKMI6BkjMsRjzQbhMEjQ==
+  dependencies:
+    is-buffer "^2.0.0"
+    replace-ext "1.0.0"
+    unist-util-stringify-position "^1.0.0"
+    vfile-message "^1.0.0"
+
+vfile@^4.0.0, vfile@^4.0.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/vfile/-/vfile-4.2.1.tgz#03f1dce28fc625c625bc6514350fbdb00fa9e624"
+  integrity sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    is-buffer "^2.0.0"
+    unist-util-stringify-position "^2.0.0"
+    vfile-message "^2.0.0"
+
 vite@^2.2.1:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/vite/-/vite-2.2.3.tgz#1acbdfa56ac00e00e7ccb6988f63f130c2f99dbb"
@@ -1954,6 +3486,143 @@ vite@^2.2.1:
   optionalDependencies:
     fsevents "~2.3.1"
 
+void-elements@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-3.1.0.tgz#614f7fbf8d801f0bb5f0661f5b2f5785750e4f09"
+  integrity sha1-YU9/v42AHwu18GYfWy9XhXUOTwk=
+
+vscode-css-languageservice@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-5.1.1.tgz#d68a22ea0b34a8356c169cafc7d32564c2ff6e87"
+  integrity sha512-QW0oe/g2y5E2AbVqY7FJNr2Q8uHiAHNSFpptI6xB8Y0KgzVKppOcIVrgmBNzXhFp9IswAwptkdqr8ExSJbqPkQ==
+  dependencies:
+    vscode-languageserver-textdocument "^1.0.1"
+    vscode-languageserver-types "^3.16.0"
+    vscode-nls "^5.0.0"
+    vscode-uri "^3.0.2"
+
+vscode-emmet-helper@^2.6.2:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-2.6.2.tgz#777b471a7851ba0ca8e4151533be7f92511f39b0"
+  integrity sha512-SkL1WjZZsA+bfTo52QH4PgqXCQAJSqzOmJtAY3rOl17MKbY6iJhVv2T26PshjmUnHoXnXMNa7PcLMCS75RsQDQ==
+  dependencies:
+    emmet "^2.3.0"
+    jsonc-parser "^2.3.0"
+    vscode-languageserver-textdocument "^1.0.1"
+    vscode-languageserver-types "^3.15.1"
+    vscode-nls "^5.0.0"
+    vscode-uri "^2.1.2"
+
+vscode-html-languageservice@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-4.0.3.tgz#3b7e7d3cfee75d47da0181dd638b5f459456a913"
+  integrity sha512-34KPIgRHVInT+TiFNmfiPFDrUAOOLuySNP2h0pMxBu1ObAbSixSqB3BMQFxIHz9hrGd3X0DEvi5YkobDxs4rWw==
+  dependencies:
+    vscode-languageserver-textdocument "^1.0.1"
+    vscode-languageserver-types "^3.16.0"
+    vscode-nls "^5.0.0"
+    vscode-uri "^3.0.2"
+
+vscode-jsonrpc@6.1.0-next.2:
+  version "6.1.0-next.2"
+  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-6.1.0-next.2.tgz#b5b67028d551d486c4ac1ec139ffc29382b36a2e"
+  integrity sha512-nkiNDGI+Ytp7uj1lxHXddXCoEunhcry1D+KmVHBfUUgWT9jMF8ZJyH5KQObdF+OGAh7bXZxD/SV4uGwSCeHHWA==
+
+vscode-languageserver-protocol@3.17.0-next.5:
+  version "3.17.0-next.5"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.0-next.5.tgz#295ebd7c416d7224b57e4de43c4bfefcc8095f06"
+  integrity sha512-LFZ6WMB3iPezQAU9OnGoERzcIVKhcs0OLfD/NHcqSj3g1wgxuLUL5kSlZbbjFySQCmhzm6b0yb3hjTSeBtq1+w==
+  dependencies:
+    vscode-jsonrpc "6.1.0-next.2"
+    vscode-languageserver-types "3.17.0-next.1"
+
+vscode-languageserver-textdocument@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.1.tgz#178168e87efad6171b372add1dea34f53e5d330f"
+  integrity sha512-UIcJDjX7IFkck7cSkNNyzIz5FyvpQfY7sdzVy+wkKN/BLaD4DQ0ppXQrKePomCxTS7RrolK1I0pey0bG9eh8dA==
+
+vscode-languageserver-types@3.17.0-next.1:
+  version "3.17.0-next.1"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.0-next.1.tgz#396348493ccf567f0c22538033ebf95da5c5e4e3"
+  integrity sha512-VGzh06oynbYa6JbTKUbxOEZN7CYEtWhN7DK5wfzUpeCJl8X8xZX39g2PVfpqXrIEduu7dcJgK007KgnX9tHNKA==
+
+vscode-languageserver-types@^3.15.1, vscode-languageserver-types@^3.16.0:
+  version "3.16.0"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz#ecf393fc121ec6974b2da3efb3155644c514e247"
+  integrity sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==
+
+vscode-languageserver@^7.1.0-next.4:
+  version "7.1.0-next.4"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-7.1.0-next.4.tgz#e9503af9d028dfc3a89e210646c265a087f46b8c"
+  integrity sha512-/65lxR/CuLJoOdzTjOTYUPWS7k5qzaWese4PObnWc6jwLryUrSa7DslYfaRXigh5/xr1nlaUZCcJwkpgM0wFvw==
+  dependencies:
+    vscode-languageserver-protocol "3.17.0-next.5"
+
+vscode-nls@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.0.0.tgz#99f0da0bd9ea7cda44e565a74c54b1f2bc257840"
+  integrity sha512-u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA==
+
+vscode-pug-languageservice@^0.25.0:
+  version "0.25.0"
+  resolved "https://registry.yarnpkg.com/vscode-pug-languageservice/-/vscode-pug-languageservice-0.25.0.tgz#5e3f627a59db78e6369f3eeeb68dd3ef1da925f7"
+  integrity sha512-3umv2uqLRaEh95qk+K8Uzgf8uGZFFtp0MWp40O8k8Yz3awctMoQOwjn1Tri7hHUhzB4c8XKvOde05x/80Al2Dw==
+  dependencies:
+    "@volar/code-gen" "^0.25.0"
+    "@volar/shared" "^0.25.0"
+    "@volar/source-map" "^0.25.0"
+    "@volar/transforms" "^0.25.0"
+    pug-beautify "^0.1.1"
+    pug-lexer "^5.0.1"
+    pug-parser "^6.0.0"
+    vscode-languageserver "^7.1.0-next.4"
+
+vscode-typescript-languageservice@^0.25.0:
+  version "0.25.0"
+  resolved "https://registry.yarnpkg.com/vscode-typescript-languageservice/-/vscode-typescript-languageservice-0.25.0.tgz#da6bfb24e0310b2966ff54476c4adb172235caf2"
+  integrity sha512-aPkoRKqyqcrhj8kPaILzB26avSV+w/fD78EdEOCgoB3SFpQVWN3G7xOk/+QFEwe17qPtfhnOzEWYrY8N6/+OuA==
+  dependencies:
+    "@volar/shared" "^0.25.0"
+    typescript-vscode-sh-plugin "^0.6.14"
+    vscode-languageserver "^7.1.0-next.4"
+    vscode-languageserver-textdocument "^1.0.1"
+
+vscode-uri@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-2.1.2.tgz#c8d40de93eb57af31f3c715dd650e2ca2c096f1c"
+  integrity sha512-8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A==
+
+vscode-uri@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.2.tgz#ecfd1d066cb8ef4c3a208decdbab9a8c23d055d0"
+  integrity sha512-jkjy6pjU1fxUvI51P+gCsxg1u2n8LSt0W6KrCNQceaziKzff74GoWmjVG46KieVzybO1sttPQmYfrwSHey7GUA==
+
+vscode-vue-languageservice@^0.25.0:
+  version "0.25.0"
+  resolved "https://registry.yarnpkg.com/vscode-vue-languageservice/-/vscode-vue-languageservice-0.25.0.tgz#ca08ba06955006d02d9687ac35ed993a5cb4a8ae"
+  integrity sha512-5ysB9tE4fZT0MDcmaJUGtN6pvExfXJr/Uf28uKN/IjcOAq25hrIqwt8pW6OyXkQXWxCBBoXMMxhg1RlbyaytNg==
+  dependencies:
+    "@starptech/prettyhtml" "^0.10.0"
+    "@volar/code-gen" "^0.25.0"
+    "@volar/html2pug" "^0.25.0"
+    "@volar/shared" "^0.25.0"
+    "@volar/source-map" "^0.25.0"
+    "@volar/transforms" "^0.25.0"
+    "@vue/compiler-dom" "^3.0.11"
+    "@vue/compiler-sfc" "^3.0.11"
+    "@vue/reactivity" "^3.0.11"
+    "@vue/shared" "^3.0.11"
+    jsonc-parser "^3.0.0"
+    prettier "^1.16.4"
+    upath "^2.0.1"
+    vscode-css-languageservice "^5.1.1"
+    vscode-emmet-helper "^2.6.2"
+    vscode-html-languageservice "^4.0.3"
+    vscode-languageserver "^7.1.0-next.4"
+    vscode-languageserver-textdocument "^1.0.1"
+    vscode-pug-languageservice "^0.25.0"
+    vscode-typescript-languageservice "^0.25.0"
+
 vue-eslint-parser@^7.6.0:
   version "7.6.0"
   resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.6.0.tgz#01ea1a2932f581ff244336565d712801f8f72561"
@@ -1971,12 +3640,12 @@ vue-router@^4.0.6:
   resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-4.0.6.tgz#91750db507d26642f225b0ec6064568e5fe448d6"
   integrity sha512-Y04llmK2PyaESj+N33VxLjGCUDuv9t4q2OpItEGU7POZiuQZaugV6cJpE6Qm1sVFtxufodLKN2y2dQl9nk0Reg==
 
-vue-tsc@^0.0.26:
-  version "0.0.26"
-  resolved "https://registry.yarnpkg.com/vue-tsc/-/vue-tsc-0.0.26.tgz#3d4b2ad64ba4fd972a5a40b342ac1e9f8d9d814a"
-  integrity sha512-UtHrHPBp7mAFN0GfsPYUPWROCGAQMl/HYTGOJy5ufPzCMt5h0kS2HOgfj4qbLSUzuYsfBqTxEj2unuNrlbbvxA==
+vue-tsc@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/vue-tsc/-/vue-tsc-0.1.0.tgz#8b7c389b59b396efb74d15dfbd142d65b3a528e4"
+  integrity sha512-tygfnTE8QIKCb7+K77CewMaH4XBYrDcwbN1ZdnEHy4XwpZVW2/+WvIjjWBsWurwOj3DMeSr/3Gt3yk8HzXDvEw==
   dependencies:
-    unzipper "0.10.11"
+    vscode-vue-languageservice "^0.25.0"
 
 vue@^3.0.5:
   version "3.0.11"
@@ -1998,6 +3667,13 @@ which-boxed-primitive@^1.0.2:
     is-string "^1.0.5"
     is-symbol "^1.0.3"
 
+which@^1.2.9:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
+  dependencies:
+    isexe "^2.0.0"
+
 which@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
@@ -2005,6 +3681,23 @@ which@^2.0.1:
   dependencies:
     isexe "^2.0.0"
 
+widest-line@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.1.tgz#7438764730ec7ef4381ce4df82fb98a53142a3fc"
+  integrity sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA==
+  dependencies:
+    string-width "^2.1.1"
+
+with@^7.0.0:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/with/-/with-7.0.2.tgz#ccee3ad542d25538a7a7a80aad212b9828495bac"
+  integrity sha512-RNGKj82nUPg3g5ygxkQl0R937xLyho1J24ItRCBTr/m1YnZkzJy1hUiHUJrc/VlsDQzsCnInEGSg3bci0Lmd4w==
+  dependencies:
+    "@babel/parser" "^7.9.6"
+    "@babel/types" "^7.9.6"
+    assert-never "^1.2.1"
+    babel-walk "3.0.0-canary-5"
+
 word-wrap@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
@@ -2015,6 +3708,40 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
+write-file-atomic@^2.0.0:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.3.tgz#1fd2e9ae1df3e75b8d8c367443c692d4ca81f481"
+  integrity sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==
+  dependencies:
+    graceful-fs "^4.1.11"
+    imurmurhash "^0.1.4"
+    signal-exit "^3.0.2"
+
+x-is-array@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/x-is-array/-/x-is-array-0.1.0.tgz#de520171d47b3f416f5587d629b89d26b12dc29d"
+  integrity sha1-3lIBcdR7P0FvVYfWKbidJrEtwp0=
+
+x-is-string@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/x-is-string/-/x-is-string-0.1.0.tgz#474b50865af3a49a9c4657f05acd145458f77d82"
+  integrity sha1-R0tQhlrzpJqcRlfwWs0UVFj3fYI=
+
+xdg-basedir@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4"
+  integrity sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=
+
+xtend@^4.0.0, xtend@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
+  integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
+
+yallist@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
+  integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
+
 yallist@^3.0.2:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
@@ -2024,3 +3751,10 @@ yallist@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
+
+yargs-parser@^10.0.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
+  integrity sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==
+  dependencies:
+    camelcase "^4.1.0"

From 48802dbc3c8fdcd1ef2cc7726dcb6b7ad638b35f Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@whitesourcesoftware.com>
Date: Fri, 7 May 2021 20:03:30 +0000
Subject: [PATCH 092/124] Update Rust crate regex to 1.5.4

---
 Cargo.lock | 4 ++--
 Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 16b16ef..f311d40 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1342,9 +1342,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.5.3"
+version = "1.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce5f1ceb7f74abbce32601642fcf8e8508a8a8991e0621c7d750295b9095702b"
+checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
 dependencies = [
  "aho-corasick",
  "memchr",
diff --git a/Cargo.toml b/Cargo.toml
index 78d47b3..27a32a7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -37,7 +37,7 @@ rocket = "0.4.7"
 serde = "1.0.125"
 chrono = "0.4.19"
 chrono-tz = "0.5.3"
-regex = "1.5.3"
+regex = "1.5.4"
 reqwest = { version = "0.11.3", features = ["blocking", "json", "cookies"] }
 diesel = { version = "1.4.6", features = ["postgres"] }
 diesel_migrations = "1.4.0"

From cd4075d294ed3a8ae95c5e95bac7aa720bf3e3f5 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Mon, 10 May 2021 21:52:24 +0200
Subject: [PATCH 093/124] [#45] First attempt at using S3 cache

---
 .woodpecker.yml | 74 ++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 64 insertions(+), 10 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 45bb910..0711f6f 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,24 +1,78 @@
 pipeline:
+    # Download the cache from S3
+    restore-cache:
+        image: plugins/drone-s3-cache
+        pull: true
+
+        endpoint: $S3_ENDPOINT
+        access_key: $S3_USER
+        secret_key: $S3_PASSWORD
+        root: fej_build-cache
+        restore: true
+
+        secrets: [ s3_endpoint, s3_user, s3_password ]
+
+
+    # =====LINTING=====
+    lint-frontend:
+        image: node:15-alpine3.13
+        group: lint
+        commands:
+            - cd web
+            - yarn run lint
+
+    lint-backend:
+        image: chewingbever/fej-builder:latest
+        pull: true
+        group: lint
+        commands:
+            - cargo fmt -- --check
+
+
+    # =====BUILDING=====
     build-frontend:
         image: node:15-alpine3.13
-        pull: true
         commands:
             - cd web
             - yarn install
             - yarn run build
 
-    lint-frontend:
-        image: node:15-alpine3.13
-        commands:
-            - cd web
-            - yarn run lint
 
-    # This doesn't require compiling anything
-    lint-backend:
+    build-backend:
         image: chewingbever/fej-builder:latest
-        pull: true
         commands:
-            - cargo fmt -- --check
+            - cargo build
+
+
+    # =====TESTING=====
+    test-backend:
+        image: chewingbever/fej-builder:latest
+        commands:
+            # This is run here because it requires compilation
+            - cargo clippy -- --no-deps -D warnings
+            - cargo test
+    
+
+    # =====REBUILD CACHE=====
+    rebuild-cache:
+        image: plugins/drone-s3-cache
+
+        endpoint: $S3_ENDPOINT
+        access_key: $S3_USER
+        secret_key: $S3_PASSWORD
+        root: fej_build-cache
+        rebuild: true
+        flush: true
+        # Delete cache older than 30 days (might lower this)
+        flush_age: 30
+        mount:
+            - target
+            - web/node_modules
+
+        secrets: [ s3_endpoint, s3_user, s3_password ]
+        # Push the cache, even on failure
+        when: [ success, failure ]
+
 
     # publish-builder:
     #     image: plugins/docker

From ff1631b5251db42a3ddf604bdd68cbb8725c588a Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Mon, 10 May 2021 21:54:03 +0200
Subject: [PATCH 094/124] [#45] Fixed first of probably many errors

---
 .woodpecker.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 0711f6f..1a0bef0 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -71,7 +71,8 @@ pipeline:
 
         secrets: [ s3_endpoint, s3_user, s3_password ]
         # Push the cache, even on failure
-        when: [ success, failure ]
+        when:
+            status: [ success, failure ]
 
 
     # publish-builder:

From 92c6e2c5cc6814769726b1585d277ab43c090250 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Mon, 10 May 2021 21:54:56 +0200
Subject: [PATCH 095/124] [#45] It's plugins/s3-cache dude

---
 .woodpecker.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 1a0bef0..a990696 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,7 +1,7 @@
 pipeline:
     # Download the cache from S3
     restore-cache:
-        image: plugins/drone-s3-cache
+        image: plugins/s3-cache
         pull: true
 
         endpoint: $S3_ENDPOINT
@@ -55,7 +55,7 @@ pipeline:
 
     # =====REBUILD CACHE=====
     rebuild-cache:
-        image: plugins/drone-s3-cache
+        image: plugins/s3-cache
 
         endpoint: $S3_ENDPOINT
         access_key: $S3_USER

From 46667907842c434d1dbe20d05d7cce6fae18f233 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Mon, 10 May 2021 21:57:15 +0200
Subject: [PATCH 096/124] [#45] Edited broken env vars

---
 .woodpecker.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index a990696..706c517 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -4,9 +4,9 @@ pipeline:
         image: plugins/s3-cache
         pull: true
 
-        endpoint: $S3_ENDPOINT
-        access_key: $S3_USER
-        secret_key: $S3_PASSWORD
+        endpoint: ${S3_ENDPOINT}
+        access_key: ${S3_USER}
+        secret_key: ${S3_PASSWORD}
         root: fej_build-cache
         restore: true
 
@@ -57,9 +57,9 @@ pipeline:
     rebuild-cache:
         image: plugins/s3-cache
 
-        endpoint: $S3_ENDPOINT
-        access_key: $S3_USER
-        secret_key: $S3_PASSWORD
+        endpoint: ${S3_ENDPOINT}
+        access_key: ${S3_USER}
+        secret_key: ${S3_PASSWORD}
         root: fej_build-cache
         rebuild: true
         flush: true

From bd51b6ce148029b5042c8ecfdecf2e1cacc46902 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Mon, 10 May 2021 22:15:05 +0200
Subject: [PATCH 097/124] [#45] More updates to cicd file

---
 .woodpecker.yml | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 706c517..2229146 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -7,7 +7,7 @@ pipeline:
         endpoint: ${S3_ENDPOINT}
         access_key: ${S3_USER}
         secret_key: ${S3_PASSWORD}
-        root: fej_build-cache
+        root: fej-build-cache
         restore: true
 
         secrets: [ s3_endpoint, s3_user, s3_password ]
@@ -53,18 +53,15 @@ pipeline:
             - cargo test
     
 
-    # =====REBUILD CACHE=====
+    # =====REBUILD & FLUSH CACHE=====
     rebuild-cache:
         image: plugins/s3-cache
 
         endpoint: ${S3_ENDPOINT}
         access_key: ${S3_USER}
         secret_key: ${S3_PASSWORD}
-        root: fej_build-cache
+        root: fej-build-cache
         rebuild: true
-        flush: true
-        # Delete cache older than 30 days (might lower this)
-        flush_age: 30
         mount:
             - target
             - web/node_modules
@@ -74,6 +71,22 @@ pipeline:
         when:
             status: [ success, failure ]
 
+    flush-cache:
+        image: plugins/s3-cache
+
+        endpoint: ${S3_ENDPOINT}
+        access_key: ${S3_USER}
+        secret_key: ${S3_PASSWORD}
+        root: fej-build-cache
+        flush: true
+        # Delete cache older than 30 days (might lower this)
+        flush_age: 30
+
+        secrets: [ s3_endpoint, s3_user, s3_password ]
+        # Push the cache, even on failure
+        when:
+            status: [ success, failure ]
+
 
     # publish-builder:
     #     image: plugins/docker

From b8f31aa337cb48a133277643e7979b4a137f852f Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Mon, 10 May 2021 22:19:49 +0200
Subject: [PATCH 098/124] [#45] Renamed root

---
 .woodpecker.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 2229146..602d04f 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -7,7 +7,7 @@ pipeline:
         endpoint: ${S3_ENDPOINT}
         access_key: ${S3_USER}
         secret_key: ${S3_PASSWORD}
-        root: fej-build-cache
+        root: build-cache
         restore: true
 
         secrets: [ s3_endpoint, s3_user, s3_password ]
@@ -60,7 +60,7 @@ pipeline:
         endpoint: ${S3_ENDPOINT}
         access_key: ${S3_USER}
         secret_key: ${S3_PASSWORD}
-        root: fej-build-cache
+        root: build-cache
         rebuild: true
         mount:
             - target
@@ -77,7 +77,7 @@ pipeline:
         endpoint: ${S3_ENDPOINT}
         access_key: ${S3_USER}
         secret_key: ${S3_PASSWORD}
-        root: fej-build-cache
+        root: build-cache
         flush: true
         # Delete cache older than 30 days (might lower this)
         flush_age: 30

From 9d065c229ea4de38a2cc896198be0422e0ac4c68 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Mon, 10 May 2021 22:21:56 +0200
Subject: [PATCH 099/124] [#45] Added path_style option

---
 .woodpecker.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 602d04f..7652ea3 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -9,6 +9,7 @@ pipeline:
         secret_key: ${S3_PASSWORD}
         root: build-cache
         restore: true
+        path_style: true
 
         secrets: [ s3_endpoint, s3_user, s3_password ]
 
@@ -62,6 +63,7 @@ pipeline:
         secret_key: ${S3_PASSWORD}
         root: build-cache
         rebuild: true
+        path_style: true
         mount:
             - target
             - web/node_modules
@@ -79,6 +81,7 @@ pipeline:
         secret_key: ${S3_PASSWORD}
         root: build-cache
         flush: true
+        path_style: true
         # Delete cache older than 30 days (might lower this)
         flush_age: 30
 

From 0ec5e33860540956b54beb5c4891fec4c7b334a3 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Mon, 10 May 2021 22:22:51 +0200
Subject: [PATCH 100/124] [#45] Enabled debug logs for debugging

---
 .woodpecker.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 7652ea3..bf18661 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -10,6 +10,7 @@ pipeline:
         root: build-cache
         restore: true
         path_style: true
+        debug: true
 
         secrets: [ s3_endpoint, s3_user, s3_password ]
 

From 63316314aadcbecbcb7ce22e6b3762e7f1b9e474 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Tue, 11 May 2021 20:43:51 +0200
Subject: [PATCH 101/124] [#45] Another try at fixing the ci

---
 .woodpecker.yml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index bf18661..45a12f3 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -4,15 +4,13 @@ pipeline:
         image: plugins/s3-cache
         pull: true
 
-        endpoint: ${S3_ENDPOINT}
+        endpoint: https://s3.roosens.me
         access_key: ${S3_USER}
         secret_key: ${S3_PASSWORD}
-        root: build-cache
+        root: /build-cache
         restore: true
-        path_style: true
-        debug: true
 
-        secrets: [ s3_endpoint, s3_user, s3_password ]
+        secrets: [ s3_user, s3_password ]
 
 
     # =====LINTING=====
@@ -59,7 +57,7 @@ pipeline:
     rebuild-cache:
         image: plugins/s3-cache
 
-        endpoint: ${S3_ENDPOINT}
+        endpoint: https://s3.roosens.me
         access_key: ${S3_USER}
         secret_key: ${S3_PASSWORD}
         root: build-cache

From 81c0d5e00b5b8710bdd65ff50406f21dd5e380dc Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Tue, 11 May 2021 21:19:18 +0200
Subject: [PATCH 102/124] [#45] Changed root style

---
 .woodpecker.yml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 45a12f3..2feb095 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -7,7 +7,7 @@ pipeline:
         endpoint: https://s3.roosens.me
         access_key: ${S3_USER}
         secret_key: ${S3_PASSWORD}
-        root: /build-cache
+        root: build-cache/
         restore: true
 
         secrets: [ s3_user, s3_password ]
@@ -60,14 +60,13 @@ pipeline:
         endpoint: https://s3.roosens.me
         access_key: ${S3_USER}
         secret_key: ${S3_PASSWORD}
-        root: build-cache
+        root: build-cache/
         rebuild: true
-        path_style: true
         mount:
             - target
             - web/node_modules
 
-        secrets: [ s3_endpoint, s3_user, s3_password ]
+        secrets: [ s3_user, s3_password ]
         # Push the cache, even on failure
         when:
             status: [ success, failure ]
@@ -75,16 +74,15 @@ pipeline:
     flush-cache:
         image: plugins/s3-cache
 
-        endpoint: ${S3_ENDPOINT}
+        endpoint: https://s3.roosens.me
         access_key: ${S3_USER}
         secret_key: ${S3_PASSWORD}
-        root: build-cache
+        root: build-cache/
         flush: true
-        path_style: true
         # Delete cache older than 30 days (might lower this)
         flush_age: 30
 
-        secrets: [ s3_endpoint, s3_user, s3_password ]
+        secrets: [ s3_user, s3_password ]
         # Push the cache, even on failure
         when:
             status: [ success, failure ]

From 2a14703097b4eca5e88b9e347f7396ead4b6ca63 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Tue, 11 May 2021 21:38:19 +0200
Subject: [PATCH 103/124] [#45] Let's try some other env vars

---
 .woodpecker.yml | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 2feb095..788d3c7 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -5,12 +5,10 @@ pipeline:
         pull: true
 
         endpoint: https://s3.roosens.me
-        access_key: ${S3_USER}
-        secret_key: ${S3_PASSWORD}
         root: build-cache/
         restore: true
 
-        secrets: [ s3_user, s3_password ]
+        secrets: [ cache_s3_access_key, cache_s3_secret_key ]
 
 
     # =====LINTING=====
@@ -58,15 +56,13 @@ pipeline:
         image: plugins/s3-cache
 
         endpoint: https://s3.roosens.me
-        access_key: ${S3_USER}
-        secret_key: ${S3_PASSWORD}
         root: build-cache/
         rebuild: true
         mount:
             - target
             - web/node_modules
 
-        secrets: [ s3_user, s3_password ]
+        secrets: [ cache_s3_access_key, cache_s3_secret_key ]
         # Push the cache, even on failure
         when:
             status: [ success, failure ]
@@ -75,14 +71,12 @@ pipeline:
         image: plugins/s3-cache
 
         endpoint: https://s3.roosens.me
-        access_key: ${S3_USER}
-        secret_key: ${S3_PASSWORD}
         root: build-cache/
         flush: true
         # Delete cache older than 30 days (might lower this)
         flush_age: 30
 
-        secrets: [ s3_user, s3_password ]
+        secrets: [ cache_s3_access_key, cache_s3_secret_key ]
         # Push the cache, even on failure
         when:
             status: [ success, failure ]

From 01aa4bae809cb54d2d91544102f1023217134853 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Tue, 11 May 2021 21:41:54 +0200
Subject: [PATCH 104/124] [#45] Re-ordered tasks to make them logical

---
 .woodpecker.yml | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 788d3c7..ab5f147 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -11,6 +11,25 @@ pipeline:
         secrets: [ cache_s3_access_key, cache_s3_secret_key ]
 
 
+    # =====BUILDING=====
+    build-frontend:
+        image: node:15-alpine3.13
+        pull: true
+        group: build
+        commands:
+            - cd web
+            - yarn install
+            - yarn run build
+
+
+    build-backend:
+        image: chewingbever/fej-builder:latest
+        pull: true
+        group: build
+        commands:
+            - cargo build
+
+
     # =====LINTING=====
     lint-frontend:
         image: node:15-alpine3.13
@@ -21,27 +40,11 @@ pipeline:
 
     lint-backend:
         image: chewingbever/fej-builder:latest
-        pull: true
         group: lint
         commands:
             - cargo fmt -- --check
 
 
-    # =====BUILDING=====
-    build-frontend:
-        image: node:15-alpine3.13
-        commands:
-            - cd web
-            - yarn install
-            - yarn run build
-
-
-    build-backend:
-        image: chewingbever/fej-builder:latest
-        commands:
-            - cargo build
-
-
     # =====TESTING=====
     test-backend:
         image: chewingbever/fej-builder:latest

From 728e72e47c7f4f0b6bc03e83b95814e7b24db400 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Tue, 11 May 2021 21:51:54 +0200
Subject: [PATCH 105/124] [#45] Removed unnecessary clippy flag (and let's test
 the cache)

---
 .woodpecker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index ab5f147..b1797e2 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -50,7 +50,7 @@ pipeline:
         image: chewingbever/fej-builder:latest
         commands:
             # This is run here because it requires compilation
-            - cargo clippy -- --no-deps -D warnings
+            - cargo clippy -- -D warnings
             - cargo test
     
 

From 9dbb4c8804f31b5a557661ec5df0ae2a94463b62 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Tue, 11 May 2021 21:58:49 +0200
Subject: [PATCH 106/124] [#45] Moved clippy call to lint phase

---
 .woodpecker.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index b1797e2..4d975b8 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -43,14 +43,14 @@ pipeline:
         group: lint
         commands:
             - cargo fmt -- --check
+            # This is run here because it requires compilation
+            - cargo clippy -- -D warnings
 
 
     # =====TESTING=====
     test-backend:
         image: chewingbever/fej-builder:latest
         commands:
-            # This is run here because it requires compilation
-            - cargo clippy -- -D warnings
             - cargo test
     
 

From c8bfc16af8614629556f198485316b008e9df7ad Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Tue, 11 May 2021 22:03:44 +0200
Subject: [PATCH 107/124] [#45] Moved tests to before linting

---
 .woodpecker.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 4d975b8..12ebf7c 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -30,6 +30,13 @@ pipeline:
             - cargo build
 
 
+    # =====TESTING=====
+    test-backend:
+        image: chewingbever/fej-builder:latest
+        commands:
+            - cargo test
+
+
     # =====LINTING=====
     lint-frontend:
         image: node:15-alpine3.13
@@ -45,13 +52,6 @@ pipeline:
             - cargo fmt -- --check
             # This is run here because it requires compilation
             - cargo clippy -- -D warnings
-
-
-    # =====TESTING=====
-    test-backend:
-        image: chewingbever/fej-builder:latest
-        commands:
-            - cargo test
     
 
     # =====REBUILD & FLUSH CACHE=====

From faa4f713c86cd82647c4e0ec92c0b7f03b205ba5 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Tue, 11 May 2021 22:11:35 +0200
Subject: [PATCH 108/124] [#45] Fixed clippy errors

---
 src/fej/ivago/pickup_time.rs | 5 +----
 src/populate_ivago.rs        | 7 +++++--
 src/server/main.rs           | 7 ++++---
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/fej/ivago/pickup_time.rs b/src/fej/ivago/pickup_time.rs
index f70cbcf..19031fb 100644
--- a/src/fej/ivago/pickup_time.rs
+++ b/src/fej/ivago/pickup_time.rs
@@ -16,10 +16,7 @@ impl PickupTime {
     /// * `date` - Date of pickup time
     /// * `label` - Type of trash
     pub fn new(date: BasicDate, label: String) -> PickupTime {
-        PickupTime {
-            date: date,
-            label: label,
-        }
+        PickupTime { date, label }
     }
 }
 
diff --git a/src/populate_ivago.rs b/src/populate_ivago.rs
index 9dfc876..0886551 100644
--- a/src/populate_ivago.rs
+++ b/src/populate_ivago.rs
@@ -8,12 +8,15 @@ fn main() {
     let database_url = std::env::var("DATABASE_URL").expect("DATABASE_URL must be set");
 
     let db_conn = PgConnection::establish(&database_url)
-        .expect(&format!("Error connecting to {}", database_url));
+        .unwrap_or_else(|_| panic!("Error connecting to {}", database_url));
 
     // Doing this linearly is good enough I'd say
     for c in ABC.chars() {
         if let Ok(streets) = search_streets(&c.to_string()) {
-            insert_into(ivago_streets).values(streets).execute(&db_conn);
+            insert_into(ivago_streets)
+                .values(streets)
+                .execute(&db_conn)
+                .expect("Failed to insert rows.");
         }
     }
 }
diff --git a/src/server/main.rs b/src/server/main.rs
index 2a5bd2f..bfe4fef 100644
--- a/src/server/main.rs
+++ b/src/server/main.rs
@@ -23,9 +23,9 @@ use rocket_contrib::databases::diesel;
 #[cfg(feature = "frontend")]
 use rocket_contrib::serve::StaticFiles;
 
-pub struct CORS;
+pub struct Cors;
 
-impl Fairing for CORS {
+impl Fairing for Cors {
     fn info(&self) -> Info {
         Info {
             name: "Add CORS headers to responses",
@@ -63,8 +63,9 @@ fn run_db_migrations(rocket: Rocket) -> Result<Rocket, Rocket> {
 
 fn rocket() -> rocket::Rocket {
     // This needs to be muted for the frontend feature
+    #[allow(unused_mut)]
     let mut rocket = rocket::ignite()
-        .attach(CORS)
+        .attach(Cors)
         .attach(FejDbConn::fairing())
         .attach(AdHoc::on_attach("Database Migrations", run_db_migrations))
         .mount("/api/ivago", routes::ivago()) // /api being hardcoded is temporary

From b9d0bb7aa5dd3aacb5072a632e6395617e421a6a Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Wed, 12 May 2021 14:12:29 +0200
Subject: [PATCH 109/124] [#45] Removed leftover comments

---
 .woodpecker.yml | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 12ebf7c..9d59c79 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -21,7 +21,6 @@ pipeline:
             - yarn install
             - yarn run build
 
-
     build-backend:
         image: chewingbever/fej-builder:latest
         pull: true
@@ -83,26 +82,3 @@ pipeline:
         # Push the cache, even on failure
         when:
             status: [ success, failure ]
-
-
-    # publish-builder:
-    #     image: plugins/docker
-    #     repo: chewingbever/fej-builder
-    #     dockerfile: docker/Dockerfile.builder
-    #     tag: [ latest ]
-    #     secrets: [ docker_username, docker_password ]
-    #     when:
-    #         branch: develop
-    #         event: push
-
-    # Backend cicd jobs are disabled until we can figure out a way to cache stuff
-    # test-backend:
-    #     image: chewingbever/fej-builder:latest
-    #     # Always update the builder image
-    #     pull: true
-    #     commands:
-    #         - cargo test
-
-    # TODO build dev & rel image, deploy these images
-
-# branches: [ master, develop ]

From 2547434d95aa3eaf92524a22967ecd951e86ebb1 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Wed, 12 May 2021 14:28:59 +0200
Subject: [PATCH 110/124] [#45] Added cargo caching; made clippy more strict

---
 .woodpecker.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 9d59c79..726f573 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -50,7 +50,7 @@ pipeline:
         commands:
             - cargo fmt -- --check
             # This is run here because it requires compilation
-            - cargo clippy -- -D warnings
+            - cargo clippy --all-targets -- -D warnings
     
 
     # =====REBUILD & FLUSH CACHE=====
@@ -62,6 +62,7 @@ pipeline:
         rebuild: true
         mount:
             - target
+            - .cargo
             - web/node_modules
 
         secrets: [ cache_s3_access_key, cache_s3_secret_key ]

From 8baeda4caed02ae32a20b0bf4484d4880ec0b0fb Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Wed, 12 May 2021 14:29:39 +0200
Subject: [PATCH 111/124] [#45] Fixed clippy errors

---
 src/fej/ivago/street.rs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/fej/ivago/street.rs b/src/fej/ivago/street.rs
index 2f30f06..4ba45cb 100644
--- a/src/fej/ivago/street.rs
+++ b/src/fej/ivago/street.rs
@@ -18,10 +18,7 @@ impl Street {
     // This constructor just makes my life a bit easier during testing
     #[cfg(test)]
     fn new(name: String, city: String) -> Street {
-        Street {
-            name: name,
-            city: city,
-        }
+        Street { name, city }
     }
 }
 

From 4cf9152fc4fe49530aa1ce39a84e43e5089cdfd1 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Wed, 12 May 2021 14:44:10 +0200
Subject: [PATCH 112/124] [#45] Hopefully made Cargo home available across
 steps

---
 .woodpecker.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 726f573..f670957 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -25,6 +25,8 @@ pipeline:
         image: chewingbever/fej-builder:latest
         pull: true
         group: build
+        environment:
+            - CARGO_HOME=.cargo
         commands:
             - cargo build
 
@@ -32,6 +34,8 @@ pipeline:
     # =====TESTING=====
     test-backend:
         image: chewingbever/fej-builder:latest
+        environment:
+            - CARGO_HOME=.cargo
         commands:
             - cargo test
 
@@ -47,6 +51,8 @@ pipeline:
     lint-backend:
         image: chewingbever/fej-builder:latest
         group: lint
+        environment:
+            - CARGO_HOME=.cargo
         commands:
             - cargo fmt -- --check
             # This is run here because it requires compilation

From 82bb4c6a6e93998260b4ff66307c4d1b5c90b58e Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@whitesourcesoftware.com>
Date: Wed, 12 May 2021 18:03:41 +0000
Subject: [PATCH 113/124] Update Rust crate serde to 1.0.126

---
 Cargo.lock | 8 ++++----
 Cargo.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f311d40..b47ca49 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1580,18 +1580,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "serde"
-version = "1.0.125"
+version = "1.0.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171"
+checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.125"
+version = "1.0.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d"
+checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43"
 dependencies = [
  "proc-macro2 1.0.26",
  "quote 1.0.9",
diff --git a/Cargo.toml b/Cargo.toml
index 27a32a7..853b913 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -34,7 +34,7 @@ doctest = false
  
 [dependencies]
 rocket = "0.4.7"
-serde = "1.0.125"
+serde = "1.0.126"
 chrono = "0.4.19"
 chrono-tz = "0.5.3"
 regex = "1.5.4"

From 6d95ffd37201fd9b168baa5fcc13ee0a8a044081 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Thu, 13 May 2021 15:42:05 +0200
Subject: [PATCH 114/124] Changed import scheme

---
 src/fej/ivago/basic_date.rs | 9 +++------
 src/fej/ivago/db.rs         | 6 ++----
 src/fej/ivago/mod.rs        | 6 ++++--
 src/fej/ivago/street.rs     | 3 +--
 src/populate_ivago.rs       | 3 +--
 src/server/main.rs          | 9 +++++----
 src/server/routes/ivago.rs  | 6 ++++--
 src/server/tests.rs         | 3 +--
 8 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/src/fej/ivago/basic_date.rs b/src/fej/ivago/basic_date.rs
index 38c6f6c..bbcae73 100644
--- a/src/fej/ivago/basic_date.rs
+++ b/src/fej/ivago/basic_date.rs
@@ -1,11 +1,8 @@
 use crate::errors::FejError;
 use chrono::{DateTime, NaiveDate, TimeZone};
-use chrono_tz::Europe::Brussels;
-use chrono_tz::Tz;
-use rocket::http::RawStr;
-use rocket::request::FromFormValue;
-use serde::ser::Serializer;
-use serde::Serialize;
+use chrono_tz::{Europe::Brussels, Tz};
+use rocket::{http::RawStr, request::FromFormValue};
+use serde::{ser::Serializer, Serialize};
 use std::convert::TryFrom;
 
 /// This class is a simple wrapper around chrono's DateTime. Its sole purpose
diff --git a/src/fej/ivago/db.rs b/src/fej/ivago/db.rs
index 6ba3174..96f6111 100644
--- a/src/fej/ivago/db.rs
+++ b/src/fej/ivago/db.rs
@@ -1,8 +1,6 @@
 use super::Street;
-use crate::errors::FejError;
-use crate::schema::ivago_streets::dsl::*;
-use diesel::prelude::*;
-use diesel::PgConnection;
+use crate::{errors::FejError, schema::ivago_streets::dsl::*};
+use {diesel::prelude::*, PgConnection};
 
 pub fn search_streets(db_con: &PgConnection, search_term: &str) -> Result<Vec<Street>, FejError> {
     Ok(ivago_streets
diff --git a/src/fej/ivago/mod.rs b/src/fej/ivago/mod.rs
index a6d8295..b1b7f0c 100644
--- a/src/fej/ivago/mod.rs
+++ b/src/fej/ivago/mod.rs
@@ -2,8 +2,10 @@ use crate::errors::FejError;
 use chrono::DateTime;
 use chrono_tz::Tz;
 use reqwest::blocking as reqwest;
-use std::collections::HashMap;
-use std::convert::{From, TryFrom};
+use std::{
+    collections::HashMap,
+    convert::{From, TryFrom},
+};
 
 mod basic_date;
 pub mod db;
diff --git a/src/fej/ivago/street.rs b/src/fej/ivago/street.rs
index 4ba45cb..5b0ba30 100644
--- a/src/fej/ivago/street.rs
+++ b/src/fej/ivago/street.rs
@@ -1,8 +1,7 @@
 use crate::schema::ivago_streets;
 use diesel::{Insertable, Queryable};
 use regex::Regex;
-use rocket::http::RawStr;
-use rocket::request::FromFormValue;
+use rocket::{http::RawStr, request::FromFormValue};
 use serde::ser::{Serialize, SerializeStruct, Serializer};
 use std::convert::TryFrom;
 
diff --git a/src/populate_ivago.rs b/src/populate_ivago.rs
index 0886551..29afd39 100644
--- a/src/populate_ivago.rs
+++ b/src/populate_ivago.rs
@@ -1,6 +1,5 @@
 use diesel::{insert_into, Connection, PgConnection, RunQueryDsl};
-use fej::ivago::search_streets;
-use fej::schema::ivago_streets::dsl::*;
+use fej::{ivago::search_streets, schema::ivago_streets::dsl::*};
 
 const ABC: &str = "abcdefghijklmnopqrstuvwxyz";
 
diff --git a/src/server/main.rs b/src/server/main.rs
index bfe4fef..c2dd19f 100644
--- a/src/server/main.rs
+++ b/src/server/main.rs
@@ -15,10 +15,11 @@ mod routes;
 
 // Very temporary solution for CORS
 // https://stackoverflow.com/questions/62412361/how-to-set-up-cors-or-options-for-rocket-rs
-use rocket::fairing::AdHoc;
-use rocket::fairing::{Fairing, Info, Kind};
-use rocket::http::Header;
-use rocket::{Request, Response, Rocket};
+use rocket::{
+    fairing::{AdHoc, Fairing, Info, Kind},
+    http::Header,
+    Request, Response, Rocket,
+};
 use rocket_contrib::databases::diesel;
 #[cfg(feature = "frontend")]
 use rocket_contrib::serve::StaticFiles;
diff --git a/src/server/routes/ivago.rs b/src/server/routes/ivago.rs
index e8c0a9e..af025fe 100644
--- a/src/server/routes/ivago.rs
+++ b/src/server/routes/ivago.rs
@@ -1,6 +1,8 @@
 use crate::FejDbConn;
-use fej::ivago::db::search_streets;
-use fej::ivago::{get_pickup_times, BasicDate, PickupTime, Street};
+use fej::{
+    db::search_streets,
+    ivago::{get_pickup_times, BasicDate, PickupTime, Street},
+};
 use rocket::http::Status;
 use rocket_contrib::json::Json;
 
diff --git a/src/server/tests.rs b/src/server/tests.rs
index 8871762..ae96481 100644
--- a/src/server/tests.rs
+++ b/src/server/tests.rs
@@ -1,6 +1,5 @@
 /// In here, any non-unit tests are placed.
-use rocket::http::Status;
-use rocket::local::Client;
+use rocket::{http::Status, local::Client};
 
 fn rocket() -> rocket::Rocket {
     rocket::ignite().mount("/", super::routes::ivago())

From cc9ff7635cb946e6a586200894a43f2eca08b75b Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Thu, 13 May 2021 15:51:44 +0200
Subject: [PATCH 115/124] Fixed faulty import line

---
 .woodpecker.yml            | 2 +-
 src/server/routes/ivago.rs | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index f670957..ce2db84 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -83,7 +83,7 @@ pipeline:
         root: build-cache/
         flush: true
         # Delete cache older than 30 days (might lower this)
-        flush_age: 30
+        flush_age: 14
 
         secrets: [ cache_s3_access_key, cache_s3_secret_key ]
         # Push the cache, even on failure
diff --git a/src/server/routes/ivago.rs b/src/server/routes/ivago.rs
index af025fe..5f5c5fc 100644
--- a/src/server/routes/ivago.rs
+++ b/src/server/routes/ivago.rs
@@ -1,8 +1,5 @@
 use crate::FejDbConn;
-use fej::{
-    db::search_streets,
-    ivago::{get_pickup_times, BasicDate, PickupTime, Street},
-};
+use fej::ivago::{db::search_streets, get_pickup_times, BasicDate, PickupTime, Street};
 use rocket::http::Status;
 use rocket_contrib::json::Json;
 

From f6faaf0db91f2bcc044e7c73f9739d87efac3bcd Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@whitesourcesoftware.com>
Date: Wed, 19 May 2021 18:00:56 +0000
Subject: [PATCH 116/124] Update Rust crate rocket_contrib to 0.4.9

---
 Cargo.lock | 28 +++++++++++-----------------
 Cargo.toml |  2 +-
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b47ca49..b059343 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -98,12 +98,6 @@ dependencies = [
  "safemem",
 ]
 
-[[package]]
-name = "base64"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff"
-
 [[package]]
 name = "base64"
 version = "0.13.0"
@@ -1406,12 +1400,12 @@ dependencies = [
 
 [[package]]
 name = "rocket"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7febfdfd4d43facfc7daba20349ebe2c310c6735bd6a2a9255ea8bc425b4cb13"
+checksum = "0dc5163d096cfe6136614a3044c705f450fba8dee9a2f0076ea9e754416a19c5"
 dependencies = [
  "atty",
- "base64 0.12.3",
+ "base64 0.13.0",
  "log 0.4.14",
  "memchr",
  "num_cpus",
@@ -1427,9 +1421,9 @@ dependencies = [
 
 [[package]]
 name = "rocket_codegen"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ceac2c55b2c8b1cdc53add64332defa5fc227f64263b86b4114d1386286d42a3"
+checksum = "33a6a0b9a676c856ed2d68ae579ef28dd17383de3e7da51430d7aed021010b63"
 dependencies = [
  "devise",
  "glob",
@@ -1442,9 +1436,9 @@ dependencies = [
 
 [[package]]
 name = "rocket_contrib"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7954a707f9ca18aa74ca8c1f5d1f900f52a4dceb68e96e3112143f759cfd20e"
+checksum = "eef4fc485b5156d05c624af1a1c1198823548e5ed760e8a1dbcefc2e7479ffa1"
 dependencies = [
  "diesel",
  "log 0.4.14",
@@ -1458,9 +1452,9 @@ dependencies = [
 
 [[package]]
 name = "rocket_contrib_codegen"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30deb6dec53b91fac3538a2a3935cf13e0f462745f9f33bf27bedffbe7265b5d"
+checksum = "1b4d1a66d019ae1ccf82360b93daa9d4773fc38dc332f76f5a66e95f12496840"
 dependencies = [
  "devise",
  "quote 0.6.13",
@@ -1470,9 +1464,9 @@ dependencies = [
 
 [[package]]
 name = "rocket_http"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce364100ed7a1bf39257b69ebd014c1d5b4979b0d365d8c9ab0aa9c79645493d"
+checksum = "51317fa44f95876c7aec93e5b3dcbd5297f801b6cc77c09608baf7aca18cdf8e"
 dependencies = [
  "cookie 0.11.4",
  "hyper 0.10.16",
diff --git a/Cargo.toml b/Cargo.toml
index 853b913..e703f1a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -43,6 +43,6 @@ diesel = { version = "1.4.6", features = ["postgres"] }
 diesel_migrations = "1.4.0"
 
 [dependencies.rocket_contrib]
-version = "0.4.7"
+version = "0.4.9"
 default-features = false
 features = ["json", "diesel_postgres_pool", "serve"]

From 4e24ad8988a61c9ea8ab7dfdcfae1478787b00a2 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@whitesourcesoftware.com>
Date: Thu, 20 May 2021 11:00:57 +0000
Subject: [PATCH 117/124] Update Rust crate rocket to 0.4.9

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index e703f1a..9727ce4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -33,7 +33,7 @@ doc = false
 doctest = false
  
 [dependencies]
-rocket = "0.4.7"
+rocket = "0.4.9"
 serde = "1.0.126"
 chrono = "0.4.19"
 chrono-tz = "0.5.3"

From af8660f99efc7f0cb5e0e091211177eb722ad2d7 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@whitesourcesoftware.com>
Date: Sat, 22 May 2021 07:00:54 +0000
Subject: [PATCH 118/124] Update Rust crate rocket to 0.4.10

---
 Cargo.lock | 12 ++++++------
 Cargo.toml |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b059343..442d814 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1400,9 +1400,9 @@ dependencies = [
 
 [[package]]
 name = "rocket"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dc5163d096cfe6136614a3044c705f450fba8dee9a2f0076ea9e754416a19c5"
+checksum = "4a7ab1dfdc75bb8bd2be381f37796b1b300c45a3c9145b34d86715e8dd90bf28"
 dependencies = [
  "atty",
  "base64 0.13.0",
@@ -1421,9 +1421,9 @@ dependencies = [
 
 [[package]]
 name = "rocket_codegen"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33a6a0b9a676c856ed2d68ae579ef28dd17383de3e7da51430d7aed021010b63"
+checksum = "1729e687d6d2cf434d174da84fb948f7fef4fac22d20ce94ca61c28b72dbcf9f"
 dependencies = [
  "devise",
  "glob",
@@ -1464,9 +1464,9 @@ dependencies = [
 
 [[package]]
 name = "rocket_http"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51317fa44f95876c7aec93e5b3dcbd5297f801b6cc77c09608baf7aca18cdf8e"
+checksum = "6131e6e6d38a9817f4a494ff5da95971451c2eb56a53915579fc9c80f6ef0117"
 dependencies = [
  "cookie 0.11.4",
  "hyper 0.10.16",
diff --git a/Cargo.toml b/Cargo.toml
index 9727ce4..4c34773 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -33,7 +33,7 @@ doc = false
 doctest = false
  
 [dependencies]
-rocket = "0.4.9"
+rocket = "0.4.10"
 serde = "1.0.126"
 chrono = "0.4.19"
 chrono-tz = "0.5.3"

From d4872e9c48bd06e0910e816ed262b67c2ba63384 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@whitesourcesoftware.com>
Date: Sat, 22 May 2021 08:00:55 +0000
Subject: [PATCH 119/124] Update Rust crate rocket_contrib to 0.4.10

---
 Cargo.lock | 8 ++++----
 Cargo.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 442d814..cb526b7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1436,9 +1436,9 @@ dependencies = [
 
 [[package]]
 name = "rocket_contrib"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eef4fc485b5156d05c624af1a1c1198823548e5ed760e8a1dbcefc2e7479ffa1"
+checksum = "6b6303dccab46dce6c7ac26c9b9d8d8cde1b19614b027c3f913be6611bff6d9b"
 dependencies = [
  "diesel",
  "log 0.4.14",
@@ -1452,9 +1452,9 @@ dependencies = [
 
 [[package]]
 name = "rocket_contrib_codegen"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b4d1a66d019ae1ccf82360b93daa9d4773fc38dc332f76f5a66e95f12496840"
+checksum = "a0f2cbcb6c09b3ac0acdf77682ff8c9d1f317361498a773ee50b32be7fddfe2b"
 dependencies = [
  "devise",
  "quote 0.6.13",
diff --git a/Cargo.toml b/Cargo.toml
index 4c34773..5307aa7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -43,6 +43,6 @@ diesel = { version = "1.4.6", features = ["postgres"] }
 diesel_migrations = "1.4.0"
 
 [dependencies.rocket_contrib]
-version = "0.4.9"
+version = "0.4.10"
 default-features = false
 features = ["json", "diesel_postgres_pool", "serve"]

From f4aba0c16f82220da3b1635629186f4a4c4579ba Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@whitesourcesoftware.com>
Date: Tue, 8 Jun 2021 08:01:24 +0000
Subject: [PATCH 120/124] Update Rust crate diesel to 1.4.7

---
 Cargo.lock | 4 ++--
 Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cb526b7..cbfda65 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -317,9 +317,9 @@ dependencies = [
 
 [[package]]
 name = "diesel"
-version = "1.4.6"
+version = "1.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "047bfc4d5c3bd2ef6ca6f981941046113524b9a9f9a7cbdfdd7ff40f58e6f542"
+checksum = "bba51ca66f57261fd17cadf8b73e4775cc307d0521d855de3f5de91a8f074e0e"
 dependencies = [
  "bitflags",
  "byteorder",
diff --git a/Cargo.toml b/Cargo.toml
index 5307aa7..106e662 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -39,7 +39,7 @@ chrono = "0.4.19"
 chrono-tz = "0.5.3"
 regex = "1.5.4"
 reqwest = { version = "0.11.3", features = ["blocking", "json", "cookies"] }
-diesel = { version = "1.4.6", features = ["postgres"] }
+diesel = { version = "1.4.7", features = ["postgres"] }
 diesel_migrations = "1.4.0"
 
 [dependencies.rocket_contrib]

From 7dfb3c0e200f64f2491ff42be2b748ec05dddc59 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@whitesourcesoftware.com>
Date: Fri, 24 Dec 2021 07:59:52 +0000
Subject: [PATCH 121/124] Update Rust crate diesel to 1.4.8

---
 Cargo.lock | 4 ++--
 Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cbfda65..9fe9d83 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -317,9 +317,9 @@ dependencies = [
 
 [[package]]
 name = "diesel"
-version = "1.4.7"
+version = "1.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bba51ca66f57261fd17cadf8b73e4775cc307d0521d855de3f5de91a8f074e0e"
+checksum = "b28135ecf6b7d446b43e27e225622a038cc4e2930a1022f51cdb97ada19b8e4d"
 dependencies = [
  "bitflags",
  "byteorder",
diff --git a/Cargo.toml b/Cargo.toml
index 106e662..3cc7386 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -39,7 +39,7 @@ chrono = "0.4.19"
 chrono-tz = "0.5.3"
 regex = "1.5.4"
 reqwest = { version = "0.11.3", features = ["blocking", "json", "cookies"] }
-diesel = { version = "1.4.7", features = ["postgres"] }
+diesel = { version = "1.4.8", features = ["postgres"] }
 diesel_migrations = "1.4.0"
 
 [dependencies.rocket_contrib]

From 9cbdfff62f36e7b59edbfbae64538cfc76dd2374 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@whitesourcesoftware.com>
Date: Fri, 24 Dec 2021 08:01:11 +0000
Subject: [PATCH 122/124] Update dependency eslint to v8

---
 web/package.json |   2 +-
 web/yarn.lock    | 286 ++++++++++++++++++++++++-----------------------
 2 files changed, 150 insertions(+), 138 deletions(-)

diff --git a/web/package.json b/web/package.json
index cdc6b59..830ea7a 100644
--- a/web/package.json
+++ b/web/package.json
@@ -17,7 +17,7 @@
     "@typescript-eslint/parser": "^4.22.0",
     "@vitejs/plugin-vue": "^1.2.1",
     "@vue/compiler-sfc": "^3.0.5",
-    "eslint": "^7.25.0",
+    "eslint": "^8.0.0",
     "eslint-config-standard": "^16.0.2",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-node": "^11.1.0",
diff --git a/web/yarn.lock b/web/yarn.lock
index 6e69f58..e40b55d 100644
--- a/web/yarn.lock
+++ b/web/yarn.lock
@@ -2,27 +2,11 @@
 # yarn lockfile v1
 
 
-"@babel/code-frame@7.12.11":
-  version "7.12.11"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
-  integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==
-  dependencies:
-    "@babel/highlight" "^7.10.4"
-
 "@babel/helper-validator-identifier@^7.14.0":
   version "7.14.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz#d26cad8a47c65286b15df1547319a5d0bcf27288"
   integrity sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==
 
-"@babel/highlight@^7.10.4":
-  version "7.14.0"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.0.tgz#3197e375711ef6bf834e67d0daec88e4f46113cf"
-  integrity sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.14.0"
-    chalk "^2.0.0"
-    js-tokens "^4.0.0"
-
 "@babel/parser@^7.12.0", "@babel/parser@^7.13.9", "@babel/parser@^7.6.0", "@babel/parser@^7.9.6":
   version "7.14.0"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.0.tgz#2f0ebfed92bcddcc8395b91f1895191ce2760380"
@@ -55,21 +39,35 @@
   resolved "https://registry.yarnpkg.com/@emmetio/scanner/-/scanner-1.0.0.tgz#065b2af6233fe7474d44823e3deb89724af42b5f"
   integrity sha512-8HqW8EVqjnCmWXVpqAOZf+EGESdkR27odcMMMGefgKXtar00SoYNSryGv//TELI4T3QFsECo78p+0lmalk/CFA==
 
-"@eslint/eslintrc@^0.4.0":
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.0.tgz#99cc0a0584d72f1df38b900fb062ba995f395547"
-  integrity sha512-2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog==
+"@eslint/eslintrc@^1.0.5":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.0.5.tgz#33f1b838dbf1f923bfa517e008362b78ddbbf318"
+  integrity sha512-BLxsnmK3KyPunz5wmCCpqy0YelEoxxGmH73Is+Z74oOTMtExcjkr3dDR6quwrjh1YspA8DH9gnX1o069KiS9AQ==
   dependencies:
     ajv "^6.12.4"
-    debug "^4.1.1"
-    espree "^7.3.0"
-    globals "^12.1.0"
+    debug "^4.3.2"
+    espree "^9.2.0"
+    globals "^13.9.0"
     ignore "^4.0.6"
     import-fresh "^3.2.1"
-    js-yaml "^3.13.1"
+    js-yaml "^4.1.0"
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
+"@humanwhocodes/config-array@^0.9.2":
+  version "0.9.2"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.9.2.tgz#68be55c737023009dfc5fe245d51181bb6476914"
+  integrity sha512-UXOuFCGcwciWckOpmfKDq/GyhlTf9pN/BzG//x8p8zTOFEcGuA68ANXheFS0AGvy3qgZqLBUkMs7hqzqCKOVwA==
+  dependencies:
+    "@humanwhocodes/object-schema" "^1.2.1"
+    debug "^4.1.1"
+    minimatch "^3.0.4"
+
+"@humanwhocodes/object-schema@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
+  integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
+
 "@nodelib/fs.scandir@2.1.4":
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69"
@@ -456,11 +454,16 @@ acorn-jsx@^5.2.0, acorn-jsx@^5.3.1:
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b"
   integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==
 
-acorn@^7.1.1, acorn@^7.4.0:
+acorn@^7.1.1:
   version "7.4.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
+acorn@^8.6.0:
+  version "8.6.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.6.0.tgz#e3692ba0eb1a0c83eaa4f37f5fa7368dd7142895"
+  integrity sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw==
+
 ajv@^6.10.0, ajv@^6.12.4:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
@@ -471,16 +474,6 @@ ajv@^6.10.0, ajv@^6.12.4:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^8.0.1:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.2.0.tgz#c89d3380a784ce81b2085f48811c4c101df4c602"
-  integrity sha512-WSNGFuyWd//XO8n/m/EaOlNLtO0yL8EXT/74LqT4khdhpZjP7lkj/kT5uwRmGitKEVp/Oj7ZUHeGfPtgHhQ5CA==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    json-schema-traverse "^1.0.0"
-    require-from-string "^2.0.2"
-    uri-js "^4.2.2"
-
 ansi-align@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.0.tgz#b536b371cf687caaef236c18d3e21fe3797467cb"
@@ -508,6 +501,11 @@ ansi-regex@^5.0.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
   integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
 
+ansi-regex@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
+  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
+
 ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
@@ -515,7 +513,7 @@ ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
-ansi-styles@^4.0.0, ansi-styles@^4.1.0:
+ansi-styles@^4.1.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
   integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
@@ -529,6 +527,11 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
+argparse@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
+  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
+
 array-find-index@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
@@ -579,11 +582,6 @@ assert-never@^1.2.1:
   resolved "https://registry.yarnpkg.com/assert-never/-/assert-never-1.2.1.tgz#11f0e363bf146205fb08193b5c7b90f4d1cf44fe"
   integrity sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw==
 
-astral-regex@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
-  integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
-
 babel-walk@3.0.0-canary-5:
   version "3.0.0-canary-5"
   resolved "https://registry.yarnpkg.com/babel-walk/-/babel-walk-3.0.0-canary-5.tgz#f66ecd7298357aee44955f235a6ef54219104b11"
@@ -695,7 +693,7 @@ ccount@^1.0.4:
   resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.1.0.tgz#246687debb6014735131be8abab2d93898f8d043"
   integrity sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg==
 
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.4.2:
+chalk@^2.0.1, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -891,13 +889,20 @@ debug@^3.1.0:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.0.1, debug@^4.1.1:
+debug@^4.1.1:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
   integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
   dependencies:
     ms "2.1.2"
 
+debug@^4.3.2:
+  version "4.3.3"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664"
+  integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==
+  dependencies:
+    ms "2.1.2"
+
 decamelize-keys@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
@@ -1099,6 +1104,11 @@ escape-string-regexp@^1.0.5:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
+escape-string-regexp@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
+  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
+
 eslint-config-standard@^16.0.2:
   version "16.0.2"
   resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-16.0.2.tgz#71e91727ac7a203782d0a5ca4d1c462d14e234f6"
@@ -1174,7 +1184,7 @@ eslint-plugin-vue@^7.9.0:
     semver "^7.3.2"
     vue-eslint-parser "^7.6.0"
 
-eslint-scope@^5.0.0, eslint-scope@^5.1.1:
+eslint-scope@^5.0.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
   integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
@@ -1182,6 +1192,14 @@ eslint-scope@^5.0.0, eslint-scope@^5.1.1:
     esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
+eslint-scope@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.0.tgz#c1f6ea30ac583031f203d65c73e723b01298f153"
+  integrity sha512-aWwkhnS0qAXqNOgKOK0dJ2nvzEbhEvpy8OlJ9kZ0FeZnA6zpjv1/Vei+puGFFX7zkPCkHHXb7IDX3A+7yPrRWg==
+  dependencies:
+    esrecurse "^4.3.0"
+    estraverse "^5.2.0"
+
 eslint-utils@^2.0.0, eslint-utils@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
@@ -1189,7 +1207,14 @@ eslint-utils@^2.0.0, eslint-utils@^2.1.0:
   dependencies:
     eslint-visitor-keys "^1.1.0"
 
-eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
+eslint-utils@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672"
+  integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==
+  dependencies:
+    eslint-visitor-keys "^2.0.0"
+
+eslint-visitor-keys@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
   integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
@@ -1199,46 +1224,52 @@ eslint-visitor-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
   integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
 
-eslint@^7.25.0:
-  version "7.25.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.25.0.tgz#1309e4404d94e676e3e831b3a3ad2b050031eb67"
-  integrity sha512-TVpSovpvCNpLURIScDRB6g5CYu/ZFq9GfX2hLNIV4dSBKxIWojeDODvYl3t0k0VtMxYeR8OXPCFE5+oHMlGfhw==
+eslint-visitor-keys@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz#eee4acea891814cda67a7d8812d9647dd0179af2"
+  integrity sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==
+
+eslint@^8.0.0:
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.5.0.tgz#ddd2c1afd8f412036f87ae2a063d2aa296d3175f"
+  integrity sha512-tVGSkgNbOfiHyVte8bCM8OmX+xG9PzVG/B4UCF60zx7j61WIVY/AqJECDgpLD4DbbESD0e174gOg3ZlrX15GDg==
   dependencies:
-    "@babel/code-frame" "7.12.11"
-    "@eslint/eslintrc" "^0.4.0"
+    "@eslint/eslintrc" "^1.0.5"
+    "@humanwhocodes/config-array" "^0.9.2"
     ajv "^6.10.0"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
-    debug "^4.0.1"
+    debug "^4.3.2"
     doctrine "^3.0.0"
     enquirer "^2.3.5"
-    eslint-scope "^5.1.1"
-    eslint-utils "^2.1.0"
-    eslint-visitor-keys "^2.0.0"
-    espree "^7.3.1"
+    escape-string-regexp "^4.0.0"
+    eslint-scope "^7.1.0"
+    eslint-utils "^3.0.0"
+    eslint-visitor-keys "^3.1.0"
+    espree "^9.2.0"
     esquery "^1.4.0"
     esutils "^2.0.2"
+    fast-deep-equal "^3.1.3"
     file-entry-cache "^6.0.1"
     functional-red-black-tree "^1.0.1"
-    glob-parent "^5.0.0"
+    glob-parent "^6.0.1"
     globals "^13.6.0"
     ignore "^4.0.6"
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
-    js-yaml "^3.13.1"
+    js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.4.1"
-    lodash "^4.17.21"
+    lodash.merge "^4.6.2"
     minimatch "^3.0.4"
     natural-compare "^1.4.0"
     optionator "^0.9.1"
     progress "^2.0.0"
-    regexpp "^3.1.0"
+    regexpp "^3.2.0"
     semver "^7.2.1"
-    strip-ansi "^6.0.0"
+    strip-ansi "^6.0.1"
     strip-json-comments "^3.1.0"
-    table "^6.0.4"
     text-table "^0.2.0"
     v8-compile-cache "^2.0.3"
 
@@ -1251,14 +1282,14 @@ espree@^6.2.1:
     acorn-jsx "^5.2.0"
     eslint-visitor-keys "^1.1.0"
 
-espree@^7.3.0, espree@^7.3.1:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6"
-  integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==
+espree@^9.2.0:
+  version "9.2.0"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.2.0.tgz#c50814e01611c2d0f8bd4daa83c369eabba80dbc"
+  integrity sha512-oP3utRkynpZWF/F2x/HZJ+AGtnIclaR7z1pYPxy7NYM2fSO6LgK/Rkny8anRSPK/VwEA1eqm2squui0T7ZMOBg==
   dependencies:
-    acorn "^7.4.0"
+    acorn "^8.6.0"
     acorn-jsx "^5.3.1"
-    eslint-visitor-keys "^1.3.0"
+    eslint-visitor-keys "^3.1.0"
 
 esprima@^4.0.0:
   version "4.0.1"
@@ -1317,7 +1348,7 @@ extend@^3.0.0:
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
-fast-deep-equal@^3.1.1:
+fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
@@ -1457,13 +1488,20 @@ get-stream@^5.1.0:
   dependencies:
     pump "^3.0.0"
 
-glob-parent@^5.0.0, glob-parent@^5.1.0:
+glob-parent@^5.1.0:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
   integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
   dependencies:
     is-glob "^4.0.1"
 
+glob-parent@^6.0.1:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
+  integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
+  dependencies:
+    is-glob "^4.0.3"
+
 glob@^7.0.3, glob@^7.1.3:
   version "7.1.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
@@ -1483,13 +1521,6 @@ global-dirs@^0.1.0:
   dependencies:
     ini "^1.3.4"
 
-globals@^12.1.0:
-  version "12.4.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8"
-  integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==
-  dependencies:
-    type-fest "^0.8.1"
-
 globals@^13.6.0:
   version "13.8.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-13.8.0.tgz#3e20f504810ce87a8d72e55aecf8435b50f4c1b3"
@@ -1497,6 +1528,13 @@ globals@^13.6.0:
   dependencies:
     type-fest "^0.20.2"
 
+globals@^13.9.0:
+  version "13.12.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.12.0.tgz#4d733760304230a0082ed96e21e5c565f898089e"
+  integrity sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==
+  dependencies:
+    type-fest "^0.20.2"
+
 globby@^11.0.1:
   version "11.0.3"
   resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.3.tgz#9b1f0cb523e171dd1ad8c7b2a9fb4b644b9593cb"
@@ -1803,6 +1841,13 @@ is-glob@^4.0.0, is-glob@^4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
+is-glob@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
+  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
+  dependencies:
+    is-extglob "^2.1.1"
+
 is-hexadecimal@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7"
@@ -1913,12 +1958,7 @@ js-stringify@^1.0.2:
   resolved "https://registry.yarnpkg.com/js-stringify/-/js-stringify-1.0.2.tgz#1736fddfd9724f28a3682adc6230ae7e4e9679db"
   integrity sha1-Fzb939lyTyijaCrcYjCufk6Weds=
 
-js-tokens@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
-  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
-
-js-yaml@^3.13.1, js-yaml@^3.6.1:
+js-yaml@^3.6.1:
   version "3.14.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
   integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
@@ -1926,6 +1966,13 @@ js-yaml@^3.13.1, js-yaml@^3.6.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
+js-yaml@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+  dependencies:
+    argparse "^2.0.1"
+
 json-buffer@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
@@ -1941,11 +1988,6 @@ json-schema-traverse@^0.4.1:
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
   integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
 
-json-schema-traverse@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
-  integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
-
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
@@ -2048,27 +2090,17 @@ lodash.camelcase@^4.3.0:
   resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
   integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY=
 
-lodash.clonedeep@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
-  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
-
-lodash.flatten@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
-  integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=
-
 lodash.iteratee@^4.5.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/lodash.iteratee/-/lodash.iteratee-4.7.0.tgz#be4177db289a8ccc3c0990f1db26b5b22fc1554c"
   integrity sha1-vkF32yiajMw8CZDx2ya1si/BVUw=
 
-lodash.truncate@^4.4.2:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
-  integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=
+lodash.merge@^4.6.2:
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
+  integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
-lodash@^4.17.15, lodash@^4.17.21:
+lodash@^4.17.15:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -2748,11 +2780,16 @@ redent@^2.0.0:
     indent-string "^3.0.0"
     strip-indent "^2.0.0"
 
-regexpp@^3.0.0, regexpp@^3.1.0:
+regexpp@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"
   integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==
 
+regexpp@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
+  integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
+
 registry-auth-token@^4.0.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250"
@@ -2786,11 +2823,6 @@ replace-ext@1.0.0:
   resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"
   integrity sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=
 
-require-from-string@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
-  integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
-
 resolve-from@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
@@ -2910,15 +2942,6 @@ slash@^3.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
-slice-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
-  integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==
-  dependencies:
-    ansi-styles "^4.0.0"
-    astral-regex "^2.0.0"
-    is-fullwidth-code-point "^3.0.0"
-
 source-map@^0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
@@ -2987,7 +3010,7 @@ string-width@^3.0.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"
 
-string-width@^4.0.0, string-width@^4.2.0:
+string-width@^4.0.0:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"
   integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==
@@ -3051,6 +3074,13 @@ strip-ansi@^6.0.0:
   dependencies:
     ansi-regex "^5.0.0"
 
+strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
 strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
@@ -3097,19 +3127,6 @@ supports-color@^7.1.0:
   dependencies:
     has-flag "^4.0.0"
 
-table@^6.0.4:
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/table/-/table-6.6.0.tgz#905654b79df98d9e9a973de1dd58682532c40e8e"
-  integrity sha512-iZMtp5tUvcnAdtHpZTWLPF0M7AgiQsURR2DwmxnJwSy8I3+cY+ozzVvYha3BOLG2TB+L0CqjIz+91htuj6yCXg==
-  dependencies:
-    ajv "^8.0.1"
-    lodash.clonedeep "^4.5.0"
-    lodash.flatten "^4.4.0"
-    lodash.truncate "^4.4.2"
-    slice-ansi "^4.0.0"
-    string-width "^4.2.0"
-    strip-ansi "^6.0.0"
-
 term-size@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69"
@@ -3209,11 +3226,6 @@ type-fest@^0.3.0:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.3.1.tgz#63d00d204e059474fe5e1b7c011112bbd1dc29e1"
   integrity sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==
 
-type-fest@^0.8.1:
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
-  integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
-
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"

From 2f66ce4e22bac098942b202804d39a10cb21bdcf Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@whitesourcesoftware.com>
Date: Fri, 24 Dec 2021 08:01:29 +0000
Subject: [PATCH 123/124] Update node Docker tag to v17

---
 docker/Dockerfile.rel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/Dockerfile.rel b/docker/Dockerfile.rel
index ae0d597..5ccc65f 100644
--- a/docker/Dockerfile.rel
+++ b/docker/Dockerfile.rel
@@ -23,7 +23,7 @@ RUN cargo install \
     --features frontend
 
 
-FROM node:16-alpine3.13 AS frontend-builder
+FROM node:17-alpine3.13 AS frontend-builder
 
 COPY ./web /app
 WORKDIR /app

From 1d83ee4338719b619e9d25a49c296459f3d27fa3 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@whitesourcesoftware.com>
Date: Fri, 24 Dec 2021 08:01:32 +0000
Subject: [PATCH 124/124] Update postgres Docker tag to v14

---
 docker/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index f2a19e0..9291408 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -13,7 +13,7 @@ services:
             - 'DATABASE_URL=postgres://fej:fej@db:5432/fej'
 
     db:
-        image: 'postgres:13-alpine'
+        image: 'postgres:14-alpine'
         restart: 'always'
 
         environment: