Skip to content

Commit 8cb99ee

Browse files
authored
Merge branch 'master' into features/custom-jar
2 parents 28921e8 + cd3aa24 commit 8cb99ee

File tree

2 files changed

+66
-67
lines changed

2 files changed

+66
-67
lines changed

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,11 @@
106106
"@commitlint/config-conventional": "12.1.4",
107107
"@nestjs/schematics": "7.3.1",
108108
"@nestjs/testing": "7.6.17",
109-
"@nrwl/eslint-plugin-nx": "12.3.3",
110-
"@nrwl/jest": "12.3.3",
111-
"@nrwl/nest": "12.3.3",
112-
"@nrwl/node": "12.3.3",
113-
"@nrwl/workspace": "12.3.3",
109+
"@nrwl/eslint-plugin-nx": "12.3.4",
110+
"@nrwl/jest": "12.3.4",
111+
"@nrwl/nest": "12.3.4",
112+
"@nrwl/node": "12.3.4",
113+
"@nrwl/workspace": "12.3.4",
114114
"@semantic-release/changelog": "5.0.1",
115115
"@types/concurrently": "6.0.1",
116116
"@types/fs-extra": "9.0.11",
@@ -132,7 +132,7 @@
132132
"ts-jest": "26.5.6",
133133
"ts-node": "9.1.1",
134134
"tslint": "6.1.3",
135-
"type-fest": "1.1.2",
135+
"type-fest": "1.1.3",
136136
"typescript": "4.2.4"
137137
}
138138
}

yarn.lock

Lines changed: 60 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -807,83 +807,83 @@
807807
dependencies:
808808
mkdirp "^1.0.4"
809809

810-
811-
version "12.3.3"
812-
resolved "https://registry.yarnpkg.com/@nrwl/cli/-/cli-12.3.3.tgz#ec5e2a96e9a76da0c83df9245462752e7783cbe2"
813-
integrity sha512-3B62KQwQpr57/kXH7eLoPOwsrZhIrqfhso85lUbmOPKpL1yzY9sQlmbBUxVze9VRWkytmSemDwJbvjudzLsjBQ==
810+
811+
version "12.3.4"
812+
resolved "https://registry.yarnpkg.com/@nrwl/cli/-/cli-12.3.4.tgz#87dfe30db8ed38f5b337d1bbb356e059cafe8b24"
813+
integrity sha512-kyel3UAz68MYpU9nsbt88WOU3Jsa6YbgDot8nw9Ig92p/+JKIXunkevtVt14GcIX14P4gor2CCjoLMr7BOg2wg==
814814
dependencies:
815-
"@nrwl/tao" "12.3.3"
815+
"@nrwl/tao" "12.3.4"
816816
chalk "4.1.0"
817817
v8-compile-cache "2.3.0"
818818
yargs "15.4.1"
819819
yargs-parser "20.0.0"
820820

821-
822-
version "12.3.3"
823-
resolved "https://registry.yarnpkg.com/@nrwl/devkit/-/devkit-12.3.3.tgz#e68fc78bd2f9c4ac6435e5b3ca3523021de0d1a3"
824-
integrity sha512-rMIWPhgsgvKsyKc79JKoGXDMfABDHCE57qy8BG9LABYukFY5qO07nhc5/HwYDVu4GFfT9vhlavGs4ynC2WX4BQ==
821+
822+
version "12.3.4"
823+
resolved "https://registry.yarnpkg.com/@nrwl/devkit/-/devkit-12.3.4.tgz#0ac1c6a742a31fe2bd6a2943e6afc5202d158d85"
824+
integrity sha512-+wPso9m699fCEfuvcnPyLUwev26JEXJawZ2qnXhcidBzC4j4XsABgl4G+ZIFI93oJ3H15X9jYE52SkoP6uBjQg==
825825
dependencies:
826-
"@nrwl/tao" "12.3.3"
826+
"@nrwl/tao" "12.3.4"
827827
ejs "^3.1.5"
828828
ignore "^5.0.4"
829829
semver "7.3.4"
830830
strip-json-comments "^3.1.1"
831831
tslib "^2.0.0"
832832

833-
834-
version "12.3.3"
835-
resolved "https://registry.yarnpkg.com/@nrwl/eslint-plugin-nx/-/eslint-plugin-nx-12.3.3.tgz#ae10dc135afc63f1b45ba0a5fe35911f87e6ab32"
836-
integrity sha512-9f8LNQYg1czV+g7t2CaQP5P2yeld+cUFPmQ4c+URO/dJk9ymC9MCYGidzZzTyGxxOr6O0jg1RGrMKcklp52kdA==
833+
834+
version "12.3.4"
835+
resolved "https://registry.yarnpkg.com/@nrwl/eslint-plugin-nx/-/eslint-plugin-nx-12.3.4.tgz#cc7d360e0879f3f940bcf82810b5c4aea9622db9"
836+
integrity sha512-vja+D/xbb6EhW8xwyUWj3wWXcPWziF9FWk/ZVZElbjMEQjFwGkIrSMks5OSXMVZtuin8AFTEi8s+dNGCBp8bYg==
837837
dependencies:
838-
"@nrwl/devkit" "12.3.3"
839-
"@nrwl/workspace" "12.3.3"
838+
"@nrwl/devkit" "12.3.4"
839+
"@nrwl/workspace" "12.3.4"
840840
"@typescript-eslint/experimental-utils" "^4.3.0"
841841
confusing-browser-globals "^1.0.9"
842842

