Parcourir la source

Merge branch 'release/v0.0.1'

Jérôme BUISINE il y a 5 ans
Parent
commit
b4fbe153ad
15 fichiers modifiés avec 363 ajouts et 58 suppressions
  1. 3 0
      .dockerignore
  2. 2 2
      .gitignore
  3. 12 0
      Dockerfile_back
  4. 16 0
      Dockerfile_front
  5. 21 0
      LICENSE
  6. 72 8
      README.md
  7. 1 22
      api/functions.js
  8. 31 7
      api/index.js
  9. 2 2
      api/routes/getImage.js
  10. 24 6
      api/routes/listScenes.js
  11. 11 7
      config.js
  12. 11 0
      docker-compose.frontapp_only.yml
  13. 18 0
      docker-compose.yml
  14. 4 0
      package.json
  15. 135 4
      yarn.lock

+ 3 - 0
.dockerignore

@@ -0,0 +1,3 @@
+node_modules
+npm-debug.log
+.git

+ 2 - 2
.gitignore

@@ -1,6 +1,5 @@
 .DS_Store
 node_modules
-/dist
 
 # local env files
 .env.local
@@ -20,4 +19,5 @@ yarn-error.log*
 *.sln
 *.sw*
 
-/images
+/images
+/dist

+ 12 - 0
Dockerfile_back

@@ -0,0 +1,12 @@
+FROM node:11.7.0-alpine
+
+# Back docker image
+COPY . /usr/src/app
+
+WORKDIR /usr/src/app
+
+EXPOSE ${PORT}
+
+RUN yarn install
+CMD yarn run api:start
+

+ 16 - 0
Dockerfile_front

@@ -0,0 +1,16 @@
+FROM nginx:1.15.10-alpine
+
+RUN apk add yarn
+RUN mkdir app
+
+COPY . /app
+
+WORKDIR /app
+
+RUN yarn install 
+RUN yarn run app:build
+
+RUN ["rm", "-r", "/usr/share/nginx/html"]
+RUN ["mv", "/app/dist", "/usr/share/nginx/html"]
+RUN ["chmod", "775", "-R", "/usr/share/nginx/html"]
+CMD ["nginx", "-g", "daemon off;"]

+ 21 - 0
LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 Prise3D
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

+ 72 - 8
README.md

@@ -1,24 +1,88 @@
 # Antoine_Internship
-
 Travaux développés par Antoine dans le cadre de son stage de DUT2.
 
 
-## Project setup
+## Run as a Docker instance
+### Run server + client
+```sh
+PORT=8080 SERVE_CLIENT=true docker-compose up
+```
+### Run only the server
+```sh
+PORT=8080 SERVE_CLIENT=false docker-compose up
+```
+
+### Run only the client
+```sh
+PORT=8080 docker-compose -f docker-compose.frontapp_only.yml up
+```
+
+To change the port the server is running on set the environnements variables if necessary (see project setup part).
+
+## Run on the file system
+### Project setup
+Install project's dependencies.
 ```
 yarn install
 ```
 
-### Compiles and hot-reloads for development
+If this is a production build, set the `NODE_ENV` environment variable to `production` to enhance performance.
+
+On Linux hosts :
+```sh
+export NODE_ENV=production
 ```
-yarn run serve
+On Windows hosts :
+```bat
+SET NODE_ENV=production
 ```
 
-### Compiles and minifies for production
+### Configuration 
+Configure the project by modifying *[config.js](config.js)*.
+
+#### Configuration options
+| Option      | Default value | Description |
+| ----------- | ------------- | ----------- |
+| apiPrefix | `/api` | The url prefix for the API |
+| serverPort | `5000` | The port used by the server |
+| imagesPath | `images` | The directory where the images are stored |
+| serveClient | `true` | Should the server serve client files from the `/dist` directory |
+
+
+### API
+#### Run the server
+```sh
+yarn run api:start
 ```
