Skip to content

Commit

Permalink
Merge pull request #187 from blackflux/dev
Browse files Browse the repository at this point in the history 
[Gally]: master <- dev
  • Loading branch information
@simlu
simlu committed Oct 29, 2019
2 parents 3df4c3c + a446fe2 commit da365fb
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 33 deletions.
12 changes: 6 additions & 6 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"description": "Wrapper around object-hash that restricts allowed values",
"main": "lib/index.js",
"scripts": {
"test": "npm run clean && npm run gardener && npm run test-simple",
"test": "yarn run clean && yarn run gardener && yarn run test-simple",
"clean": "rm -rf lib",
"build": "npx babel src --out-dir lib --copy-files --include-dotfiles --config-file ./.babelrc",
"build-clean": "npm run clean && npm run build",
"build-clean": "yarn run clean && yarn run build",
"test-simple": "nyc mocha \"./test/**/*.spec.js\"",
"docker": "docker run --net host -u`id -u`:`id -g` -v $(pwd):/user/project -v ~/.aws:/user/.aws -v ~/.npmrc:/user/.npmrc -w /user/project -it --entrypoint /bin/bash",
"u": "yarn upgrade --latest --force",
Expand All @@ -16,7 +16,7 @@
"ts": "yarn run test-simple",
"tsv": "yarn run test-simple --verbose",
"coveralls": "node ./node_modules/coveralls/bin/coveralls.js < ./coverage/lcov.info",
"semantic-release": "npm run build-clean && npx semantic-release",
"semantic-release": "yarn run build-clean && npx semantic-release",
"gardener": "node gardener"
},
"repository": {
Expand All @@ -42,7 +42,7 @@
"@babel/plugin-proposal-object-rest-spread": "7.6.2",
"@babel/register": "7.6.2",
"@blackflux/eslint-plugin-rules": "1.3.15",
"@blackflux/robo-config-plugin": "2.6.16",
"@blackflux/robo-config-plugin": "2.6.17",
"babel-eslint": "10.0.3",
"chai": "4.2.0",
"coveralls": "3.0.7",
Expand All @@ -52,8 +52,8 @@
"eslint-plugin-json": "2.0.1",
"eslint-plugin-markdown": "1.0.1",
"eslint-plugin-mocha": "6.2.1",
"js-gardener": "2.0.110",
"node-tdd": "2.5.16",
"js-gardener": "2.0.111",
"node-tdd": "2.5.17",
"nyc": "14.1.1",
"semantic-release": "15.13.28"
},
Expand Down
54 changes: 27 additions & 27 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,10 @@
dependencies:
smart-fs "1.11.0"

"@blackflux/robo-config-plugin@2.6.16":
version "2.6.16"
resolved "https://registry.yarnpkg.com/@blackflux/robo-config-plugin/-/robo-config-plugin-2.6.16.tgz#e08d99e733bffd8b1edb773f6a7f1397bafb54d2"
integrity sha512-eb7y4woq5RJj+7skz7CxSiYjhETIYgl/G4CqoUyH0PJQEWeUrLvKAz/6upftI+9qw/i32kwCncyRBAh0jPYVkA==
"@blackflux/robo-config-plugin@2.6.17":
version "2.6.17"
resolved "https://registry.yarnpkg.com/@blackflux/robo-config-plugin/-/robo-config-plugin-2.6.17.tgz#23bce5b63f2d93fdf1fdbc71475d9f1a18f5b20a"
integrity sha512-Ys7aZlJawUxsOFonSk7u4oDa3ReiX1VYGNJAnqE857jRt9j2Ayj2f4PzwTUC0l5ZrdD331VwI+O5bwUAPjjAqA==

"@hapi/address@^2.1.2":
version "2.1.2"
Expand Down Expand Up @@ -1675,10 +1675,10 @@ deep-is@~0.1.3:
resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=

deepmerge@4.2.1:
version "4.2.1"
resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.1.tgz#018a3e5dfe82b95e35e36a9a29ba15ddb194e40f"
integrity sha512-32P7FIV6JKt0hPMFNlWFytzVGpppYHFKdnhFUEMXheWc8Lw4HnHEzJa5yxhaQedDAXv2SI6zD7+UbqnC5k9g9Q==
deepmerge@4.2.2:
version "4.2.2"
resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==

default-require-extensions@^2.0.0:
version "2.0.0"
Expand Down Expand Up @@ -3608,10 +3608,10 @@ joi-strict@1.1.7:
dependencies:
"@hapi/joi" "16.1.7"

