9 files changed, 441 insertions, 56 deletions

diff --git a/README.md b/README.md
index 41457b6..9a7d01b 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 # ferdi-server
 Unofficial Franz server replacement for use with the Ferdi Client.
 
+⚠️ Currently not to be used publicly/productively as there are no validations etc. yet.
+
 ## Features
 - [x] User registration and login
 - [x] Service creation, download and listing
diff --git a/app/Controllers/Http/RecipeController.js b/app/Controllers/Http/RecipeController.js
index 641f4ef..407379e 100644
--- a/app/Controllers/Http/RecipeController.js
+++ b/app/Controllers/Http/RecipeController.js
@@ -4,9 +4,27 @@ const Recipe = use('App/Models/Recipe');
 const Helpers = use('Helpers')
 const Drive = use('Drive')
 const fetch = require('node-fetch');
+const targz = require('targz');
 const path = require('path');
+const fs = require('fs');
+
+const compress = (src, dest) => {
+  return new Promise((resolve, reject) => {
+    targz.compress({
+      src,
+      dest
+    }, function (err) {
+      if (err) {
+        reject(err);
+      } else {
+        resolve(dest);
+      }
+    });
+  })
+}
 
 class RecipeController {
+  // List official and custom recipes
   async list({
     response
   }) {
@@ -26,19 +44,29 @@ class RecipeController {
     return response.send(recipes)
   }
 
+  // Create a new recipe using the new.html page
   async create({
     request,
     response
   }) {
     const data = request.all();
 
-    const pkg = request.file('package')
+    // Check for invalid characters
+    if (/\.{1,}/.test(data.id) || /\/{1,}/.test(data.id)) {
+      return response.send('Invalid recipe name. Your recipe name may not contain "." or "/"');
+    }
 
-    await pkg.move(path.join(Helpers.appRoot(), '/recipes/'), {
-      name: data.id + '.tar.gz',
-      overwrite: false
-    })
+    // Move uploaded files to temporary path
+    const files = request.file('files')
+    await files.moveAll(Helpers.tmpPath('recipe'))
 
+    // Compress files to .tar.gz file
+    compress(
+      Helpers.tmpPath('recipe'), 
+      path.join(Helpers.appRoot(), '/recipes/' + data.id + '.tar.gz')
+    );
+
+    // Create recipe in db
     await Recipe.create({
       name: data.name,
       recipeId: data.id,
@@ -56,23 +84,25 @@ class RecipeController {
     return response.send('Created new recipe')
   }
 
+  // Search official and custom recipes
   async search({
-      request,
-      response
+    request,
+    response
   }) {
     const needle = request.input('needle')
 
+    // Get results
     const remoteResults = JSON.parse(await (await fetch('https://api.franzinfra.com/v1/recipes/search?needle=' + needle)).text());
     const localResultsArray = (await Recipe.query().where('name', 'LIKE', '%' + needle + '%').fetch()).toJSON();
     const localResults = localResultsArray.map(recipe => ({
-        "id": recipe.recipeId,
-        "name": recipe.name,
-        ...JSON.parse(recipe.data)
+      "id": recipe.recipeId,
+      "name": recipe.name,
+      ...JSON.parse(recipe.data)
     }))
 
     const results = [
-        ...localResults,
-        ...remoteResults,
+      ...localResults,
+      ...remoteResults,
     ]
 
     return response.send(results);
@@ -86,16 +116,16 @@ class RecipeController {
   }) {
     const service = params.recipe;
 
-    // Chack for invalid characters
-    if (/\.{1,}/.test(service) || /\/{1,}/.test(service)) {
-        return response.send('Invalid recipe name');
+    // Check for invalid characters
+    if (/\.{1,}/.test(service) || /\/{1,}/.test(service)) {
+      return response.send('Invalid recipe name');
     }
 
     // Check if recipe exists in recipes folder
     if (await Drive.exists(service + '.tar.gz')) {
-        response.send(await Drive.get(service + '.tar.gz'))
+      response.send(await Drive.get(service + '.tar.gz'))
     } else {
-        response.redirect('https://api.franzinfra.com/v1/recipes/download/' + service)
+      response.redirect('https://api.franzinfra.com/v1/recipes/download/' + service)
     }
   }
 }
diff --git a/app/Controllers/Http/UserController.js b/app/Controllers/Http/UserController.js
index 062e16f..f78f28d 100644
--- a/app/Controllers/Http/UserController.js
+++ b/app/Controllers/Http/UserController.js
@@ -13,11 +13,20 @@ class UserController {
     session
   }) {
     const data = request.only(['firstname', 'email', 'password']);
-    const user = await User.create({
-      email: data.email,
-      password: data.password,
-      username: data.firstname
-    });
+
+    try {
+      const user = await User.create({
+        email: data.email,
+        password: data.password,
+        username: data.firstname
+      });
+    } catch(e) {
+      return response.status(401).send({
+        "message": "E-Mail Address already in use",
+        "status": 401
+      })
+    }
+    
     const token = await auth.generate(user)
 
     return response.send({
diff --git a/config/bodyParser.js b/config/bodyParser.js
index c481b01..f04d291 100644
--- a/config/bodyParser.js
+++ b/config/bodyParser.js
@@ -20,7 +20,7 @@ module.exports = {
     | is over 1mb it will not be processed.
     |
     */
-    limit: '1mb',
+    limit: '50mb',
 
     /*
     |--------------------------------------------------------------------------
diff --git a/package.json b/package.json
index f3940d5..327fb8e 100644
--- a/package.json
+++ b/package.json
@@ -29,6 +29,7 @@
     "node-fetch": "^2.6.0",
     "pg": "^7.12.1",
     "sqlite3": "^4.1.0",
+    "targz": "^1.0.1",
     "uuid": "^3.3.3"
   },
   "devDependencies": {},
diff --git a/public/css/vanilla.css b/public/css/vanilla.css
new file mode 100644
index 0000000..37bc051
--- /dev/null
+++ b/public/css/vanilla.css
@@ -0,0 +1,138 @@
+/* Reset */
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed, 
+figure, figcaption, footer, header, hgroup, 
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+    margin: 0;
+    padding: 0;
+    border: 0;
+    font-size: 100%;
+    font: inherit;
+    vertical-align: baseline;
+}
+* {
+    box-sizing: border-box;
+}
+
+
+
+/* Variables */
+:root {
+    --desktop-font-size: 1.3rem/1.5;
+    --mobile-font-size: 1.1rem/1.4;
+    --text-color: #2d2d2d;
+    --link-color: blue;
+    --primary-color: lightsteelblue;
+    --secondary-color: aliceblue;
+    --tertiary-color: whitesmoke;
+}
+
+
+
+
+/* Typography */
+body { 
+    color: var(--text-color);
+    padding: 3rem;
+    font: var(--desktop-font-size) -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto, Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji", "Segoe UI Symbol";
+}
+
+h1,h2,h3,h4,h5,h6,p,blockquote,dl,img,figure {
+    margin: 2rem 0;
+}
+
+h1,h2,h3,h4,h5,h6 { font-weight: bold; }
+h1 { font-size: 200%; }
+h2 { font-size: 150%; }
+h3 { font-size: 120%; }
+h4,h5,h6 { font-size: 100%; }
+h5, h6 { text-transform: uppercase; }
+
+header h1 { border-bottom: 1px solid; }
+
+p { margin: 2rem 0; }
+
+a,a:visited { color: var(--link-color); }
+
+strong, time, b { font-weight: bold; }
+em, dfn, i { font-style: italic; }
+sub { font-size: 60%; vertical-align: bottom; }
+small { font-size: 80%; }
+
+blockquote, q {
+    background: var(--secondary-color);
+    border-left: 10px solid var(--primary-color);
+    font-family: "Georgia", serif; 
+    padding: 1rem;
+}
+blockquote p:first-child { margin-top: 0; }
+cite { 
+    font-family: "Georgia", serif; 
+    font-style: italic;
+    font-weight: bold;
+}
+
+kbd,code,samp,pre,var { font-family: monospace; font-weight: bold; }
+code, pre {
+    background: var(--tertiary-color);
+    padding: 0.5rem 1rem;
+}
+code pre , pre code { padding: 0; }
+
+
+
+/* Elements */
+hr {
+    background: var(--text-color);
+    border: 0;
+    height: 1px;
+    margin: 4rem 0;
+}
+
+img { max-width: 100%; }
+
+figure { 
+    border: 1px solid var(--primary-color);
+    display: inline-block;
+    padding: 1rem; 
+    width: auto;
+}
+figure img { margin: 0; }
+figure figcaption { font-size: 80%; }
+
+ul, ol { margin: 2rem 0; padding: 0 0 0 4rem; }
+
+dl dd { padding-left: 2rem; }
+
+table {
+    border: 1px solid var(--primary-color);
+    border-collapse: collapse;
+    table-layout: fixed;
+    width: 100%; 
+}
+table caption { margin: 2rem 0; }
+table thead { text-align: center; }
+table tbody { text-align: right; }
+table tr { border-bottom: 1px solid var(--primary-color); }
+table tbody tr:nth-child(even) { background: var(--tertiary-color); }
+table th { background: var(--secondary-color); font-weight: bold; }
+table th, table td { padding: 1rem; }
+table th:not(last-of-type), table td:not(last-of-type) { border-right: 1px solid var(--primary-color); }
+
+
+
+/* Mobile Styling */
+@media screen and (max-width: 50rem) {
+    body {
+        font: var(--mobile-font-size) -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto, Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji", "Segoe UI Symbol"
+    }
+}
\ No newline at end of file
diff --git a/public/js/new.js b/public/js/new.js
new file mode 100644
index 0000000..4f54245
--- /dev/null
+++ b/public/js/new.js
@@ -0,0 +1,23 @@
+const elDrop = document.getElementById('dropzone');
+const submitBtn = document.getElementById('submitbutton');
+const fileInput = document.getElementById('files');
+
+elDrop.addEventListener('dragover', function (event) {
+  event.preventDefault();
+});
+
+elDrop.addEventListener('drop', async function (event) {
+  event.preventDefault();
+
+  submitBtn.disabled = true;
+
+  fileInput.files = event.dataTransfer.files;
+
+  elDrop.innerText = `✓ ${fileInput.files.length} files selected`;
+  elDrop.style.height = 'inherit';
+
+  submitBtn.disabled = false;
+});
+elDrop.addEventListener('click', () => {
+    fileInput.click();
+})
\ No newline at end of file
diff --git a/public/new.html b/public/new.html
index 69deafd..b0e4b41 100644
--- a/public/new.html
+++ b/public/new.html
@@ -1,40 +1,115 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <title>Create a new service</title>
-
-    <style>
-        input {
-            margin-bottom: 1rem;
-        }
-    </style>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta http-equiv="X-UA-Compatible" content="ie=edge">
+  <title>Create a new service</title>
+
+  <link rel="stylesheet" href="css/vanilla.css">
+
+  <style>
+    input {
+      margin-bottom: 1rem;
+      width: 100%;
+      padding: 0.5rem;
+    }
+
+    button {
+      display: flex;
+      overflow: hidden;
+      padding: 12px 12px;
+      cursor: pointer;
+      width: 100%;
+      -webkit-user-select: none;
+      -moz-user-select: none;
+      -ms-user-select: none;
+      user-select: none;
+      transition: all 150ms linear;
+      text-align: center;
+      white-space: nowrap;
+      text-decoration: none !important;
+      text-transform: none;
+      text-transform: capitalize;
+      color: #fff;
+      border: 0 none;
+      border-radius: 4px;
+      font-size: 13px;
+      font-weight: 500;
+      line-height: 1.3;
+      -webkit-appearance: none;
+      -moz-appearance: none;
+      appearance: none;
+      justify-content: center;
+      align-items: center;
+      flex: 0 0 160px;
+      box-shadow: 2px 5px 10px #e4e4e4;
+      color: #FFFFFF;
+      background: #161616;
+    }
+
+    #dropzone {
+      width: 100%;
+      height: 30vh;
+      background-color: #ebebeb;
+
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      text-align: center;
+
+      cursor: pointer;
+    }
+
+    #dropzone p {
+      font-size: 0.85rem;
+    }
+
+    #files {
+        display: none;
+    }
+
+  </style>
 </head>
+
 <body>
-    <h1>Create a new service</h1>
-    <form action="new" method="post" enctype="multipart/form-data">
-        <label for="author">Author</label><br />
-        <input type="text" name="author" placeholder="Jon Doe" required><br />
+  <h1>Create a new recipe</h1>
+  <p>Please create a recipe using <a href="https://github.com/meetfranz/plugins/blob/master/docs/integration.md">the
+      official Franz guide</a>, then publish it here.</p>
+  <form action="new" method="post" enctype="multipart/form-data">
+    <label for="author">Author</label><br />
+    <input type="text" name="author" placeholder="Jon Doe" required><br />
+
+    <label for="name">Name</label><br />
+    <input type="text" name="name" placeholder="Sample Service" required><br />
 
-        <label for="name">Name</label><br />
-        <input type="text" name="name" placeholder="Sample Service" required><br />
+    <label for="id">Service ID</label><br />
+    <input type="text" name="id" placeholder="sample-service" required><br />
 
-        <label for="id">Service ID</label><br />
-        <input type="text" name="id" placeholder="sample-service" required><br />
+    <label for="png">Link to PNG image*</label><br />
+    <input type="text" name="png" placeholder="https://.../logo.png" required><br />
 
-        <label for="png">Link to PNG image</label><br />
-        <input type="text" name="png" placeholder="https://.../logo.png" required><br />
+    <label for="svg">Link to SVG image*</label><br />
+    <input type="text" name="svg" placeholder="https://.../logo.svg" required><br />
+    *These images must be publicly availible and have CORS enabled in order to work.<br /><br />
 
-        <label for="svg">Link to SVG image</label><br />
-        <input type="text" name="svg" placeholder="https://.../logo.svg" required><br />
+    <label for="package">Recipe files</label><br />
+    <div id="dropzone" effectAllowed="move">
+      <div>
+        Drop recipe files here<br />or click here to select files
+        <p>
+          Drag and drop your recipe files into this area.<br />
+          Please do not select the folder that contains the files but rather the files itself.
+        </p>
+      </div>
+    </div>
+    <input type="file" name="files[]" id="files" value="" multiple><br /><br />
 
-        <label for="package">Package</label><br />
-        *Please package your service into a .tar.gz file<br />
-        <input type="file" name="package" id="package"><br />
+    <button type="submit" id="submitbutton">Create recipe</button>
+  </form>
 
-        <button type="submit">Create</button>
-    </form>
+  <script src="js/new.js"></script>
 </body>
-</html>
\ No newline at end of file
+
+</html>
diff --git a/yarn.lock b/yarn.lock
index 26f1e52..f2ebd3d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -58,6 +58,13 @@
   resolved "https://registry.yarnpkg.com/@adonisjs/cors/-/cors-1.0.7.tgz#9b7565ad0b80215c620e8864b4af8651220a527c"
   integrity sha512-jBO+bI/zdydAXURL02gQxXB57L5+eV2MUYp7zmDrVa12M6mQPMRz5TC2F7a0Kknx9JUr5dsl4+eN0XNfe/8sWQ==
 
+"@adonisjs/drive@^1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@adonisjs/drive/-/drive-1.0.4.tgz#0dd2a3a5be7bf60fe80bc03d066c48eca9251ade"
+  integrity sha512-p2Ot+ylOwtGV6gHIKIMJG0M+AxBatjnqv+UOrUW3Y8xsyN9bKg9khZTEqn7WrHUAlmeS4WUR5T68KIaxuXgRDw==
+  dependencies:
+    "@slynova/flydrive" "^0.3.1"
+
 "@adonisjs/fold@^4.0.9":
   version "4.0.9"
   resolved "https://registry.yarnpkg.com/@adonisjs/fold/-/fold-4.0.9.tgz#1a9860af2dbe29e4111d7f0cc234be15c2e28be8"
@@ -143,6 +150,16 @@
     haye "^2.0.1"
     lodash "^4.17.5"
 
+"@slynova/flydrive@^0.3.1":
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/@slynova/flydrive/-/flydrive-0.3.1.tgz#7d89c43a90ef8599b29d5f7aadd9e82b6904e8ce"
+  integrity sha512-/C3chxZRqonxjQwj70WOyqtw0JGjBr6rjvkcrGlDedUXi5YoiJiTVHwD4ry6tHJKwOi3PtxpWO9RZwSKElVWzw==
+  dependencies:
+    create-output-stream "0.0.1"
+    fs-extra "^6.0.0"
+    node-exceptions "^3.0.0"
+    resetable "^1.0.2"
+
 abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
@@ -573,6 +590,14 @@ bcryptjs@^2.4.3:
   resolved "https://registry.yarnpkg.com/bcryptjs/-/bcryptjs-2.4.3.tgz#9ab5627b93e60621ff7cdac5da9733027df1d0cb"
   integrity sha1-mrVie5PmBiH/fNrF2pczAn3x0Ms=
 
+bl@^1.0.0:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.2.tgz#a160911717103c07410cef63ef51b397c025af9c"
+  integrity sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==
+  dependencies:
+    readable-stream "^2.3.5"
+    safe-buffer "^5.1.1"
+
 bluebird@^3.5.1:
   version "3.5.5"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.5.tgz#a8d0afd73251effbbd5fe384a77d73003c17a71f"
@@ -602,11 +627,29 @@ braces@^2.3.1:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
+buffer-alloc-unsafe@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
+  integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==
+
+buffer-alloc@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
+  integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==
+  dependencies:
+    buffer-alloc-unsafe "^1.1.0"
+    buffer-fill "^1.0.0"
+
 buffer-equal-constant-time@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
   integrity sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=
 
+buffer-fill@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
+  integrity sha1-+PeLdniYiO858gXNY39o5wISKyw=
+
 buffer-writer@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/buffer-writer/-/buffer-writer-2.0.0.tgz#ce7eb81a38f7829db09c873f2fbb792c0c98ec04"
@@ -686,7 +729,7 @@ choices-separator@^2.0.0:
     debug "^2.6.6"
     strip-color "^0.1.0"
 
-chownr@^1.1.1:
+chownr@^1.0.1, chownr@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.2.tgz#a18f1e0b269c8a6a5d3c86eb298beb14c3dd7bf6"
   integrity sha512-GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A==
@@ -887,6 +930,13 @@ core-util-is@1.0.2, 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=
 
+create-output-stream@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/create-output-stream/-/create-output-stream-0.0.1.tgz#e0ac31e27defeae0e4f699c0edb9c6558c9fa5ab"
+  integrity sha1-4Kwx4n3v6uDk9pnA7bnGVYyfpas=
+  dependencies:
+    mkdirp "^0.5.1"
+
 cross-env@^5.1.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.2.0.tgz#6ecd4c015d5773e614039ee529076669b9d126f2"
@@ -1064,7 +1114,7 @@ encodeurl@^1.0.2, encodeurl@~1.0.2:
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
   integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
 
-end-of-stream@^1.1.0, end-of-stream@^1.4.1:
+end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
   integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==
@@ -1304,6 +1354,20 @@ fresh@0.5.2, fresh@^0.5.2:
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
   integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
 
+fs-constants@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
+  integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
+
+fs-extra@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-6.0.1.tgz#8abc128f7946e310135ddc93b98bddb410e7a34b"
+  integrity sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
 fs-extra@^7.0.0:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
@@ -2752,6 +2816,14 @@ psl@^1.1.24:
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.3.0.tgz#e1ebf6a3b5564fa8376f3da2275da76d875ca1bd"
   integrity sha512-avHdspHO+9rQTLbv1RO+MPYeP/SzsCoxofjVnHanETfQhTJrmB0HlDoW+EiN/R+C0BZ+gERab9NY0lPN2TxNag==
 
+pump@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-1.0.3.tgz#5dfe8311c33bbf6fc18261f9f34702c47c08a954"
+  integrity sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw==
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
 pump@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
@@ -2819,7 +2891,7 @@ rc@^1.2.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-readable-stream@^2.0.6, readable-stream@^2.3.6:
+readable-stream@^2.0.6, readable-stream@^2.3.0, readable-stream@^2.3.5, readable-stream@^2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
   integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
@@ -2942,7 +3014,7 @@ require-uncached@^1.0.3:
     caller-path "^0.1.0"
     resolve-from "^1.0.0"
 
-resetable@^1.0.3:
+resetable@^1.0.2, resetable@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/resetable/-/resetable-1.0.3.tgz#0b8370bec2b921da04db0b22df8c9640fe399420"
   integrity sha512-AJuhrcU5TVUaM5j0wSjZXlzt0Qb5pai7nDI+klgv7deuSHy5Kom7ovwBt5tMMO3XmJ9YYSCbKhkgDJHL4MEerQ==
@@ -2991,7 +3063,7 @@ safe-buffer@5.1.2, 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==
 
-safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
+safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
   integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==
@@ -3375,6 +3447,29 @@ syntax-error@^1.1.4:
   dependencies:
     acorn-node "^1.2.0"
 
+tar-fs@^1.8.1:
+  version "1.16.3"
+  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-1.16.3.tgz#966a628841da2c4010406a82167cbd5e0c72d509"
+  integrity sha512-NvCeXpYx7OsmOh8zIOP/ebG55zZmxLE0etfWRbWok+q2Qo8x/vOR/IJT1taADXPe+jsiu9axDb3X4B+iIgNlKw==
+  dependencies:
+    chownr "^1.0.1"
+    mkdirp "^0.5.1"
+    pump "^1.0.0"
+    tar-stream "^1.1.2"
+
+tar-stream@^1.1.2:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz#8ea55dab37972253d9a9af90fdcd559ae435c555"
+  integrity sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==
+  dependencies:
+    bl "^1.0.0"
+    buffer-alloc "^1.2.0"
+    end-of-stream "^1.0.0"
+    fs-constants "^1.0.0"
+    readable-stream "^2.3.0"
+    to-buffer "^1.1.1"
+    xtend "^4.0.0"
+
 tar@^4:
   version "4.4.10"
   resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.10.tgz#946b2810b9a5e0b26140cf78bea6b0b0d689eba1"
@@ -3388,6 +3483,13 @@ tar@^4:
     safe-buffer "^5.1.2"
     yallist "^3.0.3"
 
+targz@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/targz/-/targz-1.0.1.tgz#8f76a523694cdedfbb5d60a4076ff6eeecc5398f"
+  integrity sha1-j3alI2lM3t+7XWCkB2/27uzFOY8=
+  dependencies:
+    tar-fs "^1.8.1"
+
 tarn@^1.1.4:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/tarn/-/tarn-1.1.5.tgz#7be88622e951738b9fa3fb77477309242cdddc2d"
@@ -3431,6 +3533,11 @@ tmp@0.0.x:
   dependencies:
     os-tmpdir "~1.0.2"
 
+to-buffer@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80"
+  integrity sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==
+
 to-object-path@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"