-yarn run build
+
+#### Run the server with hot-reload for development
+```sh
+yarn run api:dev
+```
+
+#### Automatically fix the API code syntax with ESLint
+```sh
+yarn run api:lint
+```
+
+
+### Client
+#### Compile and minify for production
+Files will be built to the `dist/` directory.
+```sh
+yarn run app:build
 ```
 
-### Lints and fixes files
+#### Run a hot-reload server for client development
+```sh
+yarn run app:dev
 ```
-yarn run lint
+
+
+#### Automatically fix the client code syntax with ESLint
 ```
+yarn run app:lint
+```
+
+## License
+[The MIT license](LICENSE)

+ 1 - 22
api/functions.js

@@ -1,9 +1,5 @@
 'use strict'
 
-import _fs, { promises as fs } from 'fs'
-import boom from 'boom'
-import { apiConfig } from '../config'
-
 /**
  * Call the error handler if a middleware function throw an error
  *
@@ -17,7 +13,7 @@ export const asyncMiddleware = fn => (req, res, next) => {
       // The error was not recognized, send a 500 HTTP error
       return next(boom.internal(err))
     }
-    // It is a boom error, give it to express to handle it
+    // It is a boom error, pass it to the error handler
     next(err)
   })
 }
@@ -28,20 +24,3 @@ export const errorHandler = (err, req, res, next) => {
   console.error(`Error ${payload.statusCode} - ${payload.error}\n${payload.message}\n`)
   return res.status(payload.statusCode).json(payload)
 }
-
-/**
- * Get a list of all available scenes
- *
- * @returns {string[]} the available scenes
- */
-export const getAvailableScenes = async () => {
-  try {
-    // Check if the images directory exists
-    await fs.access(apiConfig.imagesPath, _fs.constants.R_OK)
-  }
-  catch (err) {
-    // The images directory does not exist or is not accessible
-    throw boom.badRequest(`Can't access the "${apiConfig.imagesPath}" directory. Check it exists and you have read permission on it.`)
-  }
-  return fs.readdir(apiConfig.imagesPath)
-}

+ 31 - 7
api/index.js

@@ -1,19 +1,43 @@
 'use strict'
 
+import path from 'path'
 import express from 'express'
-import routes from './routes'
+import compression from 'compression'
+import serveStatic from 'serve-static'
+import helmet from 'helmet'
+import cors from 'cors'
 
+import routes from './routes'
 import { errorHandler } from './functions'
-import { apiConfig } from '../config'
+import { apiPrefix, serverPort, serveClient, imagesPath } from '../config'
 
 const app = express()
 
-app.listen(apiConfig.port, () => {
-  console.log('The server was started on http://localhost:' + apiConfig.port)
-})
+// Use gzip compression to improve performance
+app.use(compression())
+
+// Enhance the app security by setting some HTTP headers
+app.use(helmet())
+
 
-// Load all the routes in the server
-app.use(apiConfig.routePrefix, routes)
+if (serveClient) {
+  // Serve client files (Client is local)
+  app.use('/', express.static(path.resolve(__dirname, '../dist')))
+}
+else {
+  // Don't serve client files (Client is remote)
+  // Turn "Cross-origin resource sharing" on to allow the remote client to connect to the API
+  app.use(cors())
+}
+
+// Serve images. "serve-static" is used because it caches images ("express.static" doesn't)
+app.use(serveStatic(imagesPath))
+
+// Load all the API routes in the server
+app.use(apiPrefix, routes)
 
 // Error handler (Middleware called when throwing in another middleware)
 app.use(errorHandler)
+
+// Start the server on the configured port
+app.listen(serverPort, () => console.log('The server was started on http://localhost:' + serverPort))

+ 2 - 2
api/routes/getImage.js

@@ -3,7 +3,7 @@
 import express from 'express'
 import { promises } from 'fs'
 
-import { apiConfig } from '../../config'
+import { imagesPath } from '../../config'
 
 const fs = promises
 
