Merge branch 'master' into fix/9236

jest.config.front.js

@@ -58,6 +58,7 @@ module.exports = {
     '<rootDir>/examples/getstarted/',
     '<rootDir>/packages/strapi-helper-plugin/dist/',
     '/OLD/',
+    '__tests__',
   ],
   setupFilesAfterEnv: [
     '<rootDir>/test/config/front/enzyme-setup.js',

packages/strapi-admin/.npmignore

@@ -92,6 +92,7 @@ logs
 results
 node_modules
 .node_history
+.snyk
 
 
 ############################
@@ -99,6 +100,9 @@ node_modules
 ############################
 
 test
+tests
+__tests__
+jest.config.js
 testApp
 coverage
-webpack.config.dev.js
+webpack.config.dev.js

packages/strapi-admin/admin/.gitignore

@@ -1,12 +0,0 @@
-# Don't check auto-generated stuff into git
-coverage
-node_modules
-manifest.json
-plugins.json
-stats.json
-package-lock.json
-
-# Cruft
-.DS_Store
-npm-debug.log
-.idea

packages/strapi-admin/admin/.npmignore

@@ -1,101 +0,0 @@
-############################
-# OS X
-############################
-
-.DS_Store
-.AppleDouble
-.LSOverride
-Icon
-.Spotlight-V100
-.Trashes
-._*
-
-
-############################
-# Linux
-############################
-
-*~
-
-
-############################
-# Windows
-############################
-
-Thumbs.db
-ehthumbs.db
-Desktop.ini
-$RECYCLE.BIN/
-*.cab
-*.msi
-*.msm
-*.msp
-
-
-############################
-# Packages
-############################
-
-*.7z
-*.csv
-*.dat
-*.dmg
-*.gz
-*.iso
-*.jar
-*.rar
-*.tar
-*.zip
-*.com
-*.class
-*.dll
-*.exe
-*.o
-*.seed
-*.so
-*.swo
-*.swp
-*.swn
-*.swm
-*.out
-*.pid
-
-
-############################
-# Logs and databases
-############################
-
-*.log
-*.sql
-
-
-############################
-# Misc.
-############################
-
-*#
-ssl
-.idea
-nbproject
-
-
-############################
-# Node.js
-############################
-
-lib-cov
-lcov.info
-pids
-logs
-results
-node_modules
-.node_history
-
-
-############################
-# Tests
-############################
-
-test
-testApp
-coverage

packages/strapi-admin/admin/src/components/Webhooks/HeadersInput/tests/__snapshots__/index.test.js.snap

@@ -280,7 +280,7 @@ exports[`Admin | components | HeadersInput should render properly should match t
                 >
                   <svg
                     aria-hidden="true"
-                    class="css-6q0nyr-Svg"
+                    class="css-tj5bde-Svg"
                     focusable="false"
                     height="20"
                     viewBox="0 0 20 20"
@@ -300,7 +300,7 @@ exports[`Admin | components | HeadersInput should render properly should match t
                 >
                   <svg
                     aria-hidden="true"
-                    class="css-6q0nyr-Svg"
+                    class="css-tj5bde-Svg"
                     focusable="false"
                     height="20"
                     viewBox="0 0 20 20"

packages/strapi-admin/admin/src/components/Webhooks/Inputs/tests/__snapshots__/index.test.js.snap

@@ -871,7 +871,7 @@ exports[`<Inputs /> should match the snapshot if type is headers 1`] = `
                 >
                   <svg
                     aria-hidden="true"
-                    className="css-6q0nyr-Svg"
+                    className="css-tj5bde-Svg"
                     focusable="false"
                     height={20}
                     viewBox="0 0 20 20"
@@ -893,7 +893,7 @@ exports[`<Inputs /> should match the snapshot if type is headers 1`] = `
                 >
                   <svg
                     aria-hidden="true"
-                    className="css-6q0nyr-Svg"
+                    className="css-tj5bde-Svg"
                     focusable="false"
                     height={20}
                     viewBox="0 0 20 20"

packages/strapi-admin/package.json

@@ -85,7 +85,7 @@
     "react-redux": "7.2.0",
     "react-router": "^5.0.0",
     "react-router-dom": "^5.0.0",
-    "react-select": "^3.2.0",
+    "react-select": "^4.0.2",
     "react-transition-group": "4.4.1",
     "react-virtualized": "^9.21.2",
     "reactstrap": "8.4.1",

packages/strapi-connector-bookshelf/.npmignore

@@ -76,6 +76,7 @@ $RECYCLE.BIN/
 ############################
 
 *#
+.editorconfig
 .idea
 nbproject
 
@@ -92,6 +93,8 @@ results
 build
 node_modules
 .node_history
+.snyk
+
 
 
 ############################
@@ -99,3 +102,6 @@ node_modules
 ############################
 
 test
+tests
+__tests__
+jest.config.js

packages/strapi-connector-mongoose/.npmignore

@@ -76,6 +76,7 @@ $RECYCLE.BIN/
 ############################
 
 *#
+.editorconfig
 .idea
 nbproject
 
@@ -92,6 +93,8 @@ results
 build
 node_modules
 .node_history
+.snyk
+
 
 
 ############################
@@ -99,3 +102,6 @@ node_modules
 ############################
 
 test
+tests
+__tests__
+jest.config.js

packages/strapi-database/.npmignore

@@ -67,6 +67,7 @@ $RECYCLE.BIN/
 
 *.log
 *.sql
+*.sqlite
 
 
 ############################
@@ -75,6 +76,7 @@ $RECYCLE.BIN/
 
 *#
 ssl
+.editorconfig
 .idea
 nbproject
 
@@ -88,8 +90,11 @@ lcov.info
 pids
 logs
 results
+build
 node_modules
 .node_history
+.snyk
+
 
 
 ############################
@@ -97,5 +102,8 @@ node_modules
 ############################
 
 test
+tests
+__tests__
+jest.config.js
 testApp
 coverage

packages/strapi-generate-api/.npmignore

@@ -76,6 +76,7 @@ $RECYCLE.BIN/
 
 *#
 ssl
+.editorconfig
 .idea
 nbproject
 
@@ -92,6 +93,8 @@ results
 build
 node_modules
 .node_history
+.snyk
+
 
 
 ############################
@@ -99,5 +102,8 @@ node_modules
 ############################
 
 test
+tests
+__tests__
+jest.config.js
 testApp
 coverage

packages/strapi-generate-controller/.npmignore

@@ -76,6 +76,7 @@ $RECYCLE.BIN/
 
 *#
 ssl
+.editorconfig
 .idea
 nbproject
 
@@ -92,6 +93,8 @@ results
 build
 node_modules
 .node_history
+.snyk
+
 
 
 ############################
@@ -99,5 +102,8 @@ node_modules
 ############################
 
 test
+tests
+__tests__
+jest.config.js
 testApp
 coverage

packages/strapi-generate-model/.npmignore

@@ -76,6 +76,7 @@ $RECYCLE.BIN/
 
 *#
 ssl
+.editorconfig
 .idea
 nbproject
 
@@ -92,6 +93,8 @@ results
 build
 node_modules
 .node_history
+.snyk
+
 
 
 ############################
@@ -99,5 +102,8 @@ node_modules
 ############################
 
 test
+tests
+__tests__
+jest.config.js
 testApp
 coverage

packages/strapi-generate-new/.npmignore

@@ -75,6 +75,7 @@ $RECYCLE.BIN/
 
 *#
 ssl
+.editorconfig
 .idea
 nbproject
 
@@ -91,6 +92,8 @@ results
 build
 node_modules
 .node_history
+.snyk
+
 
 
 ############################
@@ -98,5 +101,8 @@ node_modules
 ############################
 
 test
+tests
+__tests__
+jest.config.js
 testApp
 coverage

packages/strapi-generate-plugin/.npmignore

@@ -76,6 +76,7 @@ $RECYCLE.BIN/
 
 *#
 ssl
+.editorconfig
 .idea
 nbproject
 
@@ -92,6 +93,8 @@ results
 build
 node_modules
 .node_history
+.snyk
+
 
 
 ############################
@@ -99,5 +102,8 @@ node_modules
 ############################
 
 test
+tests
+__tests__
+jest.config.js
 testApp
 coverage

packages/strapi-generate-policy/.npmignore

@@ -76,6 +76,7 @@ $RECYCLE.BIN/
 
 *#
 ssl
+.editorconfig
 .idea
 nbproject
 
@@ -92,6 +93,8 @@ results
 build
 node_modules
 .node_history
+.snyk
+
 
 
 ############################
@@ -99,5 +102,8 @@ node_modules
 ############################
 
 test
+tests
+__tests__
+jest.config.js
 testApp
 coverage

packages/strapi-generate-service/.npmignore

@@ -76,6 +76,7 @@ $RECYCLE.BIN/
 
 *#
 ssl
+.editorconfig
 .idea
 nbproject
 
@@ -92,6 +93,8 @@ results
 build
 node_modules
 .node_history
+.snyk
+
 
 
 ############################
@@ -99,5 +102,8 @@ node_modules
 ############################
 
 test
+tests
+__tests__
+jest.config.js
 testApp
 coverage

packages/strapi-generate/.npmignore

@@ -76,6 +76,7 @@ $RECYCLE.BIN/
 
 *#
 ssl
+.editorconfig
 .idea
 nbproject
 
@@ -92,6 +93,8 @@ results
 build
 node_modules
 .node_history
+.snyk
+
 
 
 ############################
@@ -99,5 +102,8 @@ node_modules
 ############################
 
 test
+tests
+__tests__
+jest.config.js
 testApp
 coverage

packages/strapi-hook-ejs/.npmignore

@@ -76,6 +76,7 @@ $RECYCLE.BIN/
 ############################
 
 *#
+.editorconfig
 .idea
 nbproject
 
@@ -92,6 +93,8 @@ results
 build
 node_modules
 .node_history
+.snyk
+
 
 
 ############################
@@ -99,3 +102,6 @@ node_modules
 ############################
 
 test
+tests
+__tests__
+jest.config.js

packages/strapi-hook-redis/.npmignore

@@ -76,6 +76,7 @@ $RECYCLE.BIN/
 ############################
 
 *#
+.editorconfig
 .idea
 nbproject
 
@@ -92,6 +93,8 @@ results
 build
 node_modules
 .node_history
+.snyk
+
 
 
 ############################
@@ -99,3 +102,6 @@ node_modules
 ############################
 
 test
+tests
+__tests__
+jest.config.js

packages/strapi-middleware-views/.npmignore

@@ -76,6 +76,7 @@ $RECYCLE.BIN/
 ############################
 
 *#
+.editorconfig
 .idea
 nbproject
 
@@ -92,6 +93,8 @@ results
 build
 node_modules
 .node_history
+.snyk
+
 
 
 ############################
@@ -99,3 +102,6 @@ node_modules
 ############################
 
 test
+tests
+__tests__
+jest.config.js

packages/strapi-plugin-content-manager/.npmignore

@@ -92,6 +92,8 @@ logs
 results
 node_modules
 .node_history
+.snyk
+
 
 
 ############################
@@ -99,5 +101,8 @@ node_modules
 ############################
 
 test
+tests
+__tests__
+jest.config.js
 testApp
 coverage

packages/strapi-plugin-content-manager/admin/.npmignore

@@ -1,101 +0,0 @@
-############################
-# OS X
-############################
-
-.DS_Store
-.AppleDouble
-.LSOverride
-Icon
-.Spotlight-V100
-.Trashes
-._*
-
-
-############################
-# Linux
-############################
-
-*~
-
-
-############################
-# Windows
-############################
-
-Thumbs.db
-ehthumbs.db
-Desktop.ini
-$RECYCLE.BIN/
-*.cab
-*.msi
-*.msm
-*.msp
-
-
-############################
-# Packages
-############################
-
-*.7z
-*.csv
-*.dat
-*.dmg
-*.gz
-*.iso
-*.jar
-*.rar
-*.tar
-*.zip
-*.com
-*.class
-*.dll
-*.exe
-*.o
-*.seed
-*.so
-*.swo
-*.swp
-*.swn
-*.swm
-*.out
-*.pid
-
-
-############################
-# Logs and databases
-############################
-
-*.log
-*.sql
-
-
-############################
-# Misc.
-############################
-
-*#
-ssl
-.idea
-nbproject
-
-
-############################
-# Node.js
-############################
-
-lib-cov
-lcov.info
-pids
-logs
-results
-node_modules
-.node_history
-
-
-############################
-# Tests
-############################
-
-test
-testApp
-coverage

packages/strapi-plugin-content-type-builder/.npmignore

@@ -92,12 +92,16 @@ logs
 results
 node_modules
 .node_history
+.snyk
+
 
 
 ############################
 # Tests
 ############################
 
-test
+tests
+__tests__
+jest.config.js
 testApp
 coverage

packages/strapi-plugin-content-type-builder/admin/.npmignore

@@ -1,101 +0,0 @@
-############################
-# OS X
-############################
-
-.DS_Store
-.AppleDouble
-.LSOverride
-Icon
-.Spotlight-V100
-.Trashes
-._*
-
-
-############################
-# Linux
-############################
-
-*~
-
-
-############################
-# Windows
-############################
-
-Thumbs.db
-ehthumbs.db
-Desktop.ini
-$RECYCLE.BIN/
-*.cab
-*.msi
-*.msm
-*.msp
-
-
-############################
-# Packages
-############################
-
-*.7z
-*.csv
-*.dat
-*.dmg
-*.gz
-*.iso
-*.jar
-*.rar
-*.tar
-*.zip
-*.com
-*.class
-*.dll
-*.exe
-*.o
-*.seed
-*.so
-*.swo
-*.swp
-*.swn
-*.swm
-*.out
-*.pid
-
-
-############################
-# Logs and databases
-############################
-
-*.log
-*.sql
-
-
-############################
-# Misc.
-############################
-
-*#
-ssl
-.idea
-nbproject
-
-
-############################
-# Node.js
-############################
-
-lib-cov
-lcov.info
-pids
-logs
-results
-node_modules
-.node_history
-
-
-############################
-# Tests
-############################
-
-test
-testApp
-coverage

packages/strapi-plugin-email/.npmignore

@@ -92,6 +92,8 @@ logs
 results
 node_modules
 .node_history
+.snyk
+
 
 
 ############################
@@ -99,5 +101,8 @@ node_modules
 ############################
 
 test
+tests
+__tests__
+jest.config.js
 testApp
 coverage

packages/strapi-plugin-graphql/.npmignore

@@ -92,6 +92,8 @@ logs
 results
 node_modules
 .node_history
+.snyk
+
 
 
 ############################
@@ -99,5 +101,8 @@ node_modules
 ############################
 
 test
+tests
+__tests__
+jest.config.js
 testApp
 coverage

packages/strapi-plugin-upload/.npmignore

@@ -92,6 +92,8 @@ logs
 results
 node_modules
 .node_history
+.snyk
+
 
 
 ############################
@@ -99,5 +101,8 @@ node_modules
 ############################
 
 test
+tests
+__tests__
+jest.config.js
 testApp
 coverage

packages/strapi-plugin-upload/config/config.json

@@ -3,5 +3,6 @@
   "provider": "local",
   "providerOptions": {
     "sizeLimit": 1000000
-  }
+  },
+  "actionOptions": {}
 }