843-
844-
version "12.3.3"
845-
resolved "https://registry.yarnpkg.com/@nrwl/jest/-/jest-12.3.3.tgz#139b22f815b29f16b35e9ee89b6eac231deac41f"
846-
integrity sha512-XZBT+/cj/6352YsmmSa0Lx6HYqVn8eiCX/n8taH9NtDW5AugL70EaPG/tNw3iTBReTsGty+ElrdbRkmj9cMx7A==
843+
844+
version "12.3.4"
845+
resolved "https://registry.yarnpkg.com/@nrwl/jest/-/jest-12.3.4.tgz#060cdd6b255665d3ade67b2d51d48cd219649588"
846+
integrity sha512-aje8D2rfQdwwJBpKTuWcddlxyk+0sh5DuYxrzsUt3IN3jGLQ+kp71XfMClqLF0w5CT3XPmIab63tlu2koWg30Q==
847847
dependencies:
848-
"@nrwl/devkit" "12.3.3"
848+
"@nrwl/devkit" "12.3.4"
849849
jest-resolve "^26.6.2"
850850
rxjs "^6.5.4"
851851
strip-json-comments "^3.1.1"
852852
tslib "^2.0.0"
853853

854-
855-
version "12.3.3"
856-
resolved "https://registry.yarnpkg.com/@nrwl/linter/-/linter-12.3.3.tgz#5c738e64393813e77fee2f7b7452fe6f8478425c"
857-
integrity sha512-LketzE/Hp10j01rlK5de/3mX+eGrRThRvMndxaO9D1T9X/5UGooOT8ywJ/H0AkdM8d8Sp8wfwhOvxY1+rKXmUQ==
854+
855+
version "12.3.4"
856+
resolved "https://registry.yarnpkg.com/@nrwl/linter/-/linter-12.3.4.tgz#0281b367af52404fe3122651f40562b5489ee619"
857+
integrity sha512-cxWLA+B1hjAjiyQadqoYIf9lUh1EKTs/kgIwXExW2qaoFv1NtTQiB+JsD2VTLUj4tKE7rWdBR13PAC9CS1Ln4g==
858858
dependencies:
859-
"@nrwl/devkit" "12.3.3"
859+
"@nrwl/devkit" "12.3.4"
860860
glob "7.1.4"
861861
minimatch "3.0.4"
862862
tmp "~0.2.1"
863863
tslib "^2.0.0"
864864

865-
866-
version "12.3.3"
867-
resolved "https://registry.yarnpkg.com/@nrwl/nest/-/nest-12.3.3.tgz#72f8e9fb745ed1f7cff07fb497783b23d59abc99"
868-
integrity sha512-2ohxqDsxYaRJ1n/F2hs01V3b8RGj6mwB5A4nHVClylfGbTXXIMqYiC/5lgZmyxvnSRpCPOgQ4sqPGfTd+65jRg==
865+
866+
version "12.3.4"
867+
resolved "https://registry.yarnpkg.com/@nrwl/nest/-/nest-12.3.4.tgz#f0625eaf76576d63d32bc61b017db0afd373e0a4"
868+
integrity sha512-dq/4kGRAwHwoEAaoY5I48K1eerSGE8YupmxpmjQSYSMEXSdpFSlGikdvrR6N7WczKgIWjoNXhbfjoKatE39knw==
869869
dependencies:
870870
"@angular-devkit/core" "~12.0.0"
871871
"@angular-devkit/schematics" "~12.0.0"
872872
"@nestjs/schematics" "^7.0.0"
873-
"@nrwl/devkit" "12.3.3"
874-
"@nrwl/jest" "12.3.3"
875-
"@nrwl/linter" "12.3.3"
876-
"@nrwl/node" "12.3.3"
877-
878-
879-
version "12.3.3"
880-
resolved "https://registry.yarnpkg.com/@nrwl/node/-/node-12.3.3.tgz#8979c676e176162d8e33ea68f55d65d02e134303"
881-
integrity sha512-x/e9AJG3kFZcA6Q44zuLeyB3ab0oiFfJ98A1y+AJG2fnJigl+zBaHobDn3I3I1qm+MXye4QcSmOC0yQpcvH+SA==
882-
dependencies:
883-
"@nrwl/devkit" "12.3.3"
884-
"@nrwl/jest" "12.3.3"
885-
"@nrwl/linter" "12.3.3"
886-
"@nrwl/workspace" "12.3.3"
873+
"@nrwl/devkit" "12.3.4"
874+
"@nrwl/jest" "12.3.4"
875+
"@nrwl/linter" "12.3.4"
876+
"@nrwl/node" "12.3.4"
877+
878+
879+
version "12.3.4"
880+
resolved "https://registry.yarnpkg.com/@nrwl/node/-/node-12.3.4.tgz#404e49659b4c5dfe07bc7e1f39aef1801c52c917"
881+
integrity sha512-PgVG9SFsLgWhXXCYP17wMTAQMruW66Nn8sS6V6VZM7QHJzDFplkwOl7v+GEL/H0k5KPE6ItoHdrKR2f60GYkfQ==
882+
dependencies:
883+
"@nrwl/devkit" "12.3.4"
884+
"@nrwl/jest" "12.3.4"
885+
"@nrwl/linter" "12.3.4"
886+
"@nrwl/workspace" "12.3.4"
887887
circular-dependency-plugin "5.2.0"
888888
copy-webpack-plugin "6.0.3"
889889
fork-ts-checker-webpack-plugin "^3.1.1"
@@ -901,10 +901,10 @@
901901
webpack-merge "4.2.1"
902902
webpack-node-externals "1.7.2"
903903