@@ -21,7 +21,7 @@ router.get('/', async (req, res) => {
     return
   }
 
-  const dirContent = await fs.readdir(apiConfig.imagesPath)
+  const dirContent = await fs.readdir(imagesPath)
   res.json(req.query)
   res.json({ msg: 'Not ready yet' })
 })

+ 24 - 6
api/routes/listScenes.js

@@ -1,14 +1,32 @@
 'use strict'
 
 import express from 'express'
-import { asyncMiddleware, getAvailableScenes } from '../functions'
+import _fs, { promises as fs } from 'fs'
+import boom from 'boom'
+import { imagesPath } from '../config'
+import { asyncMiddleware } from '../functions'
 
 const router = express.Router()
 
-router.get('/', asyncMiddleware(async (req, res) => {
-  const dirContent = await getAvailableScenes()
-  console.log('triggered')
-  res.json(dirContent)
-}))
+// Route which returns a list of all available scenes in the `imagesPath` directory
+
+/**
+ * Get a list of all available scenes
+ *
+ * @returns {string[]} the available scenes
+ */
+const getAvailableScenes = async () => {
+  try {
+    // Check if the directory which contains images exists
+    await fs.access(imagesPath, _fs.constants.R_OK)
+  }
+  catch (err) {
+    // The images directory does not exist or is not accessible
+    throw boom.badRequest(`Can't access the "${imagesPath}" directory. Check it exists and you have read permission on it.`)
+  }
+  return fs.readdir(imagesPath)
+}
+
+router.get('/', asyncMiddleware(async (req, res) => res.json(await getAvailableScenes())))
 
 export default router

+ 11 - 7
config.js

@@ -2,12 +2,16 @@
 
 import path from 'path'
 
-const PRODUCTION_MODE = process.env.NODE_ENV === 'production'
+export const PRODUCTION_MODE = process.env.NODE_ENV === 'production'
 
-const apiConfig = {
-  routePrefix: '/api',
-  port: PRODUCTION_MODE ? 80 : 5000,
-  imagesPath: path.resolve(__dirname, 'images')
-}
+// The url prefix for the API
+export const apiPrefix = '/api'
 
-export { PRODUCTION_MODE, apiConfig }
+// The port used by the server
+export const serverPort = parseInt(process.env.PORT, 10) || 5000
+
+// The directory where the images are stored (do not edit it)
+export const imagesPath = path.resolve(__dirname, 'images')
+
+// Should the server serve client files from the `/dist` directory
+export const serveClient = process.env.SERVE_CLIENT === 'true'

+ 11 - 0
docker-compose.frontapp_only.yml

@@ -0,0 +1,11 @@
+version: '3'
+
+services:
+
+   frontapp_only:
+      build:
+          context: .
+          dockerfile: Dockerfile_front
+      image: frontwebapp
+      ports:
+          - "${PORT}:80"

+ 18 - 0
docker-compose.yml

@@ -0,0 +1,18 @@
+version: '3'
+
+services:
+
+  backapp:
+      build:
+          context: .
+          dockerfile: Dockerfile_back
+      image: backapp
+      ports:
+          - "${PORT}:${PORT}"
+      environment:
+          NODE_ENV: production
+          SERVE_CLIENT: $SERVE_CLIENT
+          PORT: $PORT
+      volumes:
+          - ./images:/usr/src/app/images
+  

+ 4 - 0
package.json

@@ -12,9 +12,13 @@
   },
   "dependencies": {
     "boom": "^7.3.0",
+    "compression": "^1.7.4",
     "core-js": "^2.6.5",
+    "cors": "^2.8.5",
     "esm": "^3.2.22",
     "express": "^4.16.4",
+    "helmet": "^3.16.0",
+    "serve-static": "^1.13.2",
     "vue": "^2.6.6",
     "vue-router": "^3.0.1"
   },

+ 135 - 4
yarn.lock

@@ -1842,6 +1842,11 @@ camelcase@^5.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
+camelize@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/camelize/-/camelize-1.0.0.tgz#164a5483e630fa4321e5af07020e531831b2609b"
+  integrity sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs=
+
 caniuse-api@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0"
