diff --git a/composer.lock b/composer.lock index 8c2f2851..09e6ec1b 100644 --- a/composer.lock +++ b/composer.lock @@ -699,16 +699,16 @@ }, { "name": "doctrine/dbal", - "version": "3.3.3", + "version": "3.3.4", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "82331b861727c15b1f457ef05a8729e508e7ead5" + "reference": "83f779beaea1893c0bece093ab2104c6d15a7f26" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/82331b861727c15b1f457ef05a8729e508e7ead5", - "reference": "82331b861727c15b1f457ef05a8729e508e7ead5", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/83f779beaea1893c0bece093ab2104c6d15a7f26", + "reference": "83f779beaea1893c0bece093ab2104c6d15a7f26", "shasum": "" }, "require": { @@ -790,7 +790,7 @@ ], "support": { "issues": "https://github.com/doctrine/dbal/issues", - "source": "https://github.com/doctrine/dbal/tree/3.3.3" + "source": "https://github.com/doctrine/dbal/tree/3.3.4" }, "funding": [ { @@ -806,7 +806,7 @@ "type": "tidelift" } ], - "time": "2022-03-09T15:39:50+00:00" + "time": "2022-03-20T18:37:29+00:00" }, { "name": "doctrine/deprecations", @@ -10310,16 +10310,16 @@ }, { "name": "twig/twig", - "version": "v2.14.11", + "version": "v2.14.12", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "66baa66f29ee30e487e05f1679903e36eb01d727" + "reference": "19c898bda30c5edea573bbb9ee1235d8cf6956ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/66baa66f29ee30e487e05f1679903e36eb01d727", - "reference": "66baa66f29ee30e487e05f1679903e36eb01d727", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/19c898bda30c5edea573bbb9ee1235d8cf6956ed", + "reference": "19c898bda30c5edea573bbb9ee1235d8cf6956ed", "shasum": "" }, "require": { @@ -10374,7 +10374,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v2.14.11" + "source": "https://github.com/twigphp/Twig/tree/v2.14.12" }, "funding": [ { @@ -10386,7 +10386,7 @@ "type": "tidelift" } ], - "time": "2022-02-04T06:57:25+00:00" + "time": "2022-03-25T09:34:52+00:00" }, { "name": "webmozart/assert", diff --git a/src/Controller/AdminEntradaController.php b/src/Controller/AdminEntradaController.php index d2a80360..1d878db1 100755 --- a/src/Controller/AdminEntradaController.php +++ b/src/Controller/AdminEntradaController.php @@ -17,6 +17,7 @@ use App\Service\UploaderHelper; use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\Query\QueryException; +use Doctrine\Persistence\ManagerRegistry; use Exception; use Knp\Component\Pager\PaginatorInterface; use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted; @@ -31,16 +32,22 @@ class AdminEntradaController extends AbstractController { private LoggerClient $loggerClient; private BoleanToDateHelper $boleanToDateHelper; + private ManagerRegistry $managerRegistry; /** * NO usado es opcional. * @param LoggerClient $loggerClient * @param BoleanToDateHelper $boleanToDateHelper + * @param ManagerRegistry $managerRegistry */ - public function __construct(LoggerClient $loggerClient, BoleanToDateHelper $boleanToDateHelper) - { + public function __construct( + LoggerClient $loggerClient, + BoleanToDateHelper $boleanToDateHelper, + ManagerRegistry $managerRegistry + ) { $this->loggerClient = $loggerClient; $this->boleanToDateHelper = $boleanToDateHelper; + $this->managerRegistry = $managerRegistry; } /** @@ -51,8 +58,11 @@ public function __construct(LoggerClient $loggerClient, BoleanToDateHelper $bole * @param Request $request * @return Response */ - public function index(EntradaRepository $entradaRepository, PaginatorInterface $paginator, Request $request): Response - { + public function index( + EntradaRepository $entradaRepository, + PaginatorInterface $paginator, + Request $request + ): Response { $bus = $request->get('busq'); if ($this->isGranted('ROLE_EDITOR')) { $entrada = $entradaRepository->queryFindAllEntradas($bus); @@ -81,7 +91,8 @@ public function index(EntradaRepository $entradaRepository, PaginatorInterface $ */ public function listadoPublicado(EntradaRepository $entradaRepository): Response { - $this->isGranted('ROLE_EDITOR') ? $entrada = $entradaRepository->findAllPublicadosOrderedByPublicacion() : $entrada = $entradaRepository->findAllPublicadosOrderedByPublicacion($this->getUser()); + $this->isGranted('ROLE_EDITOR') ? $entrada = $entradaRepository->findAllPublicadosOrderedByPublicacion( + ) : $entrada = $entradaRepository->findAllPublicadosOrderedByPublicacion($this->getUser()); return $this->render('admin_entrada/list.html.twig', [ 'entradas' => $entrada, @@ -93,7 +104,6 @@ public function listadoPublicado(EntradaRepository $entradaRepository): Response * @param Entrada $entrada * @param UploaderHelper $uploaderHelper * @param ObtenerDatosHelper $datosHelper - * @param PrincipalRepository $principalRepository * @return RedirectResponse * @throws Exception * @Route("/admin/entrada/{id}/edit", name="admin_entrada_edit") @@ -103,10 +113,8 @@ public function edit( Request $request, Entrada $entrada, UploaderHelper $uploaderHelper, - ObtenerDatosHelper $datosHelper, - PrincipalRepository $principalRepository - ): Response - { + ObtenerDatosHelper $datosHelper + ): Response { $form = $this->createForm(EntradaType::class, $entrada); $form->handleRequest($request); @@ -116,7 +124,6 @@ public function edit( $boolean = $form['publicar']->getData(); $link = $form['linkRoute']->getData(); - $publicado = $this->boleanToDateHelper->setDatatimeForTrue($boolean); $entrada->setPublicadoAt($publicado); @@ -127,9 +134,9 @@ public function edit( $entrada->setImageFilename($newFilename); } - $this->getDoctrine()->getManager()->flush(); + $this->managerRegistry->getManager()->flush(); - $this->loggerClient->logMessage('Se editó la entrada \"' . $entrada->getTitulo() . '\"', ''); + $this->loggerClient->logMessage('Se editó la entrada \"'.$entrada->getTitulo().'\"', ''); return $this->redirectToRoute('admin_entrada_index'); } @@ -158,10 +165,8 @@ public function editComplex(Request $request, Entrada $entrada): Response $form->handleRequest($request); if ($form->isSubmitted() && $form->isValid()) { - - $this->getDoctrine()->getManager()->flush(); - - $this->loggerClient->logMessage('Se editó la entrada \"' . $entrada->getTitulo() . '\"', ''); + $this->managerRegistry->getManager()->flush(); + $this->loggerClient->logMessage('Se editó la entrada \"'.$entrada->getTitulo().'\"', ''); return $this->redirectToRoute('admin_entrada_index'); } @@ -202,13 +207,12 @@ public function new(EntityManagerInterface $em, Request $request, UploaderHelper $titulo = $form['titulo']->getData(); - if(!$link and $titulo) { - $link = $this->limpiaLink(null,$titulo); - }else{ + if (!$link and $titulo) { + $link = $this->limpiaLink($titulo); + } else { $link = $link->getlinkRoute(); } - $entrada->setLinkRoute($link); if ($uploadedFile) { @@ -218,7 +222,6 @@ public function new(EntityManagerInterface $em, Request $request, UploaderHelper $boolean = $form['publicar']->getData(); - $publicado = $this->boleanToDateHelper->setDatatimeForTrue($boolean); $entrada->setPublicadoAt($publicado); @@ -235,6 +238,7 @@ public function new(EntityManagerInterface $em, Request $request, UploaderHelper 'entrada' => $entrada, ]); } + /** * @Route("/admin/new/step1", name="admin_entrada_new_step1", methods={"GET","POST"}) * @param Request $request @@ -251,12 +255,11 @@ public function newStepOne(Request $request): Response if ($form->isSubmitted() && $form->isValid()) { $section = $form['section']->getData(); $entrada->addSection($section); - $entityManager = $this->getDoctrine()->getManager(); - $entityManager->persist($entrada); - $entityManager->flush(); + $this->managerRegistry->getManager()->persist($entrada); + $this->managerRegistry->getManager()->flush(); return $this->redirectToRoute('admin_entrada_new_step2', [ - 'id' => $entrada->getId() + 'id' => $entrada->getId(), ]); } @@ -266,7 +269,6 @@ public function newStepOne(Request $request): Response ]); } - /** * @Route("/admin/new/step2/{id}", name="admin_entrada_new_step2", methods={"GET","POST"}) * @param Request $request @@ -276,16 +278,15 @@ public function newStepOne(Request $request): Response */ public function newStepTwo(Request $request, Entrada $entrada): Response { - $form = $this->createForm(StepTwoType::class, $entrada); $form->handleRequest($request); if ($form->isSubmitted() && $form->isValid()) { - $this->getDoctrine()->getManager()->flush(); + $this->managerRegistry->getManager()->flush(); return $this->redirectToRoute('admin_entrada_new_step3', [ - 'id' => $entrada->getId() + 'id' => $entrada->getId(), ]); } @@ -311,12 +312,11 @@ public function newStepThree(Request $request): Response if ($form->isSubmitted() && $form->isValid()) { $section = $form['section']->getData(); $entrada->addSection($section); - $entityManager = $this->getDoctrine()->getManager(); - $entityManager->persist($entrada); - $entityManager->flush(); + $this->managerRegistry->getManager()->persist($entrada); + $this->managerRegistry->getManager()->flush(); return $this->redirectToRoute('admin_entrada_index', [ - 'id' => $entrada->getId() + 'id' => $entrada->getId(), ]); } @@ -326,7 +326,6 @@ public function newStepThree(Request $request): Response ]); } - /** * @Route("/admin/entrada/{linkRoute}", name="entrada_admin_link") * @@ -347,9 +346,6 @@ public function link(Entrada $entrada): Response */ public function show(Entrada $entrada): Response { - if (!$entrada) { - throw $this->createNotFoundException(sprintf('No se encontró la entrada "%s"', $entrada)); - } return $this->render('entrada/show.html.twig', [ 'entrada' => $entrada, @@ -364,40 +360,32 @@ public function show(Entrada $entrada): Response */ public function delete(Request $request, Entrada $entrada): Response { - if ($this->isCsrfTokenValid('delete' . $entrada->getId(), $request->request->get('_token'))) { - $entityManager = $this->getDoctrine()->getManager(); - $entityManager->remove($entrada); - $entityManager->flush(); + if ($this->isCsrfTokenValid('delete'.$entrada->getId(), $request->request->get('_token'))) { + $this->managerRegistry->getManager()->remove($entrada); + $this->managerRegistry->getManager()->flush(); } return $this->redirectToRoute('admin_entrada_index'); } /** - * @param null|string $link * @param string $titulo * @return string */ - private function limpiaLink(?string $link , string $titulo): string + private function limpiaLink(string $titulo): string { - if ('' != $link) { - $link = strtolower(str_replace(' ', '-', trim($link))); - } else { - $link = strtolower(str_replace(' ', '-', trim($titulo))); - $link = strtolower(str_replace('

', '', trim($link))); - $link = strtolower(str_replace('

', '', trim($link))); - } - return $link; + $link = strtolower(str_replace(' ', '-', trim($titulo))); + $link = strtolower(str_replace('

', '', trim($link))); + return strtolower(str_replace('

', '', trim($link))); } - /** * @param Principal|null $principal * @return string|null */ private function getLinkRoute(?Principal $principal): ?string { - if(null === $principal){ + if (null === $principal) { return null; } return $principal->getLinkRoute(); @@ -410,7 +398,7 @@ private function getLinkRoute(?Principal $principal): ?string */ private function getPrincipal(?string $linkRoute, PrincipalRepository $principalRepository): ?Principal { - if(null === $linkRoute){ + if (null === $linkRoute) { return null; } diff --git a/src/Controller/PerfilController.php b/src/Controller/PerfilController.php index fc921106..a55ce3c2 100755 --- a/src/Controller/PerfilController.php +++ b/src/Controller/PerfilController.php @@ -2,18 +2,17 @@ namespace App\Controller; - use App\Entity\User; use App\Form\ChangePasswordType; -use App\Form\UserType; use App\Repository\IndexAlamedaRepository; -use App\Repository\UserRepository; +use Psr\Container\ContainerExceptionInterface; +use Psr\Container\NotFoundExceptionInterface; use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted; - +use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Annotation\Route; -use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface; +use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface; use Symfony\Component\Security\Http\Authentication\AuthenticationUtils; /** @@ -29,10 +28,8 @@ class PerfilController extends BaseController * @param IndexAlamedaRepository $indexAlamedaRepository * @return Response */ - public function index(IndexAlamedaRepository $indexAlamedaRepository) + public function index(IndexAlamedaRepository $indexAlamedaRepository): Response { - - return $this->render('perfil/perfil_index.html.twig', [ 'datosIndex' => $indexAlamedaRepository->findAll()[0], ]); @@ -41,7 +38,7 @@ public function index(IndexAlamedaRepository $indexAlamedaRepository) /** * @Route("/api/perfil", name="api_perfil") */ - public function apiPerfil() + public function apiPerfil(): JsonResponse { $user = $this->getUser(); @@ -54,13 +51,12 @@ public function apiPerfil() * @Route("/web/cambiopassword/{email}", name="app_changepassword") * @param Request $request * @param User $user - * @param UserPasswordEncoderInterface $passwordEncoder + * @param UserPasswordHasherInterface $passwordEncoder * @param AuthenticationUtils $authenticationUtils - * @param UserRepository $userRepository * @return Response */ - public function changePassword(Request $request, User $user, UserPasswordEncoderInterface $passwordEncoder, AuthenticationUtils $authenticationUtils, UserRepository $userRepository){ - + public function changePassword(Request $request, User $user, UserPasswordHasherInterface $passwordEncoder, AuthenticationUtils $authenticationUtils): Response + { $form = $this->createForm(ChangePasswordType::class, $user); $form->handleRequest($request); @@ -68,11 +64,14 @@ public function changePassword(Request $request, User $user, UserPasswordEncoder /** @var User $user */ $password = $form['password']->getData(); $user->setPassword( - $passwordEncoder->encodePassword($user, $password) + $passwordEncoder->hashPassword($user, $password) ); - $em = $this->getDoctrine()->getManager(); - $em->persist($user); - $em->flush(); + try { + $em = $this->container->get('doctrine')->getManager(); + $em->persist($user); + $em->flush(); + } catch (NotFoundExceptionInterface|ContainerExceptionInterface $e) { + } $error = $authenticationUtils->getLastAuthenticationError(); $lastUsername = $authenticationUtils->getLastUsername(); @@ -83,10 +82,9 @@ public function changePassword(Request $request, User $user, UserPasswordEncoder ]); } - return $this->render('security/changepassword.html.twig',[ + return $this->render('security/change-password.html.twig',[ 'user' => $user, 'form'=>$form->createView() ]); - } } diff --git a/src/Entity/User.php b/src/Entity/User.php index b472af2f..ca611ac9 100755 --- a/src/Entity/User.php +++ b/src/Entity/User.php @@ -19,7 +19,7 @@ * message="Este email ya está registrado" * ) */ -class User implements UserInterface +class User implements UserInterface, \Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface { /** * @ORM\Id() diff --git a/templates/admin_entrada/list.html.twig b/templates/admin_entrada/list.html.twig index 80c59595..0680669e 100644 --- a/templates/admin_entrada/list.html.twig +++ b/templates/admin_entrada/list.html.twig @@ -54,7 +54,7 @@ T: {{ entrada.titulo | replace({'

':'', '

':''}) | raw | u.truncate(20, '...') }}
- Lr: {{ entrada.linkRoute | u.truncate(20, '...')}} + Lr: {{ entrada.linkRoute | u.truncate(20, '...')}} {% for section in entrada.sections %} @@ -65,7 +65,7 @@ {% if section.indexAlamedas is defined %} {% for index in section.indexAlamedas %} - i: {{ index.lema }} + i: {{ index.base }}
{% endfor %} {% endif %} @@ -73,8 +73,9 @@ {% if section.principal is defined %} {% for principal in section.principales %} - P: {{ principal.titulo | replace({'

':'', '

':''}) | raw | u.truncate(20, '...') }} -
+ P: {{ principal.titulo | replace({'

':'', '

':''}) | raw | u.truncate(20, '...') }} + +
{% endfor %} {% endif %} {% endfor %} @@ -83,24 +84,6 @@ {{ entrada.autor }}
{{ entrada.autor.email }} -{# #} -{# {% if entrada.createdAt %}#} -{# Creada:#} -{# {{ entrada.createdAt ? entrada.createdAt | ago : 'No fue creada' }}#} -{# #} -{#
#} -{# {% endif %}#} -{# #} -{# Publicado?:
#} -{# {{ entrada.publicadoAt ? entrada.publicadoAt | ago : 'No publicada' }}#} -{#
#} - -{# {% if entrada.updatedAt %}#} -{# Actualizada:#} -{# {{ entrada.updatedAt ? entrada.updatedAt | ago : 'Aún no fue actualizada' }}#} -{# #} -{# {% endif %}#} -{# #} {{ entrada.isPermanente ? '
' }} {{ entrada.disponibleAt ?'Desde:'~ entrada.disponibleAt | ago : '' }}
diff --git a/templates/security/changepassword.html.twig b/templates/security/change-password.html.twig similarity index 100% rename from templates/security/changepassword.html.twig rename to templates/security/change-password.html.twig diff --git a/translations/KnpPaginatorBundle.es.xliff b/translations/KnpPaginatorBundle.es.xliff new file mode 100644 index 00000000..4fa25efb --- /dev/null +++ b/translations/KnpPaginatorBundle.es.xliff @@ -0,0 +1,19 @@ + + + + + + label_previous + Ant. + + + label_next + Sig. + + + filter_searchword + Buscar... + + + + diff --git a/yarn.lock b/yarn.lock index b617200f..d0369059 100755 --- a/yarn.lock +++ b/yarn.lock @@ -998,9 +998,9 @@ "@types/node" "*" "@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8": - version "7.0.10" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.10.tgz#9b05b7896166cd00e9cbd59864853abf65d9ac23" - integrity sha512-BLO9bBq59vW3fxCpD4o0N4U+DXsvwvIcl+jofw0frQo/GrBFC+/jRZj1E7kgp6dvTyNmA4y6JCV5Id/r3mNP5A== + version "7.0.11" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3" + integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ== "@types/minimatch@*": version "3.0.5" @@ -1008,9 +1008,9 @@ integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ== "@types/node@*": - version "17.0.22" - resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.22.tgz#38b6c4b9b2f3ed9f2e376cce42a298fb2375251e" - integrity sha512-8FwbVoG4fy+ykY86XCAclKZDORttqE5/s7dyWZKLXTdv3vRy5HozBEinG5IqhvPXXzIZEcTVbuHlQEI6iuwcmw== + version "17.0.23" + resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.23.tgz#3b41a6e643589ac6442bdbd7a4a3ded62f33f7da" + integrity sha512-UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw== "@types/parse-json@^4.0.0": version "4.0.0" @@ -1668,12 +1668,12 @@ aws4@^1.8.0: integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA== babel-loader@^8.0.0, babel-loader@^8.2.2: - version "8.2.3" - resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.3.tgz#8986b40f1a64cacfcb4b8429320085ef68b1342d" - integrity sha512-n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw== + version "8.2.4" + resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.4.tgz#95f5023c791b2e9e2ca6f67b0984f39c82ff384b" + integrity sha512-8dytA3gcvPPPv4Grjhnt8b5IIiTcq/zeXOPk4iTYI0SVXcsmuGg7JtBRDp8S9X+gJfhQ8ektjXZlDu1Bb33U8A== dependencies: find-cache-dir "^3.3.1" - loader-utils "^1.4.0" + loader-utils "^2.0.0" make-dir "^3.1.0" schema-utils "^2.6.5" @@ -1856,7 +1856,7 @@ braces@^2.3.1, braces@^2.3.2: split-string "^3.0.2" to-regex "^3.0.1" -braces@^3.0.1, braces@~3.0.2: +braces@^3.0.2, braces@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== @@ -2086,9 +2086,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001317: - version "1.0.30001319" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001319.tgz#eb4da4eb3ecdd409f7ba1907820061d56096e88f" - integrity sha512-xjlIAFHucBRSMUo1kb5D4LYgcN1M45qdKP++lhqowDpwJwGkpIRTt5qQqnhxjj1vHcI7nrJxWhCC1ATrCEBTcw== + version "1.0.30001320" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001320.tgz#8397391bec389b8ccce328636499b7284ee13285" + integrity sha512-MWPzG54AGdo3nWx7zHZTefseM5Y1ccM7hlQKHRqJkPozUaw3hNbBTMmLn16GG2FUzjR13Cr3NPfhIieX5PzXDA== cardinal@^1.0.0: version "1.0.0" @@ -3055,9 +3055,9 @@ ee-first@1.1.1: integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= electron-to-chromium@^1.4.84: - version "1.4.89" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.89.tgz#33c06592812a17a7131873f4596579084ce33ff8" - integrity sha512-z1Axg0Fu54fse8wN4fd+GAINdU5mJmLtcl6bqIcYyzNVGONcfHAeeJi88KYMQVKalhXlYuVPzKkFIU5VD0raUw== + version "1.4.95" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.95.tgz#49303dbe037c15e2e0cc851d71c4cb86119a9cd6" + integrity sha512-h2VAMV/hPtmAeiDkwA8c5sjS+cWt6GlQL4ERdrOUWu7cRIG5IRk9uwR9f0utP+hPJ9ZZsADTq9HpbuT46eBYAg== elliptic@^6.5.3: version "6.5.4" @@ -4805,9 +4805,9 @@ last-call-webpack-plugin@^3.0.0: webpack-sources "^1.1.0" lilconfig@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.4.tgz#f4507d043d7058b380b6a8f5cb7bcd4b34cee082" - integrity sha512-bfTIN7lEsiooCocSISTWXkiWJkRqtL9wYtYy+8EK3Y41qh3mpwPU0ycTOgjdY9ErwXCc8QyrQp82bdL0Xkm9yA== + version "2.0.5" + resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.5.tgz#19e57fd06ccc3848fd1891655b5a447092225b25" + integrity sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg== lines-and-columns@^1.1.6: version "1.2.4" @@ -5065,12 +5065,12 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4: to-regex "^3.0.2" micromatch@^4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" - integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== + version "4.0.5" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" + integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== dependencies: - braces "^3.0.1" - picomatch "^2.2.3" + braces "^3.0.2" + picomatch "^2.3.1" microplugin@0.0.3: version "0.0.3" @@ -5140,10 +5140,10 @@ minimatch@~3.0.2: dependencies: brace-expansion "^1.1.7" -minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" - integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== +minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.6: + version "1.2.6" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" + integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== minimist@~0.0.1: version "0.0.10" @@ -5175,11 +5175,11 @@ mixin-deep@^1.2.0: is-extendable "^1.0.1" "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.1: - version "0.5.5" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" - integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== + version "0.5.6" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" + integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== dependencies: - minimist "^1.2.5" + minimist "^1.2.6" mkdirp@^1.0.4: version "1.0.4" @@ -5837,7 +5837,7 @@ picocolors@^1.0.0: resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== -picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: +picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==