diff --git a/docs/changelog.md b/docs/changelog.md index dd0d2a0e2..636500e66 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -1,5 +1,22 @@ # Changelog +3.5.2 (2021-11-26) +------------------ + +**🐛 Fixes** + +* Fix redirections defined in ``redirects.json`` (#522) +* Fix wrong URL in menu mobile version (#519) +* Add protection if a filter does not have label (#518) + +**✹ Improvements** + +* Upgrade Next.js version 11 to 12 + +**đŸ’„ Beaking changes** + +* ``Redirects`` from Next.js is replaced by a specific redirection system. ``locale`` property is no more used in ``redirects.json`` and it is no more necessary to add default locale key in other languages rules. + 3.5.1 (2021-11-24) ------------------ @@ -8,10 +25,6 @@ * Fix filter masking (#512) * Fix crash filters with using ID instead of index (#518) -**🚀 New features** - -* Allow to add dynamic links to information pages in footer (#516) - 3.5.0 (2021-11-14) ------------------ diff --git a/docs/customization.md b/docs/customization.md index c20644817..ef503ab2b 100644 --- a/docs/customization.md +++ b/docs/customization.md @@ -73,7 +73,6 @@ In json files, you can just override the primary keys you need. You have to over - `source`: must match to the old URL. Use the wildcard `*` to redirect a subdirectory. Use `:varname` to forward a variable to the destination - `destination`: must match to the new URL. Use `:varname` to inject a variable captured in the old URL - - `locale`: This can be `undefined` or `false`. This argument specifies if the server must detect automatically the locale or if the rule specifies itself the locale used. Default to `undefined` - `permanent`: Set to `true` if the redirection is permanent. Set to `false` if the redirection is temporally. Default to `false` Examples : diff --git a/frontend/next.config.js b/frontend/next.config.js index c48f949c6..ee5c7de90 100644 --- a/frontend/next.config.js +++ b/frontend/next.config.js @@ -1,5 +1,4 @@ const path = require('path'); -const withImages = require('next-images'); const withPlugins = require('next-compose-plugins'); const withSourceMaps = require('@zeit/next-source-maps'); const withPWA = require('next-pwa'); @@ -19,22 +18,9 @@ const mergedHeaderConfig = { const env = dotenv.config().parsed; -const plugins = [[withPWA], [withImages], [withSourceMaps()], [withBundleAnalyzer]]; - -const redirects = async () => { - const redirectsConfig = getConfig('redirects.json'); - - return redirectsConfig.rules.map(rule => ({ - source: rule.source, - destination: rule.destination, - permanent: rule.permanent !== undefined ? rule.permanent : false, - locale: rule.locale !== undefined ? rule.locale : undefined, - basePath: rule.basePath !== undefined ? rule.basePath : false, - })); -}; +const plugins = [[withPWA], [withSourceMaps()], [withBundleAnalyzer]]; module.exports = withPlugins(plugins, { - redirects, webpack(config) { config.resolve.modules.push(path.resolve('./src')); diff --git a/frontend/package.json b/frontend/package.json index c6dcccb8f..7a2083085 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "geotrek-rando-frontend", - "version": "3.5.1", + "version": "3.5.2", "private": true, "scripts": { "debug": "NODE_OPTIONS='--inspect' next ./src", @@ -57,10 +57,9 @@ "leaflet.markercluster": "1.5.1", "leaflet.offline": "^2.0.0-beta.3", "lodash": "4.17.21", - "next": "^11.1.2", + "next": "12", "next-compose-plugins": "^2.2.1", "next-cookies": "^2.0.3", - "next-images": "1.8.1", "next-pwa": "5.3.1", "postcss": "8.3.6", "postcss-flexbugs-fixes": "^5.0.2", diff --git a/frontend/src/components/Header/BurgerMenu/BurgerMenu.tsx b/frontend/src/components/Header/BurgerMenu/BurgerMenu.tsx index 88773f2fa..a4289acbd 100644 --- a/frontend/src/components/Header/BurgerMenu/BurgerMenu.tsx +++ b/frontend/src/components/Header/BurgerMenu/BurgerMenu.tsx @@ -1,8 +1,11 @@ +import { useRouter } from 'next/router'; // @ts-ignore Not official but useful to reduce bundle size import Slide from 'react-burger-menu/lib/menus/slide'; import { MenuConfig, MenuItem } from 'modules/header/interface'; import { useIntl } from 'react-intl'; +import NextLink from 'next/link'; import { routes } from 'services/routes'; +import { getDefaultLanguage } from '../../../modules/header/utills'; import { BurgerMenuSection } from '../BurgerMenuSection/BurgerMenuSection'; import { BurgerMenu as BmIcon } from '../../Icons/BurgerMenu'; import { Cross } from '../../Icons/Cross'; @@ -19,6 +22,8 @@ export const BurgerMenu: React.FC = ({ config, menuItems, displayState = }`; const intl = useIntl(); + const router = useRouter(); + const currentLanguage = router.locale ?? getDefaultLanguage(); return ( = ({ config, menuItems, displayState = title={intl.formatMessage({ id: 'header.language' })} languages={config.supportedLanguages} /> - window.open(routes.SEARCH, '_self')} - /> - window.open(routes.OFFLINE, '_self')} - /> + + + + + + ); }; diff --git a/frontend/src/components/pages/search/components/FilterBar/Field.tsx b/frontend/src/components/pages/search/components/FilterBar/Field.tsx index 2eb44fb78..093fcdd8c 100644 --- a/frontend/src/components/pages/search/components/FilterBar/Field.tsx +++ b/frontend/src/components/pages/search/components/FilterBar/Field.tsx @@ -35,7 +35,9 @@ const Field: React.FC = ({ filterState, onSelect, hideLabel }) => { return (
- {!hideLabel &&
{intl.formatMessage({ id: filterState.label })}
} + {!hideLabel && ( +
{intl.formatMessage({ id: filterState?.label || 'Unknown' })}
+ )}
{filterState.options.map(option => { const isSelected = filterState.selectedOptions.some(_ => _.value === option.value); diff --git a/frontend/src/public/fallback-EiTWaKGQZ0VJoweBjenOl.js b/frontend/src/public/fallback-EiTWaKGQZ0VJoweBjenOl.js new file mode 100644 index 000000000..541a72639 --- /dev/null +++ b/frontend/src/public/fallback-EiTWaKGQZ0VJoweBjenOl.js @@ -0,0 +1 @@ +(()=>{"use strict";self.fallback=async e=>"document"===e.destination?caches.match("/_offline",{ignoreSearch:!0}):Response.error()})(); \ No newline at end of file diff --git a/frontend/src/public/fallback-development.js b/frontend/src/public/fallback-development.js deleted file mode 100644 index 9ffd22d19..000000000 --- a/frontend/src/public/fallback-development.js +++ /dev/null @@ -1,36 +0,0 @@ -/******/ (() => { // webpackBootstrap -/******/ "use strict"; -var __webpack_exports__ = {}; - - -self.fallback = async request => { - // https://developer.mozilla.org/en-US/docs/Web/API/RequestDestination - switch (request.destination) { - case 'document': - if (true) return caches.match("/_offline", { - ignoreSearch: true - }); - - case 'image': - if (false) {} - - case 'audio': - if (false) {} - - case 'video': - if (false) {} - - case 'font': - if (false) {} - - case '': - if (false) {} - - default: - return Response.error(); - } - - ; -}; -/******/ })() -; \ No newline at end of file diff --git a/frontend/src/public/sw.js b/frontend/src/public/sw.js index 3ced5e29d..da10dd923 100644 --- a/frontend/src/public/sw.js +++ b/frontend/src/public/sw.js @@ -1,240 +1,2 @@ -/** - * Copyright 2018 Google Inc. All Rights Reserved. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -// If the loader is already loaded, just stop. -if (!self.define) { - const singleRequire = name => { - if (name !== 'require') { - name = name + '.js'; - } - let promise = Promise.resolve(); - if (!registry[name]) { - - promise = new Promise(async resolve => { - if ("document" in self) { - const script = document.createElement("script"); - script.src = name; - document.head.appendChild(script); - script.onload = resolve; - } else { - importScripts(name); - resolve(); - } - }); - - } - return promise.then(() => { - if (!registry[name]) { - throw new Error(`Module ${name} didn’t register its module`); - } - return registry[name]; - }); - }; - - const require = (names, resolve) => { - Promise.all(names.map(singleRequire)) - .then(modules => resolve(modules.length === 1 ? modules[0] : modules)); - }; - - const registry = { - require: Promise.resolve(require) - }; - - self.define = (moduleName, depsNames, factory) => { - if (registry[moduleName]) { - // Module is already loading or loaded. - return; - } - registry[moduleName] = Promise.resolve().then(() => { - let exports = {}; - const module = { - uri: location.origin + moduleName.slice(1) - }; - return Promise.all( - depsNames.map(depName => { - switch(depName) { - case "exports": - return exports; - case "module": - return module; - default: - return singleRequire(depName); - } - }) - ).then(deps => { - const facValue = factory(...deps); - if(!exports.default) { - exports.default = facValue; - } - return exports; - }); - }); - }; -} -define("./sw.js",['./workbox-3ccebb44'], function (workbox) { 'use strict'; - - /** - * Welcome to your Workbox-powered service worker! - * - * You'll need to register this file in your web app. - * See https://goo.gl/nhQhGp - * - * The rest of the code is auto-generated. Please don't update this file - * directly; instead, make changes to your Workbox build configuration - * and re-run your build process. - * See https://goo.gl/2aRDsh - */ - - importScripts("worker-development.js", "fallback-development.js"); - self.skipWaiting(); - workbox.clientsClaim(); - workbox.registerRoute("/", new workbox.NetworkFirst({ - "cacheName": "start-url", - plugins: [{ - cacheWillUpdate: async ({ - request, - response, - event, - state - }) => { - if (response && response.type === 'opaqueredirect') { - return new Response(response.body, { - status: 200, - statusText: 'OK', - headers: response.headers - }); - } - - return response; - } - }, { - handlerDidError: async ({ - request - }) => self.fallback(request) - }] - }), 'GET'); - workbox.registerRoute("/", new workbox.NetworkFirst({ - "cacheName": "start-url", - plugins: [new workbox.ExpirationPlugin({ - maxEntries: 1, - maxAgeSeconds: 7776000 - }), { - handlerDidError: async ({ - request - }) => self.fallback(request) - }] - }), 'GET'); - workbox.registerRoute("/offline", new workbox.NetworkFirst({ - "cacheName": "offline", - plugins: [new workbox.ExpirationPlugin({ - maxEntries: 1, - maxAgeSeconds: 7776000 - }), { - handlerDidError: async ({ - request - }) => self.fallback(request) - }] - }), 'GET'); - workbox.registerRoute(/^https:\/\/fonts\.(?:googleapis|gstatic)\.com\/.*/i, new workbox.CacheFirst({ - "cacheName": "google-fonts", - plugins: [new workbox.ExpirationPlugin({ - maxEntries: 8, - maxAgeSeconds: 31536000 - }), { - handlerDidError: async ({ - request - }) => self.fallback(request) - }] - }), 'GET'); - workbox.registerRoute(/\.(?:eot|otf|ttc|ttf|woff|woff2|font.css)$/i, new workbox.StaleWhileRevalidate({ - "cacheName": "static-font-assets", - plugins: [new workbox.ExpirationPlugin({ - maxEntries: 8, - maxAgeSeconds: 604800 - }), { - handlerDidError: async ({ - request - }) => self.fallback(request) - }] - }), 'GET'); - workbox.registerRoute(/\.(?:jpg|jpeg|gif|png|svg|ico|webp)$/i, new workbox.StaleWhileRevalidate({ - "cacheName": "static-image-assets", - plugins: [new workbox.ExpirationPlugin({ - maxEntries: 128, - maxAgeSeconds: 7776000 - }), { - handlerDidError: async ({ - request - }) => self.fallback(request) - }] - }), 'GET'); - workbox.registerRoute(/\.(?:js)$/i, new workbox.StaleWhileRevalidate({ - "cacheName": "static-js-assets", - plugins: [new workbox.ExpirationPlugin({ - maxEntries: 128, - maxAgeSeconds: 7776000 - }), { - handlerDidError: async ({ - request - }) => self.fallback(request) - }] - }), 'GET'); - workbox.registerRoute(/\.(?:css|less)$/i, new workbox.StaleWhileRevalidate({ - "cacheName": "static-style-assets", - plugins: [new workbox.ExpirationPlugin({ - maxEntries: 64, - maxAgeSeconds: 7776000 - }), { - handlerDidError: async ({ - request - }) => self.fallback(request) - }] - }), 'GET'); - workbox.registerRoute(/\.(?:json|xml|csv)$/i, new workbox.NetworkFirst({ - "cacheName": "static-data-assets", - plugins: [new workbox.ExpirationPlugin({ - maxEntries: 64, - maxAgeSeconds: 7776000 - }), { - handlerDidError: async ({ - request - }) => self.fallback(request) - }] - }), 'GET'); - workbox.registerRoute(/\/search.*$/i, new workbox.NetworkFirst({ - "cacheName": "search-pages", - "networkTimeoutSeconds": 10, - plugins: [new workbox.ExpirationPlugin({ - maxEntries: 32, - maxAgeSeconds: 604800 - }), { - handlerDidError: async ({ - request - }) => self.fallback(request) - }] - }), 'GET'); - workbox.registerRoute(/^(?!.*opentopomap|.*openstreetmap|.*\/trek\/|.*\/service\/).*$/i, new workbox.NetworkFirst({ - "cacheName": "others", - "networkTimeoutSeconds": 10, - plugins: [new workbox.ExpirationPlugin({ - maxEntries: 512, - maxAgeSeconds: 7776000 - }), { - handlerDidError: async ({ - request - }) => self.fallback(request) - }] - }), 'GET'); - -}); +if(!self.define){const e=e=>{"require"!==e&&(e+=".js");let s=Promise.resolve();return i[e]||(s=new Promise((async s=>{if("document"in self){const i=document.createElement("script");i.src=e,document.head.appendChild(i),i.onload=s}else importScripts(e),s()}))),s.then((()=>{if(!i[e])throw new Error(`Module ${e} didn’t register its module`);return i[e]}))},s=(s,i)=>{Promise.all(s.map(e)).then((e=>i(1===e.length?e[0]:e)))},i={require:Promise.resolve(s)};self.define=(s,n,a)=>{i[s]||(i[s]=Promise.resolve().then((()=>{let i={};const t={uri:location.origin+s.slice(1)};return Promise.all(n.map((s=>{switch(s){case"exports":return i;case"module":return t;default:return e(s)}}))).then((e=>{const s=a(...e);return i.default||(i.default=s),i}))})))}}define("./sw.js",["./workbox-7640c2d5"],(function(e){"use strict";importScripts("worker-EiTWaKGQZ0VJoweBjenOl.js","fallback-EiTWaKGQZ0VJoweBjenOl.js"),self.skipWaiting(),e.clientsClaim(),e.precacheAndRoute([{url:"/_next/server/middleware-manifest.json",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/EiTWaKGQZ0VJoweBjenOl/_buildManifest.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/EiTWaKGQZ0VJoweBjenOl/_middlewareManifest.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/EiTWaKGQZ0VJoweBjenOl/_ssgManifest.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/224.f32cd72cc634f4c0.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/224.f32cd72cc634f4c0.js.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/301-f2253722f10267b8.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/301-f2253722f10267b8.js.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/385.8dea7392a30a2b90.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/385.8dea7392a30a2b90.js.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/480-273ddfba90b7c96b.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/480-273ddfba90b7c96b.js.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/532-e8ab2f6715203e82.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/532-e8ab2f6715203e82.js.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/599-b748d52a5411a27b.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/599-b748d52a5411a27b.js.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/641.26028a8700bb85e2.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/641.26028a8700bb85e2.js.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/659-a3f369a82be77a98.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/659-a3f369a82be77a98.js.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/694-9e0e52608d55b759.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/694-9e0e52608d55b759.js.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/775-ca551cc71a1d1e2b.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/775-ca551cc71a1d1e2b.js.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/786-7a51c780c3efafc6.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/786-7a51c780c3efafc6.js.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/789-d4fe7a8900711087.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/789-d4fe7a8900711087.js.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/802.0925f6f697bb95d2.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/802.0925f6f697bb95d2.js.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/82-6600af857a5c712d.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/82-6600af857a5c712d.js.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/844.870c6f8a052417cd.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/844.870c6f8a052417cd.js.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/848-271c7ba1a3c3f072.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/848-271c7ba1a3c3f072.js.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/87.e0e70be2d8429448.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/87.e0e70be2d8429448.js.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/886-9df6591151b481af.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/886-9df6591151b481af.js.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/90-ea3edb01f1c48b53.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/90-ea3edb01f1c48b53.js.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/960-ee67ec261e78a7c4.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/960-ee67ec261e78a7c4.js.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/97-1b0d7d8dd5400b8e.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/97-1b0d7d8dd5400b8e.js.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/989.469c20377ed6e476.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/989.469c20377ed6e476.js.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/c158f0e1.bc2d3873306bc006.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/c158f0e1.bc2d3873306bc006.js.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/c78d26b1-a8146d7fe80ebc5d.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/c78d26b1-a8146d7fe80ebc5d.js.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/framework-2adaa55ec8ae88ed.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/framework-2adaa55ec8ae88ed.js.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/main-94a0ec38618635e1.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/main-94a0ec38618635e1.js.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/pages/404-59cfa3e87a300795.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/pages/404-59cfa3e87a300795.js.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/pages/_app-a43989e1cb9c0287.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/pages/_app-a43989e1cb9c0287.js.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/pages/_error-389f454b4ae8a0ff.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/pages/_error-389f454b4ae8a0ff.js.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/pages/_offline-a8bd6577eb5ff360.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/pages/_offline-a8bd6577eb5ff360.js.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/pages/event/%5BtouristicEvent%5D-95c265d0b271dc2f.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/pages/event/%5BtouristicEvent%5D-95c265d0b271dc2f.js.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/pages/index-206dbbbaabe20461.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/pages/index-206dbbbaabe20461.js.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/pages/information/%5BflatPage%5D-5a70267fd4eef620.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/pages/information/%5BflatPage%5D-5a70267fd4eef620.js.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/pages/manifest.json-167bb3a0f6133dd4.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/pages/manifest.json-167bb3a0f6133dd4.js.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/pages/offline-efd6be1cec6910d5.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/pages/offline-efd6be1cec6910d5.js.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/pages/outdoor-course/%5BoutdoorCourse%5D-037694bf3f6efaa9.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/pages/outdoor-course/%5BoutdoorCourse%5D-037694bf3f6efaa9.js.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/pages/outdoor-site/%5BoutdoorSite%5D-b16e2eb1f7329c4e.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/pages/outdoor-site/%5BoutdoorSite%5D-b16e2eb1f7329c4e.js.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/pages/robots.txt-681cdef87d53b224.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/pages/robots.txt-681cdef87d53b224.js.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/pages/search-25a4d3a8dc721970.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/pages/search-25a4d3a8dc721970.js.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/pages/service/%5BtouristicContent%5D-0dace27c2fbd955f.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/pages/service/%5BtouristicContent%5D-0dace27c2fbd955f.js.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/pages/sitemap.xml-f15ad78b6a04824d.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/pages/sitemap.xml-f15ad78b6a04824d.js.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/pages/trek/%5BdetailsId%5D-95f4fa5cfa8fc333.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/pages/trek/%5BdetailsId%5D-95f4fa5cfa8fc333.js.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/polyfills-5cd94c89d3acac5f.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/webpack-7b77a60bdadc6d87.js",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/chunks/webpack-7b77a60bdadc6d87.js.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/css/352bf7197d893678.css",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/css/352bf7197d893678.css.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/css/6ca13754eb9cf807.css",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/css/6ca13754eb9cf807.css.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/css/c80736f4f2811843.css",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/css/c80736f4f2811843.css.map",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/media/ajax-loader.0b80f665.gif",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/media/elevation-lime.5e917073.svg",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/media/elevation-position.7569b43a.svg",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/media/elevation-purple.5d794516.svg",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/media/elevation-pushpin.5ce6cc7a.svg",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/media/elevation-steelblue.7a095041.svg",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/media/elevation.5e917073.svg",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/media/layers-2x.9859cd12.png",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/media/layers.ef6db872.png",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/media/marker-icon.d577052a.png",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/media/remove.9822e305.svg",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/media/slick.25572f22.eot",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/media/slick.653a4cbb.woff",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/media/slick.6aa1ee46.ttf",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_next/static/media/slick.f895cfdf.svg",revision:"EiTWaKGQZ0VJoweBjenOl"},{url:"/_offline",revision:"EiTWaKGQZ0VJoweBjenOl"}],{ignoreURLParametersMatching:[]}),e.cleanupOutdatedCaches(),e.registerRoute("/",new e.NetworkFirst({cacheName:"start-url",plugins:[{cacheWillUpdate:async({request:e,response:s,event:i,state:n})=>s&&"opaqueredirect"===s.type?new Response(s.body,{status:200,statusText:"OK",headers:s.headers}):s},{handlerDidError:async({request:e})=>self.fallback(e)}]}),"GET"),e.registerRoute("/",new e.NetworkFirst({cacheName:"start-url",plugins:[new e.ExpirationPlugin({maxEntries:1,maxAgeSeconds:7776e3}),{handlerDidError:async({request:e})=>self.fallback(e)}]}),"GET"),e.registerRoute("/offline",new e.NetworkFirst({cacheName:"offline",plugins:[new e.ExpirationPlugin({maxEntries:1,maxAgeSeconds:7776e3}),{handlerDidError:async({request:e})=>self.fallback(e)}]}),"GET"),e.registerRoute(/^https:\/\/fonts\.(?:googleapis|gstatic)\.com\/.*/i,new e.CacheFirst({cacheName:"google-fonts",plugins:[new e.ExpirationPlugin({maxEntries:8,maxAgeSeconds:31536e3}),{handlerDidError:async({request:e})=>self.fallback(e)}]}),"GET"),e.registerRoute(/\.(?:eot|otf|ttc|ttf|woff|woff2|font.css)$/i,new e.StaleWhileRevalidate({cacheName:"static-font-assets",plugins:[new e.ExpirationPlugin({maxEntries:8,maxAgeSeconds:604800}),{handlerDidError:async({request:e})=>self.fallback(e)}]}),"GET"),e.registerRoute(/\.(?:jpg|jpeg|gif|png|svg|ico|webp)$/i,new e.StaleWhileRevalidate({cacheName:"static-image-assets",plugins:[new e.ExpirationPlugin({maxEntries:128,maxAgeSeconds:7776e3}),{handlerDidError:async({request:e})=>self.fallback(e)}]}),"GET"),e.registerRoute(/\.(?:js)$/i,new e.StaleWhileRevalidate({cacheName:"static-js-assets",plugins:[new e.ExpirationPlugin({maxEntries:128,maxAgeSeconds:7776e3}),{handlerDidError:async({request:e})=>self.fallback(e)}]}),"GET"),e.registerRoute(/\.(?:css|less)$/i,new e.StaleWhileRevalidate({cacheName:"static-style-assets",plugins:[new e.ExpirationPlugin({maxEntries:64,maxAgeSeconds:7776e3}),{handlerDidError:async({request:e})=>self.fallback(e)}]}),"GET"),e.registerRoute(/\.(?:json|xml|csv)$/i,new e.NetworkFirst({cacheName:"static-data-assets",plugins:[new e.ExpirationPlugin({maxEntries:64,maxAgeSeconds:7776e3}),{handlerDidError:async({request:e})=>self.fallback(e)}]}),"GET"),e.registerRoute(/\/search.*$/i,new e.NetworkFirst({cacheName:"search-pages",networkTimeoutSeconds:10,plugins:[new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:604800}),{handlerDidError:async({request:e})=>self.fallback(e)}]}),"GET"),e.registerRoute(/^(?!.*opentopomap|.*openstreetmap|.*\/trek\/|.*\/service\/).*$/i,new e.NetworkFirst({cacheName:"others",networkTimeoutSeconds:10,plugins:[new e.ExpirationPlugin({maxEntries:512,maxAgeSeconds:7776e3}),{handlerDidError:async({request:e})=>self.fallback(e)}]}),"GET")})); //# sourceMappingURL=sw.js.map diff --git a/frontend/src/public/worker-EiTWaKGQZ0VJoweBjenOl.js b/frontend/src/public/worker-EiTWaKGQZ0VJoweBjenOl.js new file mode 100644 index 000000000..79104d9da --- /dev/null +++ b/frontend/src/public/worker-EiTWaKGQZ0VJoweBjenOl.js @@ -0,0 +1 @@ +(()=>{"use strict";self.addEventListener("fetch",(e=>{var t,s;(e.request.url.includes("/trek/")||e.request.url.includes("/service/")||e.request.url.includes("/outdoor-site/")||e.request.url.includes("/outdoor-course/"))&&e.respondWith((t=e.request,s=1e4,new Promise(((e,r)=>{const c=setTimeout(r,s);fetch(t).then((t=>{clearTimeout(c),e(t)}),r)}))).catch((()=>(async e=>{const t=await caches.open("trek-pages");return await t.match(e)||t.match("/offline/")})(e.request))))})),self.addEventListener("activate",(async()=>(await caches.open("offline")).add("/offline")))})(); \ No newline at end of file diff --git a/frontend/src/public/worker-development.js b/frontend/src/public/worker-development.js deleted file mode 100644 index 8620d3b16..000000000 --- a/frontend/src/public/worker-development.js +++ /dev/null @@ -1,34 +0,0 @@ -/******/ (() => { // webpackBootstrap -/******/ "use strict"; -var __webpack_exports__ = {}; - - -const cacheName = 'trek-pages'; // fetch the resource from the network - -const fromNetwork = (request, timeout) => new Promise((fulfill, reject) => { - const timeoutId = setTimeout(reject, timeout); - fetch(request).then(response => { - clearTimeout(timeoutId); - fulfill(response); - }, reject); -}); // fetch the resource from the browser cache - - -const fromCache = async request => { - const cache = await caches.open(cacheName); - const matching = await cache.match(request); - return matching || cache.match('/offline/'); -}; - -self.addEventListener('fetch', event => { - if (event.request.url.includes('/trek/') || event.request.url.includes('/service/') || event.request.url.includes('/outdoor-site/') || event.request.url.includes('/outdoor-course/')) { - event.respondWith(fromNetwork(event.request, 10000).catch(() => fromCache(event.request))); - } -}); // Prefetch offline page to be ready on mobile - -self.addEventListener('activate', async () => { - const cache = await caches.open('offline'); - return cache.add('/offline'); -}); -/******/ })() -; \ No newline at end of file diff --git a/frontend/src/server.js b/frontend/src/server.js index b47cf9bce..85d5888d9 100644 --- a/frontend/src/server.js +++ b/frontend/src/server.js @@ -7,6 +7,7 @@ const dev = process.env.NODE_ENV !== 'production'; const app = next({ dev, dir: __dirname }); const handle = app.getRequestHandler(); const { Sentry } = require('./services/sentry'); +const getConfig = require('./services/getConfig'); app.prepare().then(() => { const server = express(); @@ -18,6 +19,20 @@ app.prepare().then(() => { return res.json({ status: 'pass' }); }); + const redirectsConfig = getConfig('redirects.json'); + const baseUrl = getConfig('global.json').baseUrl; + redirectsConfig.rules.forEach(rule => { + server.get(rule.source, (req, res) => { + let newRoute = rule.destination; + Object.keys(req.params).forEach(param => { + newRoute = newRoute.replace(':' + param, req.params[param]); + }); + res.writeHead(rule.permanent ? 301 : 302, { location: baseUrl + newRoute }); + + res.end(); + }); + }); + server.get('*', (req, res) => { return handle(req, res); }); diff --git a/frontend/src/translations/en.json b/frontend/src/translations/en.json index a63011573..bffbf6ebd 100644 --- a/frontend/src/translations/en.json +++ b/frontend/src/translations/en.json @@ -155,8 +155,8 @@ "missing": "The form is not complete" }, "offline": { - "number": "{count} contenus accessibles sans connexion internet", - "presentation": "Pour profiter de vos itinĂ©raires sans vous soucier de votre rĂ©seau.", + "number": "{count} content accessible without internet connection", + "presentation": "To enjoy your content without worrying about your network.", "explain": "Embed this item to access it offline", "explainAvailable": "This item is available offline", "title": "Offline mode", diff --git a/frontend/src/translations/fr.json b/frontend/src/translations/fr.json index ebcd16957..336f852e6 100644 --- a/frontend/src/translations/fr.json +++ b/frontend/src/translations/fr.json @@ -157,7 +157,7 @@ }, "offline": { "number": "{count} contenus accessibles sans connexion internet", - "presentation": "Pour profiter de vos Ă©lĂ©ments sans vous soucier de votre rĂ©seau.", + "presentation": "Pour profiter de vos contenus sans vous soucier de votre rĂ©seau.", "explain": "Embarquer cet Ă©lĂ©ment afin d'y avoir accĂšs hors connexion", "explainAvailable": "Cet Ă©lĂ©ment est disponible hors connexion", "title": "Mode hors ligne", diff --git a/frontend/src/tsconfig.json b/frontend/src/tsconfig.json index f66046294..bc2b336ce 100644 --- a/frontend/src/tsconfig.json +++ b/frontend/src/tsconfig.json @@ -1,7 +1,11 @@ { "compilerOptions": { "target": "es5", - "lib": ["dom", "dom.iterable", "esnext"], + "lib": [ + "dom", + "dom.iterable", + "esnext" + ], "allowJs": true, "skipLibCheck": true, "strict": true, @@ -15,16 +19,39 @@ "jsx": "preserve", "baseUrl": ".", "paths": { - "components/*": ["components/*"], - "__fixtures__/*": ["__fixtures__/*"], - "__mocks__/*": ["__mocks__/*"], - "routes": ["routes"], - "services/*": ["services/*"], - "stylesheet": ["stylesheet"], - "translations/*": ["translations/*"], - "customization/*": ["../customization/*"] - } + "components/*": [ + "components/*" + ], + "__fixtures__/*": [ + "__fixtures__/*" + ], + "__mocks__/*": [ + "__mocks__/*" + ], + "routes": [ + "routes" + ], + "services/*": [ + "services/*" + ], + "stylesheet": [ + "stylesheet" + ], + "translations/*": [ + "translations/*" + ], + "customization/*": [ + "../customization/*" + ] + }, + "incremental": true }, - "exclude": ["node_modules"], - "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"] + "exclude": [ + "node_modules" + ], + "include": [ + "next-env.d.ts", + "**/*.ts", + "**/*.tsx" + ] } diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 2c85fb231..30e5aff36 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -1138,10 +1138,10 @@ core-js-pure "^3.0.0" regenerator-runtime "^0.13.4" -"@babel/runtime@7.15.3": - version "7.15.3" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.3.tgz#2e1c2880ca118e5b2f9988322bd8a7656a32502b" - integrity sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA== +"@babel/runtime@7.15.4", "@babel/runtime@^7.6.2": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.4.tgz#fd17d16bfdf878e6dd02d19753a39fa8a8d9c84a" + integrity sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw== dependencies: regenerator-runtime "^0.13.4" @@ -1152,13 +1152,6 @@ dependencies: regenerator-runtime "^0.13.4" -"@babel/runtime@^7.6.2": - version "7.15.4" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.4.tgz#fd17d16bfdf878e6dd02d19753a39fa8a8d9c84a" - integrity sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw== - dependencies: - regenerator-runtime "^0.13.4" - "@babel/template@^7.10.4", "@babel/template@^7.12.7", "@babel/template@^7.3.3": version "7.12.7" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc" @@ -1785,7 +1778,7 @@ "@types/yargs" "^16.0.0" chalk "^4.0.0" -"@napi-rs/triples@^1.0.3": +"@napi-rs/triples@1.0.3": version "1.0.3" resolved "https://registry.yarnpkg.com/@napi-rs/triples/-/triples-1.0.3.tgz#76d6d0c3f4d16013c61e45dfca5ff1e6c31ae53c" integrity sha512-jDJTpta+P4p1NZTFVLHJ/TLFVYVcOqv6l8xwOeBKNPMgY/zDYH/YH7SJbvrr/h1RcS9GzbPcLKGzpuK9cV56UA== @@ -1797,20 +1790,20 @@ dependencies: webpack-bundle-analyzer "4.3.0" -"@next/env@11.1.2": - version "11.1.2" - resolved "https://registry.yarnpkg.com/@next/env/-/env-11.1.2.tgz#27996efbbc54c5f949f5e8c0a156e3aa48369b99" - integrity sha512-+fteyVdQ7C/OoulfcF6vd1Yk0FEli4453gr8kSFbU8sKseNSizYq6df5MKz/AjwLptsxrUeIkgBdAzbziyJ3mA== +"@next/env@12.0.4": + version "12.0.4" + resolved "https://registry.yarnpkg.com/@next/env/-/env-12.0.4.tgz#effe19526fa51ab2da1a39e594b80a257b3fa1c5" + integrity sha512-QtZ6X5c6Zqa7oWs5csEmZ7xy+gLdtRKKg02SOT5l0Ziea4P5IU8mSOCyNC4fZmXewcRVjpbY+yGqAAP7hJUfOA== -"@next/polyfill-module@11.1.2": - version "11.1.2" - resolved "https://registry.yarnpkg.com/@next/polyfill-module/-/polyfill-module-11.1.2.tgz#1fe92c364fdc81add775a16c678f5057c6aace98" - integrity sha512-xZmixqADM3xxtqBV0TpAwSFzWJP0MOQzRfzItHXf1LdQHWb0yofHHC+7eOrPFic8+ZGz5y7BdPkkgR1S25OymA== +"@next/polyfill-module@12.0.4": + version "12.0.4" + resolved "https://registry.yarnpkg.com/@next/polyfill-module/-/polyfill-module-12.0.4.tgz#ef4f4fd6d773ad655db1859ca71127e0c358af50" + integrity sha512-mk9yCDNpfXINTJKFTZNgwYs7eqRFpc5D/49O/fKB59blihyKl1GY1sZ0l7a2bn5l1X/WuaZzcIfqnrwkneqeaQ== -"@next/react-dev-overlay@11.1.2": - version "11.1.2" - resolved "https://registry.yarnpkg.com/@next/react-dev-overlay/-/react-dev-overlay-11.1.2.tgz#73795dc5454b7af168bac93df7099965ebb603be" - integrity sha512-rDF/mGY2NC69mMg2vDqzVpCOlWqnwPUXB2zkARhvknUHyS6QJphPYv9ozoPJuoT/QBs49JJd9KWaAzVBvq920A== +"@next/react-dev-overlay@12.0.4": + version "12.0.4" + resolved "https://registry.yarnpkg.com/@next/react-dev-overlay/-/react-dev-overlay-12.0.4.tgz#c97113df84986233c62eed37382aab85a0ec006e" + integrity sha512-9O0lXyzv5goFSmDwq9Hp8JE+DcObvd+bTXvmGSSvYR91AlIoVlH8/PwATx8Rf5YEuqggn/XKR1hn2kBYcbcGnA== dependencies: "@babel/code-frame" "7.12.11" anser "1.4.9" @@ -1819,42 +1812,70 @@ css.escape "1.5.1" data-uri-to-buffer "3.0.1" platform "1.3.6" - shell-quote "1.7.2" + shell-quote "1.7.3" source-map "0.8.0-beta.0" stacktrace-parser "0.1.10" - strip-ansi "6.0.0" - -"@next/react-refresh-utils@11.1.2": - version "11.1.2" - resolved "https://registry.yarnpkg.com/@next/react-refresh-utils/-/react-refresh-utils-11.1.2.tgz#44ea40d8e773e4b77bad85e24f6ac041d5e4b4a5" - integrity sha512-hsoJmPfhVqjZ8w4IFzoo8SyECVnN+8WMnImTbTKrRUHOVJcYMmKLL7xf7T0ft00tWwAl/3f3Q3poWIN2Ueql/Q== - -"@next/swc-darwin-arm64@11.1.2": - version "11.1.2" - resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-11.1.2.tgz#93226c38db488c4b62b30a53b530e87c969b8251" - integrity sha512-hZuwOlGOwBZADA8EyDYyjx3+4JGIGjSHDHWrmpI7g5rFmQNltjlbaefAbiU5Kk7j3BUSDwt30quJRFv3nyJQ0w== - -"@next/swc-darwin-x64@11.1.2": - version "11.1.2" - resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-11.1.2.tgz#792003989f560c00677b5daeff360b35b510db83" - integrity sha512-PGOp0E1GisU+EJJlsmJVGE+aPYD0Uh7zqgsrpD3F/Y3766Ptfbe1lEPPWnRDl+OzSSrSrX1lkyM/Jlmh5OwNvA== - -"@next/swc-linux-x64-gnu@11.1.2": - version "11.1.2" - resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-11.1.2.tgz#8216b2ae1f21f0112958735c39dd861088108f37" - integrity sha512-YcDHTJjn/8RqvyJVB6pvEKXihDcdrOwga3GfMv/QtVeLphTouY4BIcEUfrG5+26Nf37MP1ywN3RRl1TxpurAsQ== - -"@next/swc-win32-x64-msvc@11.1.2": - version "11.1.2" - resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-11.1.2.tgz#e15824405df137129918205e43cb5e9339589745" - integrity sha512-e/pIKVdB+tGQYa1cW3sAeHm8gzEri/HYLZHT4WZojrUxgWXqx8pk7S7Xs47uBcFTqBDRvK3EcQpPLf3XdVsDdg== - -"@node-rs/helper@1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@node-rs/helper/-/helper-1.2.1.tgz#e079b05f21ff4329d82c4e1f71c0290e4ecdc70c" - integrity sha512-R5wEmm8nbuQU0YGGmYVjEc0OHtYsuXdpRG+Ut/3wZ9XAvQWyThN08bTh2cBJgoZxHQUPtvRfeQuxcAgLuiBISg== - dependencies: - "@napi-rs/triples" "^1.0.3" + strip-ansi "6.0.1" + +"@next/react-refresh-utils@12.0.4": + version "12.0.4" + resolved "https://registry.yarnpkg.com/@next/react-refresh-utils/-/react-refresh-utils-12.0.4.tgz#20d43626498c451f71bb0bb26c3f780ad90f5fd6" + integrity sha512-kNUDmpBaJ+8Lb8CtKNynRFF9oijCjUKKru6Ont+JKhti9//5dNFFIcuo607bJSH86un06OEK0TZUt5XWVlbkjw== + +"@next/swc-android-arm64@12.0.4": + version "12.0.4" + resolved "https://registry.yarnpkg.com/@next/swc-android-arm64/-/swc-android-arm64-12.0.4.tgz#e3ad69d3aadbd1d3ff0768b4f02b66c3806aa6b2" + integrity sha512-6mXumia8ZPcy7bYu9kjItfWxrE6SFaJyqQDaFy9G9WrU9x3M1R1Yok8B2X1mboM8itD0tq+t3R/ebQEkkmevUw== + +"@next/swc-darwin-arm64@12.0.4": + version "12.0.4" + resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-12.0.4.tgz#bc083ed3ad5e6971d2f374f38a7d8f3c46a6de0a" + integrity sha512-7WMen1qhF5JmjKD9S5IEgEoaPJOXyIZj/Nsqa8ZSWxdF5oogp3uYYbKb/rvMYoKzpIbjyoLH/OCM5lm5IFM4iw== + +"@next/swc-darwin-x64@12.0.4": + version "12.0.4" + resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-12.0.4.tgz#84855d4c9fef3b3a094c0f2424ae2b7e6dc29caa" + integrity sha512-PVgefMWjxP6CU1HQs39+Bfpjcue6qErJfvJ/+n2zimjLzyeQAmD6LM9f1lDSttW2LjKjasoxR5qkRNLVlqzlaA== + +"@next/swc-linux-arm-gnueabihf@12.0.4": + version "12.0.4" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-12.0.4.tgz#090156c4fc88d86ebc67df35e99daa97ddb232de" + integrity sha512-8xGQu3sJiIdriKiCux3jDJ9pwivELEg7z2zfW0CqmQMbKNB7qP9lc0pq6CxshtKyXRMczNWRMtQ3Cjwep+UvNg== + +"@next/swc-linux-arm64-gnu@12.0.4": + version "12.0.4" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-12.0.4.tgz#3ddda6eb703eda411b117d1974f08e028bb987ed" + integrity sha512-HhEWcBkqGr3E7SYLtN9VnYUGamAWaLcXawHN33Em0WP7gzXrBqz0iIJNH7uEzHDS6980EqU/rrkLyhCHrYSZgQ== + +"@next/swc-linux-arm64-musl@12.0.4": + version "12.0.4" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-12.0.4.tgz#a17985b811166bb3598816009e5f025539827c21" + integrity sha512-oZyQ9wjtE7OX9RlnovP7izNx2AR/RzTuYWU4Ttim8ssABsipQSxSlfRaeb+Qi6jTc6k+lrPhjRfaZ+fGv/m2Ag== + +"@next/swc-linux-x64-gnu@12.0.4": + version "12.0.4" + resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-12.0.4.tgz#46fa9f4a4d381d41c0fc75912810e72468b0fb49" + integrity sha512-aBuf78QzL93T59Lk9kEGfHcA+9SzYIH7dGon1nqVxtAd2iqicKYNVaVcb38VKeiIBXMSUHXTdu6Ee053ZCOmSw== + +"@next/swc-linux-x64-musl@12.0.4": + version "12.0.4" + resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-12.0.4.tgz#5e07982c84df77ddad537f3abca7d0f52504fc08" + integrity sha512-yDgqUqL4H8M3Y0hv30ZyL9UvjnK4iXmD4I6iJz+XIHSRdA/VUiyKKoL7okf9hxr0mSxBtagbZ5A3qEoW/VliUQ== + +"@next/swc-win32-arm64-msvc@12.0.4": + version "12.0.4" + resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-12.0.4.tgz#17705a3d20b35fddd2f61c4d2e491bbf6909e71a" + integrity sha512-evDUrEYsUo+PMHsedaymfZO98VwV9wNFzuWVCyKgqg6SD1ZRpzbpqYQY7aINIuqZVdIWZElBE6EM+oxaj7PuWQ== + +"@next/swc-win32-ia32-msvc@12.0.4": + version "12.0.4" + resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-12.0.4.tgz#a2a6d5c09a07c62d3a6b5b6dbc4443b566b8385b" + integrity sha512-Lbmz0xlo8vW4EDWyzCfy3nGfqt7skqwxaERwe+vDVTBZ56mvJ5dsdyjqK24sxu4FFkWR7SaU4eNlHwZR+A3kTg== + +"@next/swc-win32-x64-msvc@12.0.4": + version "12.0.4" + resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-12.0.4.tgz#acb9ffb17118b797d8c76dd688dd0aec5fa65cd4" + integrity sha512-f+7WNIJOno5QEelrmob+3vN5EZJb3KCkOrnvUsQ0+LCCD0dIPIhCjeHAh3BGj9msGu8ijnXvD7JxVxE5V26cnQ== "@nodelib/fs.scandir@2.1.3": version "2.1.3" @@ -2736,6 +2757,11 @@ acorn-walk@^8.1.1: resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== +acorn@8.5.0, acorn@^8.2.4, acorn@^8.4.1: + version "8.5.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.5.0.tgz#4512ccb99b3698c752591e9bb4472e38ad43cee2" + integrity sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q== + acorn@^7.0.0, acorn@^7.1.1, acorn@^7.4.0: version "7.4.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" @@ -2746,11 +2772,6 @@ acorn@^8.0.4: resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.4.0.tgz#af53266e698d7cffa416714b503066a82221be60" integrity sha512-ULr0LDaEqQrMFGyQ3bhJkLsbtrQ8QibAseGZeaSUiT/6zb9IvIkomWHJIvgvwad+hinRAgsI51JcWk2yvwyL+w== -acorn@^8.2.4, acorn@^8.4.1: - version "8.5.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.5.0.tgz#4512ccb99b3698c752591e9bb4472e38ad43cee2" - integrity sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q== - agent-base@6: version "6.0.2" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" @@ -2825,6 +2846,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@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" @@ -3013,14 +3039,6 @@ assert@2.0.0: object-is "^1.0.1" util "^0.12.0" -assert@^1.1.1: - version "1.5.0" - resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb" - integrity sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA== - dependencies: - object-assign "^4.1.1" - util "0.10.3" - ast-transform@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/ast-transform/-/ast-transform-0.0.0.tgz#74944058887d8283e189d954600947bc98fe0062" @@ -3035,11 +3053,6 @@ ast-types-flow@^0.0.7: resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad" integrity sha1-9wtzXGvKGlycItmCw+Oef+ujva0= -ast-types@0.13.2: - version "0.13.2" - resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.13.2.tgz#df39b677a911a83f3a049644fb74fdded23cea48" - integrity sha512-uWMHxJxtfj/1oZClOxDEV1sQ1HCDkA4MG8Gr69KKeBjEVH0R84WlejZ0y2DcwyBlpAEMltmVYkVgqfLFb2oyiA== - ast-types@0.9.6: version "0.9.6" resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.6.tgz#102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9" @@ -3485,7 +3498,7 @@ browserify-sign@^4.0.0: readable-stream "^3.6.0" safe-buffer "^5.2.0" -browserify-zlib@0.2.0, browserify-zlib@^0.2.0: +browserify-zlib@0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f" integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA== @@ -3577,15 +3590,6 @@ buffer@5.6.0, buffer@^5.5.0: base64-js "^1.0.2" ieee754 "^1.1.4" -buffer@^4.3.0: - version "4.9.2" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8" - integrity sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg== - dependencies: - base64-js "^1.0.2" - ieee754 "^1.1.4" - isarray "^1.0.0" - builtin-modules@^3.1.0: version "3.2.0" resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.2.0.tgz#45d5db99e7ee5e6bc4f362e008bf917ab5049887" @@ -4136,17 +4140,12 @@ console-browserify@1.1.x: dependencies: date-now "^0.1.4" -console-browserify@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336" - integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA== - console-control-strings@^1.0.0, console-control-strings@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= -constants-browserify@1.0.0, constants-browserify@^1.0.0: +constants-browserify@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U= @@ -4327,7 +4326,7 @@ cross-spawn@^7.0.2, cross-spawn@^7.0.3: shebang-command "^2.0.0" which "^2.0.1" -crypto-browserify@3.12.0, crypto-browserify@^3.11.0: +crypto-browserify@3.12.0: version "3.12.0" resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec" integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg== @@ -4840,11 +4839,6 @@ domain-browser@4.19.0: resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-4.19.0.tgz#1093e17c0a17dbd521182fe90d49ac1370054af1" integrity sha512-fRA+BaAWOR/yr/t7T9E9GJztHPeFjj8U35ajyAjCDtAAnTn1Rc1f6W6VGPJrO1tkQv9zWu+JRof7z6oQtiYVFQ== -domain-browser@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda" - integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA== - domelementtype@1, domelementtype@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" @@ -5526,10 +5520,10 @@ eventemitter2@^6.4.2: resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-6.4.3.tgz#35c563619b13f3681e7eb05cbdaf50f56ba58820" integrity sha512-t0A2msp6BzOf+QAcI6z9XMktLj52OjGQg+8SJH6v5+3uxNpWYRR3wQmfA+6xtMU9kOC59qk9licus5dYcrYkMQ== -events@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379" - integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg== +events@3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" + integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: version "1.0.3" @@ -5775,14 +5769,6 @@ file-entry-cache@^6.0.1: dependencies: flat-cache "^3.0.4" -file-loader@^6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d" - integrity sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw== - dependencies: - loader-utils "^2.0.0" - schema-utils "^3.0.0" - fill-range@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" @@ -6559,7 +6545,7 @@ http-signature@~1.2.0: jsprim "^1.2.2" sshpk "^1.7.0" -https-browserify@1.0.0, https-browserify@^1.0.0: +https-browserify@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= @@ -6718,11 +6704,6 @@ inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, i resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== -inherits@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" - integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE= - inherits@2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" @@ -7126,7 +7107,7 @@ isarray@0.0.1: resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= -isarray@^1.0.0, 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= @@ -8372,7 +8353,7 @@ mime-db@1.44.0, "mime-db@>= 1.43.0 < 2": resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92" integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg== -mime-types@^2.1.12, mime-types@^2.1.27, mime-types@~2.1.19, mime-types@~2.1.24: +mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.24: version "2.1.27" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f" integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w== @@ -8509,13 +8490,6 @@ napi-build-utils@^1.0.1: resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806" integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg== -native-url@0.3.4: - version "0.3.4" - resolved "https://registry.yarnpkg.com/native-url/-/native-url-0.3.4.tgz#29c943172aed86c63cee62c8c04db7f5756661f8" - integrity sha512-6iM8R99ze45ivyH8vybJ7X0yekIcPf5GgLV5K0ENCbmRcaRIDoj37BC8iLEmaaBfqqb8enuZ5p0uhY+lVAbAcA== - dependencies: - querystring "^0.2.0" - natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" @@ -8538,14 +8512,6 @@ next-cookies@^2.0.3: dependencies: universal-cookie "^4.0.2" -next-images@1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/next-images/-/next-images-1.8.1.tgz#adea0c46a2e837cb49b6f95b478500a7ed4eea4f" - integrity sha512-/DoXucQKWkEBT2rCQKtm9bb+KTAnd1vVTLO12lX4oxdiBQa2uqn5vhcMPwKsdJlxNBzwg6EVnddFs3aqcwiiGA== - dependencies: - file-loader "^6.2.0" - url-loader "^4.1.0" - next-pwa@5.3.1: version "5.3.1" resolved "https://registry.yarnpkg.com/next-pwa/-/next-pwa-5.3.1.tgz#5bcd854422a452fd1fd56500d1c483664d9733d9" @@ -8578,20 +8544,20 @@ next-server@^9.0.5: styled-jsx "3.2.1" url "0.11.0" -next@^11.1.2: - version "11.1.2" - resolved "https://registry.yarnpkg.com/next/-/next-11.1.2.tgz#527475787a9a362f1bc916962b0c0655cc05bc91" - integrity sha512-azEYL0L+wFjv8lstLru3bgvrzPvK0P7/bz6B/4EJ9sYkXeW8r5Bjh78D/Ol7VOg0EIPz0CXoe72hzAlSAXo9hw== +next@12: + version "12.0.4" + resolved "https://registry.yarnpkg.com/next/-/next-12.0.4.tgz#096578b320f0faf0bd51798decb39aaf00052efe" + integrity sha512-1pvjcSZBm5OLoGmDhp4JwKwIE798WbqUNLuyU7w6a2jUkdWaxOYtkE/ROXQTi2pXHj7+6rm68AvhxROLX2NHQg== dependencies: - "@babel/runtime" "7.15.3" + "@babel/runtime" "7.15.4" "@hapi/accept" "5.0.2" - "@next/env" "11.1.2" - "@next/polyfill-module" "11.1.2" - "@next/react-dev-overlay" "11.1.2" - "@next/react-refresh-utils" "11.1.2" - "@node-rs/helper" "1.2.1" + "@napi-rs/triples" "1.0.3" + "@next/env" "12.0.4" + "@next/polyfill-module" "12.0.4" + "@next/react-dev-overlay" "12.0.4" + "@next/react-refresh-utils" "12.0.4" + acorn "8.5.0" assert "2.0.0" - ast-types "0.13.2" browserify-zlib "0.2.0" browserslist "4.16.6" buffer "5.6.0" @@ -8604,29 +8570,28 @@ next@^11.1.2: domain-browser "4.19.0" encoding "0.1.13" etag "1.8.1" + events "3.3.0" find-cache-dir "3.3.1" get-orientation "1.1.2" https-browserify "1.0.0" image-size "1.0.0" jest-worker "27.0.0-next.5" - native-url "0.3.4" node-fetch "2.6.1" node-html-parser "1.4.9" - node-libs-browser "^2.2.1" os-browserify "0.3.0" p-limit "3.1.0" path-browserify "1.0.1" - pnp-webpack-plugin "1.6.4" postcss "8.2.15" process "0.11.10" querystring-es3 "0.2.1" raw-body "2.4.1" react-is "17.0.2" react-refresh "0.8.3" + regenerator-runtime "0.13.4" stream-browserify "3.0.0" stream-http "3.1.1" string_decoder "1.3.0" - styled-jsx "4.0.1" + styled-jsx "5.0.0-beta.3" timers-browserify "2.0.12" tty-browserify "0.0.1" use-subscription "1.5.1" @@ -8634,10 +8599,17 @@ next@^11.1.2: vm-browserify "1.1.2" watchpack "2.1.1" optionalDependencies: - "@next/swc-darwin-arm64" "11.1.2" - "@next/swc-darwin-x64" "11.1.2" - "@next/swc-linux-x64-gnu" "11.1.2" - "@next/swc-win32-x64-msvc" "11.1.2" + "@next/swc-android-arm64" "12.0.4" + "@next/swc-darwin-arm64" "12.0.4" + "@next/swc-darwin-x64" "12.0.4" + "@next/swc-linux-arm-gnueabihf" "12.0.4" + "@next/swc-linux-arm64-gnu" "12.0.4" + "@next/swc-linux-arm64-musl" "12.0.4" + "@next/swc-linux-x64-gnu" "12.0.4" + "@next/swc-linux-x64-musl" "12.0.4" + "@next/swc-win32-arm64-msvc" "12.0.4" + "@next/swc-win32-ia32-msvc" "12.0.4" + "@next/swc-win32-x64-msvc" "12.0.4" nice-try@^1.0.4: version "1.0.5" @@ -8700,35 +8672,6 @@ node-int64@^0.4.0: resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs= -node-libs-browser@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425" - integrity sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q== - dependencies: - assert "^1.1.1" - browserify-zlib "^0.2.0" - buffer "^4.3.0" - console-browserify "^1.1.0" - constants-browserify "^1.0.0" - crypto-browserify "^3.11.0" - domain-browser "^1.1.1" - events "^3.0.0" - https-browserify "^1.0.0" - os-browserify "^0.3.0" - path-browserify "0.0.1" - process "^0.11.10" - punycode "^1.2.4" - querystring-es3 "^0.2.0" - readable-stream "^2.3.3" - stream-browserify "^2.0.1" - stream-http "^2.7.2" - string_decoder "^1.0.0" - timers-browserify "^2.0.4" - tty-browserify "0.0.0" - url "^0.11.0" - util "^0.11.0" - vm-browserify "^1.0.1" - node-modules-regexp@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40" @@ -8999,7 +8942,7 @@ optionator@^0.9.1: type-check "^0.4.0" word-wrap "^1.2.3" -os-browserify@0.3.0, os-browserify@^0.3.0: +os-browserify@0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc= @@ -9179,11 +9122,6 @@ pascal-case@^3.1.2: no-case "^3.0.4" tslib "^2.0.3" -path-browserify@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a" - integrity sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ== - path-browserify@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.1.tgz#d98454a9c3753d5790860f16f68867b9e46be1fd" @@ -9344,13 +9282,6 @@ platform@1.3.6: resolved "https://registry.yarnpkg.com/platform/-/platform-1.3.6.tgz#48b4ce983164b209c2d45a107adb31f473a6e7a7" integrity sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg== -pnp-webpack-plugin@1.6.4: - version "1.6.4" - resolved "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz#c9711ac4dc48a685dabafc86f8b6dd9f8df84149" - integrity sha512-7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg== - dependencies: - ts-pnp "^1.1.6" - postcss-attribute-case-insensitive@^4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-4.0.2.tgz#d93e46b504589e94ac7277b0463226c68041a880" @@ -9884,7 +9815,7 @@ process-nextick-args@~2.0.0: resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== -process@0.11.10, process@^0.11.10: +process@0.11.10: version "0.11.10" resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI= @@ -9954,11 +9885,6 @@ punycode@1.3.2: resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0= -punycode@^1.2.4: - version "1.4.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" - integrity sha1-wNWmOycYgArY4esPpSachN1BhF4= - punycode@^2.1.0, punycode@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" @@ -9989,12 +9915,12 @@ qs@~6.5.2: resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== -querystring-es3@0.2.1, querystring-es3@^0.2.0: +querystring-es3@0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM= -querystring@0.2.0, querystring@^0.2.0: +querystring@0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA= @@ -10349,7 +10275,7 @@ readable-stream@1.1: isarray "0.0.1" string_decoder "~0.10.x" -readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6: +readable-stream@^2.0.6, 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== @@ -10423,6 +10349,11 @@ regenerate@^1.4.0: resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A== +regenerator-runtime@0.13.4: + version "0.13.4" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz#e96bf612a3362d12bb69f7e8f74ffeab25c7ac91" + integrity sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g== + regenerator-runtime@^0.11.0: version "0.11.1" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" @@ -10898,10 +10829,10 @@ shebang-regex@^3.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== -shell-quote@1.7.2: - version "1.7.2" - resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.2.tgz#67a7d02c76c9da24f99d20808fcaded0e0e04be2" - integrity sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg== +shell-quote@1.7.3: + version "1.7.3" + resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.3.tgz#aa40edac170445b9a431e17bb62c0b881b9c4123" + integrity sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw== shelljs@0.3.x: version "0.3.0" @@ -11174,14 +11105,6 @@ stream-browserify@3.0.0: inherits "~2.0.4" readable-stream "^3.5.0" -stream-browserify@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b" - integrity sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg== - dependencies: - inherits "~2.0.1" - readable-stream "^2.0.2" - stream-http@3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-3.1.1.tgz#0370a8017cf8d050b9a8554afe608f043eaff564" @@ -11192,17 +11115,6 @@ stream-http@3.1.1: readable-stream "^3.6.0" xtend "^4.0.2" -stream-http@^2.7.2: - version "2.8.3" - resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc" - integrity sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw== - dependencies: - builtin-status-codes "^3.0.0" - inherits "^2.0.1" - readable-stream "^2.3.6" - to-arraybuffer "^1.0.0" - xtend "^4.0.0" - stream-parser@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/stream-parser/-/stream-parser-0.3.1.tgz#1618548694420021a1182ff0af1911c129761773" @@ -11309,7 +11221,7 @@ string.prototype.trimstart@^1.0.4: call-bind "^1.0.2" define-properties "^1.1.3" -string_decoder@1.3.0, string_decoder@^1.0.0, string_decoder@^1.1.1: +string_decoder@1.3.0, string_decoder@^1.1.1: version "1.3.0" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== @@ -11337,12 +11249,12 @@ stringify-object@^3.3.0: is-obj "^1.0.1" is-regexp "^1.0.0" -strip-ansi@6.0.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== +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.0" + ansi-regex "^5.0.1" strip-ansi@^3.0.0, strip-ansi@^3.0.1: version "3.0.1" @@ -11358,6 +11270,13 @@ strip-ansi@^4.0.0: dependencies: ansi-regex "^3.0.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" @@ -11459,10 +11378,10 @@ styled-jsx@3.2.1: stylis "3.5.4" stylis-rule-sheet "0.0.10" -styled-jsx@4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-4.0.1.tgz#ae3f716eacc0792f7050389de88add6d5245b9e9" - integrity sha512-Gcb49/dRB1k8B4hdK8vhW27Rlb2zujCk1fISrizCcToIs+55B4vmUM0N9Gi4nnVfFZWe55jRdWpAqH1ldAKWvQ== +styled-jsx@5.0.0-beta.3: + version "5.0.0-beta.3" + resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-5.0.0-beta.3.tgz#400d16179b5dff10d5954ab8be27a9a1b7780dd2" + integrity sha512-HtDDGSFPvmjHIqWf9n8Oo54tAoY/DTplvlyOH2+YOtD80Sp31Ap8ffSmxhgk5EkUoJ7xepdXMGT650mSffWuRA== dependencies: "@babel/plugin-syntax-jsx" "7.14.5" "@babel/types" "7.15.0" @@ -11843,13 +11762,6 @@ timers-browserify@2.0.12: dependencies: setimmediate "^1.0.4" -timers-browserify@^2.0.4: - version "2.0.11" - resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.11.tgz#800b1f3eee272e5bc53ee465a04d0e804c31211f" - integrity sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ== - dependencies: - setimmediate "^1.0.4" - tiny-warning@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754" @@ -11874,11 +11786,6 @@ tmpl@1.0.x: resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1" integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE= -to-arraybuffer@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43" - integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M= - to-fast-properties@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47" @@ -11972,11 +11879,6 @@ ts-node@10.2.1: make-error "^1.1.1" yn "3.1.1" -ts-pnp@^1.1.6: - version "1.2.0" - resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92" - integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw== - tsconfig-paths@^3.11.0: version "3.11.0" resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz#954c1fe973da6339c78e06b03ce2e48810b65f36" @@ -12014,11 +11916,6 @@ tsutils@^3.21.0: dependencies: tslib "^1.8.1" -tty-browserify@0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" - integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY= - tty-browserify@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.1.tgz#3f05251ee17904dfd0677546670db9651682b811" @@ -12269,15 +12166,6 @@ urix@^0.1.0: resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= -url-loader@^4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-4.1.1.tgz#28505e905cae158cf07c92ca622d7f237e70a4e2" - integrity sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA== - dependencies: - loader-utils "^2.0.0" - mime-types "^2.1.27" - schema-utils "^3.0.0" - url@0.11.0, url@^0.11.0: version "0.11.0" resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" @@ -12298,13 +12186,6 @@ util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= -util@0.10.3: - version "0.10.3" - resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" - integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk= - dependencies: - inherits "2.0.1" - util@0.12.4, util@^0.12.0: version "0.12.4" resolved "https://registry.yarnpkg.com/util/-/util-0.12.4.tgz#66121a31420df8f01ca0c464be15dfa1d1850253" @@ -12317,13 +12198,6 @@ util@0.12.4, util@^0.12.0: safe-buffer "^5.1.2" which-typed-array "^1.1.2" -util@^0.11.0: - version "0.11.1" - resolved "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61" - integrity sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ== - dependencies: - inherits "2.0.3" - utils-merge@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" @@ -12394,7 +12268,7 @@ vfile@^4.0.0: unist-util-stringify-position "^2.0.0" vfile-message "^2.0.0" -vm-browserify@1.1.2, vm-browserify@^1.0.1: +vm-browserify@1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== @@ -12804,7 +12678,7 @@ xmlchars@^2.2.0: resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== -xtend@^4.0.0, xtend@^4.0.2: +xtend@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==