@@ -2116,7 +2121,7 @@ compressible@~2.0.16:
   dependencies:
     mime-db ">= 1.38.0 < 2"
 
-compression@^1.5.2:
+compression@^1.5.2, compression@^1.7.4:
   version "1.7.4"
   resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
   integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
@@ -2195,6 +2200,11 @@ content-disposition@0.5.2:
   resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
   integrity sha1-DPaLud318r55YcOoUXjLhdunjLQ=
 
+content-security-policy-builder@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/content-security-policy-builder/-/content-security-policy-builder-2.0.0.tgz#8749a1d542fcbe82237281ea9f716ce68b394dd2"
+  integrity sha512-j+Nhmj1yfZAikJLImCvPJFE29x/UuBi+/MWqggGGc515JKaZrjuei2RhULJmy0MsstW3E3htl002bwmBNMKr7w==
+
 content-type@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
@@ -2258,6 +2268,14 @@ 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=
 
+cors@^2.8.5:
+  version "2.8.5"
+  resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29"
+  integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==
+  dependencies:
+    object-assign "^4"
+    vary "^1"
+
 cosmiconfig@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-4.0.0.tgz#760391549580bbd2df1e562bc177b13c290972dc"
@@ -2551,6 +2569,11 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
+dasherize@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/dasherize/-/dasherize-2.0.0.tgz#6d809c9cd0cf7bb8952d80fc84fa13d47ddb1308"
+  integrity sha1-bYCcnNDPe7iVLYD8hPoT1H3bEwg=
+
 date-now@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
@@ -2680,6 +2703,11 @@ delegates@^1.0.0:
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
   integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
 
+depd@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
+  integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
+
 depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
@@ -2737,6 +2765,11 @@ dns-packet@^1.3.1:
     ip "^1.1.0"
     safe-buffer "^5.0.1"
 
+dns-prefetch-control@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/dns-prefetch-control/-/dns-prefetch-control-0.1.0.tgz#60ddb457774e178f1f9415f0cabb0e85b0b300b2"
+  integrity sha1-YN20V3dOF48flBXwyrsOhbCzALI=
+
 dns-txt@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6"
@@ -2814,6 +2847,11 @@ domutils@^1.5.1, domutils@^1.7.0:
     dom-serializer "0"
     domelementtype "1"
 
+dont-sniff-mimetype@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/dont-sniff-mimetype/-/dont-sniff-mimetype-1.0.0.tgz#5932890dc9f4e2f19e5eb02a20026e5e5efc8f58"
+  integrity sha1-WTKJDcn04vGeXrAqIAJuXl78j1g=
+
 dot-prop@^4.1.0, dot-prop@^4.1.1:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57"
@@ -3339,6 +3377,11 @@ expand-brackets@^2.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
+expect-ct@0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/expect-ct/-/expect-ct-0.1.1.tgz#de84476a2dbcb85000d5903737e9bc8a5ba7b897"
+  integrity sha512-ngXzTfoRGG7fYens3/RMb6yYoVLvLMfmsSllP/mZPxNHgFq41TmPSLF/nLY7fwoclI2vElvAmILFWGUYqdjfCg==
+
 express@^4.16.2, express@^4.16.3, express@^4.16.4:
   version "4.16.4"
   resolved "https://registry.yarnpkg.com/express/-/express-4.16.4.tgz#fddef61926109e24c515ea97fd2f1bdbf62df12e"
@@ -3488,6 +3531,11 @@ faye-websocket@~0.11.1:
   dependencies:
     websocket-driver ">=0.5.1"
 
+feature-policy@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/feature-policy/-/feature-policy-0.2.0.tgz#22096de49ab240176878ffe2bde2f6ff04d48c43"
+  integrity sha512-2hGrlv6efG4hscYVZeaYjpzpT6I2OZgYqE2yDUzeAcKj2D1SH0AsEzqJNXzdoglEddcIXQQYop3lD97XpG75Jw==
+
 figgy-pudding@^3.5.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