904-
905-
version "12.3.3"
906-
resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-12.3.3.tgz#5c78c0e86512fc83cca8a85012e85229f6dcc95e"
907-
integrity sha512-jVza/w34NtFZNQ1YbhdsHcWnoiA5gbTAY8Uvox75jvo2qz1T/D2U3FlbaXc6/J675n6htmNITXHpTuaJIYCtig==
904+
905+
version "12.3.4"
906+
resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-12.3.4.tgz#017b1c57c23d518a0f4f5abf75d0f086793f1f56"
907+
integrity sha512-oNInYtmUPkV0NlfaBpeQ34IOrQDr9z1vMNj/AIw1XHSXY/uGAf1aW17MiEX4VPUF8Xl+sulgZo6rVJMxkRhQxA==
908908
dependencies:
909909
chalk "4.1.0"
910910
enquirer "~2.3.6"
@@ -917,16 +917,15 @@
917917
tslib "^2.0.0"
918918
yargs-parser "20.0.0"
919919

920-
921-
version "12.3.3"
922-
resolved "https://registry.yarnpkg.com/@nrwl/workspace/-/workspace-12.3.3.tgz#45b4644c4882b341a76adf008c39141b9d6b09c8"
923-
integrity sha512-Ccn6yuYZF+C0HPOq2ipQIJVEObzQx7rTZOQvU3TeHhatHSJ5/PqlOMSijnoF9Hz6sO+0OBR4ACChrHkNMsfxYg==
920+
921+
version "12.3.4"
922+
resolved "https://registry.yarnpkg.com/@nrwl/workspace/-/workspace-12.3.4.tgz#0a0abfa4ab3e46780894f2b692735766a498936d"
923+
integrity sha512-TVdtgjfgwTzGC8B2gDnd6r2gebGnD8pib0csC3mSg5LxUWf9d1zU701TMGFzTXOC82JJRQU9dF7LreQWepVHjA==
924924
dependencies:
925-
"@nrwl/cli" "12.3.3"
926-
"@nrwl/devkit" "12.3.3"
927-
"@nrwl/jest" "12.3.3"
928-
"@nrwl/linter" "12.3.3"
929-
axios "0.21.1"
925+
"@nrwl/cli" "12.3.4"
926+
"@nrwl/devkit" "12.3.4"
927+
"@nrwl/jest" "12.3.4"
928+
"@nrwl/linter" "12.3.4"
930929
chalk "4.1.0"
931930
cosmiconfig "^4.0.0"
932931
dotenv "8.2.0"
@@ -9952,10 +9951,10 @@ [email protected]:
99529951
resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
99539952
integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
99549953

9955-
9956-
version "1.1.2"
9957-
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-1.1.2.tgz#0de29c10ea673e089eb8d4afb788928a72ed7594"
9958-
integrity sha512-q++CYzCt8xYVqKnPfJi5o3rMx83MxN4h+hqp/4+5+J7MrbmV5qwVk6epQ4tKp7pGIF9TDmbmunHSW8UtacKnBQ==
9954+
9955+
version "1.1.3"
9956+
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-1.1.3.tgz#ea1a602e98e5a968a56a289886a52f04c686fc81"
9957+
integrity sha512-CsiQeFMR1jZEq8R+H59qe+bBevnjoV5N2WZTTdlyqxeoODQOOepN2+msQOywcieDq5sBjabKzTn3U+sfHZlMdw==
99599958

99609959
type-fest@^0.11.0:
99619960
version "0.11.0"

0 commit comments

Comments
 (0)