packages/strapi-plugin-upload/config/functions/bootstrap.js

@@ -36,14 +36,18 @@ const wrapFunctionForErrors = fn => async (...args) => {
   }
 };
 
-const createProvider = ({ provider, providerOptions }) => {
+const createProvider = ({ provider, providerOptions, actionOptions = {} }) => {
   try {
     const providerInstance = require(`strapi-provider-upload-${provider}`).init(providerOptions);
 
     return Object.assign(Object.create(baseProvider), {
       ...providerInstance,
-      upload: wrapFunctionForErrors(providerInstance.upload.bind(providerInstance)),
+      upload: wrapFunctionForErrors((file, options = actionOptions.upload) => {
-      delete: wrapFunctionForErrors(providerInstance.delete.bind(providerInstance)),
+        return providerInstance.upload(file, options);
+      }),
+      delete: wrapFunctionForErrors((file, options = actionOptions.delete) => {
+        return providerInstance.delete(file, options);
+      }),
     });
   } catch (err) {
     strapi.log.error(err);

packages/strapi-plugin-upload/services/image-manipulation.js

@@ -87,12 +87,14 @@ const optimize = async buffer => {
     .catch(() => ({ buffer }));
 };
 
-const BREAKPOINTS = {
+const DEFAULT_BREAKPOINTS = {
   large: 1000,
   medium: 750,
   small: 500,
 };
 
+const getBreakpoints = () => strapi.config.get('plugins.upload.breakpoints', DEFAULT_BREAKPOINTS);
+
 const generateResponsiveFormats = async file => {
   const {
     responsiveDimensions = false,
@@ -106,9 +108,10 @@ const generateResponsiveFormats = async file => {
 
   const originalDimensions = await getDimensions(file.buffer);
 
+  const breakpoints = getBreakpoints();
   return Promise.all(
-    Object.keys(BREAKPOINTS).map(key => {
+    Object.keys(breakpoints).map(key => {
-      const breakpoint = BREAKPOINTS[key];
+      const breakpoint = breakpoints[key];
 
       if (breakpointSmallerThan(breakpoint, originalDimensions)) {
         return generateBreakpoint(key, { file, breakpoint, originalDimensions });

packages/strapi-plugin-users-permissions/.npmignore

@@ -92,6 +92,8 @@ logs
 results
 node_modules
 .node_history
+.snyk
+
 
 
 ############################
@@ -99,5 +101,8 @@ node_modules
 ############################
 
 test
+tests
+__tests__
+jest.config.js
 testApp
 coverage

packages/strapi-plugin-users-permissions/admin/.npmignore

@@ -1,101 +0,0 @@
-############################
-# OS X
-############################
-
-.DS_Store
-.AppleDouble
-.LSOverride
-Icon
-.Spotlight-V100
-.Trashes
-._*
-
-
-############################
-# Linux
-############################
-
-*~
-
-
-############################
-# Windows
-############################
-
-Thumbs.db
-ehthumbs.db
-Desktop.ini
-$RECYCLE.BIN/
-*.cab
-*.msi
-*.msm
-*.msp
-
-
-############################
-# Packages
-############################
-
-*.7z
-*.csv
-*.dat
-*.dmg
-*.gz
-*.iso
-*.jar
-*.rar
-*.tar
-*.zip
-*.com
-*.class
-*.dll
-*.exe
-*.o
-*.seed
-*.so
-*.swo
-*.swp
-*.swn
-*.swm
-*.out
-*.pid
-
-
-############################
-# Logs and databases
-############################
-
-*.log
-*.sql
-
-
-############################
-# Misc.
-############################
-
-*#
-ssl
-.idea
-nbproject
-
-
-############################
-# Node.js
-############################
-
-lib-cov
-lcov.info
-pids
-logs
-results
-node_modules
-.node_history
-
-
-############################
-# Tests
-############################
-
-test
-testApp
-coverage

packages/strapi-provider-email-amazon-ses/.npmignore

@@ -95,6 +95,8 @@ results
 build
 node_modules
 .node_history
+.snyk
+
 
 
 ############################
@@ -102,3 +104,6 @@ node_modules
 ############################
 
 test
+tests
+__tests__
+jest.config.js

packages/strapi-provider-email-mailgun/.npmignore

@@ -95,6 +95,8 @@ results
 build
 node_modules
 .node_history
+.snyk
+
 
 
 ############################
@@ -102,3 +104,6 @@ node_modules
 ############################
 
 test
+tests
+__tests__
+jest.config.js

packages/strapi-provider-email-sendgrid/.npmignore

@@ -95,6 +95,8 @@ results
 build
 node_modules
 .node_history
+.snyk
+
 
 
 ############################
@@ -102,3 +104,6 @@ node_modules
 ############################
 
 test
+tests
+__tests__
+jest.config.js

packages/strapi-provider-email-sendmail/.npmignore

@@ -95,6 +95,8 @@ results
 build
 node_modules
 .node_history
+.snyk
+
 
 
 ############################
@@ -102,3 +104,6 @@ node_modules
 ############################
 
 test
+tests
+__tests__
+jest.config.js

packages/strapi-provider-upload-aws-s3/.npmignore

@@ -95,6 +95,8 @@ results
 build
 node_modules
 .node_history
+.snyk
+
 
 
 ############################
@@ -102,3 +104,6 @@ node_modules
 ############################
 
 test
+tests
+__tests__
+jest.config.js

packages/strapi-provider-upload-cloudinary/.npmignore

@@ -95,6 +95,8 @@ results
 build
 node_modules
 .node_history
+.snyk
+
 
 
 ############################
@@ -102,3 +104,6 @@ node_modules
 ############################
 
 test
+tests
+__tests__
+jest.config.js

packages/strapi-provider-upload-cloudinary/README.md

@@ -4,6 +4,8 @@
 
 Your configuration is passed down to the cloudinary configuration. (e.g: `cloudinary.config(config)`). You can see the complete list of options [here](https://cloudinary.com/documentation/cloudinary_sdks#configuration_parameters)
 
+`actionOptions` are passed directly to the upload and delete functions respectively allowing for custom options such as folder, type, etc. You can see the complete list of upload options [here](https://cloudinary.com/documentation/image_upload_api_reference#upload_optional_parameters) and delete options [here](https://cloudinary.com/documentation/image_upload_api_reference#destroy_optional_parameters)
+
 See the [using a provider](https://strapi.io/documentation/developer-docs/latest/plugins/upload.html#using-a-provider) documentation for information on installing and using a provider. And see the [environment variables](https://strapi.io/documentation/developer-docs/latest/concepts/configurations.html#environment-variables) for setting and using environment variables in your configs.
 
 **Example**
@@ -20,6 +22,10 @@ module.exports = ({ env }) => ({
       api_key: env('CLOUDINARY_KEY'),
       api_secret: env('CLOUDINARY_SECRET'),
     },
+    actionOptions: {
+      upload: {},
+      delete: {}
+    }
   },
   // ...
 });

packages/strapi-provider-upload-local/.npmignore

@@ -95,6 +95,8 @@ results
 build
 node_modules
 .node_history
+.snyk
+
 
 
 ############################
@@ -102,3 +104,6 @@ node_modules
 ############################
 
 test
+tests
+__tests__
+jest.config.js

packages/strapi-provider-upload-rackspace/.npmignore

@@ -95,6 +95,8 @@ results
 build
 node_modules
 .node_history
+.snyk
+
 
 
 ############################
@@ -102,3 +104,6 @@ node_modules
 ############################
 
 test
+tests
+__tests__
+jest.config.js

packages/strapi-utils/.npmignore

@@ -76,6 +76,7 @@ $RECYCLE.BIN/
 ############################
 
 *#
+.editorconfig
 .idea
 nbproject
 
@@ -92,6 +93,8 @@ results
 build
 node_modules
 .node_history
+.snyk
+
 
 
 ############################
@@ -99,3 +102,6 @@ node_modules
 ############################
 
 test
+tests
+__tests__
+jest.config.js

packages/strapi/.npmignore

@@ -76,6 +76,7 @@ $RECYCLE.BIN/
 ############################
 
 *#
+.editorconfig
 .idea
 nbproject
 
@@ -92,6 +93,8 @@ results
 build
 node_modules
 .node_history
+.snyk
+
 
 
 ############################
@@ -99,5 +102,8 @@ node_modules
 ############################
 
 test
+tests
+__tests__
+jest.config.js
 testApp
 coverage

yarn.lock

@@ -222,7 +222,7 @@
   dependencies:
     "@babel/types" "^7.10.4"
 
-"@babel/helper-module-imports@^7.12.1":
+"@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.7.0":
   version "7.12.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz#1bfc0229f794988f76ed0a4d4e90860850b54dfb"
   integrity sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==
@@ -514,6 +514,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-syntax-jsx@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz#9d9d357cc818aa7ae7935917c1257f67677a0926"
+  integrity sha512-1yRi7yAtB0ETgxdY9ti/p2TivUxJkTdhu/ZbF9MshVGqOx1TdB3b7xCXs49Fupgg50N45KcAsRP/ZqWjs9SRjg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
 "@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
@@ -1126,38 +1133,47 @@
     exec-sh "^0.3.2"
     minimist "^1.2.0"
 
-"@emotion/cache@^10.0.27", "@emotion/cache@^10.0.9":
+"@emotion/babel-plugin@^11.0.0":
-  version "10.0.29"
+  version "11.1.2"
-  resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-10.0.29.tgz#87e7e64f412c060102d589fe7c6dc042e6f9d1e0"
+  resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.1.2.tgz#68fe1aa3130099161036858c64ee92056c6730b7"
-  integrity sha512-fU2VtSVlHiF27empSbxi1O2JFdNWZO+2NFHfwO0pxgTep6Xa3uGb+3pVKfLww2l/IBGLNEZl5Xf/++A4wAYDYQ==
+  integrity sha512-Nz1k7b11dWw8Nw4Z1R99A9mlB6C6rRsCtZnwNUOj4NsoZdrO2f2A/83ST7htJORD5zpOiLKY59aJN23092949w==
   dependencies:
-    "@emotion/sheet" "0.9.4"
+    "@babel/helper-module-imports" "^7.7.0"
-    "@emotion/stylis" "0.8.5"
+    "@babel/plugin-syntax-jsx" "^7.12.1"
-    "@emotion/utils" "0.11.3"
+    "@babel/runtime" "^7.7.2"
-    "@emotion/weak-memoize" "0.2.5"
+    "@emotion/hash" "^0.8.0"
+    "@emotion/memoize" "^0.7.5"
+    "@emotion/serialize" "^1.0.0"
+    babel-plugin-macros "^2.6.1"
+    convert-source-map "^1.5.0"
+    escape-string-regexp "^4.0.0"
+    find-root "^1.1.0"
+    source-map "^0.5.7"
+    stylis "^4.0.3"
 
-"@emotion/core@^10.0.9":
+"@emotion/cache@^11.0.0", "@emotion/cache@^11.1.3":
-  version "10.0.35"
+  version "11.1.3"
-  resolved "https://registry.yarnpkg.com/@emotion/core/-/core-10.0.35.tgz#513fcf2e22cd4dfe9d3894ed138c9d7a859af9b3"
+  resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.1.3.tgz#c7683a9484bcd38d5562f2b9947873cf66829afd"
-  integrity sha512-sH++vJCdk025fBlRZSAhkRlSUoqSqgCzYf5fMOmqqi3bM6how+sQpg3hkgJonj8GxXM4WbD7dRO+4tegDB9fUw==
+  integrity sha512-n4OWinUPJVaP6fXxWZD9OUeQ0lY7DvtmtSuqtRWT0Ofo/sBLCVSgb4/Oa0Q5eFxcwablRKjUXqXtNZVyEwCAuA==
   dependencies:
-    "@babel/runtime" "^7.5.5"
+    "@emotion/memoize" "^0.7.4"
-    "@emotion/cache" "^10.0.27"
+    "@emotion/sheet" "^1.0.0"
-    "@emotion/css" "^10.0.27"
+    "@emotion/utils" "^1.0.0"
-    "@emotion/serialize" "^0.11.15"
+    "@emotion/weak-memoize" "^0.2.5"
-    "@emotion/sheet" "0.9.4"
+    stylis "^4.0.3"
-    "@emotion/utils" "0.11.3"
 
-"@emotion/css@^10.0.27", "@emotion/css@^10.0.9":
+"@emotion/css@^11.0.0":
-  version "10.0.27"
+  version "11.1.3"
-  resolved "https://registry.yarnpkg.com/@emotion/css/-/css-10.0.27.tgz#3a7458198fbbebb53b01b2b87f64e5e21241e14c"
+  resolved "https://registry.yarnpkg.com/@emotion/css/-/css-11.1.3.tgz#9ed44478b19e5d281ccbbd46d74d123d59be793f"
-  integrity sha512-6wZjsvYeBhyZQYNrGoR5yPMYbMBNEnanDrqmsqS1mzDm1cOTu12shvl2j4QHNS36UaTE0USIJawCH9C8oW34Zw==
+  integrity sha512-RSQP59qtCNTf5NWD6xM08xsQdCZmVYnX/panPYvB6LQAPKQB6GL49Njf0EMbS3CyDtrlWsBcmqBtysFvfWT3rA==
   dependencies:
-    "@emotion/serialize" "^0.11.15"
+    "@emotion/babel-plugin" "^11.0.0"
-    "@emotion/utils" "0.11.3"
+    "@emotion/cache" "^11.1.3"
-    babel-plugin-emotion "^10.0.27"
+    "@emotion/serialize" "^1.0.0"
+    "@emotion/sheet" "^1.0.0"
+    "@emotion/utils" "^1.0.0"
 
-"@emotion/hash@0.8.0":
+"@emotion/hash@^0.8.0":
   version "0.8.0"
   resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413"
   integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==
@@ -1174,38 +1190,56 @@
   resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.4.tgz#19bf0f5af19149111c40d98bb0cf82119f5d9eeb"
   integrity sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==
 
-"@emotion/serialize@^0.11.15", "@emotion/serialize@^0.11.16":
+"@emotion/memoize@^0.7.4", "@emotion/memoize@^0.7.5":
-  version "0.11.16"
+  version "0.7.5"
-  resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-0.11.16.tgz#dee05f9e96ad2fb25a5206b6d759b2d1ed3379ad"
+  resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.5.tgz#2c40f81449a4e554e9fc6396910ed4843ec2be50"
-  integrity sha512-G3J4o8by0VRrO+PFeSc3js2myYNOXVJ3Ya+RGVxnshRYgsvErfAOglKAiy1Eo1vhzxqtUvjCyS5gtewzkmvSSg==
+  integrity sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ==
+
+"@emotion/react@^11.1.1":
+  version "11.1.4"
+  resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.1.4.tgz#ddee4247627ff7dd7d0c6ae52f1cfd6b420357d2"
+  integrity sha512-9gkhrW8UjV4IGRnEe4/aGPkUxoGS23aD9Vu6JCGfEDyBYL+nGkkRBoMFGAzCT9qFdyUvQp4UUtErbKWxq/JS4A==
   dependencies:
-    "@emotion/hash" "0.8.0"
+    "@babel/runtime" "^7.7.2"
-    "@emotion/memoize" "0.7.4"
+    "@emotion/cache" "^11.1.3"
-    "@emotion/unitless" "0.7.5"
+    "@emotion/serialize" "^1.0.0"
-    "@emotion/utils" "0.11.3"
+    "@emotion/sheet" "^1.0.1"
-    csstype "^2.5.7"
+    "@emotion/utils" "^1.0.0"
+    "@emotion/weak-memoize" "^0.2.5"
+    hoist-non-react-statics "^3.3.1"
 
-"@emotion/sheet@0.9.4":
+"@emotion/serialize@^1.0.0":
-  version "0.9.4"
+  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-0.9.4.tgz#894374bea39ec30f489bbfc3438192b9774d32e5"
+  resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-1.0.0.tgz#1a61f4f037cf39995c97fc80ebe99abc7b191ca9"
-  integrity sha512-zM9PFmgVSqBw4zL101Q0HrBVTGmpAxFZH/pYx/cjJT5advXguvcgjHFTCaIO3enL/xr89vK2bh0Mfyj9aa0ANA==
+  integrity sha512-zt1gm4rhdo5Sry8QpCOpopIUIKU+mUSpV9WNmFILUraatm5dttNEaYzUWWSboSMUE6PtN2j1cAsuvcugfdI3mw==
+  dependencies:
+    "@emotion/hash" "^0.8.0"
+    "@emotion/memoize" "^0.7.4"
+    "@emotion/unitless" "^0.7.5"
+    "@emotion/utils" "^1.0.0"
+    csstype "^3.0.2"
 
-"@emotion/stylis@0.8.5", "@emotion/stylis@^0.8.4":
+"@emotion/sheet@^1.0.0", "@emotion/sheet@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.0.1.tgz#245f54abb02dfd82326e28689f34c27aa9b2a698"
+  integrity sha512-GbIvVMe4U+Zc+929N1V7nW6YYJtidj31lidSmdYcWozwoBIObXBnaJkKNDjZrLm9Nc0BR+ZyHNaRZxqNZbof5g==
+
+"@emotion/stylis@^0.8.4":
   version "0.8.5"
   resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.8.5.tgz#deacb389bd6ee77d1e7fcaccce9e16c5c7e78e04"
   integrity sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ==
 
-"@emotion/unitless@0.7.5", "@emotion/unitless@^0.7.4":
+"@emotion/unitless@^0.7.4", "@emotion/unitless@^0.7.5":
   version "0.7.5"
   resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed"
   integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==
 
-"@emotion/utils@0.11.3":
+"@emotion/utils@^1.0.0":
-  version "0.11.3"
+  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.11.3.tgz#a759863867befa7e583400d322652a3f44820924"
+  resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.0.0.tgz#abe06a83160b10570816c913990245813a2fd6af"
-  integrity sha512-0o4l6pZC+hI88+bzuaX/6BgOvQVhbt2PfmxauVaYOGgbsAw14wdKyvMCZXnsnsHys94iadcF+RG/wZyx6+ZZBw==
+  integrity sha512-mQC2b3XLDs6QCW+pDQDiyO/EdGZYOygE8s5N5rrzjSI4M3IejPE/JPndCBwRT9z982aqQNi6beWs1UeayrQxxA==
 
-"@emotion/weak-memoize@0.2.5":
+"@emotion/weak-memoize@^0.2.5":
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz#8eed982e2ee6f7f4e44c253e12962980791efd46"
   integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==
@@ -4548,22 +4582,6 @@ babel-plugin-dynamic-import-node@^2.3.3:
   dependencies:
     object.assign "^4.1.0"
 
-babel-plugin-emotion@^10.0.27:
-  version "10.0.33"
-  resolved "https://registry.yarnpkg.com/babel-plugin-emotion/-/babel-plugin-emotion-10.0.33.tgz#ce1155dcd1783bbb9286051efee53f4e2be63e03"
-  integrity sha512-bxZbTTGz0AJQDHm8k6Rf3RQJ8tX2scsfsRyKVgAbiUPUNIRtlK+7JxP+TAd1kRLABFxe0CFm2VdK4ePkoA9FxQ==
-  dependencies:
-    "@babel/helper-module-imports" "^7.0.0"
-    "@emotion/hash" "0.8.0"
-    "@emotion/memoize" "0.7.4"
-    "@emotion/serialize" "^0.11.16"
-    babel-plugin-macros "^2.0.0"
-    babel-plugin-syntax-jsx "^6.18.0"
-    convert-source-map "^1.5.0"
-    escape-string-regexp "^1.0.5"
-    find-root "^1.1.0"
-    source-map "^0.5.7"
-
 babel-plugin-istanbul@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz#e159ccdc9af95e0b570c75b4573b7c34d671d765"
@@ -4585,7 +4603,7 @@ babel-plugin-jest-hoist@^26.6.2:
     "@types/babel__core" "^7.0.0"
     "@types/babel__traverse" "^7.0.6"
 
-babel-plugin-macros@^2.0.0:
+babel-plugin-macros@^2.6.1:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz#0f958a7cc6556b1e65344465d99111a1e5e10138"
   integrity sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg==
@@ -6578,11 +6596,6 @@ cssstyle@^2.2.0:
   dependencies:
     cssom "~0.3.6"
 
-csstype@^2.5.7:
-  version "2.6.13"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.13.tgz#a6893015b90e84dd6e85d0e3b442a1e84f2dbe0f"
-  integrity sha512-ul26pfSQTZW8dcOnD2iiJssfXw0gdNVX9IJDH/X3K5DGPfj+fUYe3kB+swUY6BF3oZDxaID3AJt+9/ojSAE05A==
-
 csstype@^3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.3.tgz#2b410bbeba38ba9633353aff34b05d9755d065f8"
@@ -9523,7 +9536,7 @@ hoek@6.x.x:
   resolved "https://registry.yarnpkg.com/hoek/-/hoek-6.1.3.tgz#73b7d33952e01fe27a38b0457294b79dd8da242c"
   integrity sha512-YXXAAhmF9zpQbC7LEcREFtXfGq5K1fmd+4PHkBq8NUqmzW3G+Dq10bI/i0KucLRwss3YYFQ0fSfoxBZYiGUqtQ==
 
-hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.2.1, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:
+hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.2.1, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.1, hoist-non-react-statics@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
   integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
@@ -15921,15 +15934,15 @@ react-router@^5.0.0:
     tiny-invariant "^1.0.2"
     tiny-warning "^1.0.0"
 
-react-select@^3.2.0:
+react-select@^4.0.2:
-  version "3.2.0"
+  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/react-select/-/react-select-3.2.0.tgz#de9284700196f5f9b5277c5d850a9ce85f5c72fe"
+  resolved "https://registry.yarnpkg.com/react-select/-/react-select-4.0.2.tgz#4dcca9f38d6a41e01f2dc7673e244a325e3b4e0e"
-  integrity sha512-B/q3TnCZXEKItO0fFN/I0tWOX3WJvi/X2wtdffmwSQVRwg5BpValScTO1vdic9AxlUgmeSzib2hAZAwIUQUZGQ==
+  integrity sha512-BiihrRpRIBBvNqofNZIBpo08Kw8DBHb/kgpIDW4bxgkttk50Sxf0alEIKobns3U7UJXk/CA4rsFUueQEg9Pm5A==
   dependencies:
     "@babel/runtime" "^7.4.4"
-    "@emotion/cache" "^10.0.9"
+    "@emotion/cache" "^11.0.0"
-    "@emotion/core" "^10.0.9"
+    "@emotion/css" "^11.0.0"
-    "@emotion/css" "^10.0.9"
+    "@emotion/react" "^11.1.1"
     memoize-one "^5.0.0"
     prop-types "^15.6.0"
     react-input-autosize "^3.0.0"
@@ -18591,6 +18604,11 @@ stylelint@10.1.0:
     svg-tags "^1.0.0"
     table "^5.2.3"
 
+stylis@^4.0.3:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.6.tgz#0d8b97b6bc4748bea46f68602b6df27641b3c548"
+  integrity sha512-1igcUEmYFBEO14uQHAJhCUelTR5jPztfdVKrYxRnDa5D5Dn3w0NxXupJNPr/VV/yRfZYEAco8sTIRZzH3sRYKg==
+
 subscriptions-transport-ws@^0.9.11:
   version "0.9.18"
   resolved "https://registry.yarnpkg.com/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.18.tgz#bcf02320c911fbadb054f7f928e51c6041a37b97"