@@ -3670,6 +3718,11 @@ fragment-cache@^0.2.1:
   dependencies:
     map-cache "^0.2.2"
 
+frameguard@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/frameguard/-/frameguard-3.0.0.tgz#7bcad469ee7b96e91d12ceb3959c78235a9272e9"
+  integrity sha1-e8rUae57lukdEs6zlZx4I1qScuk=
+
 fresh@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
@@ -3983,11 +4036,52 @@ he@1.2.x, he@^1.1.0:
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
   integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
 
+helmet-crossdomain@0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/helmet-crossdomain/-/helmet-crossdomain-0.3.0.tgz#707e2df930f13ad61f76ed08e1bb51ab2b2e85fa"
+  integrity sha512-YiXhj0E35nC4Na5EPE4mTfoXMf9JTGpN4OtB4aLqShKuH9d2HNaJX5MQoglO6STVka0uMsHyG5lCut5Kzsy7Lg==
+
+helmet-csp@2.7.1:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/helmet-csp/-/helmet-csp-2.7.1.tgz#e8e0b5186ffd4db625cfcce523758adbfadb9dca"
+  integrity sha512-sCHwywg4daQ2mY0YYwXSZRsgcCeerUwxMwNixGA7aMLkVmPTYBl7gJoZDHOZyXkqPrtuDT3s2B1A+RLI7WxSdQ==
+  dependencies:
+    camelize "1.0.0"
+    content-security-policy-builder "2.0.0"
+    dasherize "2.0.0"
+    platform "1.3.5"
+
+helmet@^3.16.0:
+  version "3.16.0"
+  resolved "https://registry.yarnpkg.com/helmet/-/helmet-3.16.0.tgz#7df41a4bfe4c83d90147c1e30d70893f92a9d97c"
+  integrity sha512-rsTKRogc5OYGlvSHuq5QsmOsOzF6uDoMqpfh+Np8r23+QxDq+SUx90Rf8HyIKQVl7H6NswZEwfcykinbAeZ6UQ==
+  dependencies:
+    depd "2.0.0"
+    dns-prefetch-control "0.1.0"
+    dont-sniff-mimetype "1.0.0"
+    expect-ct "0.1.1"
+    feature-policy "0.2.0"
+    frameguard "3.0.0"
+    helmet-crossdomain "0.3.0"
+    helmet-csp "2.7.1"
+    hide-powered-by "1.0.0"
+    hpkp "2.0.0"
+    hsts "2.2.0"
+    ienoopen "1.1.0"
+    nocache "2.0.0"
+    referrer-policy "1.1.0"
+    x-xss-protection "1.1.0"
+
 hex-color-regex@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"
   integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
 
+hide-powered-by@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/hide-powered-by/-/hide-powered-by-1.0.0.tgz#4a85ad65881f62857fc70af7174a1184dccce32b"
+  integrity sha1-SoWtZYgfYoV/xwr3F0oRhNzM4ys=
+
 hmac-drbg@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
@@ -4022,6 +4116,11 @@ hpack.js@^2.1.6:
     readable-stream "^2.0.1"
     wbuf "^1.1.0"
 
+hpkp@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/hpkp/-/hpkp-2.0.0.tgz#10e142264e76215a5d30c44ec43de64dee6d1672"
+  integrity sha1-EOFCJk52IVpdMMROxD3mTe5tFnI=
+
 hsl-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/hsl-regex/-/hsl-regex-1.0.0.tgz#d49330c789ed819e276a4c0d272dffa30b18fe6e"
@@ -4032,6 +4131,13 @@ hsla-regex@^1.0.0:
   resolved "https://registry.yarnpkg.com/hsla-regex/-/hsla-regex-1.0.0.tgz#c1ce7a3168c8c6614033a4b5f7877f3b225f9c38"
   integrity sha1-wc56MWjIxmFAM6S194d/OyJfnDg=
 
