diff --git a/.circleci/config.yml b/.circleci/config.yml index b83c7ba..8a09be9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,7 +9,7 @@ workflows: - test-node-v10: requires: - gally-create-pr - - gally-auto-merge: + - gally-auto-approve: requires: - gally-create-pr - test-node-v12 @@ -34,28 +34,6 @@ jobs: - checkout - run: sudo yarn global add gally - run: ga promote $CIRCLE_BRANCH - gally-auto-merge: - docker: - - image: 'circleci/node:12' - steps: - - run: - name: Set PR number - command: > - echo 'export - CIRCLE_PR_NUMBER="${CIRCLE_PR_NUMBER:-${CIRCLE_PULL_REQUEST##*/}}"' - >> $BASH_ENV - - source $BASH_ENV - - echo $CIRCLE_PR_NUMBER - - checkout - - run: sudo yarn global add gally - - run: >- - ga approve $CIRCLE_PR_NUMBER --condition - "base.ref=dev&state=open&user.login=dependabot-preview[bot]&mergeable=true" - - run: >- - ga merge $CIRCLE_PR_NUMBER --condition - "base.ref=dev&state=open&user.login=dependabot-preview[bot]&mergeable=true" test-node-v10: docker: - image: 'circleci/node:10' @@ -154,3 +132,22 @@ jobs: if [[ "${CIRCLE_BRANCH}" == "master" ]]; then yarn run coveralls fi + gally-auto-approve: + docker: + - image: 'circleci/node:12' + steps: + - run: + name: Set PR number + command: > + echo 'export + CIRCLE_PR_NUMBER="${CIRCLE_PR_NUMBER:-${CIRCLE_PULL_REQUEST##*/}}"' + >> $BASH_ENV + + source $BASH_ENV + + echo $CIRCLE_PR_NUMBER + - checkout + - run: sudo yarn global add gally + - run: >- + ga approve $CIRCLE_PR_NUMBER --condition + "base.ref=dev&state=open&user.login=dependabot-preview[bot]" diff --git a/package.json b/package.json index f88b402..455084d 100644 --- a/package.json +++ b/package.json @@ -41,8 +41,8 @@ "@babel/core": "7.6.0", "@babel/plugin-proposal-object-rest-spread": "7.5.5", "@babel/register": "7.6.0", - "@blackflux/eslint-plugin-rules": "1.3.10", - "@blackflux/robo-config-plugin": "2.6.7", + "@blackflux/eslint-plugin-rules": "1.3.12", + "@blackflux/robo-config-plugin": "2.6.8", "babel-eslint": "10.0.3", "chai": "4.2.0", "coveralls": "3.0.6", @@ -52,8 +52,8 @@ "eslint-plugin-json": "1.4.0", "eslint-plugin-markdown": "1.0.0", "eslint-plugin-mocha": "6.1.1", - "js-gardener": "2.0.89", - "node-tdd": "2.5.5", + "js-gardener": "2.0.95", + "node-tdd": "2.5.8", "nyc": "14.1.1", "semantic-release": "15.13.24", "uuid": "3.3.3" @@ -72,7 +72,7 @@ ], "dependencies": { "fast-safe-stringify": "2.0.7", - "joi-strict": "1.1.2", + "joi-strict": "1.1.3", "lodash.get": "4.4.2", "rollbar": "2.13.0" }, diff --git a/yarn.lock b/yarn.lock index 87a3deb..1255272 100644 --- a/yarn.lock +++ b/yarn.lock @@ -167,17 +167,17 @@ lodash "^4.17.13" to-fast-properties "^2.0.0" -"@blackflux/eslint-plugin-rules@1.3.10": - version "1.3.10" - resolved "https://registry.yarnpkg.com/@blackflux/eslint-plugin-rules/-/eslint-plugin-rules-1.3.10.tgz#183e3d1d1b4e054e7a3b5f6b625911d286cc4bbe" - integrity sha512-0wvQpnQgY3O/Arnz4KQR9Dg7wx3Ttb1twWp9/E8TAI9Sc23CY3CTq877WILHWzYteAThmQkHGAepOPzlyu3NtQ== +"@blackflux/eslint-plugin-rules@1.3.12": + version "1.3.12" + resolved "https://registry.yarnpkg.com/@blackflux/eslint-plugin-rules/-/eslint-plugin-rules-1.3.12.tgz#f9e52d3fbf6b76dfcea7aaa037520ed90e903e3f" + integrity sha512-VOK7igr+Gr8QSD4zb9LC8esin/z3dlTOYInXN3PDc0gHJDkX4oGzMhvQUcfE8GLs4HeNeJbXgQpDrf9i3pFbSA== dependencies: - smart-fs "1.9.12" + smart-fs "1.9.14" -"@blackflux/robo-config-plugin@2.6.7": - version "2.6.7" - resolved "https://registry.yarnpkg.com/@blackflux/robo-config-plugin/-/robo-config-plugin-2.6.7.tgz#ab04180917713c7deeeaf4ce5ba4489d709666ba" - integrity sha512-MZ9kcShTjL/dfuo2qWaibHLbGC62YKqvIQq9D6EMV7JWie1TNk0ddOnYP9XlMx1X3tFRX85p+xasIr8nNtjI6Q== +"@blackflux/robo-config-plugin@2.6.8": + version "2.6.8" + resolved "https://registry.yarnpkg.com/@blackflux/robo-config-plugin/-/robo-config-plugin-2.6.8.tgz#58bd672fa76bd9221e1d3c1bb13bc51fd73485e9" + integrity sha512-CqXGjFEua9lOYzLYVVEGR0e3PYxxBFnCNWKqRLORg66lA1Sw4sKhSGfD+hUMm/ugdr+bUo9T2GyUI+OPqP19vA== "@hapi/address@2.x.x": version "2.1.1" @@ -3600,42 +3600,28 @@ java-properties@^1.0.0: resolved "https://registry.yarnpkg.com/java-properties/-/java-properties-1.0.2.tgz#ccd1fa73907438a5b5c38982269d0e771fe78211" integrity sha512-qjdpeo2yKlYTH7nFdK0vbZWuTCesk4o63v5iVOlhMQPfuIZQfW/HI35SjfhA+4qpg36rnFSvUK5b1m+ckIblQQ== -joi-strict@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/joi-strict/-/joi-strict-1.1.0.tgz#0474ecfd92dd83b68e0b9fb6a47d090934f0dc0f" - integrity sha512-2LWLKxElwDxMNh8OPRBIaghZK53AZaKGtkxpGXJrJscSMpuFuvfmYr7ptHyqhEAdN/yO8Dk/mWp63cPF57Hr8w== - dependencies: - "@hapi/joi" "16.0.1" - -joi-strict@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/joi-strict/-/joi-strict-1.1.1.tgz#ecebac91a37421e27526f64bd3beb7e83058c6ba" - integrity sha512-2ZgLzvWzE6KglTz1TS2ptNDntesji9fItT9hBbViej8RB5orLWT9jadhN91Snr6VPNvlZkhvIIpSc6N0TWjBVg== - dependencies: - "@hapi/joi" "16.0.1" - -joi-strict@1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/joi-strict/-/joi-strict-1.1.2.tgz#6ccc94f615ccafb4bf707a7764b184ae152690a4" - integrity sha512-5FJarK5iGIUL4e+CBhvv4B9ptW2GcpUVkTKhNfwYNYMjG2UjQV2PGO5c5oQLUIS7s7ugO5Z9W5+LGuLfeQUqDA== +joi-strict@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/joi-strict/-/joi-strict-1.1.3.tgz#7ffd4c722826d3082f67d3f51f21cd445635c5f7" + integrity sha512-xHfMrEb/C6tYWWz6c+oZA0Ch4fWJ7gV5JierV+9tsaUbJAIzxNIhOJUSf1S9AP9TWm4TmD2oIllaxPfldqg0VA== dependencies: "@hapi/joi" "16.0.1" -js-gardener@2.0.89: - version "2.0.89" - resolved "https://registry.yarnpkg.com/js-gardener/-/js-gardener-2.0.89.tgz#2ae4a3b21694d3b77c430f5758710b7394ea8c9c" - integrity sha512-GcaBsU92ZB+dyOB5NRMWI3B7BFwFez7fD3+insFzIUdi+oxUo+b7PeXNVmqvjbUQxlCCqsUVIs+6WdmlGWDFxQ== +js-gardener@2.0.95: + version "2.0.95" + resolved "https://registry.yarnpkg.com/js-gardener/-/js-gardener-2.0.95.tgz#6169579448c3a841781c6d9ba7efbea9d4e0812e" + integrity sha512-iGSu0SvLSe1xFjT/7+EnRtEBJYtNlf4hEafTdxh9PJY7fl7EA/XUXBmq++xVNJxvLAS1pX2UI6Td6nhuJkTi9Q== dependencies: chalk "2.4.2" fancy-log "1.3.3" glob "7.1.4" - joi-strict "1.1.1" + joi-strict "1.1.3" js-yaml "3.13.1" lodash.difference "4.5.0" lodash.get "4.4.2" mocha "6.2.0" npm-check "5.9.0" - robo-config "3.3.6" + robo-config "3.3.10" js-tokens@^3.0.0, js-tokens@^3.0.2: version "3.0.2" @@ -4668,16 +4654,16 @@ node-pre-gyp@^0.12.0: semver "^5.3.0" tar "^4" -node-tdd@2.5.5: - version "2.5.5" - resolved "https://registry.yarnpkg.com/node-tdd/-/node-tdd-2.5.5.tgz#3a40b31b8a8a5659fba023a06ed8652e3167d77a" - integrity sha512-quWBFiqMDb3ZsrHzIMS9A0/LMTGY7ViPVYak5wa+J0DlMFeNzXV2AfkzJVF2v3X6Ox4IWecx/p7dwrMMclvoCw== +node-tdd@2.5.8: + version "2.5.8" + resolved "https://registry.yarnpkg.com/node-tdd/-/node-tdd-2.5.8.tgz#0ec7647eec1c727c1e65cd7efda6bb1aa44bd3e9" + integrity sha512-W27kWm4uS4a+Zb2BnOwxUYHsP3lgMGCmovRTP+6RDtITsUa7n70GSvFlwJVBE4J5Uf9+Ui/tTv9FEmkL40dOZA== dependencies: callsites "3.1.0" - joi-strict "1.1.1" + joi-strict "1.1.3" lodash.get "4.4.2" nock "11.3.4" - smart-fs "1.9.12" + smart-fs "1.9.14" timekeeper "2.2.0" tmp "0.1.0" @@ -5046,10 +5032,10 @@ oauth-sign@~0.9.0: resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== -object-align@1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/object-align/-/object-align-1.0.7.tgz#2a170cfdd34fc089cf8b7184b4ec09bc4a50f3c0" - integrity sha512-iyfxri2SSIJ5jvaIqDFiXkkyRGjyvaX/jAOffBbGHCEsHHmWr1hT1avhOC5EAsj2ZhEC9gFhibb7O4E1SM9VyA== +object-align@1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/object-align/-/object-align-1.0.8.tgz#ff549c2e80a2e5ace2d22275afe9497a5842ba54" + integrity sha512-/2D+LEr8M9F1GEuiJBdiIrytv9o2Oh+eaO4G2pm84JJ0a6vD/cKt9ZXZxEKbo/agPFPJCLSm0Aa1Ssg5apGwvA== object-assign@^4.0.1, object-assign@^4.1.0: version "4.1.1" @@ -5065,10 +5051,10 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" -object-deep-contain@1.0.18: - version "1.0.18" - resolved "https://registry.yarnpkg.com/object-deep-contain/-/object-deep-contain-1.0.18.tgz#74fb17fd70648712e131670f813ca47f3f8538ea" - integrity sha512-Mr3c+1cGX3WoZr2sTsjbUjurckRNvu9RUPwoP8yeG8nDCnU5dswIcyq6IWrrZQAp/65akHaZl3UC4OxRUCzvNw== +object-deep-contain@1.0.19: + version "1.0.19" + resolved "https://registry.yarnpkg.com/object-deep-contain/-/object-deep-contain-1.0.19.tgz#faec02a5552f70c58f972344cfafe9f778cdf274" + integrity sha512-SYI0nlnmN0BRurAyXcbIzaO8aih9IYcNbBj1KeawlL5wfB5/jp+agmuLaUXpXHYZQ9zbRficvBSuR7XKcaNe6A== object-inspect@^1.6.0: version "1.6.0" @@ -5080,15 +5066,15 @@ object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1: resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== -object-scan@10.0.11: - version "10.0.11" - resolved "https://registry.yarnpkg.com/object-scan/-/object-scan-10.0.11.tgz#e559093079658bf8a2de7bcae17c15746aeb4c20" - integrity sha512-mLCcwD6uVdKLOp/wKKNb06g5YW7ayXrMr1iagl9QOdP3da6CBxSSJW94gbPozWDg+dTuVX2aJ6z5Aqx0brwDUw== +object-scan@10.0.13: + version "10.0.13" + resolved "https://registry.yarnpkg.com/object-scan/-/object-scan-10.0.13.tgz#5b6ebbc34bba32fdc92f30edde231eaf53735b41" + integrity sha512-5w/BPfsSFwjWct98ON3Rjd/s2jQBshjSo3pZCLd7b9P/sUbggUfOFdhMNbDzvKXsYvPc3Y133+BhYGwj0Ot8gw== -object-treeify@1.1.19: - version "1.1.19" - resolved "https://registry.yarnpkg.com/object-treeify/-/object-treeify-1.1.19.tgz#5987fae7218c2ff0bac547ed632fa23571cc8866" - integrity sha512-I1RwSZyxXhgfm3+RYmBSZWozLHe1UuGn6dwW3Ppz3Iub5xzNs0TArp7UgPER22o914EIOcRfCQokRM9MLZGOOQ== +object-treeify@1.1.20: + version "1.1.20" + resolved "https://registry.yarnpkg.com/object-treeify/-/object-treeify-1.1.20.tgz#34076946e2b6a14c8a3accef4f3a07686659ebaa" + integrity sha512-vtED3MD4Y3lEP1BE6klEP10HWj1XNPC+dCWo7QkrDpXspQVHg5gnJ8cSt9YxZhgGSM3YDV87dEjzOnoHWbGxmg== object-visit@^1.0.0: version "1.0.1" @@ -6250,21 +6236,21 @@ rimraf@2.6.3: dependencies: glob "^7.1.3" -robo-config@3.3.6: - version "3.3.6" - resolved "https://registry.yarnpkg.com/robo-config/-/robo-config-3.3.6.tgz#e2aaa1d6c86baa9fa8f122f9b2d3f1553a953e7e" - integrity sha512-Xx/rzuFpKb+Fj47BnPG5qMY4QzQj4D8nn4/OYldP1EnbENDGZfZUId5Pd4SdkLWn2TwA8C830Qkm3eJKfWatxg== +robo-config@3.3.10: + version "3.3.10" + resolved "https://registry.yarnpkg.com/robo-config/-/robo-config-3.3.10.tgz#710a4ed555bda1d84e25ef0141e1dc3db8535658" + integrity sha512-ZZNwHISQV8LBZ2uqV64lF4k2w/v+kKCBxTVl+4usvXvze7lAa1P9UQvn4HAXU4r8E6sOBhH1ZZUdTs4H+gkZdg== dependencies: app-root-path "2.2.1" deepmerge "4.0.0" - joi-strict "1.1.0" + joi-strict "1.1.3" lodash.clonedeep "4.5.0" lodash.difference "4.5.0" lodash.get "4.4.2" - object-deep-contain "1.0.18" - object-scan "10.0.11" - object-treeify "1.1.19" - smart-fs "1.9.11" + object-deep-contain "1.0.19" + object-scan "10.0.13" + object-treeify "1.1.20" + smart-fs "1.9.14" rollbar@2.13.0: version "2.13.0" @@ -6490,31 +6476,18 @@ smart-buffer@4.0.2: resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.0.2.tgz#5207858c3815cc69110703c6b94e46c15634395d" integrity sha512-JDhEpTKzXusOqXZ0BUIdH+CjFdO/CR3tLlf5CN34IypI+xMmXW1uB16OOY8z3cICbJlDAVJzNbwBhNO0wt9OAw== -smart-fs@1.9.11: - version "1.9.11" - resolved "https://registry.yarnpkg.com/smart-fs/-/smart-fs-1.9.11.tgz#5e95b397078d5db1f4167338bf360b54f2e99dca" - integrity sha512-BSCaUQ+HUPT1FM2t5Em8OKfGruOXeyWX1WOXJCVU4HNH01+iLc6EJHPACpHvlASKJ0T8bI5q6DAxzriWWRplzw== - dependencies: - fs-extra "8.1.0" - json-stringify-pretty-compact "2.0.0" - lodash.clonedeep "4.5.0" - lodash.isequal "4.5.0" - object-align "1.0.7" - xml-js "1.6.11" - yaml-boost "1.9.15" - -smart-fs@1.9.12: - version "1.9.12" - resolved "https://registry.yarnpkg.com/smart-fs/-/smart-fs-1.9.12.tgz#4897d26cce76f19621dd2bb73350b30b1f82faad" - integrity sha512-wkR7Pva0AVAGhjFfIIloY58qebcJ/3Z8GQrrNSYxZ+RD/NPSsZqqJ+NxiER2I8aqu6yk6SVtcjh6g6sl5bBH4g== +smart-fs@1.9.14: + version "1.9.14" + resolved "https://registry.yarnpkg.com/smart-fs/-/smart-fs-1.9.14.tgz#1f9096368818ffc08b27f9160f7c5cec1bcb7a72" + integrity sha512-/gFqpNJGPzDG5QNNg9P1evU+mWXL5M0fYXabd/AC25cRzRU9MTju9sddNG7JO8fsMA9BBUqkc/XRFr8VWda3HQ== dependencies: fs-extra "8.1.0" json-stringify-pretty-compact "2.0.0" lodash.clonedeep "4.5.0" lodash.isequal "4.5.0" - object-align "1.0.7" + object-align "1.0.8" xml-js "1.6.11" - yaml-boost "1.9.15" + yaml-boost "1.9.17" snapdragon-node@^2.0.1: version "2.1.1" @@ -7615,10 +7588,10 @@ yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3: resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9" integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A== -yaml-boost@1.9.15: - version "1.9.15" - resolved "https://registry.yarnpkg.com/yaml-boost/-/yaml-boost-1.9.15.tgz#8698cda859e53c77356f07eb34614a9d5f7a5f36" - integrity sha512-qaOJltUlcR3+hevjMQh903eaUARIN3QFEYUldSpqEerfPwcqtH2/J3qPMBvw1rxjHuh6PfHPB6nuFZS13c183w== +yaml-boost@1.9.17: + version "1.9.17" + resolved "https://registry.yarnpkg.com/yaml-boost/-/yaml-boost-1.9.17.tgz#4cb1c7405aa55a48488e77c34a1772c58e62d2d6" + integrity sha512-4pPqz1pt07W3QMeQ/yZs7NuatgfH0pQGlUnzJR53uw34EvgocD1YvBZZ5WPrdO5dqVuz84zZLmFMQJHoPPrOPw== dependencies: js-yaml "3.13.1" lodash.get "4.4.2"