js-gardener@2.0.110:
version "2.0.110"
resolved "https://registry.yarnpkg.com/js-gardener/-/js-gardener-2.0.110.tgz#7b2415cb2b522df704523343338deb7a096863cc"
integrity sha512-/Lc39BfT8OK6pEyZDmOB3mxHXYXRsPeO6GBwwz1FTLwG0ix6Q4Z0b9bVEyOL6tbEyQGqTOSx0YAqWufATI/ewg==
js-gardener@2.0.111:
version "2.0.111"
resolved "https://registry.yarnpkg.com/js-gardener/-/js-gardener-2.0.111.tgz#8c9ac6046e3beab91e7b63456d9acd1e9b5c5890"
integrity sha512-EaqkZqelhYD5FVNPgplc0AhFhOc9tpa5YYrRvngue+tM7fd5EEjwudX96Xaya7rXFqv5eTXuSTRYLVUKIP4M5w==
dependencies:
chalk "2.4.2"
fancy-log "1.3.3"
Expand All @@ -3622,7 +3622,7 @@ js-gardener@2.0.110:
lodash.get "4.4.2"
mocha "6.2.2"
npm-check "5.9.0"
robo-config "3.4.7"
robo-config "3.4.8"

js-tokens@^3.0.0, js-tokens@^3.0.2:
version "3.0.2"
Expand Down Expand Up @@ -4543,10 +4543,10 @@ nice-try@^1.0.4:
resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==

nock@11.4.0:
version "11.4.0"
resolved "https://registry.yarnpkg.com/nock/-/nock-11.4.0.tgz#68c2f9cf533f13ecb1a43e956823dbfba5593d17"
integrity sha512-UrVEbEAvhyDoUttrS0fv3znhZ5nEJvlxqgmrC6Gb2Mf9cFci65RMK17e6EjDDQB57g5iwZw1TFnVvyeL0eUlhQ==
nock@11.6.0:
version "11.6.0"
resolved "https://registry.yarnpkg.com/nock/-/nock-11.6.0.tgz#481961e0cf78794f200ea71e25d948d668446717"
integrity sha512-9ocFR68CxS6nf2XtQNpdSh5n4QQSKl87DhXgLnHO/RD4CsGThFtu8/QG6myHTnrUHRE6JSKpiGjLJdRe2ZSlIA==
dependencies:
chai "^4.1.2"
debug "^4.1.0"
Expand Down Expand Up @@ -4622,15 +4622,15 @@ node-pre-gyp@^0.12.0:
semver "^5.3.0"
tar "^4"

node-tdd@2.5.16:
version "2.5.16"
resolved "https://registry.yarnpkg.com/node-tdd/-/node-tdd-2.5.16.tgz#930aa027c6185feb92f3568e3d6ef16ad758ae8e"
integrity sha512-hz6YV9Zi1Pi0O+Q+MLsZejY+w84NvwO/OiYvBeT0MWFHImDSbfeBj+GxuhqvvsZ0wFpqWrDhEzzxVwaq7/ETiw==
node-tdd@2.5.17:
version "2.5.17"
resolved "https://registry.yarnpkg.com/node-tdd/-/node-tdd-2.5.17.tgz#29426e05a5187916cc1a91fac20dc6d6b2942321"
integrity sha512-nULYh1U6R/82zoaxZMT+OUnwNpoqKah9FdqZEhXhu13yUqyy25fppbqqhRtE5Sy5CLN+x1lxe2h4MOhVC+jzwQ==
dependencies:
callsites "3.1.0"
joi-strict "1.1.7"
lodash.get "4.4.2"
nock "11.4.0"
nock "11.6.0"
smart-fs "1.11.0"
timekeeper "2.2.0"
tmp "0.1.0"
Expand Down Expand Up @@ -6197,13 +6197,13 @@ rimraf@2.6.3:
dependencies:
glob "^7.1.3"

robo-config@3.4.7:
version "3.4.7"
resolved "https://registry.yarnpkg.com/robo-config/-/robo-config-3.4.7.tgz#3ee3bfefe58b63465316e188d5f9c555838acce9"
integrity sha512-C1Fhb9TXER880rymL2i7GQAXAMDDnWWyGE5buG52jR9/fgL7FQ1mWyEbbD4DWtgj5c1+C8t3fR6+yWqSM/z01A==
robo-config@3.4.8:
version "3.4.8"
resolved "https://registry.yarnpkg.com/robo-config/-/robo-config-3.4.8.tgz#07e22c28f237e62a4747f4142b3f6180a83be0e7"
integrity sha512-11bHWJZyAlwpvscY0wMf38y3FwftH08yoJ1E9fFkiw2NFGR61N1a1Csf6BjLtcMFmTvBKqrKF95GDYnOdO0n7g==
dependencies:
app-root-path "2.2.1"
deepmerge "4.2.1"
deepmerge "4.2.2"
joi-strict "1.1.7"
lodash.clonedeep "4.5.0"
lodash.difference "4.5.0"
Expand Down

0 comments on commit da365fb

Please sign in to comment.