+hsts@2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/hsts/-/hsts-2.2.0.tgz#09119d42f7a8587035d027dda4522366fe75d964"
+  integrity sha512-ToaTnQ2TbJkochoVcdXYm4HOCliNozlviNsg+X2XQLQvZNI/kCHR9rZxVYpJB3UPcHz80PgxRyWQ7PdU1r+VBQ==
+  dependencies:
+    depd "2.0.0"
+
 html-comment-regex@^1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.2.tgz#97d4688aeb5c81886a364faa0cad1dda14d433a7"
@@ -4169,6 +4275,11 @@ ieee754@^1.1.4:
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
   integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
 
+ienoopen@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/ienoopen/-/ienoopen-1.1.0.tgz#411e5d530c982287dbdc3bb31e7a9c9e32630974"
+  integrity sha512-MFs36e/ca6ohEKtinTJ5VvAJ6oDRAYFdYXweUnGY9L9vcoqFOU4n2ZhmJ0C4z/cwGZ3YIQRSB3XZ1+ghZkY5NQ==
+
 iferr@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
@@ -5352,6 +5463,11 @@ no-case@^2.2.0:
   dependencies:
     lower-case "^1.1.1"
 
+nocache@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/nocache/-/nocache-2.0.0.tgz#202b48021a0c4cbde2df80de15a17443c8b43980"
+  integrity sha1-ICtIAhoMTL3i34DeFaF0Q8i0OYA=
+
 node-forge@0.7.5:
   version "0.7.5"
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.5.tgz#6c152c345ce11c52f465c2abd957e8639cd674df"
@@ -5538,7 +5654,7 @@ oauth-sign@~0.9.0:
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
   integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
 
-object-assign@^4.0.1, object-assign@^4.1.0:
+object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
@@ -5968,6 +6084,11 @@ pkg-dir@^3.0.0:
   dependencies:
     find-up "^3.0.0"
 
+platform@1.3.5:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/platform/-/platform-1.3.5.tgz#fb6958c696e07e2918d2eeda0f0bc9448d733444"
+  integrity sha512-TuvHS8AOIZNAlE77WUDiR4rySV/VMptyMfcfeoMgs4P8apaZM3JrnbzBiixKUv+XR6i+BXrQh8WAnjaSPFO65Q==
+
 pluralize@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
@@ -6575,6 +6696,11 @@ readdirp@^2.2.1:
     micromatch "^3.1.10"
     readable-stream "^2.0.2"
 
+referrer-policy@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/referrer-policy/-/referrer-policy-1.1.0.tgz#35774eb735bf50fb6c078e83334b472350207d79"
+  integrity sha1-NXdOtzW/UPtsB46DM0tHI1AgfXk=
+
 regenerate-unicode-properties@^8.0.2:
   version "8.0.2"
   resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.0.2.tgz#7b38faa296252376d363558cfbda90c9ce709662"
@@ -6988,7 +7114,7 @@ serve-index@^1.7.2:
     mime-types "~2.1.17"
     parseurl "~1.3.2"
 
-serve-static@1.13.2:
+serve-static@1.13.2, serve-static@^1.13.2:
   version "1.13.2"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
   integrity sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==
@@ -7977,7 +8103,7 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
-vary@~1.1.2:
+vary@^1, vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
   integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
@@ -8317,6 +8443,11 @@ ws@^6.0.0:
   dependencies:
     async-limiter "~1.0.0"
 
+x-xss-protection@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/x-xss-protection/-/x-xss-protection-1.1.0.tgz#4f1898c332deb1e7f2be1280efb3e2c53d69c1a7"
+  integrity sha512-rx3GzJlgEeZ08MIcDsU2vY2B1QEriUKJTSiNHHUIem6eg9pzVOr2TL3Y4Pd6TMAM5D5azGjcxqI62piITBDHVg==
+
 xdg-basedir@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4"