Download as
Browse Code »

Commit 54c2afcef28091998e68908fb56cb493bcd14d1f

Authored by Joalisson Barros
Committed by GitHub
2 parents 8afed739 0cbffee6
Exists in 2.9 and in 2 other branches 2.7, 2.8

Merge branch 'main' into release-registro00

Showing 30 changed files with 904 additions and 613 deletions   Show diff stats
app/Models/Exporter/Person.php
  Diff comments   View file @54c2afc
... ... @@ -51,6 +51,7 @@ class Person extends Model
51 51 'organization' => 'Empresa',
52 52 'monthly_income' => 'Renda Mensal',
53 53 'gender' => 'Gênero',
  54 + 'race' => 'Raça',
54 55 'phones.phones' => 'Telefones',
55 56 'disabilities.disabilities' => 'Deficiências',
56 57 ],
... ...
app/Models/Exporter/Student.php
  Diff comments   View file @54c2afc
... ... @@ -38,6 +38,7 @@ class Student extends Model
38 38 'Códigos' => [
39 39 'id' => 'ID Pessoa',
40 40 'student_id' => 'ID Aluno',
  41 +
41 42 'registration_id' => 'ID Matrícula',
42 43 'school_id' => 'ID Escola',
43 44 'school_class_id' => 'ID Turma',
... ... @@ -55,10 +56,12 @@ class Student extends Model
55 56 'email' => 'E-mail',
56 57 'sus' => 'Número SUS',
57 58 'nis' => 'NIS (PIS/PASEP)',
  59 + 'registration_code_id' => 'Código da Rede Estadual (RA)',
58 60 'occupation' => 'Ocupação',
59 61 'organization' => 'Empresa',
60 62 'monthly_income' => 'Renda Mensal',
61 63 'gender' => 'Gênero',
  64 + 'race' => 'Raça'
62 65 ],
63 66 'Escola' => [
64 67 'school' => 'Escola',
... ...
app/Models/Exporter/Teacher.php
  Diff comments   View file @54c2afc
... ... @@ -57,6 +57,7 @@ class Teacher extends Model
57 57 'organization' => 'Empresa',
58 58 'monthly_income' => 'Renda Mensal',
59 59 'gender' => 'Gênero',
  60 + 'race' => 'Raça'
60 61 ],
61 62 'Escola' => [
62 63 'school' => 'Escola',
... ...
app/Rules/CheckMandatoryCensoFields.php
  Diff comments   View file @54c2afc
... ... @@ -7,6 +7,7 @@ use App\Models\LegacyInstitution;
7 7 use App\Models\School;
8 8 use App_Model_LocalFuncionamentoDiferenciado;
9 9 use App_Model_TipoMediacaoDidaticoPedagogico;
  10 +use iEducar\Modules\Educacenso\Model\ModalidadeCurso;
10 11 use iEducar\Modules\Educacenso\Model\TipoAtendimentoTurma;
11 12 use Illuminate\Contracts\Validation\Rule;
12 13  
... ... @@ -181,42 +182,52 @@ class CheckMandatoryCensoFields implements Rule
181 182 return false;
182 183 }
183 184  
184   - if ((int)$course->modalidade_curso === 1 && !in_array((int)$params->etapa_educacenso, self::ETAPAS_ENSINO_REGULAR)) {
  185 + if ((int)$course->modalidade_curso === ModalidadeCurso::ENSINO_REGULAR &&
  186 + isset($params->etapa_educacenso) &&
  187 + !in_array((int)$params->etapa_educacenso, self::ETAPAS_ENSINO_REGULAR)) {
185 188 $this->message = 'Quando a modalidade do curso é: Ensino regular, o campo: Etapa de ensino deve ser uma das seguintes opções:'
186 189 . implode(',', self::ETAPAS_ENSINO_REGULAR) . '.';
187 190  
188 191 return false;
189 192 }
190 193  
191   - if ($course->modalidade_curso == 2 && !in_array((int) $params->etapa_educacenso, self::ETAPAS_ESPECIAL_SUBSTITUTIVAS)) {
  194 + if ((int)$course->modalidade_curso === ModalidadeCurso::EDUCACAO_ESPECIAL &&
  195 + isset($params->etapa_educacenso) &&
  196 + !in_array((int) $params->etapa_educacenso, self::ETAPAS_ESPECIAL_SUBSTITUTIVAS)) {
192 197 $this->message = 'Quando a modalidade do curso é: Educação especial, o campo: Etapa de ensino deve ser uma das seguintes opções:'
193 198 . implode(',', self::ETAPAS_ESPECIAL_SUBSTITUTIVAS) . '.';
194 199  
195 200 return false;
196 201 }
197 202  
198   - if ($course->modalidade_curso == 3 && !in_array($params->etapa_educacenso, [69, 70, 71, 72])) {
  203 + if ((int)$course->modalidade_curso === ModalidadeCurso::EJA &&
  204 + isset($params->etapa_educacenso) &&
  205 + !in_array($params->etapa_educacenso, [69, 70, 71, 72])) {
199 206 $this->message = 'Quando a modalidade do curso é: Educação de Jovens e Adultos (EJA), o campo: Etapa de ensino deve ser uma das seguintes opções: 69, 70, 71 ou 72.';
200 207  
201 208 return false;
202 209 }
203 210  
204   - if ($course->modalidade_curso == 4 && !in_array((int) $params->etapa_educacenso, [30, 31, 32, 33, 34, 39, 40, 73, 74, 64, 67, 68])) {
  211 + if ($course->modalidade_curso == 4 &&
  212 + isset($params->etapa_educacenso) &&
  213 + !in_array((int) $params->etapa_educacenso, [30, 31, 32, 33, 34, 39, 40, 73, 74, 64, 67, 68])) {
205 214 $this->message = 'Quando a modalidade do curso é: Educação Profissional, o campo: Etapa de ensino deve ser uma das seguintes opções: 30, 31, 32, 33, 34, 39, 40, 73, 74, 64, 67 ou 68.';
206 215  
207 216 return false;
208 217 }
209 218  
210   - if ($params->tipo_mediacao_didatico_pedagogico == App_Model_TipoMediacaoDidaticoPedagogico::SEMIPRESENCIAL
211   - && !in_array($params->etapa_educacenso, [69, 70, 71, 72])) {
  219 + if ($params->tipo_mediacao_didatico_pedagogico == App_Model_TipoMediacaoDidaticoPedagogico::SEMIPRESENCIAL &&
  220 + isset($params->etapa_educacenso) &&
  221 + !in_array($params->etapa_educacenso, [69, 70, 71, 72])) {
212 222 $this->message = 'Quando o campo: Tipo de mediação didático-pedagógica é: Semipresencial, o campo: Etapa de ensino deve ser uma das seguintes opções: 69, 70, 71 ou 72.';
213 223  
214 224 return false;
215 225 }
216 226  
217 227 if ($params->tipo_mediacao_didatico_pedagogico == App_Model_TipoMediacaoDidaticoPedagogico::EDUCACAO_A_DISTANCIA &&
218   - !in_array((int) $params->etapa_educacenso, [25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 40, 70, 71, 73, 74, 67, 68], true)) {
219   - $this->message = 'Quando o campo: Tipo de mediação didático-pedagógica é: Educação a Distância, o campo: Etapa de ensino deve ser uma das seguintes opções: 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 70, 71, 73, 74, 64, 67 ou 68.';
  228 + isset($params->etapa_educacenso) &&
  229 + !in_array((int) $params->etapa_educacenso, [25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 70, 71, 73, 74, 67, 68], true)) {
  230 + $this->message = 'Quando o campo: Tipo de mediação didático-pedagógica é: Educação a Distância, o campo: Etapa de ensino deve ser uma das seguintes opções: 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 70, 71, 73, 74, 67 ou 68';
220 231  
221 232 return false;
222 233 }
... ... @@ -226,7 +237,9 @@ class CheckMandatoryCensoFields implements Rule
226 237 App_Model_LocalFuncionamentoDiferenciado::UNIDADE_PRISIONAL
227 238 ];
228 239  
229   - if (in_array($params->local_funcionamento_diferenciado, $localDeFuncionamentoData) && in_array($params->etapa_educacenso, [1, 2, 3, 56])) {
  240 + if (in_array($params->local_funcionamento_diferenciado, $localDeFuncionamentoData) &&
  241 + isset($params->etapa_educacenso) &&
  242 + in_array($params->etapa_educacenso, [1, 2, 3, 56])) {
230 243 $nomeOpcao = (App_Model_LocalFuncionamentoDiferenciado::getInstance()->getEnums())[$params->local_funcionamento_diferenciado];
231 244 $this->message = "Quando o campo: Local de funcionamento diferenciado é: {$nomeOpcao}, o campo: Etapa de ensino não pode ser nenhuma das seguintes opções: 1, 2, 3 ou 56.";
232 245  
... ... @@ -265,15 +278,22 @@ class CheckMandatoryCensoFields implements Rule
265 278 if ($params->tipo_atendimento != TipoAtendimentoTurma::ESCOLARIZACAO && in_array(
266 279 $params->tipo_mediacao_didatico_pedagogico,
267 280 [
268   - App_Model_TipoMediacaoDidaticoPedagogico::SEMIPRESENCIAL,
269   - App_Model_TipoMediacaoDidaticoPedagogico::EDUCACAO_A_DISTANCIA
270   - ]
  281 + App_Model_TipoMediacaoDidaticoPedagogico::SEMIPRESENCIAL,
  282 + App_Model_TipoMediacaoDidaticoPedagogico::EDUCACAO_A_DISTANCIA
  283 + ]
271 284 )) {
272 285 $this->message = 'O campo: Tipo de atendimento deve ser: Escolarização quando o campo: Tipo de mediação didático-pedagógica for: Semipresencial ou Educação a Distância.';
273 286  
274 287 return false;
275 288 }
276 289  
  290 + $course = LegacyCourse::find($params->ref_cod_curso);
  291 + if ((int)$params->tipo_atendimento === TipoAtendimentoTurma::ATIVIDADE_COMPLEMENTAR && (int) $course->modalidade_curso === ModalidadeCurso::EJA) {
  292 + $this->message = 'Quando a modalidade do curso é: <b>Educação de Jovens e Adultos (EJA)</b>, o campo <b>Tipo de atendimento</b> não pode ser <b>Atividade complementar</b>';
  293 +
  294 + return false;
  295 + }
  296 +
277 297 return true;
278 298 }
279 299  
... ... @@ -318,28 +338,37 @@ class CheckMandatoryCensoFields implements Rule
318 338 return false;
319 339 }
320 340  
321   - if (count($estruturaCurricular) > 1 && in_array(3, $estruturaCurricular, true)) {
  341 + if (is_array($estruturaCurricular) && count($estruturaCurricular) > 1 && in_array(3, $estruturaCurricular, true)) {
322 342 $this->message = 'Não é possível informar mais de uma opção no campo: <b>Estrutura curricular</b>, quando a opção: <b>Não se aplica</b> estiver selecionada';
323 343  
324 344 return false;
325 345 }
326 346  
327 347 $etapaEnsinoCanNotContainsWithFormacaoGeralBasica = [1, 2, 3, 39, 40, 64, 68];
328   - if (in_array(1, $estruturaCurricular, true) && in_array((int) $params->tipo_atendimento, $etapaEnsinoCanNotContainsWithFormacaoGeralBasica)) {
  348 + if (is_array($estruturaCurricular) &&
  349 + in_array(1, $estruturaCurricular, true) &&
  350 + isset($params->etapa_educacenso) &&
  351 + in_array((int) $params->etapa_educacenso, $etapaEnsinoCanNotContainsWithFormacaoGeralBasica)) {
329 352 $this->message = 'Quando o campo: <b>Estrutura curricular</b> for preenchido com: <b>Formação geral básica</b>, o campo: <b>Etapa de ensino</b> deve ser uma das seguintes opções: 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 41, 69, 70, 71, 72, 56, 73, 74 ou 67';
330 353  
331 354 return false;
332 355 }
333 356  
334 357 $etapaEnsinoCanNotContainsWithItinerarioFormativo = [1, 2, 3, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 39, 40, 41, 56, 64, 68, 69, 70, 72, 73];
335   - if (in_array(2, $estruturaCurricular, true) && in_array((int) $params->tipo_atendimento, $etapaEnsinoCanNotContainsWithItinerarioFormativo)) {
  358 + if (is_array($estruturaCurricular) &&
  359 + in_array(2, $estruturaCurricular, true) &&
  360 + isset($params->etapa_educacenso) &&
  361 + in_array((int) $params->etapa_educacenso, $etapaEnsinoCanNotContainsWithItinerarioFormativo)) {
336 362 $this->message = 'Quando o campo: <b>Estrutura curricular</b> for preenchido com: <b>Itinerário formativo</b>, o campo: <b>Etapa de ensino</b> deve ser uma das seguintes opções: 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 71, 74, 67';
337 363  
338 364 return false;
339 365 }
340 366  
341   - $etapaEnsinoCanNotContainsWithNaoSeAplica = [1, 2, 3, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 39, 40, 41, 56, 64, 68, 69, 70, 72 , 73];
342   - if (in_array(3, $estruturaCurricular, true) && in_array((int) $params->tipo_atendimento, $etapaEnsinoCanNotContainsWithNaoSeAplica)) {
  367 + $etapaEnsinoCanNotContainsWithNaoSeAplica = [14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 41, 56, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 69, 70, 72, 71, 73, 67, 74];
  368 + if (is_array($estruturaCurricular) &&
  369 + in_array(3, $estruturaCurricular, true) &&
  370 + isset($params->etapa_educacenso) &&
  371 + in_array((int) $params->etapa_educacenso, $etapaEnsinoCanNotContainsWithNaoSeAplica)) {
343 372 $this->message = 'Quando o campo: <b>Estrutura curricular</b> for preenchido com: <b>Não se aplica</b>, o campo: <b>Etapa de ensino</b> deve ser uma das seguintes opções: 1, 2, 3, 24, 39, 40, 64, 68';
344 373  
345 374 return false;
... ...
app/Services/CyclicRegimeService.php
  Diff comments   View file @54c2afc
... ... @@ -27,7 +27,6 @@ class CyclicRegimeService
27 27 foreach ($grades as $grade) {
28 28 $result = LegacyRegistration::where('ref_ref_cod_serie', $grade->getKey())
29 29 ->where('ref_cod_aluno', $registration->ref_cod_aluno)
30   - ->where('ano', $registration->ano)
31 30 ->active()
32 31 ->get()
33 32 ->first();
... ...
app/Services/SchoolClass/SchoolClassService.php
  Diff comments   View file @54c2afc
... ... @@ -108,6 +108,7 @@ class SchoolClassService
108 108 public function storeSchoolClass(LegacySchoolClass $schoolClass)
109 109 {
110 110 $this->validate($schoolClass);
  111 +
111 112 $schoolClass->save();
112 113  
113 114 return $schoolClass;
... ...
composer.json
  Diff comments   View file @54c2afc
... ... @@ -18,7 +18,7 @@
18 18 "aws/aws-sdk-php-laravel": "^3.7",
19 19 "composer/semver": "^3.2",
20 20 "cossou/jasperphp": "^2.8",
21   - "dex/composer-plug-and-play": "^0.6.0",
  21 + "dex/composer-plug-and-play": "^0.8.0",
22 22 "dex/frontier": "^0.2.0",
23 23 "doctrine/dbal": "^2.13",
24 24 "fruitcake/laravel-cors": "^2.0",
... ...
composer.lock
  Diff comments   View file @54c2afc
... ... @@ -4,7 +4,7 @@
4 4 "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
5 5 "This file is @generated automatically"
6 6 ],
7   - "content-hash": "5819342077bf76be04688b10c6b18c3b",
  7 + "content-hash": "d29daca30edf9b4327a3b51c20cd7dba",
8 8 "packages": [
9 9 {
10 10 "name": "asm89/stack-cors",
... ... @@ -114,16 +114,16 @@
114 114 },
115 115 {
116 116 "name": "aws/aws-sdk-php",
117   - "version": "3.218.2",
  117 + "version": "3.219.5",
118 118 "source": {
119 119 "type": "git",
120 120 "url": "https://github.com/aws/aws-sdk-php.git",
121   - "reference": "dd981c2e95fd1dd65d8e05b30e257b8413d63071"
  121 + "reference": "7e8da5b45d545ca3129a14e972001698212b1a00"
122 122 },
123 123 "dist": {
124 124 "type": "zip",
125   - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/dd981c2e95fd1dd65d8e05b30e257b8413d63071",
126   - "reference": "dd981c2e95fd1dd65d8e05b30e257b8413d63071",
  125 + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/7e8da5b45d545ca3129a14e972001698212b1a00",
  126 + "reference": "7e8da5b45d545ca3129a14e972001698212b1a00",
127 127 "shasum": ""
128 128 },
129 129 "require": {
... ... @@ -131,9 +131,9 @@
131 131 "ext-json": "*",
132 132 "ext-pcre": "*",
133 133 "ext-simplexml": "*",
134   - "guzzlehttp/guzzle": "^5.3.3|^6.2.1|^7.0",
  134 + "guzzlehttp/guzzle": "^5.3.3 || ^6.2.1 || ^7.0",
135 135 "guzzlehttp/promises": "^1.4.0",
136   - "guzzlehttp/psr7": "^1.7.0|^2.0",
  136 + "guzzlehttp/psr7": "^1.7.0 || ^2.1.1",
137 137 "mtdowling/jmespath.php": "^2.6",
138 138 "php": ">=5.5"
139 139 },
... ... @@ -148,7 +148,7 @@
148 148 "ext-sockets": "*",
149 149 "nette/neon": "^2.3",
150 150 "paragonie/random_compat": ">= 2",
151   - "phpunit/phpunit": "^4.8.35|^5.4.3",
  151 + "phpunit/phpunit": "^4.8.35 || ^5.6.3",
152 152 "psr/cache": "^1.0",
153 153 "psr/simple-cache": "^1.0",
154 154 "sebastian/comparator": "^1.2.3"
... ... @@ -199,9 +199,9 @@
199 199 "support": {
200 200 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
201 201 "issues": "https://github.com/aws/aws-sdk-php/issues",
202   - "source": "https://github.com/aws/aws-sdk-php/tree/3.218.2"
  202 + "source": "https://github.com/aws/aws-sdk-php/tree/3.219.5"
203 203 },
204   - "time": "2022-04-04T18:18:52+00:00"
  204 + "time": "2022-04-15T18:16:29+00:00"
205 205 },
206 206 {
207 207 "name": "aws/aws-sdk-php-laravel",
... ... @@ -466,16 +466,16 @@
466 466 },
467 467 {
468 468 "name": "dex/composer-plug-and-play",
469   - "version": "0.6.0",
  469 + "version": "0.8.0",
470 470 "source": {
471 471 "type": "git",
472 472 "url": "https://github.com/edersoares/composer-plug-and-play.git",
473   - "reference": "15c73b02b1bd3d0b99310eacff8270754b3a5ae0"
  473 + "reference": "6c385dfd4ab7885d07a14ce2dd0428e2f1efba01"
474 474 },
475 475 "dist": {
476 476 "type": "zip",
477   - "url": "https://api.github.com/repos/edersoares/composer-plug-and-play/zipball/15c73b02b1bd3d0b99310eacff8270754b3a5ae0",
478   - "reference": "15c73b02b1bd3d0b99310eacff8270754b3a5ae0",
  477 + "url": "https://api.github.com/repos/edersoares/composer-plug-and-play/zipball/6c385dfd4ab7885d07a14ce2dd0428e2f1efba01",
  478 + "reference": "6c385dfd4ab7885d07a14ce2dd0428e2f1efba01",
479 479 "shasum": ""
480 480 },
481 481 "require": {
... ... @@ -484,7 +484,7 @@
484 484 "php": ">=7.3"
485 485 },
486 486 "require-dev": {
487   - "composer/composer": "^2.0",
  487 + "composer/composer": "^2.3.0",
488 488 "phpunit/phpunit": "^9.4"
489 489 },
490 490 "type": "composer-plugin",
... ... @@ -510,9 +510,9 @@
510 510 "description": "Plug and play packages for Composer",
511 511 "support": {
512 512 "issues": "https://github.com/edersoares/composer-plug-and-play/issues",
513   - "source": "https://github.com/edersoares/composer-plug-and-play/tree/0.6.0"
  513 + "source": "https://github.com/edersoares/composer-plug-and-play/tree/0.8.0"
514 514 },
515   - "time": "2021-12-29T14:30:42+00:00"
  515 + "time": "2022-04-08T01:32:57+00:00"
516 516 },
517 517 {
518 518 "name": "dex/frontier",
... ... @@ -2251,16 +2251,16 @@
2251 2251 },
2252 2252 {
2253 2253 "name": "laravel/framework",
2254   - "version": "v9.6.0",
  2254 + "version": "v9.8.1",
2255 2255 "source": {
2256 2256 "type": "git",
2257 2257 "url": "https://github.com/laravel/framework.git",
2258   - "reference": "47940a1a8774b96696ed57e6736ccea4a880c057"
  2258 + "reference": "9f468689964ac80b674a2fe71a56baa7e9e20493"
2259 2259 },
2260 2260 "dist": {
2261 2261 "type": "zip",
2262   - "url": "https://api.github.com/repos/laravel/framework/zipball/47940a1a8774b96696ed57e6736ccea4a880c057",
2263   - "reference": "47940a1a8774b96696ed57e6736ccea4a880c057",
  2262 + "url": "https://api.github.com/repos/laravel/framework/zipball/9f468689964ac80b674a2fe71a56baa7e9e20493",
  2263 + "reference": "9f468689964ac80b674a2fe71a56baa7e9e20493",
2264 2264 "shasum": ""
2265 2265 },
2266 2266 "require": {
... ... @@ -2426,7 +2426,7 @@
2426 2426 "issues": "https://github.com/laravel/framework/issues",
2427 2427 "source": "https://github.com/laravel/framework"
2428 2428 },
2429   - "time": "2022-03-29T14:41:26+00:00"
  2429 + "time": "2022-04-12T15:43:03+00:00"
2430 2430 },
2431 2431 {
2432 2432 "name": "laravel/horizon",
... ... @@ -2507,16 +2507,16 @@
2507 2507 },
2508 2508 {
2509 2509 "name": "laravel/sanctum",
2510   - "version": "v2.15.0",
  2510 + "version": "v2.15.1",
2511 2511 "source": {
2512 2512 "type": "git",
2513 2513 "url": "https://github.com/laravel/sanctum.git",
2514   - "reference": "5be160413b6f37dcf8758663edeab12d0e806f56"
  2514 + "reference": "31fbe6f85aee080c4dc2f9b03dc6dd5d0ee72473"
2515 2515 },
2516 2516 "dist": {
2517 2517 "type": "zip",
2518   - "url": "https://api.github.com/repos/laravel/sanctum/zipball/5be160413b6f37dcf8758663edeab12d0e806f56",
2519   - "reference": "5be160413b6f37dcf8758663edeab12d0e806f56",
  2518 + "url": "https://api.github.com/repos/laravel/sanctum/zipball/31fbe6f85aee080c4dc2f9b03dc6dd5d0ee72473",
  2519 + "reference": "31fbe6f85aee080c4dc2f9b03dc6dd5d0ee72473",
2520 2520 "shasum": ""
2521 2521 },
2522 2522 "require": {
... ... @@ -2568,7 +2568,7 @@
2568 2568 "issues": "https://github.com/laravel/sanctum/issues",
2569 2569 "source": "https://github.com/laravel/sanctum"
2570 2570 },
2571   - "time": "2022-03-28T13:53:05+00:00"
  2571 + "time": "2022-04-08T13:39:49+00:00"
2572 2572 },
2573 2573 {
2574 2574 "name": "laravel/serializable-closure",
... ... @@ -2760,16 +2760,16 @@
2760 2760 },
2761 2761 {
2762 2762 "name": "league/commonmark",
2763   - "version": "2.2.3",
  2763 + "version": "2.3.0",
2764 2764 "source": {
2765 2765 "type": "git",
2766 2766 "url": "https://github.com/thephpleague/commonmark.git",
2767   - "reference": "47b015bc4e50fd4438c1ffef6139a1fb65d2ab71"
  2767 + "reference": "32a49eb2b38fe5e5c417ab748a45d0beaab97955"
2768 2768 },
2769 2769 "dist": {
2770 2770 "type": "zip",
2771   - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/47b015bc4e50fd4438c1ffef6139a1fb65d2ab71",
2772   - "reference": "47b015bc4e50fd4438c1ffef6139a1fb65d2ab71",
  2771 + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/32a49eb2b38fe5e5c417ab748a45d0beaab97955",
  2772 + "reference": "32a49eb2b38fe5e5c417ab748a45d0beaab97955",
2773 2773 "shasum": ""
2774 2774 },
2775 2775 "require": {
... ... @@ -2778,17 +2778,19 @@
2778 2778 "php": "^7.4 || ^8.0",
2779 2779 "psr/event-dispatcher": "^1.0",
2780 2780 "symfony/deprecation-contracts": "^2.1 || ^3.0",
2781   - "symfony/polyfill-php80": "^1.15"
  2781 + "symfony/polyfill-php80": "^1.16"
2782 2782 },
2783 2783 "require-dev": {
2784 2784 "cebe/markdown": "^1.0",
2785 2785 "commonmark/cmark": "0.30.0",
2786 2786 "commonmark/commonmark.js": "0.30.0",
2787 2787 "composer/package-versions-deprecated": "^1.8",
  2788 + "embed/embed": "^4.4",
2788 2789 "erusev/parsedown": "^1.0",
2789 2790 "ext-json": "*",
2790 2791 "github/gfm": "0.29.0",
2791 2792 "michelf/php-markdown": "^1.4",
  2793 + "nyholm/psr7": "^1.5",
2792 2794 "phpstan/phpstan": "^0.12.88 || ^1.0.0",
2793 2795 "phpunit/phpunit": "^9.5.5",
2794 2796 "scrutinizer/ocular": "^1.8.1",
... ... @@ -2803,7 +2805,7 @@
2803 2805 "type": "library",
2804 2806 "extra": {
2805 2807 "branch-alias": {
2806   - "dev-main": "2.3-dev"
  2808 + "dev-main": "2.4-dev"
2807 2809 }
2808 2810 },
2809 2811 "autoload": {
... ... @@ -2860,7 +2862,7 @@
2860 2862 "type": "tidelift"
2861 2863 }
2862 2864 ],
2863   - "time": "2022-02-26T21:24:45+00:00"
  2865 + "time": "2022-04-07T22:37:05+00:00"
2864 2866 },
2865 2867 {
2866 2868 "name": "league/config",
... ... @@ -3030,16 +3032,16 @@
3030 3032 },
3031 3033 {
3032 3034 "name": "league/flysystem",
3033   - "version": "3.0.13",
  3035 + "version": "3.0.17",
3034 3036 "source": {
3035 3037 "type": "git",
3036 3038 "url": "https://github.com/thephpleague/flysystem.git",
3037   - "reference": "15dc1ccb2db8daef507c4d3e501565bae42a9f0e"
  3039 + "reference": "29eb78cac0be0c22237c5e0f6f98234d97037d79"
3038 3040 },
3039 3041 "dist": {
3040 3042 "type": "zip",
3041   - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/15dc1ccb2db8daef507c4d3e501565bae42a9f0e",
3042   - "reference": "15dc1ccb2db8daef507c4d3e501565bae42a9f0e",
  3043 + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/29eb78cac0be0c22237c5e0f6f98234d97037d79",
  3044 + "reference": "29eb78cac0be0c22237c5e0f6f98234d97037d79",
3043 3045 "shasum": ""
3044 3046 },
3045 3047 "require": {
... ... @@ -3100,7 +3102,7 @@
3100 3102 ],
3101 3103 "support": {
3102 3104 "issues": "https://github.com/thephpleague/flysystem/issues",
3103   - "source": "https://github.com/thephpleague/flysystem/tree/3.0.13"
  3105 + "source": "https://github.com/thephpleague/flysystem/tree/3.0.17"
3104 3106 },
3105 3107 "funding": [
3106 3108 {
... ... @@ -3116,7 +3118,7 @@
3116 3118 "type": "tidelift"
3117 3119 }
3118 3120 ],
3119   - "time": "2022-04-02T08:55:13+00:00"
  3121 + "time": "2022-04-14T14:57:13+00:00"
3120 3122 },
3121 3123 {
3122 3124 "name": "league/flysystem-aws-s3-v3",
... ... @@ -3240,16 +3242,16 @@
3240 3242 },
3241 3243 {
3242 3244 "name": "league/flysystem-sftp-v3",
3243   - "version": "3.0.12",
  3245 + "version": "3.0.17",
3244 3246 "source": {
3245 3247 "type": "git",
3246 3248 "url": "https://github.com/thephpleague/flysystem-sftp-v3.git",
3247   - "reference": "672a59d1bb40133e7669b236c111aa6e5b7265f3"
  3249 + "reference": "8e5c3d4d50b58281786f9a15b827aaeef739fc32"
3248 3250 },
3249 3251 "dist": {
3250 3252 "type": "zip",
3251   - "url": "https://api.github.com/repos/thephpleague/flysystem-sftp-v3/zipball/672a59d1bb40133e7669b236c111aa6e5b7265f3",
3252   - "reference": "672a59d1bb40133e7669b236c111aa6e5b7265f3",
  3253 + "url": "https://api.github.com/repos/thephpleague/flysystem-sftp-v3/zipball/8e5c3d4d50b58281786f9a15b827aaeef739fc32",
  3254 + "reference": "8e5c3d4d50b58281786f9a15b827aaeef739fc32",
3253 3255 "shasum": ""
3254 3256 },
3255 3257 "require": {
... ... @@ -3284,7 +3286,7 @@
3284 3286 ],
3285 3287 "support": {
3286 3288 "issues": "https://github.com/thephpleague/flysystem-sftp-v3/issues",
3287   - "source": "https://github.com/thephpleague/flysystem-sftp-v3/tree/3.0.12"
  3289 + "source": "https://github.com/thephpleague/flysystem-sftp-v3/tree/3.0.17"
3288 3290 },
3289 3291 "funding": [
3290 3292 {
... ... @@ -3300,20 +3302,20 @@
3300 3302 "type": "tidelift"
3301 3303 }
3302 3304 ],
3303   - "time": "2022-03-11T08:21:11+00:00"
  3305 + "time": "2022-04-14T14:56:41+00:00"
3304 3306 },
3305 3307 {
3306 3308 "name": "league/mime-type-detection",
3307   - "version": "1.9.0",
  3309 + "version": "1.11.0",
3308 3310 "source": {
3309 3311 "type": "git",
3310 3312 "url": "https://github.com/thephpleague/mime-type-detection.git",
3311   - "reference": "aa70e813a6ad3d1558fc927863d47309b4c23e69"
  3313 + "reference": "ff6248ea87a9f116e78edd6002e39e5128a0d4dd"
3312 3314 },
3313 3315 "dist": {
3314 3316 "type": "zip",
3315   - "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/aa70e813a6ad3d1558fc927863d47309b4c23e69",
3316   - "reference": "aa70e813a6ad3d1558fc927863d47309b4c23e69",
  3317 + "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ff6248ea87a9f116e78edd6002e39e5128a0d4dd",
  3318 + "reference": "ff6248ea87a9f116e78edd6002e39e5128a0d4dd",
3317 3319 "shasum": ""
3318 3320 },
3319 3321 "require": {
... ... @@ -3344,7 +3346,7 @@
3344 3346 "description": "Mime-type detection for Flysystem",
3345 3347 "support": {
3346 3348 "issues": "https://github.com/thephpleague/mime-type-detection/issues",
3347   - "source": "https://github.com/thephpleague/mime-type-detection/tree/1.9.0"
  3349 + "source": "https://github.com/thephpleague/mime-type-detection/tree/1.11.0"
3348 3350 },
3349 3351 "funding": [
3350 3352 {
... ... @@ -3356,7 +3358,7 @@
3356 3358 "type": "tidelift"
3357 3359 }
3358 3360 ],
3359   - "time": "2021-11-21T11:48:40+00:00"
  3361 + "time": "2022-04-17T13:12:02+00:00"
3360 3362 },
3361 3363 {
3362 3364 "name": "maatwebsite/excel",
... ... @@ -3678,16 +3680,16 @@
3678 3680 },
3679 3681 {
3680 3682 "name": "monolog/monolog",
3681   - "version": "2.4.0",
  3683 + "version": "2.5.0",
3682 3684 "source": {
3683 3685 "type": "git",
3684 3686 "url": "https://github.com/Seldaek/monolog.git",
3685   - "reference": "d7fd7450628561ba697b7097d86db72662f54aef"
  3687 + "reference": "4192345e260f1d51b365536199744b987e160edc"
3686 3688 },
3687 3689 "dist": {
3688 3690 "type": "zip",
3689   - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/d7fd7450628561ba697b7097d86db72662f54aef",
3690   - "reference": "d7fd7450628561ba697b7097d86db72662f54aef",
  3691 + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/4192345e260f1d51b365536199744b987e160edc",
  3692 + "reference": "4192345e260f1d51b365536199744b987e160edc",
3691 3693 "shasum": ""
3692 3694 },
3693 3695 "require": {
... ... @@ -3761,7 +3763,7 @@
3761 3763 ],
3762 3764 "support": {
3763 3765 "issues": "https://github.com/Seldaek/monolog/issues",
3764   - "source": "https://github.com/Seldaek/monolog/tree/2.4.0"
  3766 + "source": "https://github.com/Seldaek/monolog/tree/2.5.0"
3765 3767 },
3766 3768 "funding": [
3767 3769 {
... ... @@ -3773,7 +3775,7 @@
3773 3775 "type": "tidelift"
3774 3776 }
3775 3777 ],
3776   - "time": "2022-03-14T12:44:37+00:00"
  3778 + "time": "2022-04-08T15:43:54+00:00"
3777 3779 },
3778 3780 {
3779 3781 "name": "mtdowling/jmespath.php",
... ... @@ -4197,16 +4199,16 @@
4197 4199 },
4198 4200 {
4199 4201 "name": "nuwave/lighthouse",
4200   - "version": "v5.45.3",
  4202 + "version": "v5.47.0",
4201 4203 "source": {
4202 4204 "type": "git",
4203 4205 "url": "https://github.com/nuwave/lighthouse.git",
4204   - "reference": "4f541221a04d3ae498db3ccf0ef595193ad30fc7"
  4206 + "reference": "a5b63e19b78c6e6dd499e2304408dba484679e9a"
4205 4207 },
4206 4208 "dist": {
4207 4209 "type": "zip",
4208   - "url": "https://api.github.com/repos/nuwave/lighthouse/zipball/4f541221a04d3ae498db3ccf0ef595193ad30fc7",
4209   - "reference": "4f541221a04d3ae498db3ccf0ef595193ad30fc7",
  4210 + "url": "https://api.github.com/repos/nuwave/lighthouse/zipball/a5b63e19b78c6e6dd499e2304408dba484679e9a",
  4211 + "reference": "a5b63e19b78c6e6dd499e2304408dba484679e9a",
4210 4212 "shasum": ""
4211 4213 },
4212 4214 "require": {
... ... @@ -4323,7 +4325,7 @@
4323 4325 "type": "tidelift"
4324 4326 }
4325 4327 ],
4326   - "time": "2022-03-25T10:12:24+00:00"
  4328 + "time": "2022-04-19T12:41:29+00:00"
4327 4329 },
4328 4330 {
4329 4331 "name": "paragonie/constant_time_encoding",
... ... @@ -8288,16 +8290,16 @@
8288 8290 },
8289 8291 {
8290 8292 "name": "webonyx/graphql-php",
8291   - "version": "v14.11.5",
  8293 + "version": "v14.11.6",
8292 8294 "source": {
8293 8295 "type": "git",
8294 8296 "url": "https://github.com/webonyx/graphql-php.git",
8295   - "reference": "ffa431c0821821839370a68dab3c2597c06bf7f0"
  8297 + "reference": "6070542725b61fc7d0654a8a9855303e5e157434"
8296 8298 },
8297 8299 "dist": {
8298 8300 "type": "zip",
8299   - "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/ffa431c0821821839370a68dab3c2597c06bf7f0",
8300   - "reference": "ffa431c0821821839370a68dab3c2597c06bf7f0",
  8301 + "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/6070542725b61fc7d0654a8a9855303e5e157434",
  8302 + "reference": "6070542725b61fc7d0654a8a9855303e5e157434",
8301 8303 "shasum": ""
8302 8304 },
8303 8305 "require": {
... ... @@ -8342,7 +8344,7 @@
8342 8344 ],
8343 8345 "support": {
8344 8346 "issues": "https://github.com/webonyx/graphql-php/issues",
8345   - "source": "https://github.com/webonyx/graphql-php/tree/v14.11.5"
  8347 + "source": "https://github.com/webonyx/graphql-php/tree/v14.11.6"
8346 8348 },
8347 8349 "funding": [
8348 8350 {
... ... @@ -8350,7 +8352,7 @@
8350 8352 "type": "open_collective"
8351 8353 }
8352 8354 ],
8353   - "time": "2022-01-24T11:13:31+00:00"
  8355 + "time": "2022-04-13T16:25:32+00:00"
8354 8356 }
8355 8357 ],
8356 8358 "packages-dev": [
... ... @@ -9178,16 +9180,16 @@
9178 9180 },
9179 9181 {
9180 9182 "name": "laravel/telescope",
9181   - "version": "v4.8.1",
  9183 + "version": "v4.8.3",
9182 9184 "source": {
9183 9185 "type": "git",
9184 9186 "url": "https://github.com/laravel/telescope.git",
9185   - "reference": "2c61ad4a1d1366f2829cbe3d50d004cef7dfc691"
  9187 + "reference": "bb23d58161032c8745d38348452afcbcd8adfc78"
9186 9188 },
9187 9189 "dist": {
9188 9190 "type": "zip",
9189   - "url": "https://api.github.com/repos/laravel/telescope/zipball/2c61ad4a1d1366f2829cbe3d50d004cef7dfc691",
9190   - "reference": "2c61ad4a1d1366f2829cbe3d50d004cef7dfc691",
  9191 + "url": "https://api.github.com/repos/laravel/telescope/zipball/bb23d58161032c8745d38348452afcbcd8adfc78",
  9192 + "reference": "bb23d58161032c8745d38348452afcbcd8adfc78",
9191 9193 "shasum": ""
9192 9194 },
9193 9195 "require": {
... ... @@ -9240,9 +9242,9 @@
9240 9242 ],
9241 9243 "support": {
9242 9244 "issues": "https://github.com/laravel/telescope/issues",
9243   - "source": "https://github.com/laravel/telescope/tree/v4.8.1"
  9245 + "source": "https://github.com/laravel/telescope/tree/v4.8.3"
9244 9246 },
9245   - "time": "2022-03-26T16:04:21+00:00"
  9247 + "time": "2022-04-11T14:29:02+00:00"
9246 9248 },
9247 9249 {
9248 9250 "name": "mockery/mockery",
... ... @@ -9377,16 +9379,16 @@
9377 9379 },
9378 9380 {
9379 9381 "name": "nunomaduro/collision",
9380   - "version": "v6.1.0",
  9382 + "version": "v6.2.0",
9381 9383 "source": {
9382 9384 "type": "git",
9383 9385 "url": "https://github.com/nunomaduro/collision.git",
9384   - "reference": "df09e21a5e5d5a7d51a8b9ecd44d3dd150d97fec"
  9386 + "reference": "c379636dc50e829edb3a8bcb944a01aa1aed8f25"
9385 9387 },
9386 9388 "dist": {
9387 9389 "type": "zip",
9388   - "url": "https://api.github.com/repos/nunomaduro/collision/zipball/df09e21a5e5d5a7d51a8b9ecd44d3dd150d97fec",
9389   - "reference": "df09e21a5e5d5a7d51a8b9ecd44d3dd150d97fec",
  9390 + "url": "https://api.github.com/repos/nunomaduro/collision/zipball/c379636dc50e829edb3a8bcb944a01aa1aed8f25",
  9391 + "reference": "c379636dc50e829edb3a8bcb944a01aa1aed8f25",
9390 9392 "shasum": ""
9391 9393 },
9392 9394 "require": {
... ... @@ -9397,10 +9399,10 @@
9397 9399 },
9398 9400 "require-dev": {
9399 9401 "brianium/paratest": "^6.4.1",
9400   - "laravel/framework": "^9.0",
  9402 + "laravel/framework": "^9.7",
9401 9403 "nunomaduro/larastan": "^1.0.2",
9402 9404 "nunomaduro/mock-final-classes": "^1.1.0",
9403   - "orchestra/testbench": "^7.0.0",
  9405 + "orchestra/testbench": "^7.3.0",
9404 9406 "phpunit/phpunit": "^9.5.11"
9405 9407 },
9406 9408 "type": "library",
... ... @@ -9460,7 +9462,7 @@
9460 9462 "type": "patreon"
9461 9463 }
9462 9464 ],
9463   - "time": "2022-01-18T17:49:08+00:00"
  9465 + "time": "2022-04-05T15:31:38+00:00"
9464 9466 },
9465 9467 {
9466 9468 "name": "phar-io/manifest",
... ... @@ -11484,16 +11486,16 @@
11484 11486 },
11485 11487 {
11486 11488 "name": "spatie/laravel-ignition",
11487   - "version": "1.2.0",
  11489 + "version": "1.2.2",
11488 11490 "source": {
11489 11491 "type": "git",
11490 11492 "url": "https://github.com/spatie/laravel-ignition.git",
11491   - "reference": "2b54c8c66f2d280f25e15064ebe3d5e3eda19820"
  11493 + "reference": "924d1ae878874ad0bb49f63b69a9af759a34ee78"
11492 11494 },
11493 11495 "dist": {
11494 11496 "type": "zip",
11495   - "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/2b54c8c66f2d280f25e15064ebe3d5e3eda19820",
11496   - "reference": "2b54c8c66f2d280f25e15064ebe3d5e3eda19820",
  11497 + "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/924d1ae878874ad0bb49f63b69a9af759a34ee78",
  11498 + "reference": "924d1ae878874ad0bb49f63b69a9af759a34ee78",
11497 11499 "shasum": ""
11498 11500 },
11499 11501 "require": {
... ... @@ -11570,7 +11572,7 @@
11570 11572 "type": "github"
11571 11573 }
11572 11574 ],
11573   - "time": "2022-04-01T21:01:58+00:00"
  11575 + "time": "2022-04-14T18:04:51+00:00"
11574 11576 },
11575 11577 {
11576 11578 "name": "symfony/filesystem",
... ... @@ -11828,5 +11830,5 @@
11828 11830 "ext-pgsql": "*"
11829 11831 },
11830 11832 "platform-dev": [],
11831   - "plugin-api-version": "2.2.0"
  11833 + "plugin-api-version": "2.3.0"
11832 11834 }
... ...
config/assets.php
  Diff comments   View file @54c2afc
... ... @@ -13,9 +13,7 @@ return [
13 13 | Example: http://website.domain/path/to/asset.css?v=0.0.1
14 14 |
15 15 */
16   -
17   - 'version' => '0.1.07',
18   -
  16 + 'version' => '0.1.09',
19 17 /*
20 18 |--------------------------------------------------------------------------
21 19 | Assets Secure Option
... ...
database/migrations/2022_04_14_175126_add_race_view_export_person.php 0 → 100644
  Diff comments   View file @54c2afc
... ... @@ -0,0 +1,35 @@
  1 +<?php
  2 +
  3 +use App\Support\Database\AsView;
  4 +use Illuminate\Database\Migrations\Migration;
  5 +
  6 +class AddRaceViewExportPerson extends Migration
  7 +{
  8 + use AsView;
  9 +
  10 + public function up()
  11 + {
  12 + $this->dropView('public.exporter_teacher');
  13 + $this->dropView('public.exporter_social_assistance');
  14 + $this->dropView('public.exporter_student');
  15 + $this->dropView('public.exporter_person');
  16 +
  17 + $this->createView('public.exporter_person', '2022-04-14');
  18 + $this->createView('public.exporter_student', '2021-07-19');
  19 + $this->createView('public.exporter_social_assistance', '2020-05-07');
  20 + $this->createView('public.exporter_teacher', '2021-10-13');
  21 + }
  22 +
  23 + public function down()
  24 + {
  25 + $this->dropView('public.exporter_teacher');
  26 + $this->dropView('public.exporter_social_assistance');
  27 + $this->dropView('public.exporter_student');
  28 + $this->dropView('public.exporter_person');
  29 +
  30 + $this->createView('public.exporter_person', '2021-04-13');
  31 + $this->createView('public.exporter_student', '2021-07-19');
  32 + $this->createView('public.exporter_social_assistance', '2020-05-07');
  33 + $this->createView('public.exporter_teacher', '2021-10-13');
  34 + }
  35 +}
... ...
database/migrations/2022_04_26_093217_add_race_view_export_student.php 0 → 100644
  Diff comments   View file @54c2afc
... ... @@ -0,0 +1,27 @@
  1 +<?php
  2 +
  3 +use App\Support\Database\AsView;
  4 +use Illuminate\Database\Migrations\Migration;
  5 +
  6 +class AddRaceViewExportStudent extends Migration
  7 +{
  8 + use AsView;
  9 +
  10 + public function up()
  11 + {
  12 + $this->dropView('public.exporter_social_assistance');
  13 + $this->dropView('public.exporter_student');
  14 +
  15 + $this->createView('public.exporter_student', '2022-04-26');
  16 + $this->createView('public.exporter_social_assistance', '2020-05-07');
  17 + }
  18 +
  19 + public function down()
  20 + {
  21 + $this->dropView('public.exporter_social_assistance');
  22 + $this->dropView('public.exporter_student');
  23 +
  24 + $this->createView('public.exporter_student', '2021-07-19');
  25 + $this->createView('public.exporter_social_assistance', '2020-05-07');
  26 + }
  27 +}
... ...
database/migrations/2022_04_28_093345_add_registration_code_view_export_student.php 0 → 100644
  Diff comments   View file @54c2afc
... ... @@ -0,0 +1,27 @@
  1 +<?php
  2 +
  3 +use App\Support\Database\AsView;
  4 +use Illuminate\Database\Migrations\Migration;
  5 +
  6 +class AddRegistrationCodeViewExportStudent extends Migration
  7 +{
  8 + use AsView;
  9 +
  10 + public function up()
  11 + {
  12 + $this->dropView('public.exporter_social_assistance');
  13 + $this->dropView('public.exporter_student');
  14 +
  15 + $this->createView('public.exporter_student', '2022-04-28');
  16 + $this->createView('public.exporter_social_assistance', '2020-05-07');
  17 + }
  18 +
  19 + public function down()
  20 + {
  21 + $this->dropView('public.exporter_social_assistance');
  22 + $this->dropView('public.exporter_student');
  23 +
  24 + $this->createView('public.exporter_student', '2022-04-26');
  25 + $this->createView('public.exporter_social_assistance', '2020-05-07');
  26 + }
  27 +}
... ...
database/sqls/views/public.exporter_person-2022-04-14.sql 0 → 100644
  Diff comments   View file @54c2afc
... ... @@ -0,0 +1,35 @@
  1 +create view public.exporter_person
  2 +AS SELECT p.idpes AS id,
  3 + p.nome AS name,
  4 + f.nome_social AS social_name,
  5 + f.cpf,
  6 + d.rg,
  7 + d.data_exp_rg AS rg_issue_date,
  8 + d.sigla_uf_exp_rg AS rg_state_abbreviation,
  9 + f.data_nasc AS date_of_birth,
  10 + p.email,
  11 + f.sus,
  12 + f.nis_pis_pasep AS nis,
  13 + f.ocupacao AS occupation,
  14 + f.empresa AS organization,
  15 + f.renda_mensal AS monthly_income,
  16 + f.sexo AS gender,
  17 + r.nm_raca AS race,
  18 + f.idpes_mae AS mother_id,
  19 + f.idpes_pai AS father_id,
  20 + f.idpes_responsavel AS guardian_id,
  21 + case f.nacionalidade
  22 + when 1 then 'Brasileira'::varchar
  23 + when 2 then 'Naturalizado brasileiro'::varchar
  24 + when 3 then 'Estrangeira'::varchar
  25 + else 'Não informado'::varchar
  26 + end as nationality,
  27 + COALESCE( ci."name"||' - '||st.abbreviation , 'Não informado') as birthplace
  28 + FROM cadastro.pessoa p
  29 + JOIN cadastro.fisica f ON f.idpes = p.idpes
  30 + LEFT JOIN cadastro.fisica_raca fr ON fr.ref_idpes = f.idpes
  31 + LEFT JOIN cadastro.raca r ON r.cod_raca = fr.ref_cod_raca
  32 + LEFT JOIN cadastro.documento d ON d.idpes = p.idpes
  33 + LEFT JOIN public.cities ci ON ci.id = f.idmun_nascimento
  34 + LEFT JOIN public.states st on ci.state_id = st.id
  35 + WHERE true AND f.ativo = 1;
... ...
database/sqls/views/public.exporter_person.sql
  Diff comments   View file @54c2afc
... ... @@ -15,6 +15,7 @@ select
15 15 f.empresa as organization,
16 16 f.renda_mensal as monthly_income,
17 17 f.sexo as gender,
  18 + r.nm_raca as race,
18 19 f.idpes_mae as mother_id,
19 20 f.idpes_pai as father_id,
20 21 f.idpes_responsavel as guardian_id,
... ... @@ -27,6 +28,8 @@ select
27 28 COALESCE(ci."name" || '/' || st.abbreviation, 'Não informado') as birthplace
28 29 from cadastro.pessoa p
29 30 inner join cadastro.fisica f on f.idpes = p.idpes
  31 +left join cadastro.fisica_raca fr on fr.ref_idpes = f.idpes
  32 +left join cadastro.raca r on r.cod_raca = fr.ref_cod_raca
30 33 left join cadastro.documento d on d.idpes = p.idpes
31 34 left join public.cities ci on ci.id = f.idmun_nascimento
32 35 left join public.states st on ci.state_id = st.id
... ...
database/sqls/views/public.exporter_student-2022-04-26.sql 0 → 100644
  Diff comments   View file @54c2afc
... ... @@ -0,0 +1,64 @@
  1 +create view public.exporter_student as
  2 +SELECT p.id,
  3 + p.name,
  4 + p.social_name,
  5 + p.cpf,
  6 + p.rg,
  7 + p.rg_issue_date,
  8 + p.rg_state_abbreviation,
  9 + p.date_of_birth,
  10 + p.email,
  11 + p.sus,
  12 + p.nis,
  13 + p.occupation,
  14 + p.organization,
  15 + p.monthly_income,
  16 + p.gender,
  17 + p.race,
  18 + p.mother_id,
  19 + p.father_id,
  20 + p.guardian_id,
  21 + ep.nome AS school,
  22 + t.nm_turma AS school_class,
  23 + s.nm_serie AS grade,
  24 + c.nm_curso AS course,
  25 + m.data_matricula::date AS registration_date,
  26 + COALESCE(m.data_cancel::date, mt.data_exclusao::date) AS registration_out,
  27 + m.ano AS year,
  28 + vs.cod_situacao AS status,
  29 + vs.texto_situacao AS status_text,
  30 + a.cod_aluno AS student_id,
  31 + m.cod_matricula AS registration_id,
  32 + m.ref_cod_curso AS course_id,
  33 + m.ref_ref_cod_serie AS grade_id,
  34 + m.ref_ref_cod_escola AS school_id,
  35 + t.cod_turma AS school_class_id,
  36 + t.tipo_atendimento AS attendance_type,
  37 + ece.cod_escola_inep AS school_inep,
  38 + t.etapa_educacenso AS school_class_stage,
  39 + COALESCE(tm.nome, tt.nome) AS period,
  40 + array_to_string(ARRAY( SELECT json_array_elements_text(ma.recursos_tecnologicos) AS json_array_elements_text), ';'::text) AS technological_resources,
  41 + p.nationality,
  42 + p.birthplace,
  43 + CASE m.modalidade_ensino
  44 + WHEN 0 THEN 'Semipresencial'::varchar
  45 + WHEN 1 THEN 'EAD'::varchar
  46 + WHEN 2 THEN 'Off-line'::varchar
  47 + ELSE 'Presencial'::varchar
  48 + END AS modalidade_ensino
  49 +FROM exporter_person p
  50 + JOIN pmieducar.aluno a ON p.id = a.ref_idpes::numeric
  51 + JOIN pmieducar.matricula m ON m.ref_cod_aluno = a.cod_aluno
  52 + JOIN pmieducar.escola e ON e.cod_escola = m.ref_ref_cod_escola
  53 + JOIN cadastro.pessoa ep ON ep.idpes = e.ref_idpes::numeric
  54 + JOIN pmieducar.serie s ON s.cod_serie = m.ref_ref_cod_serie
  55 + JOIN pmieducar.curso c ON c.cod_curso = m.ref_cod_curso
  56 + JOIN pmieducar.matricula_turma mt ON mt.ref_cod_matricula = m.cod_matricula
  57 + JOIN relatorio.view_situacao vs ON vs.cod_matricula = m.cod_matricula AND vs.cod_turma = mt.ref_cod_turma AND vs.sequencial = mt.sequencial
  58 + JOIN pmieducar.turma t ON t.cod_turma = mt.ref_cod_turma
  59 + LEFT JOIN modules.educacenso_cod_escola ece ON e.cod_escola = ece.cod_escola
  60 + LEFT JOIN pmieducar.turma_turno tt ON tt.id = t.turma_turno_id
  61 + LEFT JOIN pmieducar.turma_turno tm ON tm.id = mt.turno_id
  62 + LEFT JOIN modules.moradia_aluno ma ON ma.ref_cod_aluno = a.cod_aluno
  63 +WHERE true AND a.ativo = 1 AND m.ativo = 1
  64 +ORDER BY a.ref_idpes;
... ...
database/sqls/views/public.exporter_student-2022-04-28.sql 0 → 100644
  Diff comments   View file @54c2afc
... ... @@ -0,0 +1,65 @@
  1 +create view public.exporter_student as
  2 +SELECT p.id,
  3 + p.name,
  4 + p.social_name,
  5 + p.cpf,
  6 + p.rg,
  7 + p.rg_issue_date,
  8 + p.rg_state_abbreviation,
  9 + p.date_of_birth,
  10 + p.email,
  11 + p.sus,
  12 + p.nis,
  13 + p.occupation,
  14 + p.organization,
  15 + p.monthly_income,
  16 + p.gender,
  17 + p.race,
  18 + p.mother_id,
  19 + p.father_id,
  20 + p.guardian_id,
  21 + ep.nome AS school,
  22 + t.nm_turma AS school_class,
  23 + s.nm_serie AS grade,
  24 + c.nm_curso AS course,
  25 + m.data_matricula::date AS registration_date,
  26 + COALESCE(m.data_cancel::date, mt.data_exclusao::date) AS registration_out,
  27 + m.ano AS year,
  28 + vs.cod_situacao AS status,
  29 + vs.texto_situacao AS status_text,
  30 + a.cod_aluno AS student_id,
  31 + a.aluno_estado_id AS registration_code_id,
  32 + m.cod_matricula AS registration_id,
  33 + m.ref_cod_curso AS course_id,
  34 + m.ref_ref_cod_serie AS grade_id,
  35 + m.ref_ref_cod_escola AS school_id,
  36 + t.cod_turma AS school_class_id,
  37 + t.tipo_atendimento AS attendance_type,
  38 + ece.cod_escola_inep AS school_inep,
  39 + t.etapa_educacenso AS school_class_stage,
  40 + COALESCE(tm.nome, tt.nome) AS period,
  41 + array_to_string(ARRAY( SELECT json_array_elements_text(ma.recursos_tecnologicos) AS json_array_elements_text), ';'::text) AS technological_resources,
  42 + p.nationality,
  43 + p.birthplace,
  44 + CASE m.modalidade_ensino
  45 + WHEN 0 THEN 'Semipresencial'::varchar
  46 + WHEN 1 THEN 'EAD'::varchar
  47 + WHEN 2 THEN 'Off-line'::varchar
  48 + ELSE 'Presencial'::varchar
  49 + END AS modalidade_ensino
  50 +FROM exporter_person p
  51 + JOIN pmieducar.aluno a ON p.id = a.ref_idpes::numeric
  52 + JOIN pmieducar.matricula m ON m.ref_cod_aluno = a.cod_aluno
  53 + JOIN pmieducar.escola e ON e.cod_escola = m.ref_ref_cod_escola
  54 + JOIN cadastro.pessoa ep ON ep.idpes = e.ref_idpes::numeric
  55 + JOIN pmieducar.serie s ON s.cod_serie = m.ref_ref_cod_serie
  56 + JOIN pmieducar.curso c ON c.cod_curso = m.ref_cod_curso
  57 + JOIN pmieducar.matricula_turma mt ON mt.ref_cod_matricula = m.cod_matricula
  58 + JOIN relatorio.view_situacao vs ON vs.cod_matricula = m.cod_matricula AND vs.cod_turma = mt.ref_cod_turma AND vs.sequencial = mt.sequencial
  59 + JOIN pmieducar.turma t ON t.cod_turma = mt.ref_cod_turma
  60 + LEFT JOIN modules.educacenso_cod_escola ece ON e.cod_escola = ece.cod_escola
  61 + LEFT JOIN pmieducar.turma_turno tt ON tt.id = t.turma_turno_id
  62 + LEFT JOIN pmieducar.turma_turno tm ON tm.id = mt.turno_id
  63 + LEFT JOIN modules.moradia_aluno ma ON ma.ref_cod_aluno = a.cod_aluno
  64 +WHERE true AND a.ativo = 1 AND m.ativo = 1
  65 +ORDER BY a.ref_idpes;
... ...
database/sqls/views/public.exporter_student.sql
  Diff comments   View file @54c2afc
... ... @@ -14,6 +14,7 @@ SELECT p.id,
14 14 p.organization,
15 15 p.monthly_income,
16 16 p.gender,
  17 + p.race,
17 18 p.mother_id,
18 19 p.father_id,
19 20 p.guardian_id,
... ... @@ -27,6 +28,7 @@ SELECT p.id,
27 28 vs.cod_situacao AS status,
28 29 vs.texto_situacao AS status_text,
29 30 a.cod_aluno AS student_id,
  31 + a.aluno_estado_id AS registration_code_id,
30 32 m.cod_matricula AS registration_id,
31 33 m.ref_cod_curso AS course_id,
32 34 m.ref_ref_cod_serie AS grade_id,
... ...
docker-compose.yml
  Diff comments   View file @54c2afc
... ... @@ -27,7 +27,7 @@ services:
27 27  
28 28 postgres:
29 29 container_name: ieducar-postgres
30   - image: postgres:13-alpine
  30 + image: postgres:14-alpine
31 31 environment:
32 32 POSTGRES_DB: ieducar
33 33 POSTGRES_USER: ieducar
... ...
ieducar/intranet/atendidos_cad.php
  Diff comments   View file @54c2afc
... ... @@ -140,7 +140,7 @@ return new class extends clsCadastro {
140 140 );
141 141  
142 142 $nomeMenu = $this->retorno === 'Editar' ? $this->retorno : 'Cadastrar';
143   -
  143 +
144 144 $this->nome_url_cancelar = 'Cancelar';
145 145 $this->breadcrumb("{$nomeMenu} pessoa física", ['educar_pessoas_index.php' => 'Pessoas']);
146 146  
... ... @@ -623,7 +623,7 @@ return new class extends clsCadastro {
623 623  
624 624 $raca = new clsCadastroFisicaRaca($this->cod_pessoa_fj);
625 625 $raca = $raca->detalhe();
626   - $this->cod_raca = is_array($raca) ? $raca['ref_cod_raca'] : null;
  626 + $this->cod_raca = is_array($raca) ? $raca['ref_cod_raca'] : $this->cor_raca;
627 627  
628 628 $this->campoLista('cor_raca', 'Raça', $selectOptionsRaca, $this->cod_raca, '', false, '', '', '', $obrigarCamposCenso);
629 629  
... ...
ieducar/intranet/educar_biblioteca_cad.php
  Diff comments   View file @54c2afc
... ... @@ -141,6 +141,13 @@ return new class extends clsCadastro {
141 141 $this->campoQuebra();
142 142 }
143 143  
  144 + public function Formular()
  145 + {
  146 + $this->title = 'Biblioteca';
  147 + $this->processoAp = '591';
  148 + }
  149 +
  150 +
144 151 public function Novo()
145 152 {
146 153 $obj_permissoes = new clsPermissoes();
... ...
ieducar/intranet/educar_calendario_ano_letivo_lst.php
  Diff comments   View file @54c2afc
... ... @@ -278,7 +278,7 @@ return new class extends clsListagem {
278 278 $obj_calendario->adicionarLegenda('Extra Letivo', 'LARANJA_ESCURO');
279 279 $obj_calendario->adicionarArrayDias('Extra Letivo', [$dia['dia']]);
280 280 } elseif (mb_strtoupper($det_motivo['tipo']) == 'N') {
281   - $obj_calendario->adicionarLegenda('Não Letivo', '#VERDE_ESCURO');
  281 + $obj_calendario->adicionarLegenda('Não Letivo', 'VERDE_ESCURO');
282 282 $obj_calendario->adicionarArrayDias('Não Letivo', [$dia['dia']]);
283 283 }
284 284  
... ...
ieducar/intranet/educar_consulta_movimento_geral_lst.php
  Diff comments   View file @54c2afc
... ... @@ -118,7 +118,7 @@ return new class extends clsListagem {
118 118 table.push('<td class="formdktd" style="font-weight: bold; text-align: center;" rowspan="2">7° Ano</td>');
119 119 table.push('<td class="formdktd" style="font-weight: bold; text-align: center;" rowspan="2">8° Ano</td>');
120 120 table.push('<td class="formdktd" style="font-weight: bold; text-align: center;" rowspan="2">9° Ano</td>');
121   - table.push('<td class="formdktd" style="font-weight: bold; text-align: center;" colspan="3">Eliminados</td>');
  121 + table.push('<td class="formdktd" style="font-weight: bold; text-align: center;" colspan="3">Movimentações</td>');
122 122 table.push('<td class="formdktd" style="font-weight: bold; text-align: center;" rowspan="2">Rem.</td>');
123 123 table.push('<td class="formdktd" style="font-weight: bold; text-align: center;" rowspan="2">Recla.</td>');
124 124 table.push('<td class="formdktd" style="font-weight: bold; text-align: center;" rowspan="2">Óbito</td>');
... ...
ieducar/intranet/educar_turma_cad.php
  Diff comments   View file @54c2afc
... ... @@ -624,7 +624,7 @@ return new class extends clsCadastro {
624 624 $etapas_educacenso = loadJson('educacenso_json/etapas_ensino.json');
625 625 $etapas_educacenso = array_replace([null => 'Selecione'], $etapas_educacenso);
626 626  
627   - $options = ['label' => 'Etapa de ensino', 'resources' => $etapas_educacenso, 'value' => $this->etapa_educacenso, 'required' => false, 'size' => 70,];
  627 + $options = ['label' => 'Etapa de ensino', 'resources' => $etapas_educacenso, 'value' => $this->etapa_educacenso, 'required' => false, 'size' => 70];
628 628 $this->inputsHelper()->select('etapa_educacenso', $options);
629 629  
630 630 $resources = [
... ...
ieducar/intranet/include/pmieducar/clsPmieducarAluno.inc.php
  Diff comments   View file @54c2afc
... ... @@ -807,7 +807,7 @@ class clsPmieducarAluno extends Model
807 807 $int_rg_aluno = null,
808 808 $situacao_matricula_id = null,
809 809 ) {
810   - $filtra_baseado_matricula = is_numeric($ano) || is_numeric($ref_cod_instituicao) || is_numeric($ref_cod_escola) || is_numeric($ref_cod_curso) || is_numeric($ref_cod_serie) || $situacao_matricula_id != EnrollmentStatusFilter::ALL;
  810 + $filtra_baseado_matricula = is_numeric($ano) || is_numeric($ref_cod_instituicao) || is_numeric($ref_cod_escola) || is_numeric($ref_cod_curso) || is_numeric($ref_cod_serie);
811 811  
812 812 $filtros = '';
813 813 $this->resetCamposLista();
... ... @@ -815,21 +815,28 @@ class clsPmieducarAluno extends Model
815 815 $this->_campos_lista .= ', pessoa.nome AS nome_aluno, fisica.nome_social, COALESCE(nome_social, pessoa.nome) AS ordem_aluno, pessoa_mae.nome AS nome_mae, educacenso_cod_aluno.cod_aluno_inep AS codigo_inep';
816 816  
817 817 if ($filtra_baseado_matricula) {
818   - $sql = "SELECT distinct {$this->_campos_lista} FROM {$this->_tabela} INNER JOIN pmieducar.matricula m ON (m.ref_cod_aluno = a.cod_aluno) ";
  818 + $sql = "
  819 + SELECT distinct {$this->_campos_lista}
  820 + FROM {$this->_tabela}
  821 + INNER JOIN pmieducar.matricula m
  822 + ON m.ref_cod_aluno = a.cod_aluno
  823 + INNER JOIN relatorio.view_situacao s
  824 + ON s.cod_matricula = m.cod_matricula
  825 + ";
819 826 } else {
820 827 $sql = "SELECT {$this->_campos_lista} FROM {$this->_tabela}";
821 828 }
822 829 $db = new clsBanco();
823 830  
824 831 $joins = '
825   - LEFT JOIN cadastro.pessoa ON pessoa.idpes = a.ref_idpes
826   - LEFT JOIN cadastro.fisica ON fisica.idpes = a.ref_idpes
  832 + INNER JOIN cadastro.pessoa ON pessoa.idpes = a.ref_idpes
  833 + INNER JOIN cadastro.fisica ON fisica.idpes = a.ref_idpes
827 834 LEFT JOIN cadastro.pessoa AS pessoa_mae ON pessoa_mae.idpes = fisica.idpes_mae
828 835 LEFT JOIN modules.educacenso_cod_aluno ON educacenso_cod_aluno.cod_aluno = a.cod_aluno';
829 836  
830 837 $sql .= $joins;
831 838  
832   - $whereAnd = ' WHERE ';
  839 + $whereAnd = ' WHERE a.ativo = 1 AND ';
833 840  
834 841 if (is_numeric($int_cod_aluno)) {
835 842 $filtros .= "{$whereAnd} a.cod_aluno = {$int_cod_aluno}";
... ... @@ -888,9 +895,10 @@ class clsPmieducarAluno extends Model
888 895 $whereAnd = ' AND ';
889 896 }
890 897  
891   - if ($situacao_matricula_id && $situacao_matricula_id != EnrollmentStatusFilter::ALL) {
892   - $situacao_matricula_id = intval($situacao_matricula_id);
893   - $filtros .= "{$whereAnd} m.aprovado = $situacao_matricula_id ";
  898 + if ($filtra_baseado_matricula && $situacao_matricula_id) {
  899 + $situacao_matricula_id = (int)$situacao_matricula_id;
  900 + $filtros .= "{$whereAnd} s.cod_situacao = {$situacao_matricula_id} ";
  901 +
894 902 $whereAnd = ' AND ';
895 903 }
896 904  
... ... @@ -958,7 +966,13 @@ class clsPmieducarAluno extends Model
958 966 $sql .= $filtros . $this->getOrderby() . $this->getLimite();
959 967  
960 968 if ($filtra_baseado_matricula) {
961   - $sqlCount = "SELECT COUNT(DISTINCT a.cod_aluno) FROM {$this->_tabela} INNER JOIN pmieducar.matricula m ON (m.ref_cod_aluno = a.cod_aluno) ";
  969 + $sqlCount = "
  970 + SELECT COUNT(DISTINCT a.cod_aluno) FROM {$this->_tabela}
  971 + INNER JOIN pmieducar.matricula m
  972 + ON (m.ref_cod_aluno = a.cod_aluno)
  973 + INNER JOIN relatorio.view_situacao s
  974 + ON s.cod_matricula = m.cod_matricula
  975 + ";
962 976 } else {
963 977 $sqlCount = "SELECT COUNT(0) FROM {$this->_tabela} ";
964 978 }
... ...
ieducar/modules/Avaliacao/Service/Boletim.php
  Diff comments   View file @54c2afc
... ... @@ -469,8 +469,9 @@ class Avaliacao_Service_Boletim implements CoreExt_Configurable
469 469 {
470 470 $faltas = [];
471 471  
472   - /** @var LegacyRegistration[] $registrations */
473   - $registrations = app(CyclicRegimeService::class)->getAllRegistrationsOfCycle($matricula);
  472 + /** @var CyclicRegimeService $cyclicRegimeService */
  473 + $cyclicRegimeService = app(CyclicRegimeService::class);
  474 + $registrations = $cyclicRegimeService->getAllRegistrationsOfCycle($matricula);
474 475  
475 476 /** @var StudentAbsenceService $studentAbsenceService */
476 477 $studentAbsenceService = app(StudentAbsenceService::class);
... ... @@ -498,8 +499,9 @@ class Avaliacao_Service_Boletim implements CoreExt_Configurable
498 499 */
499 500 private function getComponentesRegimeCiclico($matricula)
500 501 {
501   - /** @var LegacyRegistration[] $registrations */
502   - $registrations = app(CyclicRegimeService::class)->getAllRegistrationsOfCycle($matricula);
  502 + /** @var CyclicRegimeService $cyclicRegimeService */
  503 + $cyclicRegimeService = app(CyclicRegimeService::class);
  504 + $registrations = $cyclicRegimeService->getAllRegistrationsOfCycle($matricula);
503 505  
504 506 $componentes = [];
505 507 foreach ($registrations as $registration) {
... ... @@ -3520,8 +3522,9 @@ class Avaliacao_Service_Boletim implements CoreExt_Configurable
3520 3522 return $this->getOption('serieCargaHoraria');
3521 3523 }
3522 3524  
3523   - /** @var LegacyRegistration[] $registrations */
3524   - $registrations = app(CyclicRegimeService::class)->getAllRegistrationsOfCycle($registration);
  3525 + /** @var CyclicRegimeService $cyclicRegimeService */
  3526 + $cyclicRegimeService = app(CyclicRegimeService::class);
  3527 + $registrations = $cyclicRegimeService->getAllRegistrationsOfCycle($registration);
3525 3528  
3526 3529 $cargaHoraria = 0;
3527 3530 foreach ($registrations as $registration) {
... ... @@ -3537,8 +3540,9 @@ class Avaliacao_Service_Boletim implements CoreExt_Configurable
3537 3540 return $this->getOption('serieDiasLetivos');
3538 3541 }
3539 3542  
3540   - /** @var LegacyRegistration[] $registrations */
3541   - $registrations = app(CyclicRegimeService::class)->getAllRegistrationsOfCycle($registration);
  3543 + /** @var CyclicRegimeService $cyclicRegimeService */
  3544 + $cyclicRegimeService = app(CyclicRegimeService::class);
  3545 + $registrations = $cyclicRegimeService->getAllRegistrationsOfCycle($registration);
3542 3546  
3543 3547 $diasLetivos = 0;
3544 3548 foreach ($registrations as $registration) {
... ...
ieducar/modules/Cadastro/Assets/Javascripts/Turma.js
  Diff comments   View file @54c2afc
... ... @@ -40,12 +40,23 @@ let verificaEtapaEducacenso = ()=&gt;{
40 40 }
41 41  
42 42 let verificaFormaOrganizacaoTurma = ()=> {
  43 + const escolarizacao = ['1', '2', '3', '24', '62'];
  44 + const tipoAtendimento = $j('#tipo_atendimento').val() == '0';
  45 + const etapaEducacenso = $j('#etapa_educacenso').val()
  46 +
43 47 $j('#formas_organizacao_turma').makeUnrequired();
44 48 if (obrigarCamposCenso &&
45   - $j('#estrutura_curricular').val() &&
46   - $j('#estrutura_curricular').val().includes("1")) {
  49 + tipoAtendimento &&
  50 + etapaEducacenso &&
  51 + !escolarizacao.includes(etapaEducacenso)
  52 + ) {
47 53 $j('#formas_organizacao_turma').makeRequired();
48 54 }
  55 +
  56 + $j("#formas_organizacao_turma").prop('disabled', false);
  57 + if (!tipoAtendimento && escolarizacao.includes(etapaEducacenso)) {
  58 + $j("#formas_organizacao_turma").prop('disabled', true).val("");
  59 + }
49 60 }
50 61  
51 62 let verificaUnidadeCurricular = ()=> {
... ... @@ -74,22 +85,20 @@ let verificaLocalFuncionamentoDiferenciado = () =&gt; {
74 85 $j('#tipo_atendimento').change(function() {
75 86 mostraAtividadesComplementares();
76 87 verificaEstruturacurricular();
  88 + verificaFormaOrganizacaoTurma();
77 89 });
78 90 $j('#estrutura_curricular').change(function() {
79   - verificaFormaOrganizacaoTurma();
80   - habilitaFormasOrganizarTurma();
81 91 verificaUnidadeCurricular();
82 92 habilitaUnidadeCurricular();
83 93 verificaEtapaEducacenso();
84 94 habilitaEtapaEducacenso();
85 95 });
86 96  
87   -verificaEtapaEducacenso();
88   -habilitaEtapaEducacenso();
89 97 verificaLocalFuncionamentoDiferenciado();
90 98  
91 99 $j('#etapa_educacenso').change(function() {
92 100 mostraCursoTecnico();
  101 + verificaFormaOrganizacaoTurma();
93 102 });
94 103  
95 104 function mostraAtividadesComplementares(){
... ... @@ -213,16 +222,7 @@ function habilitaEtapaEducacenso() {
213 222  
214 223 if (notContainData || (!$j('#estrutura_curricular').val().include('1') &&
215 224 !$j('#estrutura_curricular').val().include('3'))) {
216   - $j("#etapa_educacenso").prop('disabled', true).val("");
217   - }
218   -}
219   -
220   -function habilitaFormasOrganizarTurma() {
221   - $j("#formas_organizacao_turma").prop('disabled', false);
222   - if (obrigarCamposCenso &&
223   - !$j('#estrutura_curricular').val() ||
224   - !$j('#estrutura_curricular').val().includes("1")) {
225   - $j("#formas_organizacao_turma").prop('disabled', true).val("");
  225 + $j("#etapa_educacenso").prop('disabled', true).val('');
226 226 }
227 227 }
228 228  
... ... @@ -419,7 +419,6 @@ $j(document).ready(function() {
419 419 habilitaEtapaEducacenso();
420 420 verificaEtapaEducacenso();
421 421 verificaFormaOrganizacaoTurma();
422   - habilitaFormasOrganizarTurma();
423 422 verificaUnidadeCurricular();
424 423 habilitaUnidadeCurricular();
425 424 });
... ...
src/Modules/Enrollments/Model/EnrollmentStatusFilter.php
  Diff comments   View file @54c2afc
... ... @@ -4,6 +4,7 @@ namespace iEducar\Modules\Enrollments\Model;
4 4  
5 5 class EnrollmentStatusFilter
6 6 {
  7 + public const EXCEPT_TRANSFERRED_OR_ABANDONMENT = 9;
7 8 public const ALL = 10;
8 9  
9 10 public static function getDescriptiveValues()
... ...
src/Modules/Reports/QueryFactory/MovimentoGeralAlunosAdmitidosQueryFactory.php
  Diff comments   View file @54c2afc
... ... @@ -53,7 +53,7 @@ class MovimentoGeralAlunosAdmitidosQueryFactory extends QueryFactory
53 53 end)
54 54 )
55 55 and mt.sequencial = 1
56   - and (coalesce(mt.data_enturmacao, m.data_cadastro) > :data_inicial::date and coalesce(mt.data_enturmacao, m.data_cadastro) < :data_final::date)
  56 + and coalesce(mt.data_enturmacao, m.data_cadastro) between :data_inicial::date and :data_final::date
57 57 order by
58 58 pessoa.nome asc
59 59 SQL;
... ...
src/Modules/Reports/QueryFactory/MovimentoGeralQueryFactory.php
  Diff comments   View file @54c2afc
... ... @@ -344,7 +344,7 @@ class MovimentoGeralQueryFactory extends QueryFactory
344 344 end)
345 345 )
346 346 and mt.sequencial = 1
347   - and (coalesce(mt.data_enturmacao, m.data_cadastro) > :data_inicial::date and coalesce(mt.data_enturmacao, m.data_cadastro) < :data_final::date)
  347 + and coalesce(mt.data_enturmacao, m.data_cadastro) between :data_inicial::date and :data_final::date
348 348 ) as admitidos,
349 349 (
350 350 select count(cod_matricula)
... ...
yarn.lock
  Diff comments   View file @54c2afc
... ... @@ -3,11 +3,12 @@
3 3  
4 4  
5 5 "@ampproject/remapping@^2.1.0":
6   - version "2.1.2"
7   - resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.1.2.tgz#4edca94973ded9630d20101cd8559cedb8d8bd34"
8   - integrity sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==
  6 + version "2.2.0"
  7 + resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d"
  8 + integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==
9 9 dependencies:
10   - "@jridgewell/trace-mapping" "^0.3.0"
  10 + "@jridgewell/gen-mapping" "^0.1.0"
  11 + "@jridgewell/trace-mapping" "^0.3.9"
11 12  
12 13 "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.7":
13 14 version "7.16.7"
... ... @@ -22,30 +23,30 @@
22 23 integrity sha512-p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ==
23 24  
24 25 "@babel/core@^7.15.8", "@babel/core@^7.17.8":
25   - version "7.17.8"
26   - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.8.tgz#3dac27c190ebc3a4381110d46c80e77efe172e1a"
27   - integrity sha512-OdQDV/7cRBtJHLSOBqqbYNkOcydOgnX59TZx4puf41fzcVtN3e/4yqY8lMQsK+5X2lJtAdmA+6OHqsj1hBJ4IQ==
  26 + version "7.17.9"
  27 + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.9.tgz#6bae81a06d95f4d0dec5bb9d74bbc1f58babdcfe"
  28 + integrity sha512-5ug+SfZCpDAkVp9SFIZAzlW18rlzsOcJGaetCjkySnrXXDUw9AR8cDUm1iByTmdWM6yxX6/zycaV76w3YTF2gw==
28 29 dependencies:
29 30 "@ampproject/remapping" "^2.1.0"
30 31 "@babel/code-frame" "^7.16.7"
31   - "@babel/generator" "^7.17.7"
  32 + "@babel/generator" "^7.17.9"
32 33 "@babel/helper-compilation-targets" "^7.17.7"
33 34 "@babel/helper-module-transforms" "^7.17.7"
34   - "@babel/helpers" "^7.17.8"
35   - "@babel/parser" "^7.17.8"
  35 + "@babel/helpers" "^7.17.9"
  36 + "@babel/parser" "^7.17.9"
36 37 "@babel/template" "^7.16.7"
37   - "@babel/traverse" "^7.17.3"
  38 + "@babel/traverse" "^7.17.9"
38 39 "@babel/types" "^7.17.0"
39 40 convert-source-map "^1.7.0"
40 41 debug "^4.1.0"
41 42 gensync "^1.0.0-beta.2"
42   - json5 "^2.1.2"
  43 + json5 "^2.2.1"
43 44 semver "^6.3.0"
44 45  
45   -"@babel/generator@^7.17.3", "@babel/generator@^7.17.7":
46   - version "7.17.7"
47   - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.7.tgz#8da2599beb4a86194a3b24df6c085931d9ee45ad"
48   - integrity sha512-oLcVCTeIFadUoArDTwpluncplrYBmTCCZZgXCbgNGvOBBiSDDK3eWO4b/+eOTli5tKv1lg+a5/NAXg+nTcei1w==
  46 +"@babel/generator@^7.17.9":
  47 + version "7.17.9"
  48 + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.9.tgz#f4af9fd38fa8de143c29fce3f71852406fc1e2fc"
  49 + integrity sha512-rAdDousTwxbIxbz5I7GEQ3lUip+xVCXooZNbsydCWs3xA7ZsYOv+CFRdzGxRX78BmQHu9B1Eso59AOZQOJDEdQ==
49 50 dependencies:
50 51 "@babel/types" "^7.17.0"
51 52 jsesc "^2.5.1"
... ... @@ -77,14 +78,14 @@
77 78 semver "^6.3.0"
78 79  
79 80 "@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.17.6":
80   - version "7.17.6"
81   - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz#3778c1ed09a7f3e65e6d6e0f6fbfcc53809d92c9"
82   - integrity sha512-SogLLSxXm2OkBbSsHZMM4tUi8fUzjs63AT/d0YQIzr6GSd8Hxsbk2KYDX0k0DweAzGMj/YWeiCsorIdtdcW8Eg==
  81 + version "7.17.9"
  82 + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.9.tgz#71835d7fb9f38bd9f1378e40a4c0902fdc2ea49d"
  83 + integrity sha512-kUjip3gruz6AJKOq5i3nC6CoCEEF/oHH3cp6tOZhB+IyyyPyW0g1Gfsxn3mkk6S08pIA2y8GQh609v9G/5sHVQ==
83 84 dependencies:
84 85 "@babel/helper-annotate-as-pure" "^7.16.7"
85 86 "@babel/helper-environment-visitor" "^7.16.7"
86   - "@babel/helper-function-name" "^7.16.7"
87   - "@babel/helper-member-expression-to-functions" "^7.16.7"
  87 + "@babel/helper-function-name" "^7.17.9"
  88 + "@babel/helper-member-expression-to-functions" "^7.17.7"
88 89 "@babel/helper-optimise-call-expression" "^7.16.7"
89 90 "@babel/helper-replace-supers" "^7.16.7"
90 91 "@babel/helper-split-export-declaration" "^7.16.7"
... ... @@ -125,21 +126,13 @@
125 126 dependencies:
126 127 "@babel/types" "^7.16.7"
127 128  
128   -"@babel/helper-function-name@^7.16.7":
129   - version "7.16.7"
130   - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz#f1ec51551fb1c8956bc8dd95f38523b6cf375f8f"
131   - integrity sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==
  129 +"@babel/helper-function-name@^7.16.7", "@babel/helper-function-name@^7.17.9":
  130 + version "7.17.9"
  131 + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz#136fcd54bc1da82fcb47565cf16fd8e444b1ff12"
  132 + integrity sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==
132 133 dependencies:
133   - "@babel/helper-get-function-arity" "^7.16.7"
134 134 "@babel/template" "^7.16.7"
135   - "@babel/types" "^7.16.7"
136   -
137   -"@babel/helper-get-function-arity@^7.16.7":
138   - version "7.16.7"
139   - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz#ea08ac753117a669f1508ba06ebcc49156387419"
140   - integrity sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==
141   - dependencies:
142   - "@babel/types" "^7.16.7"
  135 + "@babel/types" "^7.17.0"
143 136  
144 137 "@babel/helper-hoist-variables@^7.16.7":
145 138 version "7.16.7"
... ... @@ -148,7 +141,7 @@
148 141 dependencies:
149 142 "@babel/types" "^7.16.7"
150 143  
151   -"@babel/helper-member-expression-to-functions@^7.16.7":
  144 +"@babel/helper-member-expression-to-functions@^7.16.7", "@babel/helper-member-expression-to-functions@^7.17.7":
152 145 version "7.17.7"
153 146 resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz#a34013b57d8542a8c4ff8ba3f747c02452a4d8c4"
154 147 integrity sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw==
... ... @@ -249,28 +242,28 @@
249 242 "@babel/traverse" "^7.16.8"
250 243 "@babel/types" "^7.16.8"
251 244  
252   -"@babel/helpers@^7.17.8":
253   - version "7.17.8"
254   - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.8.tgz#288450be8c6ac7e4e44df37bcc53d345e07bc106"
255   - integrity sha512-QcL86FGxpfSJwGtAvv4iG93UL6bmqBdmoVY0CMCU2g+oD2ezQse3PT5Pa+jiD6LJndBQi0EDlpzOWNlLuhz5gw==
  245 +"@babel/helpers@^7.17.9":
  246 + version "7.17.9"
  247 + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.9.tgz#b2af120821bfbe44f9907b1826e168e819375a1a"
  248 + integrity sha512-cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q==
256 249 dependencies:
257 250 "@babel/template" "^7.16.7"
258   - "@babel/traverse" "^7.17.3"
  251 + "@babel/traverse" "^7.17.9"
259 252 "@babel/types" "^7.17.0"
260 253  
261 254 "@babel/highlight@^7.16.7":
262   - version "7.16.10"
263   - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.10.tgz#744f2eb81579d6eea753c227b0f570ad785aba88"
264   - integrity sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==
  255 + version "7.17.9"
  256 + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.17.9.tgz#61b2ee7f32ea0454612def4fccdae0de232b73e3"
  257 + integrity sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==
265 258 dependencies:
266 259 "@babel/helper-validator-identifier" "^7.16.7"
267 260 chalk "^2.0.0"
268 261 js-tokens "^4.0.0"
269 262  
270   -"@babel/parser@^7.1.0", "@babel/parser@^7.16.7", "@babel/parser@^7.17.3", "@babel/parser@^7.17.8":
271   - version "7.17.8"
272   - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.8.tgz#2817fb9d885dd8132ea0f8eb615a6388cca1c240"
273   - integrity sha512-BoHhDJrJXqcg+ZL16Xv39H9n+AqJ4pcDrQBGZN+wHxIysrLZ3/ECwCBUch/1zUNhnsXULcONU3Ei5Hmkfk6kiQ==
  263 +"@babel/parser@^7.1.0", "@babel/parser@^7.16.7", "@babel/parser@^7.17.9":
  264 + version "7.17.9"
  265 + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.9.tgz#9c94189a6062f0291418ca021077983058e171ef"
  266 + integrity sha512-vqUSBLP8dQHFPdPi9bc5GK9vRkYHJ49fsZdtoJ8EQ8ibpwk5rPKfvNIwChB0KVXcIjcepEBBd2VHC5r9Gy8ueg==
274 267  
275 268 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7":
276 269 version "7.16.7"
... ... @@ -635,9 +628,9 @@
635 628 babel-plugin-dynamic-import-node "^2.3.3"
636 629  
637 630 "@babel/plugin-transform-modules-commonjs@^7.16.8":
638   - version "7.17.7"
639   - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.7.tgz#d86b217c8e45bb5f2dbc11eefc8eab62cf980d19"
640   - integrity sha512-ITPmR2V7MqioMJyrxUo2onHNC3e+MvfFiFIR0RP21d3PtlVb6sfzoxNKiphSZUOM9hEIdzCcZe83ieX3yoqjUA==
  631 + version "7.17.9"
  632 + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.9.tgz#274be1a2087beec0254d4abd4d86e52442e1e5b6"
  633 + integrity sha512-2TBFd/r2I6VlYn0YRTz2JdazS+FoUuQ2rIFHoAxtyP/0G3D82SBLaRq9rnUkpqlLg03Byfl/+M32mpxjO6KaPw==
641 634 dependencies:
642 635 "@babel/helper-module-transforms" "^7.17.7"
643 636 "@babel/helper-plugin-utils" "^7.16.7"
... ... @@ -700,11 +693,11 @@
700 693 "@babel/helper-plugin-utils" "^7.16.7"
701 694  
702 695 "@babel/plugin-transform-regenerator@^7.16.7":
703   - version "7.16.7"
704   - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz#9e7576dc476cb89ccc5096fff7af659243b4adeb"
705   - integrity sha512-mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q==
  696 + version "7.17.9"
  697 + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.17.9.tgz#0a33c3a61cf47f45ed3232903683a0afd2d3460c"
  698 + integrity sha512-Lc2TfbxR1HOyn/c6b4Y/b6NHoTb67n/IoWLxTu4kC7h4KQnWlhCq2S8Tx0t2SVvv5Uu87Hs+6JEJ5kt2tYGylQ==
706 699 dependencies:
707   - regenerator-transform "^0.14.2"
  700 + regenerator-transform "^0.15.0"
708 701  
709 702 "@babel/plugin-transform-reserved-words@^7.16.7":
710 703 version "7.16.7"
... ... @@ -868,9 +861,9 @@
868 861 esutils "^2.0.2"
869 862  
870 863 "@babel/runtime@^7.15.4", "@babel/runtime@^7.8.4":
871   - version "7.17.8"
872   - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.8.tgz#3e56e4aff81befa55ac3ac6a0967349fd1c5bca2"
873   - integrity sha512-dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA==
  864 + version "7.17.9"
  865 + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.9.tgz#d19fbf802d01a8cb6cf053a64e472d42c434ba72"
  866 + integrity sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg==
874 867 dependencies:
875 868 regenerator-runtime "^0.13.4"
876 869  
... ... @@ -883,18 +876,18 @@
883 876 "@babel/parser" "^7.16.7"
884 877 "@babel/types" "^7.16.7"
885 878  
886   -"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.3":
887   - version "7.17.3"
888   - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz#0ae0f15b27d9a92ba1f2263358ea7c4e7db47b57"
889   - integrity sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==
  879 +"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.3", "@babel/traverse@^7.17.9":
  880 + version "7.17.9"
  881 + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.9.tgz#1f9b207435d9ae4a8ed6998b2b82300d83c37a0d"
  882 + integrity sha512-PQO8sDIJ8SIwipTPiR71kJQCKQYB5NGImbOviK8K+kg5xkNSYXLBupuX9QhatFowrsvo9Hj8WgArg3W7ijNAQw==
890 883 dependencies:
891 884 "@babel/code-frame" "^7.16.7"
892   - "@babel/generator" "^7.17.3"
  885 + "@babel/generator" "^7.17.9"
893 886 "@babel/helper-environment-visitor" "^7.16.7"
894   - "@babel/helper-function-name" "^7.16.7"
  887 + "@babel/helper-function-name" "^7.17.9"
895 888 "@babel/helper-hoist-variables" "^7.16.7"
896 889 "@babel/helper-split-export-declaration" "^7.16.7"
897   - "@babel/parser" "^7.17.3"
  890 + "@babel/parser" "^7.17.9"
898 891 "@babel/types" "^7.17.0"
899 892 debug "^4.1.0"
900 893 globals "^11.1.0"
... ... @@ -907,6 +900,11 @@
907 900 "@babel/helper-validator-identifier" "^7.16.7"
908 901 to-fast-properties "^2.0.0"
909 902  
  903 +"@colors/colors@1.5.0":
  904 + version "1.5.0"
  905 + resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
  906 + integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==
  907 +
910 908 "@discoveryjs/json-ext@^0.5.0":
911 909 version "0.5.7"
912 910 resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
... ... @@ -922,24 +920,42 @@
922 920 resolved "https://registry.yarnpkg.com/@hutson/parse-repository-url/-/parse-repository-url-3.0.2.tgz#98c23c950a3d9b6c8f0daed06da6c3af06981340"
923 921 integrity sha512-H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q==
924 922  
  923 +"@jridgewell/gen-mapping@^0.1.0":
  924 + version "0.1.1"
  925 + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996"
  926 + integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==
  927 + dependencies:
  928 + "@jridgewell/set-array" "^1.0.0"
  929 + "@jridgewell/sourcemap-codec" "^1.4.10"
  930 +
925 931 "@jridgewell/resolve-uri@^3.0.3":
926   - version "3.0.5"
927   - resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz#68eb521368db76d040a6315cdb24bf2483037b9c"
928   - integrity sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew==
  932 + version "3.0.6"
  933 + resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.6.tgz#4ac237f4dabc8dd93330386907b97591801f7352"
  934 + integrity sha512-R7xHtBSNm+9SyvpJkdQl+qrM3Hm2fea3Ef197M3mUug+v+yR+Rhfbs7PBtcBUVnIWJ4JcAdjvij+c8hXS9p5aw==
  935 +
  936 +"@jridgewell/set-array@^1.0.0":
  937 + version "1.1.0"
  938 + resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.0.tgz#1179863356ac8fbea64a5a4bcde93a4871012c01"
  939 + integrity sha512-SfJxIxNVYLTsKwzB3MoOQ1yxf4w/E6MdkvTgrgAt1bfxjSrLUoHMKrDOykwN14q65waezZIdqDneUIPh4/sKxg==
929 940  
930 941 "@jridgewell/sourcemap-codec@^1.4.10":
931 942 version "1.4.11"
932 943 resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz#771a1d8d744eeb71b6adb35808e1a6c7b9b8c8ec"
933 944 integrity sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg==
934 945  
935   -"@jridgewell/trace-mapping@^0.3.0":
936   - version "0.3.4"
937   - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz#f6a0832dffd5b8a6aaa633b7d9f8e8e94c83a0c3"
938   - integrity sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ==
  946 +"@jridgewell/trace-mapping@^0.3.9":
  947 + version "0.3.9"
  948 + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9"
  949 + integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==
939 950 dependencies:
940 951 "@jridgewell/resolve-uri" "^3.0.3"
941 952 "@jridgewell/sourcemap-codec" "^1.4.10"
942 953  
  954 +"@leichtgewicht/ip-codec@^2.0.1":
  955 + version "2.0.3"
  956 + resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.3.tgz#0300943770e04231041a51bd39f0439b5c7ab4f0"
  957 + integrity sha512-nkalE/f1RvRGChwBnEIoBfSEYOXnCRdleKuv6+lePbMDrMZXeDQnqak5XDOeBgrPPyPfAdcCu/B5z+v3VhplGg==
  958 +
943 959 "@lerna/add@4.0.0":
944 960 version "4.0.0"
945 961 resolved "https://registry.yarnpkg.com/@lerna/add/-/add-4.0.0.tgz#c36f57d132502a57b9e7058d1548b7a565ef183f"
... ... @@ -1840,9 +1856,9 @@
1840 1856 "@babel/types" "^7.0.0"
1841 1857  
1842 1858 "@types/babel__traverse@*":
1843   - version "7.14.2"
1844   - resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.14.2.tgz#ffcd470bbb3f8bf30481678fb5502278ca833a43"
1845   - integrity sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA==
  1859 + version "7.17.1"
  1860 + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.17.1.tgz#1a0e73e8c28c7e832656db372b779bfd2ef37314"
  1861 + integrity sha512-kVzjari1s2YVi77D3w1yuvohV2idweYXMCDzqBiVNN63TcDWrIlTVOYpqVrvbbyOE/IyzBoTKF0fdnLPEORFxA==
1846 1862 dependencies:
1847 1863 "@babel/types" "^7.3.0"
1848 1864  
... ... @@ -1996,9 +2012,9 @@
1996 2012 integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
1997 2013  
1998 2014 "@types/node@*":
1999   - version "17.0.23"
2000   - resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.23.tgz#3b41a6e643589ac6442bdbd7a4a3ded62f33f7da"
2001   - integrity sha512-UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw==
  2015 + version "17.0.30"
  2016 + resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.30.tgz#2c6e8512acac70815e8176aa30c38025067880ef"
  2017 + integrity sha512-oNBIZjIqyHYP8VCNAV9uEytXVeXG2oR0w9lgAXro20eugRQfY002qr3CUl6BAe+Yf/z3CRjPdz27Pu6WWtuSRw==
2002 2018  
2003 2019 "@types/normalize-package-data@^2.4.0":
2004 2020 version "2.4.1"
... ... @@ -2020,10 +2036,10 @@
2020 2036 resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
2021 2037 integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
2022 2038  
2023   -"@types/retry@^0.12.0":
2024   - version "0.12.1"
2025   - resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.1.tgz#d8f1c0d0dc23afad6dc16a9e993a0865774b4065"
2026   - integrity sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g==
  2039 +"@types/retry@0.12.0":
  2040 + version "0.12.0"
  2041 + resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d"
  2042 + integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==
2027 2043  
2028 2044 "@types/serve-index@^1.9.1":
2029 2045 version "1.9.1"
... ... @@ -2052,7 +2068,7 @@
2052 2068 resolved "https://registry.yarnpkg.com/@types/svgo/-/svgo-1.3.6.tgz#9db00a7ddf9b26ad2feb6b834bef1818677845e1"
2053 2069 integrity sha512-AZU7vQcy/4WFEuwnwsNsJnFwupIpbllH1++LXScN6uxT1Z4zPzdrWG97w4/I7eFKFTvfy/bHFStWjdBAg2Vjug==
2054 2070  
2055   -"@types/ws@^8.2.2":
  2071 +"@types/ws@^8.5.1":
2056 2072 version "8.5.3"
2057 2073 resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.3.tgz#7d25a1ffbecd3c4f2d35068d0b283c037003274d"
2058 2074 integrity sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==
... ... @@ -2234,9 +2250,9 @@ acorn-import-assertions@^1.7.6:
2234 2250 integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==
2235 2251  
2236 2252 acorn@^8.4.1, acorn@^8.5.0:
2237   - version "8.7.0"
2238   - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"
2239   - integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==
  2253 + version "8.7.1"
  2254 + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30"
  2255 + integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==
2240 2256  
2241 2257 add-stream@^1.0.0:
2242 2258 version "1.0.0"
... ... @@ -2341,11 +2357,6 @@ ansi-regex@^5.0.1:
2341 2357 resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
2342 2358 integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
2343 2359  
2344   -ansi-regex@^6.0.1:
2345   - version "6.0.1"
2346   - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a"
2347   - integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==
2348   -
2349 2360 ansi-styles@^3.2.1:
2350 2361 version "3.2.1"
2351 2362 resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
... ... @@ -2401,7 +2412,7 @@ array-flatten@1.1.1:
2401 2412 resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
2402 2413 integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
2403 2414  
2404   -array-flatten@^2.1.0:
  2415 +array-flatten@^2.1.2:
2405 2416 version "2.1.2"
2406 2417 resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
2407 2418 integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
... ... @@ -2467,9 +2478,9 @@ assert@^1.1.1:
2467 2478 util "0.10.3"
2468 2479  
2469 2480 async@^2.6.2:
2470   - version "2.6.3"
2471   - resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
2472   - integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
  2481 + version "2.6.4"
  2482 + resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221"
  2483 + integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==
2473 2484 dependencies:
2474 2485 lodash "^4.17.14"
2475 2486  
... ... @@ -2489,12 +2500,12 @@ atob@^2.1.2:
2489 2500 integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
2490 2501  
2491 2502 autoprefixer@^10.4.0:
2492   - version "10.4.4"
2493   - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.4.tgz#3e85a245b32da876a893d3ac2ea19f01e7ea5a1e"
2494   - integrity sha512-Tm8JxsB286VweiZ5F0anmbyGiNI3v3wGv3mz9W+cxEDYB/6jbnj6GM9H9mK3wIL8ftgl+C07Lcwb8PG5PCCPzA==
  2503 + version "10.4.5"
  2504 + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.5.tgz#662193c744094b53d3637f39be477e07bd904998"
  2505 + integrity sha512-Fvd8yCoA7lNX/OUllvS+aS1I7WRBclGXsepbvT8ZaPgrH24rgXpZzF0/6Hh3ZEkwg+0AES/Osd196VZmYoEFtw==
2495 2506 dependencies:
2496 2507 browserslist "^4.20.2"
2497   - caniuse-lite "^1.0.30001317"
  2508 + caniuse-lite "^1.0.30001332"
2498 2509 fraction.js "^4.2.0"
2499 2510 normalize-range "^0.1.2"
2500 2511 picocolors "^1.0.0"
... ... @@ -2518,9 +2529,9 @@ axios@^0.21.2:
2518 2529 follow-redirects "^1.14.0"
2519 2530  
2520 2531 babel-loader@^8.2.3:
2521   - version "8.2.4"
2522   - resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.4.tgz#95f5023c791b2e9e2ca6f67b0984f39c82ff384b"
2523   - integrity sha512-8dytA3gcvPPPv4Grjhnt8b5IIiTcq/zeXOPk4iTYI0SVXcsmuGg7JtBRDp8S9X+gJfhQ8ektjXZlDu1Bb33U8A==
  2532 + version "8.2.5"
  2533 + resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.5.tgz#d45f585e654d5a5d90f5350a779d7647c5ed512e"
  2534 + integrity sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ==
2524 2535 dependencies:
2525 2536 find-cache-dir "^3.3.1"
2526 2537 loader-utils "^2.0.0"
... ... @@ -2630,33 +2641,33 @@ bn.js@^5.0.0, bn.js@^5.1.1:
2630 2641 resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz#358860674396c6997771a9d051fcc1b57d4ae002"
2631 2642 integrity sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==
2632 2643  
2633   -body-parser@1.19.2:
2634   - version "1.19.2"
2635   - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.2.tgz#4714ccd9c157d44797b8b5607d72c0b89952f26e"
2636   - integrity sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==
  2644 +body-parser@1.20.0:
  2645 + version "1.20.0"
  2646 + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.0.tgz#3de69bd89011c11573d7bfee6a64f11b6bd27cc5"
  2647 + integrity sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==
2637 2648 dependencies:
2638 2649 bytes "3.1.2"
2639 2650 content-type "~1.0.4"
2640 2651 debug "2.6.9"
2641   - depd "~1.1.2"
2642   - http-errors "1.8.1"
  2652 + depd "2.0.0"
  2653 + destroy "1.2.0"
  2654 + http-errors "2.0.0"
2643 2655 iconv-lite "0.4.24"
2644   - on-finished "~2.3.0"
2645   - qs "6.9.7"
2646   - raw-body "2.4.3"
  2656 + on-finished "2.4.1"
  2657 + qs "6.10.3"
  2658 + raw-body "2.5.1"
2647 2659 type-is "~1.6.18"
  2660 + unpipe "1.0.0"
2648 2661  
2649   -bonjour@^3.5.0:
2650   - version "3.5.0"
2651   - resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"
2652   - integrity sha1-jokKGD2O6aI5OzhExpGkK897yfU=
  2662 +bonjour-service@^1.0.11:
  2663 + version "1.0.12"
  2664 + resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.0.12.tgz#28fbd4683f5f2e36feedb833e24ba661cac960c3"
  2665 + integrity sha512-pMmguXYCu63Ug37DluMKEHdxc+aaIf/ay4YbF8Gxtba+9d3u+rmEWy61VK3Z3hp8Rskok3BunHYnG0dUHAsblw==
2653 2666 dependencies:
2654   - array-flatten "^2.1.0"
2655   - deep-equal "^1.0.1"
  2667 + array-flatten "^2.1.2"
2656 2668 dns-equal "^1.0.0"
2657   - dns-txt "^2.0.2"
2658   - multicast-dns "^6.0.1"
2659   - multicast-dns-service-types "^1.1.0"
  2669 + fast-deep-equal "^3.1.3"
  2670 + multicast-dns "^7.2.4"
2660 2671  
2661 2672 boolbase@^1.0.0:
2662 2673 version "1.0.0"
... ... @@ -2749,15 +2760,15 @@ browserify-zlib@^0.2.0:
2749 2760 dependencies:
2750 2761 pako "~1.0.5"
2751 2762  
2752   -browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.6, browserslist@^4.17.5, browserslist@^4.19.1, browserslist@^4.20.2:
2753   - version "4.20.2"
2754   - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.2.tgz#567b41508757ecd904dab4d1c646c612cd3d4f88"
2755   - integrity sha512-CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA==
  2763 +browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.6, browserslist@^4.17.5, browserslist@^4.20.2, browserslist@^4.20.3:
  2764 + version "4.20.3"
  2765 + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.3.tgz#eb7572f49ec430e054f56d52ff0ebe9be915f8bf"
  2766 + integrity sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg==
2756 2767 dependencies:
2757   - caniuse-lite "^1.0.30001317"
2758   - electron-to-chromium "^1.4.84"
  2768 + caniuse-lite "^1.0.30001332"
  2769 + electron-to-chromium "^1.4.118"
2759 2770 escalade "^3.1.1"
2760   - node-releases "^2.0.2"
  2771 + node-releases "^2.0.3"
2761 2772 picocolors "^1.0.0"
2762 2773  
2763 2774 buffer-from@^1.0.0:
... ... @@ -2765,11 +2776,6 @@ buffer-from@^1.0.0:
2765 2776 resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
2766 2777 integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
2767 2778  
2768   -buffer-indexof@^1.0.0:
2769   - version "1.1.1"
2770   - resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c"
2771   - integrity sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==
2772   -
2773 2779 buffer-xor@^1.0.3:
2774 2780 version "1.0.3"
2775 2781 resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
... ... @@ -2883,10 +2889,10 @@ caniuse-api@^3.0.0:
2883 2889 lodash.memoize "^4.1.2"
2884 2890 lodash.uniq "^4.5.0"
2885 2891  
2886   -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001317:
2887   - version "1.0.30001320"
2888   - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001320.tgz#8397391bec389b8ccce328636499b7284ee13285"
2889   - integrity sha512-MWPzG54AGdo3nWx7zHZTefseM5Y1ccM7hlQKHRqJkPozUaw3hNbBTMmLn16GG2FUzjR13Cr3NPfhIieX5PzXDA==
  2892 +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001332:
  2893 + version "1.0.30001334"
  2894 + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001334.tgz#892e9965b35285033fc2b8a8eff499fe02f13d8b"
  2895 + integrity sha512-kbaCEBRRVSoeNs74sCuq92MJyGrMtjWVfhltoHUCW4t4pXFvGjUBrfo47weBRViHkiV3eBYyIsfl956NtHGazw==
2890 2896  
2891 2897 caseless@~0.12.0:
2892 2898 version "0.12.0"
... ... @@ -2971,9 +2977,9 @@ clean-css@^4.2.3:
2971 2977 source-map "~0.6.0"
2972 2978  
2973 2979 clean-css@^5.2.4:
2974   - version "5.2.4"
2975   - resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-5.2.4.tgz#982b058f8581adb2ae062520808fb2429bd487a4"
2976   - integrity sha512-nKseG8wCzEuji/4yrgM/5cthL9oTDc5UOQyFMvW/Q53oP6gLH690o1NbuTh6Y18nujr7BxlsFuS7gXLnLzKJGg==
  2980 + version "5.3.0"
  2981 + resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-5.3.0.tgz#ad3d8238d5f3549e83d5f87205189494bc7cbb59"
  2982 + integrity sha512-YYuuxv4H/iNb1Z/5IbMRoxgrzjWGhOEFfd+groZ5dMCVkpENiMZmwspdrzBo9286JjM1gZJPAyL7ZIdzuvu2AQ==
2977 2983 dependencies:
2978 2984 source-map "~0.6.0"
2979 2985  
... ... @@ -2990,13 +2996,13 @@ cli-cursor@^3.1.0:
2990 2996 restore-cursor "^3.1.0"
2991 2997  
2992 2998 cli-table3@^0.6.0:
2993   - version "0.6.1"
2994   - resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.1.tgz#36ce9b7af4847f288d3cdd081fbd09bf7bd237b8"
2995   - integrity sha512-w0q/enDHhPLq44ovMGdQeeDLvwxwavsJX7oQGYt/LrBlYsyaxyDnp6z3QzFut/6kLLKnlcUVJLrpB7KBfgG/RA==
  2999 + version "0.6.2"
  3000 + resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.2.tgz#aaf5df9d8b5bf12634dc8b3040806a0c07120d2a"
  3001 + integrity sha512-QyavHCaIC80cMivimWu4aWHilIpiDpfm3hGmqAmXVL1UsnbLuBSMd21hTX6VY4ZSDSM73ESLeF8TOYId3rBTbw==
2996 3002 dependencies:
2997 3003 string-width "^4.2.0"
2998 3004 optionalDependencies:
2999   - colors "1.4.0"
  3005 + "@colors/colors" "1.5.0"
3000 3006  
3001 3007 cli-width@^3.0.0:
3002 3008 version "3.0.0"
... ... @@ -3053,9 +3059,9 @@ code-point-at@^1.0.0:
3053 3059 integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
3054 3060  
3055 3061 collect.js@^4.28.5:
3056   - version "4.32.0"
3057   - resolved "https://registry.yarnpkg.com/collect.js/-/collect.js-4.32.0.tgz#4c1569243cd340f19cedb955e28c1288d013bd09"
3058   - integrity sha512-Ro0fspulC0J325cgFdkzFEkRDs6MmclMy2Fy5adhdFKg5QqMv1nn1zLpCdAxiehlur6Ep08Wr1f7ldNv+fB6+Q==
  3062 + version "4.33.0"
  3063 + resolved "https://registry.yarnpkg.com/collect.js/-/collect.js-4.33.0.tgz#9670e6cdf9a01e671d128917c2f049f2dc112ada"
  3064 + integrity sha512-jEFD39H+09JyvjxwwHGX6Z7j+SB4OdXxHWG8Dus5eVQmwngWGNluRBQ2qS92K9MkRH+fjh91u1TGa31LIeBKhQ==
3059 3065  
3060 3066 color-convert@^1.9.0:
3061 3067 version "1.9.3"
... ... @@ -3359,17 +3365,22 @@ cookie-signature@1.0.6:
3359 3365 resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
3360 3366 integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
3361 3367  
3362   -cookie@0.4.2, cookie@~0.4.1:
  3368 +cookie@0.5.0:
  3369 + version "0.5.0"
  3370 + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"
  3371 + integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
  3372 +
  3373 +cookie@~0.4.1:
3363 3374 version "0.4.2"
3364 3375 resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432"
3365 3376 integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==
3366 3377  
3367 3378 core-js-compat@^3.20.2, core-js-compat@^3.21.0:
3368   - version "3.21.1"
3369   - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.21.1.tgz#cac369f67c8d134ff8f9bd1623e3bc2c42068c82"
3370   - integrity sha512-gbgX5AUvMb8gwxC7FLVWYT7Kkgu/y7+h/h1X43yJkNqhlK2fuYyQimqvKGNZFAY6CKii/GFKJ2cp/1/42TN36g==
  3379 + version "3.22.3"
  3380 + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.22.3.tgz#9b10d786052d042bc97ee8df9c0d1fb6a49c2005"
  3381 + integrity sha512-wliMbvPI2idgFWpFe7UEyHMvu6HWgW8WA+HnDRtgzoSDYvXFMpoGX1H3tPDDXrcfUSyXafCLDd7hOeMQHEZxGw==
3371 3382 dependencies:
3372   - browserslist "^4.19.1"
  3383 + browserslist "^4.20.3"
3373 3384 semver "7.0.0"
3374 3385  
3375 3386 core-util-is@1.0.2:
... ... @@ -3473,7 +3484,7 @@ crypto-browserify@^3.11.0:
3473 3484 randombytes "^2.0.0"
3474 3485 randomfill "^1.0.3"
3475 3486  
3476   -css-declaration-sorter@^6.0.3:
  3487 +css-declaration-sorter@^6.2.2:
3477 3488 version "6.2.2"
3478 3489 resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.2.2.tgz#bfd2f6f50002d6a3ae779a87d3a0c5d5b10e0f02"
3479 3490 integrity sha512-Ufadglr88ZLsrvS11gjeu/40Lw74D9Am/Jpr3LlYm5Q4ZP5KdlUhG+6u2EjyXeZcxmZ2h1ebCKngDjolpeLHpg==
... ... @@ -3514,9 +3525,9 @@ css-tree@^1.1.2, css-tree@^1.1.3:
3514 3525 source-map "^0.6.1"
3515 3526  
3516 3527 css-what@^6.0.1:
3517   - version "6.0.1"
3518   - resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.0.1.tgz#3be33be55b9f302f710ba3a9c3abc1e2a63fc7eb"
3519   - integrity sha512-z93ZGFLNc6yaoXAmVhqoSIb+BduplteCt1fepvwhBUQK6MNE4g6fgjpuZKJKp0esUe+vXWlIkwZZjNWoOKw0ZA==
  3528 + version "6.1.0"
  3529 + resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4"
  3530 + integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==
3520 3531  
3521 3532 css@^2.0.0:
3522 3533 version "2.2.4"
... ... @@ -3533,12 +3544,12 @@ cssesc@^3.0.0:
3533 3544 resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
3534 3545 integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
3535 3546  
3536   -cssnano-preset-default@^5.2.5:
3537   - version "5.2.5"
3538   - resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.2.5.tgz#267ded811a3e1664d78707f5355fcd89feeb38ac"
3539   - integrity sha512-WopL7PzN7sos3X8B54/QGl+CZUh1f0qN4ds+y2d5EPwRSSc3jsitVw81O+Uyop0pXyOfPfZxnc+LmA8w/Ki/WQ==
  3547 +cssnano-preset-default@^5.2.7:
  3548 + version "5.2.7"
  3549 + resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.2.7.tgz#791e3603fb8f1b46717ac53b47e3c418e950f5f3"
  3550 + integrity sha512-JiKP38ymZQK+zVKevphPzNSGHSlTI+AOwlasoSRtSVMUU285O7/6uZyd5NbW92ZHp41m0sSHe6JoZosakj63uA==
3540 3551 dependencies:
3541   - css-declaration-sorter "^6.0.3"
  3552 + css-declaration-sorter "^6.2.2"
3542 3553 cssnano-utils "^3.1.0"
3543 3554 postcss-calc "^8.2.3"
3544 3555 postcss-colormin "^5.3.0"
... ... @@ -3547,7 +3558,7 @@ cssnano-preset-default@^5.2.5:
3547 3558 postcss-discard-duplicates "^5.1.0"
3548 3559 postcss-discard-empty "^5.1.1"
3549 3560 postcss-discard-overridden "^5.1.0"
3550   - postcss-merge-longhand "^5.1.3"
  3561 + postcss-merge-longhand "^5.1.4"
3551 3562 postcss-merge-rules "^5.1.1"
3552 3563 postcss-minify-font-values "^5.1.0"
3553 3564 postcss-minify-gradients "^5.1.1"
... ... @@ -3574,11 +3585,11 @@ cssnano-utils@^3.1.0:
3574 3585 integrity sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==
3575 3586  
3576 3587 cssnano@^5.0.8:
3577   - version "5.1.5"
3578   - resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.1.5.tgz#5f3f519538c7f1c182c527096892243db3e17397"
3579   - integrity sha512-VZO1e+bRRVixMeia1zKagrv0lLN1B/r/u12STGNNUFxnp97LIFgZHQa0JxqlwEkvzUyA9Oz/WnCTAFkdEbONmg==
  3588 + version "5.1.7"
  3589 + resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.1.7.tgz#99858bef6c76c9240f0cdc9239570bc7db8368be"
  3590 + integrity sha512-pVsUV6LcTXif7lvKKW9ZrmX+rGRzxkEdJuVJcp5ftUjWITgwam5LMZOgaTvUrWPkcORBey6he7JKb4XAJvrpKg==
3580 3591 dependencies:
3581   - cssnano-preset-default "^5.2.5"
  3592 + cssnano-preset-default "^5.2.7"
3582 3593 lilconfig "^2.0.3"
3583 3594 yaml "^1.10.2"
3584 3595  
... ... @@ -3626,7 +3637,7 @@ debug@2.6.9:
3626 3637 dependencies:
3627 3638 ms "2.0.0"
3628 3639  
3629   -debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1:
  3640 +debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.3:
3630 3641 version "4.3.4"
3631 3642 resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
3632 3643 integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
... ... @@ -3682,18 +3693,6 @@ dedent@^0.7.0:
3682 3693 resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
3683 3694 integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=
3684 3695  
3685   -deep-equal@^1.0.1:
3686   - version "1.1.1"
3687   - resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a"
3688   - integrity sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==
3689   - dependencies:
3690   - is-arguments "^1.0.4"
3691   - is-date-object "^1.0.1"
3692   - is-regex "^1.0.4"
3693   - object-is "^1.0.1"
3694   - object-keys "^1.1.1"
3695   - regexp.prototype.flags "^1.2.0"
3696   -
3697 3696 default-gateway@^6.0.3:
3698 3697 version "6.0.3"
3699 3698 resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-6.0.3.tgz#819494c888053bdb743edbf343d6cdf7f2943a71"
... ... @@ -3714,25 +3713,12 @@ define-lazy-prop@^2.0.0:
3714 3713 integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==
3715 3714  
3716 3715 define-properties@^1.1.3:
3717   - version "1.1.3"
3718   - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
3719   - integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
3720   - dependencies:
3721   - object-keys "^1.0.12"
3722   -
3723   -del@^6.0.0:
3724   - version "6.0.0"
3725   - resolved "https://registry.yarnpkg.com/del/-/del-6.0.0.tgz#0b40d0332cea743f1614f818be4feb717714c952"
3726   - integrity sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ==
  3716 + version "1.1.4"
  3717 + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1"
  3718 + integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==
3727 3719 dependencies:
3728   - globby "^11.0.1"
3729   - graceful-fs "^4.2.4"
3730   - is-glob "^4.0.1"
3731   - is-path-cwd "^2.2.0"
3732   - is-path-inside "^3.0.2"
3733   - p-map "^4.0.0"
3734   - rimraf "^3.0.2"
3735   - slash "^3.0.0"
  3720 + has-property-descriptors "^1.0.0"
  3721 + object-keys "^1.1.1"
3736 3722  
3737 3723 delayed-stream@~1.0.0:
3738 3724 version "1.0.0"
... ... @@ -3749,6 +3735,11 @@ denque@^1.1.0:
3749 3735 resolved "https://registry.yarnpkg.com/denque/-/denque-1.5.1.tgz#07f670e29c9a78f8faecb2566a1e2c11929c5cbf"
3750 3736 integrity sha512-XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw==
3751 3737  
  3738 +depd@2.0.0:
  3739 + version "2.0.0"
  3740 + resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
  3741 + integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
  3742 +
3752 3743 depd@^1.1.2, depd@~1.1.2:
3753 3744 version "1.1.2"
3754 3745 resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
... ... @@ -3767,10 +3758,10 @@ des.js@^1.0.0:
3767 3758 inherits "^2.0.1"
3768 3759 minimalistic-assert "^1.0.0"
3769 3760  
3770   -destroy@~1.0.4:
3771   - version "1.0.4"
3772   - resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
3773   - integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
  3761 +destroy@1.2.0:
  3762 + version "1.2.0"
  3763 + resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
  3764 + integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==
3774 3765  
3775 3766 detect-indent@^5.0.0:
3776 3767 version "5.0.0"
... ... @@ -3788,9 +3779,9 @@ detect-node@^2.0.4:
3788 3779 integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==
3789 3780  
3790 3781 dezalgo@^1.0.0:
3791   - version "1.0.3"
3792   - resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456"
3793   - integrity sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=
  3782 + version "1.0.4"
  3783 + resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.4.tgz#751235260469084c132157dfa857f386d4c33d81"
  3784 + integrity sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==
3794 3785 dependencies:
3795 3786 asap "^2.0.0"
3796 3787 wrappy "1"
... ... @@ -3816,25 +3807,17 @@ dns-equal@^1.0.0:
3816 3807 resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
3817 3808 integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0=
3818 3809  
3819   -dns-packet@^1.3.1:
3820   - version "1.3.4"
3821   - resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.4.tgz#e3455065824a2507ba886c55a89963bb107dec6f"
3822   - integrity sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==
3823   - dependencies:
3824   - ip "^1.1.0"
3825   - safe-buffer "^5.0.1"
3826   -
3827   -dns-txt@^2.0.2:
3828   - version "2.0.2"
3829   - resolved "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6"
3830   - integrity sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=
  3810 +dns-packet@^5.2.2:
  3811 + version "5.3.1"
  3812 + resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.3.1.tgz#eb94413789daec0f0ebe2fcc230bdc9d7c91b43d"
  3813 + integrity sha512-spBwIj0TK0Ey3666GwIdWVfUpLyubpU53BTCu8iPn4r4oXd9O14Hjg3EHw3ts2oed77/SeckunUYCyRlSngqHw==
3831 3814 dependencies:
3832   - buffer-indexof "^1.0.0"
  3815 + "@leichtgewicht/ip-codec" "^2.0.1"
3833 3816  
3834 3817 dom-serializer@^1.0.1:
3835   - version "1.3.2"
3836   - resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91"
3837   - integrity sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==
  3818 + version "1.4.1"
  3819 + resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.4.1.tgz#de5d41b1aea290215dc45a6dae8adcf1d32e2d30"
  3820 + integrity sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==
3838 3821 dependencies:
3839 3822 domelementtype "^2.0.1"
3840 3823 domhandler "^4.2.0"
... ... @@ -3846,9 +3829,9 @@ domain-browser@^1.1.1:
3846 3829 integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
3847 3830  
3848 3831 domelementtype@^2.0.1, domelementtype@^2.2.0:
3849   - version "2.2.0"
3850   - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57"
3851   - integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==
  3832 + version "2.3.0"
  3833 + resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
  3834 + integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
3852 3835  
3853 3836 domhandler@^3.0.0:
3854 3837 version "3.3.0"
... ... @@ -3928,10 +3911,10 @@ ee-first@1.1.1:
3928 3911 resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
3929 3912 integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
3930 3913  
3931   -electron-to-chromium@^1.4.84:
3932   - version "1.4.96"
3933   - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.96.tgz#a97438a01d5db1460343fea4a344960b09330990"
3934   - integrity sha512-DPNjvNGPabv6FcyjzLAN4C0psN/GgD9rSGvMTuv81SeXG/EX3mCz0wiw9N1tUEnfQXYCJi3H8M0oFPRziZh7rw==
  3914 +electron-to-chromium@^1.4.118:
  3915 + version "1.4.127"
  3916 + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.127.tgz#4ef19d5d920abe2676d938f4170729b44f7f423a"
  3917 + integrity sha512-nhD6S8nKI0O2MueC6blNOEZio+/PWppE/pevnf3LOlQA/fKPCrDp2Ao4wx4LFwmIkJpVdFdn2763YWLy9ENIZg==
3935 3918  
3936 3919 elliptic@^6.5.3:
3937 3920 version "6.5.4"
... ... @@ -4014,9 +3997,9 @@ engine.io@~3.5.0:
4014 3997 ws "~7.4.2"
4015 3998  
4016 3999 enhanced-resolve@^5.9.2:
4017   - version "5.9.2"
4018   - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.9.2.tgz#0224dcd6a43389ebfb2d55efee517e5466772dd9"
4019   - integrity sha512-GIm3fQfwLJ8YZx2smuHpBKkXC1yOk+OBEmKckVyL0i/ea8mqDEykK3ld5dgH1QYPNyT/lIllxV2LULnxCHaHkA==
  4000 + version "5.9.3"
  4001 + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.9.3.tgz#44a342c012cbc473254af5cc6ae20ebd0aae5d88"
  4002 + integrity sha512-Bq9VSor+kjvW3f9/MiiR4eE3XYgOl7/rS8lnSxbRbF3kS0B2r+Y9w5krBWxZgDxASVZbdYrn5wT4j/Wb0J9qow==
4020 4003 dependencies:
4021 4004 graceful-fs "^4.2.4"
4022 4005 tapable "^2.2.0"
... ... @@ -4049,9 +4032,9 @@ error-ex@^1.3.1:
4049 4032 is-arrayish "^0.2.1"
4050 4033  
4051 4034 es-abstract@^1.19.1:
4052   - version "1.19.2"
4053   - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.2.tgz#8f7b696d8f15b167ae3640b4060670f3d054143f"
4054   - integrity sha512-gfSBJoZdlL2xRiOCy0g8gLMryhoe1TlimjzU99L/31Z8QEGIhVQI+EWwt5lT+AuU9SnorVupXFqqOGqGfsyO6w==
  4035 + version "1.19.5"
  4036 + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.5.tgz#a2cb01eb87f724e815b278b0dd0d00f36ca9a7f1"
  4037 + integrity sha512-Aa2G2+Rd3b6kxEUKTF4TaW67czBLyAv3z7VOhYRU50YBx+bbsYZ9xQP4lMNazePuFlybXI0V4MruPos7qUo5fA==
4055 4038 dependencies:
4056 4039 call-bind "^1.0.2"
4057 4040 es-to-primitive "^1.2.1"
... ... @@ -4064,7 +4047,7 @@ es-abstract@^1.19.1:
4064 4047 is-callable "^1.2.4"
4065 4048 is-negative-zero "^2.0.2"
4066 4049 is-regex "^1.1.4"
4067   - is-shared-array-buffer "^1.0.1"
  4050 + is-shared-array-buffer "^1.0.2"
4068 4051 is-string "^1.0.7"
4069 4052 is-weakref "^1.0.2"
4070 4053 object-inspect "^1.12.0"
... ... @@ -4089,9 +4072,9 @@ es-to-primitive@^1.2.1:
4089 4072 is-symbol "^1.0.2"
4090 4073  
4091 4074 es5-ext@^0.10.35, es5-ext@^0.10.50:
4092   - version "0.10.59"
4093   - resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.59.tgz#71038939730eb6f4f165f1421308fb60be363bc6"
4094   - integrity sha512-cOgyhW0tIJyQY1Kfw6Kr0viu9ZlUctVchRMZ7R0HiH3dxTSp5zJDLecwxUqPUrGKMsgBI1wd1FL+d9Jxfi4cLw==
  4075 + version "0.10.61"
  4076 + resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.61.tgz#311de37949ef86b6b0dcea894d1ffedb909d3269"
  4077 + integrity sha512-yFhIqQAzu2Ca2I4SE2Au3rxVfmohU9Y7wqGR+s7+H7krk26NXhIRAZDgqd6xqjCEFUomDEA3/Bo/7fKmIkW1kA==
4095 4078 dependencies:
4096 4079 es6-iterator "^2.0.3"
4097 4080 es6-symbol "^3.1.3"
... ... @@ -4197,38 +4180,39 @@ execa@^5.0.0:
4197 4180 signal-exit "^3.0.3"
4198 4181 strip-final-newline "^2.0.0"
4199 4182  
4200   -express@^4.17.1:
4201   - version "4.17.3"
4202   - resolved "https://registry.yarnpkg.com/express/-/express-4.17.3.tgz#f6c7302194a4fb54271b73a1fe7a06478c8f85a1"
4203   - integrity sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==
  4183 +express@^4.17.1, express@^4.17.3:
  4184 + version "4.18.0"
  4185 + resolved "https://registry.yarnpkg.com/express/-/express-4.18.0.tgz#7a426773325d0dd5406395220614c0db10b6e8e2"
  4186 + integrity sha512-EJEXxiTQJS3lIPrU1AE2vRuT7X7E+0KBbpm5GSoK524yl0K8X+er8zS2P14E64eqsVNoWbMCT7MpmQ+ErAhgRg==
4204 4187 dependencies:
4205 4188 accepts "~1.3.8"
4206 4189 array-flatten "1.1.1"
4207   - body-parser "1.19.2"
  4190 + body-parser "1.20.0"
4208 4191 content-disposition "0.5.4"
4209 4192 content-type "~1.0.4"
4210   - cookie "0.4.2"
  4193 + cookie "0.5.0"
4211 4194 cookie-signature "1.0.6"
4212 4195 debug "2.6.9"
4213   - depd "~1.1.2"
  4196 + depd "2.0.0"
4214 4197 encodeurl "~1.0.2"
4215 4198 escape-html "~1.0.3"
4216 4199 etag "~1.8.1"
4217   - finalhandler "~1.1.2"
  4200 + finalhandler "1.2.0"
4218 4201 fresh "0.5.2"
  4202 + http-errors "2.0.0"
4219 4203 merge-descriptors "1.0.1"
4220 4204 methods "~1.1.2"
4221   - on-finished "~2.3.0"
  4205 + on-finished "2.4.1"
4222 4206 parseurl "~1.3.3"
4223 4207 path-to-regexp "0.1.7"
4224 4208 proxy-addr "~2.0.7"
4225   - qs "6.9.7"
  4209 + qs "6.10.3"
4226 4210 range-parser "~1.2.1"
4227 4211 safe-buffer "5.2.1"
4228   - send "0.17.2"
4229   - serve-static "1.14.2"
  4212 + send "0.18.0"
  4213 + serve-static "1.15.0"
4230 4214 setprototypeof "1.2.0"
4231   - statuses "~1.5.0"
  4215 + statuses "2.0.1"
4232 4216 type-is "~1.6.18"
4233 4217 utils-merge "1.0.1"
4234 4218 vary "~1.1.2"
... ... @@ -4336,17 +4320,17 @@ filter-obj@^1.1.0:
4336 4320 resolved "https://registry.yarnpkg.com/filter-obj/-/filter-obj-1.1.0.tgz#9b311112bc6c6127a16e016c6c5d7f19e0805c5b"
4337 4321 integrity sha1-mzERErxsYSehbgFsbF1/GeCAXFs=
4338 4322  
4339   -finalhandler@~1.1.2:
4340   - version "1.1.2"
4341   - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
4342   - integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
  4323 +finalhandler@1.2.0:
  4324 + version "1.2.0"
  4325 + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32"
  4326 + integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==
4343 4327 dependencies:
4344 4328 debug "2.6.9"
4345 4329 encodeurl "~1.0.2"
4346 4330 escape-html "~1.0.3"
4347   - on-finished "~2.3.0"
  4331 + on-finished "2.4.1"
4348 4332 parseurl "~1.3.3"
4349   - statuses "~1.5.0"
  4333 + statuses "2.0.1"
4350 4334 unpipe "~1.0.0"
4351 4335  
4352 4336 find-cache-dir@^3.3.1:
... ... @@ -4408,9 +4392,9 @@ fresh@0.5.2:
4408 4392 integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
4409 4393  
4410 4394 fs-extra@^10.0.0:
4411   - version "10.0.1"
4412   - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.1.tgz#27de43b4320e833f6867cc044bfce29fdf0ef3b8"
4413   - integrity sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==
  4395 + version "10.1.0"
  4396 + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
  4397 + integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==
4414 4398 dependencies:
4415 4399 graceful-fs "^4.2.0"
4416 4400 jsonfile "^6.0.1"
... ... @@ -4620,7 +4604,7 @@ globby@^10.0.0:
4620 4604 merge2 "^1.2.3"
4621 4605 slash "^3.0.0"
4622 4606  
4623   -globby@^11.0.1, globby@^11.0.2:
  4607 +globby@^11.0.2:
4624 4608 version "11.1.0"
4625 4609 resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
4626 4610 integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
... ... @@ -4633,9 +4617,9 @@ globby@^11.0.1, globby@^11.0.2:
4633 4617 slash "^3.0.0"
4634 4618  
4635 4619 graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.3, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
4636   - version "4.2.9"
4637   - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96"
4638   - integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==
  4620 + version "4.2.10"
  4621 + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
  4622 + integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
4639 4623  
4640 4624 growly@^1.3.0:
4641 4625 version "1.3.0"
... ... @@ -4677,10 +4661,10 @@ hard-rejection@^2.1.0:
4677 4661 resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883"
4678 4662 integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==
4679 4663  
4680   -has-bigints@^1.0.1:
4681   - version "1.0.1"
4682   - resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
4683   - integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==
  4664 +has-bigints@^1.0.1, has-bigints@^1.0.2:
  4665 + version "1.0.2"
  4666 + resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa"
  4667 + integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==
4684 4668  
4685 4669 has-binary2@~1.0.2:
4686 4670 version "1.0.3"
... ... @@ -4704,6 +4688,13 @@ has-flag@^4.0.0:
4704 4688 resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
4705 4689 integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
4706 4690  
  4691 +has-property-descriptors@^1.0.0:
  4692 + version "1.0.0"
  4693 + resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861"
  4694 + integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==
  4695 + dependencies:
  4696 + get-intrinsic "^1.1.1"
  4697 +
4707 4698 has-symbols@^1.0.1, has-symbols@^1.0.2, has-symbols@^1.0.3:
4708 4699 version "1.0.3"
4709 4700 resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
... ... @@ -4834,15 +4825,15 @@ http-deceiver@^1.2.7:
4834 4825 resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
4835 4826 integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=
4836 4827  
4837   -http-errors@1.8.1:
4838   - version "1.8.1"
4839   - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c"
4840   - integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==
  4828 +http-errors@2.0.0:
  4829 + version "2.0.0"
  4830 + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3"
  4831 + integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==
4841 4832 dependencies:
4842   - depd "~1.1.2"
  4833 + depd "2.0.0"
4843 4834 inherits "2.0.4"
4844 4835 setprototypeof "1.2.0"
4845   - statuses ">= 1.5.0 < 2"
  4836 + statuses "2.0.1"
4846 4837 toidentifier "1.0.1"
4847 4838  
4848 4839 http-errors@~1.6.2:
... ... @@ -4869,10 +4860,10 @@ http-proxy-agent@^4.0.1:
4869 4860 agent-base "6"
4870 4861 debug "4"
4871 4862  
4872   -http-proxy-middleware@^2.0.0:
4873   - version "2.0.4"
4874   - resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.4.tgz#03af0f4676d172ae775cb5c33f592f40e1a4e07a"
4875   - integrity sha512-m/4FxX17SUvz4lJ5WPXOHDUuCwIqXLfLHs1s0uZ3oYjhoXlx9csYxaOa0ElDEJ+h8Q4iJ1s+lTMbiCa4EXIJqg==
  4863 +http-proxy-middleware@^2.0.3:
  4864 + version "2.0.6"
  4865 + resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz#e1a4dd6979572c7ab5a4e4b55095d1f32a74963f"
  4866 + integrity sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==
4876 4867 dependencies:
4877 4868 "@types/http-proxy" "^1.17.8"
4878 4869 http-proxy "^1.18.1"
... ... @@ -4904,9 +4895,9 @@ https-browserify@^1.0.0:
4904 4895 integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
4905 4896  
4906 4897 https-proxy-agent@^5.0.0:
4907   - version "5.0.0"
4908   - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
4909   - integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==
  4898 + version "5.0.1"
  4899 + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
  4900 + integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
4910 4901 dependencies:
4911 4902 agent-base "6"
4912 4903 debug "4"
... ... @@ -5111,7 +5102,7 @@ ioredis@^4.16.0:
5111 5102 redis-parser "^3.0.0"
5112 5103 standard-as-callback "^2.1.0"
5113 5104  
5114   -ip@^1.1.0, ip@^1.1.5:
  5105 +ip@^1.1.5:
5115 5106 version "1.1.5"
5116 5107 resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
5117 5108 integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
... ... @@ -5126,14 +5117,6 @@ ipaddr.js@^2.0.1:
5126 5117 resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.0.1.tgz#eca256a7a877e917aeb368b0a7497ddf42ef81c0"
5127 5118 integrity sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==
5128 5119  
5129   -is-arguments@^1.0.4:
5130   - version "1.1.1"
5131   - resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b"
5132   - integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==
5133   - dependencies:
5134   - call-bind "^1.0.2"
5135   - has-tostringtag "^1.0.0"
5136   -
5137 5120 is-arrayish@^0.2.1:
5138 5121 version "0.2.1"
5139 5122 resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
... ... @@ -5179,9 +5162,9 @@ is-ci@^2.0.0:
5179 5162 ci-info "^2.0.0"
5180 5163  
5181 5164 is-core-module@^2.5.0, is-core-module@^2.8.1:
5182   - version "2.8.1"
5183   - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211"
5184   - integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==
  5165 + version "2.9.0"
  5166 + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69"
  5167 + integrity sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==
5185 5168 dependencies:
5186 5169 has "^1.0.3"
5187 5170  
... ... @@ -5232,9 +5215,9 @@ is-negative-zero@^2.0.2:
5232 5215 integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==
5233 5216  
5234 5217 is-number-object@^1.0.4:
5235   - version "1.0.6"
5236   - resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.6.tgz#6a7aaf838c7f0686a50b4553f7e54a96494e89f0"
5237   - integrity sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==
  5218 + version "1.0.7"
  5219 + resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc"
  5220 + integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==
5238 5221 dependencies:
5239 5222 has-tostringtag "^1.0.0"
5240 5223  
... ... @@ -5248,16 +5231,6 @@ is-obj@^2.0.0:
5248 5231 resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
5249 5232 integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
5250 5233  
5251   -is-path-cwd@^2.2.0:
5252   - version "2.2.0"
5253   - resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb"
5254   - integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==
5255   -
5256   -is-path-inside@^3.0.2:
5257   - version "3.0.3"
5258   - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
5259   - integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
5260   -
5261 5234 is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
5262 5235 version "1.1.0"
5263 5236 resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
... ... @@ -5285,7 +5258,7 @@ is-plain-object@^5.0.0:
5285 5258 resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
5286 5259 integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
5287 5260  
5288   -is-regex@^1.0.4, is-regex@^1.1.4:
  5261 +is-regex@^1.1.4:
5289 5262 version "1.1.4"
5290 5263 resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
5291 5264 integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
... ... @@ -5293,10 +5266,12 @@ is-regex@^1.0.4, is-regex@^1.1.4:
5293 5266 call-bind "^1.0.2"
5294 5267 has-tostringtag "^1.0.0"
5295 5268  
5296   -is-shared-array-buffer@^1.0.1:
5297   - version "1.0.1"
5298   - resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6"
5299   - integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==
  5269 +is-shared-array-buffer@^1.0.2:
  5270 + version "1.0.2"
  5271 + resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
  5272 + integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==
  5273 + dependencies:
  5274 + call-bind "^1.0.2"
5300 5275  
5301 5276 is-ssh@^1.3.0:
5302 5277 version "1.3.3"
... ... @@ -5446,7 +5421,7 @@ json5@^1.0.1:
5446 5421 dependencies:
5447 5422 minimist "^1.2.0"
5448 5423  
5449   -json5@^2.1.2:
  5424 +json5@^2.1.2, json5@^2.2.1:
5450 5425 version "2.2.1"
5451 5426 resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
5452 5427 integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
... ... @@ -5506,9 +5481,9 @@ laravel-echo-server@^1.6.2:
5506 5481 yargs "^15.3.1"
5507 5482  
5508 5483 laravel-echo@^1.10.0:
5509   - version "1.11.4"
5510   - resolved "https://registry.yarnpkg.com/laravel-echo/-/laravel-echo-1.11.4.tgz#eb5f07dd36dbd0b54a374b3084e47746e83817fa"
5511   - integrity sha512-zoWMT7Cb3QVYEq+gyZ/hQvE3sSIiFxZH6c2Wg6tAwg9hukwyOLbDLpy9XT5U1mIC0lK+HFLzetnbfCtrl00jEg==
  5484 + version "1.11.7"
  5485 + resolved "https://registry.yarnpkg.com/laravel-echo/-/laravel-echo-1.11.7.tgz#f9e4e6ce8069eaeca0b41924dd237629bf9f4bcb"
  5486 + integrity sha512-LhEZp/RbdtdMlhptJyn452+aXfz+A1UW2bhJM7NROgXhnNgj+6P9BkG9JcPCBMernp5TGkOGI6A0NPbkAWYWGg==
5512 5487  
5513 5488 laravel-mix@^6.0:
5514 5489 version "6.0.43"
... ... @@ -5611,7 +5586,7 @@ libnpmpublish@^4.0.0:
5611 5586 semver "^7.1.3"
5612 5587 ssri "^8.0.1"
5613 5588  
5614   -lilconfig@^2.0.3, lilconfig@^2.0.4:
  5589 +lilconfig@^2.0.3, lilconfig@^2.0.5:
5615 5590 version "2.0.5"
5616 5591 resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.5.tgz#19e57fd06ccc3848fd1891655b5a447092225b25"
5617 5592 integrity sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg==
... ... @@ -5642,9 +5617,9 @@ load-json-file@^6.2.0:
5642 5617 type-fest "^0.6.0"
5643 5618  
5644 5619 loader-runner@^4.2.0:
5645   - version "4.2.0"
5646   - resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384"
5647   - integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==
  5620 + version "4.3.0"
  5621 + resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1"
  5622 + integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==
5648 5623  
5649 5624 loader-utils@1.2.3:
5650 5625 version "1.2.3"
... ... @@ -5723,6 +5698,11 @@ lodash.memoize@^4.1.2:
5723 5698 resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
5724 5699 integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
5725 5700  
  5701 +lodash.sortby@^4.7.0:
  5702 + version "4.7.0"
  5703 + resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
  5704 + integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
  5705 +
5726 5706 lodash.template@^4.5.0:
5727 5707 version "4.5.0"
5728 5708 resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
... ... @@ -6103,17 +6083,12 @@ ms@2.1.3, ms@^2.0.0, ms@^2.1.1:
6103 6083 resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
6104 6084 integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
6105 6085  
6106   -multicast-dns-service-types@^1.1.0:
6107   - version "1.1.0"
6108   - resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901"
6109   - integrity sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=
6110   -
6111   -multicast-dns@^6.0.1:
6112   - version "6.2.3"
6113   - resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229"
6114   - integrity sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==
  6086 +multicast-dns@^7.2.4:
  6087 + version "7.2.4"
  6088 + resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-7.2.4.tgz#cf0b115c31e922aeb20b64e6556cbeb34cf0dd19"
  6089 + integrity sha512-XkCYOU+rr2Ft3LI6w4ye51M3VK31qJXFIxu0XLw169PtKG0Zx47OrXeVW/GCYOfpC9s1yyyf1S+L8/4LY0J9Zw==
6115 6090 dependencies:
6116   - dns-packet "^1.3.1"
  6091 + dns-packet "^5.2.2"
6117 6092 thunky "^1.0.2"
6118 6093  
6119 6094 multimatch@^5.0.0:
... ... @@ -6133,9 +6108,9 @@ mute-stream@0.0.8, mute-stream@~0.0.4:
6133 6108 integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
6134 6109  
6135 6110 nanoid@^3.3.1:
6136   - version "3.3.2"
6137   - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.2.tgz#c89622fafb4381cd221421c69ec58547a1eec557"
6138   - integrity sha512-CuHBogktKwpm5g2sRgv83jEy2ijFzBwMoYA60orPDR7ynsLijJDqgsi4RDGj3OJpy3Ieb+LYwiRmIOGyytgITA==
  6111 + version "3.3.3"
  6112 + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.3.tgz#fd8e8b7aa761fe807dba2d1b98fb7241bb724a25"
  6113 + integrity sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==
6139 6114  
6140 6115 negotiator@0.6.3, negotiator@^0.6.2:
6141 6116 version "0.6.3"
... ... @@ -6173,9 +6148,9 @@ node-fetch@^2.6.1, node-fetch@^2.6.7:
6173 6148 whatwg-url "^5.0.0"
6174 6149  
6175 6150 node-forge@^1:
6176   - version "1.3.0"
6177   - resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.0.tgz#37a874ea723855f37db091e6c186e5b67a01d4b2"
6178   - integrity sha512-08ARB91bUi6zNKzVmaj3QO7cr397uiDT2nJ63cHjyNtCTWIgvS47j3eT0WfzUwS9+6Z5YshRaoasFkXCKrIYbA==
  6151 + version "1.3.1"
  6152 + resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
  6153 + integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==
6179 6154  
6180 6155 node-gyp@^5.0.2:
6181 6156 version "5.1.1"
... ... @@ -6251,10 +6226,10 @@ node-notifier@^9.0.0:
6251 6226 uuid "^8.3.0"
6252 6227 which "^2.0.2"
6253 6228  
6254   -node-releases@^2.0.2:
6255   - version "2.0.2"
6256   - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.2.tgz#7139fe71e2f4f11b47d4d2986aaf8c48699e0c01"
6257   - integrity sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg==
  6229 +node-releases@^2.0.3:
  6230 + version "2.0.4"
  6231 + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.4.tgz#f38252370c43854dc48aa431c766c6c398f40476"
  6232 + integrity sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ==
6258 6233  
6259 6234 nopt@^4.0.1:
6260 6235 version "4.0.3"
... ... @@ -6438,15 +6413,7 @@ object-inspect@^1.12.0, object-inspect@^1.9.0:
6438 6413 resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0"
6439 6414 integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==
6440 6415  
6441   -object-is@^1.0.1:
6442   - version "1.1.5"
6443   - resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac"
6444   - integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==
6445   - dependencies:
6446   - call-bind "^1.0.2"
6447   - define-properties "^1.1.3"
6448   -
6449   -object-keys@^1.0.12, object-keys@^1.1.1:
  6416 +object-keys@^1.1.1:
6450 6417 version "1.1.1"
6451 6418 resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
6452 6419 integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
... ... @@ -6475,10 +6442,10 @@ obuf@^1.0.0, obuf@^1.1.2:
6475 6442 resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
6476 6443 integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
6477 6444  
6478   -on-finished@~2.3.0:
6479   - version "2.3.0"
6480   - resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
6481   - integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
  6445 +on-finished@2.4.1:
  6446 + version "2.4.1"
  6447 + resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
  6448 + integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==
6482 6449 dependencies:
6483 6450 ee-first "1.1.1"
6484 6451  
... ... @@ -6602,11 +6569,11 @@ p-reduce@^2.0.0, p-reduce@^2.1.0:
6602 6569 integrity sha512-2USApvnsutq8uoxZBGbbWM0JIYLiEMJ9RlaN7fAzVNb9OZN0SHjjTTfIcb667XynS5Y1VhwDJVDa72TnPzAYWw==
6603 6570  
6604 6571 p-retry@^4.5.0:
6605   - version "4.6.1"
6606   - resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.1.tgz#8fcddd5cdf7a67a0911a9cf2ef0e5df7f602316c"
6607   - integrity sha512-e2xXGNhZOZ0lfgR9kL34iGlU8N/KO0xZnQxVEwdeOvpqNDQfdnxIYizvWtK8RglUa3bGqI8g0R/BdfzLMxRkiA==
  6572 + version "4.6.2"
  6573 + resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.2.tgz#9baae7184057edd4e17231cee04264106e092a16"
  6574 + integrity sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==
6608 6575 dependencies:
6609   - "@types/retry" "^0.12.0"
  6576 + "@types/retry" "0.12.0"
6610 6577 retry "^0.13.1"
6611 6578  
6612 6579 p-timeout@^3.2.0:
... ... @@ -6915,11 +6882,11 @@ postcss-discard-overridden@^5.1.0:
6915 6882 integrity sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==
6916 6883  
6917 6884 postcss-load-config@^3.1.0:
6918   - version "3.1.3"
6919   - resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-3.1.3.tgz#21935b2c43b9a86e6581a576ca7ee1bde2bd1d23"
6920   - integrity sha512-5EYgaM9auHGtO//ljHH+v/aC/TQ5LHXtL7bQajNAUBKUVKiYE8rYpFms7+V26D9FncaGe2zwCoPQsFKb5zF/Hw==
  6885 + version "3.1.4"
  6886 + resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-3.1.4.tgz#1ab2571faf84bb078877e1d07905eabe9ebda855"
  6887 + integrity sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==
6921 6888 dependencies:
6922   - lilconfig "^2.0.4"
  6889 + lilconfig "^2.0.5"
6923 6890 yaml "^1.10.2"
6924 6891  
6925 6892 postcss-loader@^6.2.0:
... ... @@ -6931,10 +6898,10 @@ postcss-loader@^6.2.0:
6931 6898 klona "^2.0.5"
6932 6899 semver "^7.3.5"
6933 6900  
6934   -postcss-merge-longhand@^5.1.3:
6935   - version "5.1.3"
6936   - resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.1.3.tgz#a49e2be6237316e3b55e329e0a8da15d1f9f47ab"
6937   - integrity sha512-lX8GPGvZ0iGP/IboM7HXH5JwkXvXod1Rr8H8ixwiA372hArk0zP4ZcCy4z4Prg/bfNlbbTf0KCOjCF9kKnpP/w==
  6901 +postcss-merge-longhand@^5.1.4:
  6902 + version "5.1.4"
  6903 + resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.1.4.tgz#0f46f8753989a33260efc47de9a0cdc571f2ec5c"
  6904 + integrity sha512-hbqRRqYfmXoGpzYKeW0/NCZhvNyQIlQeWVSao5iKWdyx7skLvCfQFGIUsP9NUs3dSbPac2IC4Go85/zG+7MlmA==
6938 6905 dependencies:
6939 6906 postcss-value-parser "^4.2.0"
6940 6907 stylehacks "^5.1.0"
... ... @@ -7096,9 +7063,9 @@ postcss-reduce-transforms@^5.1.0:
7096 7063 postcss-value-parser "^4.2.0"
7097 7064  
7098 7065 postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.9:
7099   - version "6.0.9"
7100   - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.9.tgz#ee71c3b9ff63d9cd130838876c13a2ec1a992b2f"
7101   - integrity sha512-UO3SgnZOVTwu4kyLR22UQ1xZh086RyNZppb7lLAKBFK8a32ttG5i87Y/P3+2bRSjZNyJ1B7hfFNo273tKe9YxQ==
  7066 + version "6.0.10"
  7067 + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz#79b61e2c0d1bfc2602d549e11d0876256f8df88d"
  7068 + integrity sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==
7102 7069 dependencies:
7103 7070 cssesc "^3.0.0"
7104 7071 util-deprecate "^1.0.2"
... ... @@ -7236,12 +7203,7 @@ q@^1.5.1:
7236 7203 resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
7237 7204 integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
7238 7205  
7239   -qs@6.9.7:
7240   - version "6.9.7"
7241   - resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.7.tgz#4610846871485e1e048f44ae3b94033f0e675afe"
7242   - integrity sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==
7243   -
7244   -qs@^6.9.4:
  7206 +qs@6.10.3, qs@^6.9.4:
7245 7207 version "6.10.3"
7246 7208 resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.3.tgz#d6cde1b2ffca87b5aa57889816c5f81535e22e8e"
7247 7209 integrity sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==
... ... @@ -7303,13 +7265,13 @@ range-parser@^1.2.1, range-parser@~1.2.1:
7303 7265 resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
7304 7266 integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
7305 7267  
7306   -raw-body@2.4.3:
7307   - version "2.4.3"
7308   - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.3.tgz#8f80305d11c2a0a545c2d9d89d7a0286fcead43c"
7309   - integrity sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==
  7268 +raw-body@2.5.1:
  7269 + version "2.5.1"
  7270 + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857"
  7271 + integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==
7310 7272 dependencies:
7311 7273 bytes "3.1.2"
7312   - http-errors "1.8.1"
  7274 + http-errors "2.0.0"
7313 7275 iconv-lite "0.4.24"
7314 7276 unpipe "1.0.0"
7315 7277  
... ... @@ -7496,10 +7458,10 @@ regenerator-runtime@^0.13.4:
7496 7458 resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
7497 7459 integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==
7498 7460  
7499   -regenerator-transform@^0.14.2:
7500   - version "0.14.5"
7501   - resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4"
7502   - integrity sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==
  7461 +regenerator-transform@^0.15.0:
  7462 + version "0.15.0"
  7463 + resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.0.tgz#cbd9ead5d77fae1a48d957cf889ad0586adb6537"
  7464 + integrity sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==
7503 7465 dependencies:
7504 7466 "@babel/runtime" "^7.8.4"
7505 7467  
... ... @@ -7508,14 +7470,6 @@ regex-parser@^2.2.11:
7508 7470 resolved "https://registry.yarnpkg.com/regex-parser/-/regex-parser-2.2.11.tgz#3b37ec9049e19479806e878cabe7c1ca83ccfe58"
7509 7471 integrity sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q==
7510 7472  
7511   -regexp.prototype.flags@^1.2.0:
7512   - version "1.4.1"
7513   - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.1.tgz#b3f4c0059af9e47eca9f3f660e51d81307e72307"
7514   - integrity sha512-pMR7hBVUUGI7PMA37m2ofIdQCsomVnas+Jn5UPGAHQ+/LlwKm/aTLJHdasmHRzlfeZwHiAOaRSo2rbBDm3nNUQ==
7515   - dependencies:
7516   - call-bind "^1.0.2"
7517   - define-properties "^1.1.3"
7518   -
7519 7473 regexpu-core@^5.0.1:
7520 7474 version "5.0.1"
7521 7475 resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.0.1.tgz#c531122a7840de743dcf9c83e923b5560323ced3"
... ... @@ -7744,9 +7698,9 @@ sass-loader@^12.6.0:
7744 7698 neo-async "^2.6.2"
7745 7699  
7746 7700 sass@^1.49.9:
7747   - version "1.49.9"
7748   - resolved "https://registry.yarnpkg.com/sass/-/sass-1.49.9.tgz#b15a189ecb0ca9e24634bae5d1ebc191809712f9"
7749   - integrity sha512-YlYWkkHP9fbwaFRZQRXgDi3mXZShslVmmo+FVK3kHLUELHHEYrCmL1x6IUjC7wLS6VuJSAFXRQS/DxdsC4xL1A==
  7701 + version "1.51.0"
  7702 + resolved "https://registry.yarnpkg.com/sass/-/sass-1.51.0.tgz#25ea36cf819581fe1fe8329e8c3a4eaaf70d2845"
  7703 + integrity sha512-haGdpTgywJTvHC2b91GSq+clTKGbtkkZmVAb82jZQN/wTy6qs8DdFm2lhEQbEwrY0QDRgSQ3xDurqM977C3noA==
7750 7704 dependencies:
7751 7705 chokidar ">=3.0.0 <4.0.0"
7752 7706 immutable "^4.0.0"
... ... @@ -7785,7 +7739,7 @@ select-hose@^2.0.0:
7785 7739 resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
7786 7740 integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
7787 7741  
7788   -selfsigned@^2.0.0:
  7742 +selfsigned@^2.0.1:
7789 7743 version "2.0.1"
7790 7744 resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.0.1.tgz#8b2df7fa56bf014d19b6007655fff209c0ef0a56"
7791 7745 integrity sha512-LmME957M1zOsUhG+67rAjKfiWFox3SBxE/yymatMZsAx+oMrJ0YQ8AToOnyCm7xbeg2ep37IHLxdu0o2MavQOQ==
... ... @@ -7808,30 +7762,30 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
7808 7762 integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
7809 7763  
7810 7764 semver@^7.1.1, semver@^7.1.3, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
7811   - version "7.3.5"
7812   - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
7813   - integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
  7765 + version "7.3.7"
  7766 + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
  7767 + integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
7814 7768 dependencies:
7815 7769 lru-cache "^6.0.0"
7816 7770  
7817   -send@0.17.2:
7818   - version "0.17.2"
7819   - resolved "https://registry.yarnpkg.com/send/-/send-0.17.2.tgz#926622f76601c41808012c8bf1688fe3906f7820"
7820   - integrity sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==
  7771 +send@0.18.0:
  7772 + version "0.18.0"
  7773 + resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be"
  7774 + integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==
7821 7775 dependencies:
7822 7776 debug "2.6.9"
7823   - depd "~1.1.2"
7824   - destroy "~1.0.4"
  7777 + depd "2.0.0"
  7778 + destroy "1.2.0"
7825 7779 encodeurl "~1.0.2"
7826 7780 escape-html "~1.0.3"
7827 7781 etag "~1.8.1"
7828 7782 fresh "0.5.2"
7829   - http-errors "1.8.1"
  7783 + http-errors "2.0.0"
7830 7784 mime "1.6.0"
7831 7785 ms "2.1.3"
7832   - on-finished "~2.3.0"
  7786 + on-finished "2.4.1"
7833 7787 range-parser "~1.2.1"
7834   - statuses "~1.5.0"
  7788 + statuses "2.0.1"
7835 7789  
7836 7790 serialize-javascript@^6.0.0:
7837 7791 version "6.0.0"
... ... @@ -7853,15 +7807,15 @@ serve-index@^1.9.1:
7853 7807 mime-types "~2.1.17"
7854 7808 parseurl "~1.3.2"
7855 7809  
7856   -serve-static@1.14.2:
7857   - version "1.14.2"
7858   - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.2.tgz#722d6294b1d62626d41b43a013ece4598d292bfa"
7859   - integrity sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==
  7810 +serve-static@1.15.0:
  7811 + version "1.15.0"
  7812 + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540"
  7813 + integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==
7860 7814 dependencies:
7861 7815 encodeurl "~1.0.2"
7862 7816 escape-html "~1.0.3"
7863 7817 parseurl "~1.3.3"
7864   - send "0.17.2"
  7818 + send "0.18.0"
7865 7819  
7866 7820 set-blocking@^2.0.0, set-blocking@~2.0.0:
7867 7821 version "2.0.0"
... ... @@ -8027,15 +7981,15 @@ socks-proxy-agent@^5.0.0:
8027 7981 socks "^2.3.3"
8028 7982  
8029 7983 socks-proxy-agent@^6.0.0:
8030   - version "6.1.1"
8031   - resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.1.1.tgz#e664e8f1aaf4e1fb3df945f09e3d94f911137f87"
8032   - integrity sha512-t8J0kG3csjA4g6FTbsMOWws+7R7vuRC8aQ/wy3/1OWmsgwA68zs/+cExQ0koSitUDXqhufF/YJr9wtNMZHw5Ew==
  7984 + version "6.2.0"
  7985 + resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.2.0.tgz#f6b5229cc0cbd6f2f202d9695f09d871e951c85e"
  7986 + integrity sha512-wWqJhjb32Q6GsrUqzuFkukxb/zzide5quXYcMVpIjxalDBBYy2nqKCFQ/9+Ie4dvOYSQdOk3hUlZSdzZOd3zMQ==
8033 7987 dependencies:
8034 7988 agent-base "^6.0.2"
8035   - debug "^4.3.1"
8036   - socks "^2.6.1"
  7989 + debug "^4.3.3"
  7990 + socks "^2.6.2"
8037 7991  
8038   -socks@^2.3.3, socks@^2.6.1:
  7992 +socks@^2.3.3, socks@^2.6.2:
8039 7993 version "2.6.2"
8040 7994 resolved "https://registry.yarnpkg.com/socks/-/socks-2.6.2.tgz#ec042d7960073d40d94268ff3bb727dc685f111a"
8041 7995 integrity sha512-zDZhHhZRY9PxRruRMR7kMhnf3I8hDs4S3f9RecfnGxvcBHQcKcIH/oUcEWffsfl1XxdYlA7nnlGbbTvPz9D8gA==
... ... @@ -8101,10 +8055,12 @@ source-map@^0.5.0:
8101 8055 resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
8102 8056 integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
8103 8057  
8104   -source-map@~0.7.2:
8105   - version "0.7.3"
8106   - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
8107   - integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
  8058 +source-map@~0.8.0-beta.0:
  8059 + version "0.8.0-beta.0"
  8060 + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.8.0-beta.0.tgz#d4c1bb42c3f7ee925f005927ba10709e0d1d1f11"
  8061 + integrity sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==
  8062 + dependencies:
  8063 + whatwg-url "^7.0.0"
8108 8064  
8109 8065 spdx-correct@^3.0.0:
8110 8066 version "3.1.1"
... ... @@ -8206,15 +8162,20 @@ standard-as-callback@^2.1.0:
8206 8162 resolved "https://registry.yarnpkg.com/standard-as-callback/-/standard-as-callback-2.1.0.tgz#8953fc05359868a77b5b9739a665c5977bb7df45"
8207 8163 integrity sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==
8208 8164  
8209   -"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0:
  8165 +statuses@2.0.1:
  8166 + version "2.0.1"
  8167 + resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63"
  8168 + integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==
  8169 +
  8170 +"statuses@>= 1.4.0 < 2":
8210 8171 version "1.5.0"
8211 8172 resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
8212 8173 integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
8213 8174  
8214 8175 std-env@^3.0.1:
8215   - version "3.0.1"
8216   - resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.0.1.tgz#bc4cbc0e438610197e34c2d79c3df30b491f5182"
8217   - integrity sha512-mC1Ps9l77/97qeOZc+HrOL7TIaOboHqMZ24dGVQrlxFcpPpfCHpH+qfUT7Dz+6mlG8+JPA1KfBQo19iC/+Ngcw==
  8176 + version "3.1.1"
  8177 + resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.1.1.tgz#1f19c4d3f6278c52efd08a94574a2a8d32b7d092"
  8178 + integrity sha512-/c645XdExBypL01TpFKiG/3RAa/Qmu+zRi0MwAmrdEkwHNuN0ebo8ccAXBBDa5Z0QOJgBskUIbuCK91x0sCVEw==
8218 8179  
8219 8180 stream-browserify@^2.0.1:
8220 8181 version "2.0.2"
... ... @@ -8302,13 +8263,6 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:
8302 8263 dependencies:
8303 8264 ansi-regex "^5.0.1"
8304 8265  
8305   -strip-ansi@^7.0.0:
8306   - version "7.0.1"
8307   - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2"
8308   - integrity sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==
8309   - dependencies:
8310   - ansi-regex "^6.0.1"
8311   -
8312 8266 strip-bom@^3.0.0:
8313 8267 version "3.0.0"
8314 8268 resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
... ... @@ -8469,13 +8423,13 @@ terser@^4.6.3:
8469 8423 source-map-support "~0.5.12"
8470 8424  
8471 8425 terser@^5.7.2, terser@^5.9.0:
8472   - version "5.12.1"
8473   - resolved "https://registry.yarnpkg.com/terser/-/terser-5.12.1.tgz#4cf2ebed1f5bceef5c83b9f60104ac4a78b49e9c"
8474   - integrity sha512-NXbs+7nisos5E+yXwAD+y7zrcTkMqb0dEJxIGtSKPdCBzopf7ni4odPul2aechpV7EXNvOudYOX2bb5tln1jbQ==
  8426 + version "5.13.1"
  8427 + resolved "https://registry.yarnpkg.com/terser/-/terser-5.13.1.tgz#66332cdc5a01b04a224c9fad449fc1a18eaa1799"
  8428 + integrity sha512-hn4WKOfwnwbYfe48NgrQjqNOH9jzLqRcIfbYytOXCOv46LBfWr9bDS17MQqOi+BWGD0sJK3Sj5NC/gJjiojaoA==
8475 8429 dependencies:
8476 8430 acorn "^8.5.0"
8477 8431 commander "^2.20.0"
8478   - source-map "~0.7.2"
  8432 + source-map "~0.8.0-beta.0"
8479 8433 source-map-support "~0.5.20"
8480 8434  
8481 8435 text-extensions@^1.0.0:
... ... @@ -8557,6 +8511,13 @@ tough-cookie@~2.5.0:
8557 8511 psl "^1.1.28"
8558 8512 punycode "^2.1.1"
8559 8513  
  8514 +tr46@^1.0.1:
  8515 + version "1.0.1"
  8516 + resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
  8517 + integrity sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=
  8518 + dependencies:
  8519 + punycode "^2.1.0"
  8520 +
8560 8521 tr46@^2.1.0:
8561 8522 version "2.1.0"
8562 8523 resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240"
... ... @@ -8580,9 +8541,9 @@ tslib@^1.9.0:
8580 8541 integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
8581 8542  
8582 8543 tslib@^2.0.3:
8583   - version "2.3.1"
8584   - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
8585   - integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
  8544 + version "2.4.0"
  8545 + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
  8546 + integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
8586 8547  
8587 8548 tty-browserify@0.0.0:
8588 8549 version "0.0.0"
... ... @@ -8657,9 +8618,9 @@ typedarray@^0.0.6:
8657 8618 integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
8658 8619  
8659 8620 uglify-js@^3.1.4:
8660   - version "3.15.3"
8661   - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.15.3.tgz#9aa82ca22419ba4c0137642ba0df800cb06e0471"
8662   - integrity sha512-6iCVm2omGJbsu3JWac+p6kUiOpg3wFO2f8lIXjfEb8RrmLjzog1wTPMmwKB7swfzzqxj9YM+sGUM++u1qN4qJg==
  8621 + version "3.15.4"
  8622 + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.15.4.tgz#fa95c257e88f85614915b906204b9623d4fa340d"
  8623 + integrity sha512-vMOPGDuvXecPs34V74qDKk4iJ/SN4vL3Ow/23ixafENYvtrNvtbcgUeugTcUGRGsOF/5fU8/NYSL5Hyb3l1OJA==
8663 8624  
8664 8625 uid-number@0.0.6:
8665 8626 version "0.0.6"
... ... @@ -8672,13 +8633,13 @@ umask@^1.1.0:
8672 8633 integrity sha1-8pzr8B31F5ErtY/5xOUP3o4zMg0=
8673 8634  
8674 8635 unbox-primitive@^1.0.1:
8675   - version "1.0.1"
8676   - resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471"
8677   - integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==
  8636 + version "1.0.2"
  8637 + resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e"
  8638 + integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==
8678 8639 dependencies:
8679   - function-bind "^1.1.1"
8680   - has-bigints "^1.0.1"
8681   - has-symbols "^1.0.2"
  8640 + call-bind "^1.0.2"
  8641 + has-bigints "^1.0.2"
  8642 + has-symbols "^1.0.3"
8682 8643 which-boxed-primitive "^1.0.2"
8683 8644  
8684 8645 unicode-canonical-property-names-ecmascript@^2.0.0:
... ... @@ -8881,6 +8842,11 @@ webidl-conversions@^3.0.0:
8881 8842 resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
8882 8843 integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
8883 8844  
  8845 +webidl-conversions@^4.0.2:
  8846 + version "4.0.2"
  8847 + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
  8848 + integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
  8849 +
8884 8850 webidl-conversions@^6.1.0:
8885 8851 version "6.1.0"
8886 8852 resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
... ... @@ -8916,38 +8882,37 @@ webpack-dev-middleware@^5.3.1:
8916 8882 schema-utils "^4.0.0"
8917 8883  
8918 8884 webpack-dev-server@^4.7.3:
8919   - version "4.7.4"
8920   - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.7.4.tgz#d0ef7da78224578384e795ac228d8efb63d5f945"
8921   - integrity sha512-nfdsb02Zi2qzkNmgtZjkrMOcXnYZ6FLKcQwpxT7MvmHKc+oTtDsBju8j+NMyAygZ9GW1jMEUpy3itHtqgEhe1A==
  8885 + version "4.8.1"
  8886 + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.8.1.tgz#58f9d797710d6e25fa17d6afab8708f958c11a29"
  8887 + integrity sha512-dwld70gkgNJa33czmcj/PlKY/nOy/BimbrgZRaR9vDATBQAYgLzggR0nxDtPLJiLrMgZwbE6RRfJ5vnBBasTyg==
8922 8888 dependencies:
8923 8889 "@types/bonjour" "^3.5.9"
8924 8890 "@types/connect-history-api-fallback" "^1.3.5"
8925 8891 "@types/express" "^4.17.13"
8926 8892 "@types/serve-index" "^1.9.1"
8927 8893 "@types/sockjs" "^0.3.33"
8928   - "@types/ws" "^8.2.2"
  8894 + "@types/ws" "^8.5.1"
8929 8895 ansi-html-community "^0.0.8"
8930   - bonjour "^3.5.0"
  8896 + bonjour-service "^1.0.11"
8931 8897 chokidar "^3.5.3"
8932 8898 colorette "^2.0.10"
8933 8899 compression "^1.7.4"
8934 8900 connect-history-api-fallback "^1.6.0"
8935 8901 default-gateway "^6.0.3"
8936   - del "^6.0.0"
8937   - express "^4.17.1"
  8902 + express "^4.17.3"
8938 8903 graceful-fs "^4.2.6"
8939 8904 html-entities "^2.3.2"
8940   - http-proxy-middleware "^2.0.0"
  8905 + http-proxy-middleware "^2.0.3"
8941 8906 ipaddr.js "^2.0.1"
8942 8907 open "^8.0.9"
8943 8908 p-retry "^4.5.0"
8944 8909 portfinder "^1.0.28"
  8910 + rimraf "^3.0.2"
8945 8911 schema-utils "^4.0.0"
8946   - selfsigned "^2.0.0"
  8912 + selfsigned "^2.0.1"
8947 8913 serve-index "^1.9.1"
8948 8914 sockjs "^0.3.21"
8949 8915 spdy "^4.0.2"
8950   - strip-ansi "^7.0.0"
8951 8916 webpack-dev-middleware "^5.3.1"
8952 8917 ws "^8.4.2"
8953 8918  
... ... @@ -8981,9 +8946,9 @@ webpack-sources@^3.2.3:
8981 8946 integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
8982 8947  
8983 8948 webpack@^5.60.0, webpack@^5.70.0:
8984   - version "5.70.0"
8985   - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.70.0.tgz#3461e6287a72b5e6e2f4872700bc8de0d7500e6d"
8986   - integrity sha512-ZMWWy8CeuTTjCxbeaQI21xSswseF2oNOwc70QSKNePvmxE7XW36i7vpBMYZFAUHPwQiEbNGCEYIOOlyRbdGmxw==
  8949 + version "5.72.0"
  8950 + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.72.0.tgz#f8bc40d9c6bb489a4b7a8a685101d6022b8b6e28"
  8951 + integrity sha512-qmSmbspI0Qo5ld49htys8GY9XhS9CGqFoHTsOVAnjBdg0Zn79y135R+k4IR4rKK6+eKaabMhJwiVB7xw0SJu5w==
8987 8952 dependencies:
8988 8953 "@types/eslint-scope" "^3.7.3"
8989 8954 "@types/estree" "^0.0.51"
... ... @@ -9042,6 +9007,15 @@ whatwg-url@^5.0.0:
9042 9007 tr46 "~0.0.3"
9043 9008 webidl-conversions "^3.0.0"
9044 9009  
  9010 +whatwg-url@^7.0.0:
  9011 + version "7.1.0"
  9012 + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.1.0.tgz#c2c492f1eca612988efd3d2266be1b9fc6170d06"
  9013 + integrity sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==
  9014 + dependencies:
  9015 + lodash.sortby "^4.7.0"
  9016 + tr46 "^1.0.1"
  9017 + webidl-conversions "^4.0.2"
  9018 +
9045 9019 whatwg-url@^8.4.0:
9046 9020 version "8.7.0"
9047 9021 resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77"
... ... @@ -9272,9 +9246,9 @@ yargs@^16.2.0:
9272 9246 yargs-parser "^20.2.2"
9273 9247  
9274 9248 yargs@^17.2.1:
9275   - version "17.4.0"
9276   - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.4.0.tgz#9fc9efc96bd3aa2c1240446af28499f0e7593d00"
9277   - integrity sha512-WJudfrk81yWFSOkZYpAZx4Nt7V4xp7S/uJkX0CnxovMCt1wCE8LNftPpNuF9X/u9gN5nsD7ycYtRcDf2pL3UiA==
  9249 + version "17.4.1"
  9250 + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.4.1.tgz#ebe23284207bb75cee7c408c33e722bfb27b5284"
  9251 + integrity sha512-WSZD9jgobAg3ZKuCQZSa3g9QOJeCCqLoLAykiWgmXnDo9EPnn4RPf5qVTtzgOx66o6/oqhcA5tHtJXpG8pMt3g==
9278 9252 dependencies:
9279 9253 cliui "^7.0.2"
9280 9254 escalade "^3.1.1"
... ...