Skip to content

Commit 4d7a5b6

Browse files
authored
Merge pull request #1690 from commercetools/chore/circle-ci-test-branch
Test Circle Ci
2 parents 86e6137 + 141e63c commit 4d7a5b6

File tree

2 files changed

+23
-33
lines changed

2 files changed

+23
-33
lines changed

package.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,17 @@
125125
},
126126
"resolutions": {
127127
"graceful-fs": "4.2.4",
128-
"**/graceful-fs": "4.2.4"
128+
"**/graceful-fs": "4.2.4",
129+
"y18n": "3.2.2",
130+
"lodash": "4.17.21",
131+
"handlebars": "4.7.7",
132+
"growl": "1.10.2",
133+
"dot-prop": "5.1.1",
134+
"merge": "2.1.1",
135+
"npm-user-validate": "1.0.1",
136+
"serialize-javascript": "3.1.0",
137+
"diff": "3.5.0",
138+
"object-path": "0.11.5"
129139
},
130140
"config": {
131141
"commitizen": {

yarn.lock

Lines changed: 12 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -7237,10 +7237,10 @@ growly@^1.3.0:
72377237
resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
72387238
integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
72397239

7240-
handlebars@^4.7.6:
7241-
version "4.7.6"
7242-
resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.6.tgz#d4c05c1baf90e9945f77aa68a7a219aa4a7df74e"
7243-
integrity sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==
7240+
handlebars@4.7.7, handlebars@^4.7.6:
7241+
version "4.7.7"
7242+
resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1"
7243+
integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==
72447244
dependencies:
72457245
minimist "^1.2.5"
72467246
neo-async "^2.6.0"
@@ -9608,25 +9608,10 @@ lodash.zipobject@^4.1.3:
96089608
resolved "https://registry.yarnpkg.com/lodash.zipobject/-/lodash.zipobject-4.1.3.tgz#b399f5aba8ff62a746f6979bf20b214f964dbef8"
96099609
integrity sha1-s5n1q6j/YqdG9peb8gshT5ZNvvg=
96109610

9611-
9612-
version "4.17.15"
9613-
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
9614-
integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
9615-
9616-
9617-
version "4.17.4"
9618-
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
9619-
integrity sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=
9620-
9621-
lodash@^3.10.1:
9622-
version "3.10.1"
9623-
resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
9624-
integrity sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=
9625-
9626-
lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.1, lodash@^4.3.0:
9627-
version "4.17.20"
9628-
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
9629-
integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
9611+
[email protected], [email protected], [email protected], lodash@^3.10.1, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.1, lodash@^4.3.0:
9612+
version "4.17.21"
9613+
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
9614+
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
96309615

96319616
log-ok@^0.1.1:
96329617
version "0.1.1"
@@ -14874,15 +14859,10 @@ xtend@^4.0.1, xtend@~4.0.1:
1487414859
resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
1487514860
integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
1487614861

14877-
y18n@^3.2.1:
14878-
version "3.2.1"
14879-
resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
14880-
integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
14881-
14882-
y18n@^4.0.0:
14883-
version "4.0.0"
14884-
resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
14885-
integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
14862+
[email protected], y18n@^3.2.1, y18n@^4.0.0:
14863+
version "3.2.2"
14864+
resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696"
14865+
integrity sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==
1488614866

1488714867
yallist@^2.1.2:
1488814868
version "2.1.2"

0 commit comments

Comments
 (0)