Merge pull request #1144 from blackflux/dev

[Gally]: master <- dev
blackflux · Jun 4, 2020 · e1f3429 · e1f3429
2 parents a477640 + fbf40dd
commit e1f3429
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 82 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,7 +3,7 @@ workflows:
   node-multi-build:
     jobs:
       - gally-create-pr
-      - test-node-v13:
+      - test-node-v14:
           requires:
             - gally-create-pr
       - test-node-v12:
@@ -15,7 +15,7 @@ workflows:
       - gally-auto-approve:
           requires:
             - gally-create-pr
-            - test-node-v13
+            - test-node-v14
             - test-node-v12
             - test-node-v10
           filters:
@@ -24,7 +24,7 @@ workflows:
       - release:
           requires:
             - gally-create-pr
-            - test-node-v13
+            - test-node-v14
             - test-node-v12
             - test-node-v10
           filters:
@@ -156,9 +156,9 @@ jobs:
       - run: >-
           ga approve $CIRCLE_PR_NUMBER --condition
           "base.ref=dev&state=open&user.login=dependabot-preview[bot]"
-  test-node-v13:
+  test-node-v14:
     docker:
-      - image: 'circleci/node:13'
+      - image: 'circleci/node:14'
     steps:
       - checkout
       - run:

diff --git a/.gally.json b/.gally.json
@@ -23,7 +23,7 @@
         "strict": true,
         "contexts": [
           "ci/circleci: gally-create-pr",
-          "ci/circleci: test-node-v13",
+          "ci/circleci: test-node-v14",
           "ci/circleci: test-node-v12",
           "ci/circleci: test-node-v10"
         ]

diff --git a/package.json b/package.json
@@ -37,11 +37,11 @@
   "homepage": "https://github.com/blackflux/robo-config#readme",
   "devDependencies": {
     "@babel/cli": "7.10.1",
-    "@babel/core": "7.10.1",
+    "@babel/core": "7.10.2",
     "@babel/plugin-proposal-object-rest-spread": "7.10.1",
     "@babel/register": "7.10.1",
     "@blackflux/eslint-plugin-rules": "1.3.29",
-    "@blackflux/robo-config-plugin": "3.4.1",
+    "@blackflux/robo-config-plugin": "3.4.7",
     "babel-eslint": "10.1.0",
     "chai": "4.2.0",
     "coveralls": "3.1.0",
@@ -50,10 +50,10 @@
     "eslint-plugin-import": "2.20.2",
     "eslint-plugin-json": "2.1.1",
     "eslint-plugin-markdown": "1.0.2",
-    "eslint-plugin-mocha": "7.0.0",
-    "js-gardener": "2.0.158",
+    "eslint-plugin-mocha": "7.0.1",
+    "js-gardener": "2.0.159",
     "node-tdd": "2.11.3",
-    "nyc": "15.0.1",
+    "nyc": "15.1.0",
     "semantic-release": "17.0.8"
   },
   "nyc": {
@@ -106,8 +106,8 @@
     "lodash.difference": "4.5.0",
     "lodash.get": "4.4.2",
     "object-deep-contain": "1.0.24",
-    "object-scan": "13.0.3",
-    "object-treeify": "1.1.24",
-    "smart-fs": "1.11.12"
+    "object-scan": "13.1.0",
+    "object-treeify": "1.1.25",
+    "smart-fs": "1.11.13"
   }
 }
diff --git a/yarn.lock b/yarn.lock
@@ -25,19 +25,19 @@
   dependencies:
     "@babel/highlight" "^7.10.1"
 
-"@babel/core@7.10.1", "@babel/core@^7.7.5":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.10.1.tgz#2a0ad0ea693601820defebad2140206503d89af3"
-  integrity sha512-u8XiZ6sMXW/gPmoP5ijonSUln4unazG291X0XAQ5h0s8qnAFr6BRRZGUEK+jtRWdmB0NTJQt7Uga25q8GetIIg==
+"@babel/core@7.10.2", "@babel/core@^7.7.5":
+  version "7.10.2"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.10.2.tgz#bd6786046668a925ac2bd2fd95b579b92a23b36a"
+  integrity sha512-KQmV9yguEjQsXqyOUGKjS4+3K8/DlOCE2pZcq4augdQmtTy5iv5EHtmMSJ7V4c1BIPjuwtZYqYLCq9Ga+hGBRQ==
   dependencies:
     "@babel/code-frame" "^7.10.1"
-    "@babel/generator" "^7.10.1"
+    "@babel/generator" "^7.10.2"
     "@babel/helper-module-transforms" "^7.10.1"
     "@babel/helpers" "^7.10.1"
-    "@babel/parser" "^7.10.1"
+    "@babel/parser" "^7.10.2"
     "@babel/template" "^7.10.1"
     "@babel/traverse" "^7.10.1"
-    "@babel/types" "^7.10.1"
+    "@babel/types" "^7.10.2"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.1"
@@ -47,12 +47,12 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.10.1.tgz#4d14458e539bcb04ffe34124143f5c489f2dbca9"
-  integrity sha512-AT0YPLQw9DI21tliuJIdplVfLHya6mcGa8ctkv7n4Qv+hYacJrKmNWIteAK1P9iyLikFIAkwqJ7HAOqIDLFfgA==
+"@babel/generator@^7.10.1", "@babel/generator@^7.10.2":
+  version "7.10.2"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.10.2.tgz#0fa5b5b2389db8bfdfcc3492b551ee20f5dd69a9"
+  integrity sha512-AxfBNHNu99DTMvlUPlt1h2+Hn7knPpH5ayJ8OqDWSeLld+Fi2AYBTC/IejWDM9Edcii4UzZRCsbUt0WlSDsDsA==
   dependencies:
-    "@babel/types" "^7.10.1"
+    "@babel/types" "^7.10.2"
     jsesc "^2.5.1"
     lodash "^4.17.13"
     source-map "^0.5.0"
@@ -160,10 +160,10 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.10.1", "@babel/parser@^7.3.1", "@babel/parser@^7.7.0", "@babel/parser@^7.7.5":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.1.tgz#2e142c27ca58aa2c7b119d09269b702c8bbad28c"
-  integrity sha512-AUTksaz3FqugBkbTZ1i+lDLG5qy8hIzCaAxEtttU6C0BtZZU9pkNZtWSVAht4EW9kl46YBiyTGMp9xTTGqViNg==
+"@babel/parser@^7.10.1", "@babel/parser@^7.10.2", "@babel/parser@^7.3.1", "@babel/parser@^7.7.0", "@babel/parser@^7.7.5":
+  version "7.10.2"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.2.tgz#871807f10442b92ff97e4783b9b54f6a0ca812d0"
+  integrity sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==
 
 "@babel/plugin-proposal-object-rest-spread@7.10.1":
   version "7.10.1"
@@ -231,10 +231,10 @@
     globals "^11.1.0"
     lodash "^4.17.13"
 
-"@babel/types@^7.10.1", "@babel/types@^7.7.0":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.10.1.tgz#6886724d31c8022160a7db895e6731ca33483921"
-  integrity sha512-L2yqUOpf3tzlW9GVuipgLEcZxnO+96SzR6fjXMuxxNkIgFJ5+07mHCZ+HkHqaeZu8+3LKnNJJ1bKbjBETQAsrA==
+"@babel/types@^7.10.1", "@babel/types@^7.10.2", "@babel/types@^7.7.0":
+  version "7.10.2"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.10.2.tgz#30283be31cad0dbf6fb00bd40641ca0ea675172d"
+  integrity sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==
   dependencies:
     "@babel/helper-validator-identifier" "^7.10.1"
     lodash "^4.17.13"
@@ -247,10 +247,10 @@
   dependencies:
     smart-fs "1.11.13"
 
-"@blackflux/robo-config-plugin@3.4.1":
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/@blackflux/robo-config-plugin/-/robo-config-plugin-3.4.1.tgz#cde3aac42ab8d136399d3012ca84e8cace568828"
-  integrity sha512-sFtgr132PzdwFUJyd1zuPMeOu7gyvedXmJiqEJRkU2cXJ3MmJb8w2evJwn24u+305qeia9xANTkz1f0COluAKA==
+"@blackflux/robo-config-plugin@3.4.7":
+  version "3.4.7"
+  resolved "https://registry.yarnpkg.com/@blackflux/robo-config-plugin/-/robo-config-plugin-3.4.7.tgz#96fc69929331a2e70a1aa76c188b87ce035ff880"
+  integrity sha512-qbC3WzygzPxtP/XjVnTFp2p3kpMEL+jZ/M/qQiX2XIn1mbONksudrgYtSNrxd7p0/hAVcELGhn2W9ykioxsdoA==
 
 "@hapi/address@^4.0.1":
   version "4.0.1"
@@ -2206,10 +2206,10 @@ eslint-plugin-markdown@1.0.2:
     remark-parse "^5.0.0"
     unified "^6.1.2"
 
-eslint-plugin-mocha@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-mocha/-/eslint-plugin-mocha-7.0.0.tgz#3155cfb9b7883d6df34ed45702736654e89ce154"
-  integrity sha512-1qh2wBCCIobzyRfXppo7wrFctYjE1tEdp0rTzLVFVKfQTTh6RZ7HCQXcxj70HQ1BVp3NqEVm7puwHeSonRizrA==
+eslint-plugin-mocha@7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-mocha/-/eslint-plugin-mocha-7.0.1.tgz#b2e9e8ebef7836f999a83f8bab25d0e0c05f0d28"
+  integrity sha512-zkQRW9UigRaayGm/pK9TD5RjccKXSgQksNtpsXbG9b6L5I+jNx7m98VUbZ4w1H1ArlNA+K7IOH+z8TscN6sOYg==
   dependencies:
     eslint-utils "^2.0.0"
     ramda "^0.27.0"
@@ -2823,6 +2823,11 @@ get-func-name@^2.0.0:
   resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
   integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=
 
+get-package-type@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
+  integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
+
 get-stdin@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
@@ -3831,10 +3836,10 @@ joi-strict@1.2.2:
   dependencies:
     "@hapi/joi" "17.1.1"
 
-js-gardener@2.0.158:
-  version "2.0.158"
-  resolved "https://registry.yarnpkg.com/js-gardener/-/js-gardener-2.0.158.tgz#2810a71ef02b3597356183ead4d7585520109583"
-  integrity sha512-VGjw5gE8f+qcrbk8DhwQDl+MsTb6eRfVDjeRL3U3mDpL4T+xyUUwxO+5S5KJP3r42aQwW/G0biw5Az2vo+bobQ==
+js-gardener@2.0.159:
+  version "2.0.159"
+  resolved "https://registry.yarnpkg.com/js-gardener/-/js-gardener-2.0.159.tgz#58c8699b380b6c63f756829c92c19a367890df87"
+  integrity sha512-fB3ObN5BYrrtXrTM+WxctXfzye7KKDVBI93sfhZSY1YQkyxkvmw+6v0arEWrHg3lnwADnB2/GXGA6mWhO6zdZA==
   dependencies:
     chalk "4.0.0"
     fancy-log "1.3.3"
@@ -3845,7 +3850,7 @@ js-gardener@2.0.158:
     lodash.get "4.4.2"
     mocha "7.2.0"
     npm-check "5.9.2"
-    robo-config "3.7.2"
+    robo-config "3.7.5"
 
 js-tokens@^3.0.0:
   version "3.0.2"
@@ -5191,10 +5196,10 @@ number-is-nan@^1.0.0:
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
   integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
-nyc@15.0.1:
-  version "15.0.1"
-  resolved "https://registry.yarnpkg.com/nyc/-/nyc-15.0.1.tgz#bd4d5c2b17f2ec04370365a5ca1fc0ed26f9f93d"
-  integrity sha512-n0MBXYBYRqa67IVt62qW1r/d9UH/Qtr7SF1w/nQLJ9KxvWF6b2xCHImRAixHN9tnMMYHC2P14uo6KddNGwMgGg==
+nyc@15.1.0:
+  version "15.1.0"
+  resolved "https://registry.yarnpkg.com/nyc/-/nyc-15.1.0.tgz#1335dae12ddc87b6e249d5a1994ca4bdaea75f02"
+  integrity sha512-jMW04n9SxKdKi1ZMGhvUTHBN0EICCRkHemEoE5jm6mTYcqcdas0ATzgUgejlQUHMvpnOZqGB5Xxsv9KxJW1j8A==
   dependencies:
     "@istanbuljs/load-nyc-config" "^1.0.0"
     "@istanbuljs/schema" "^0.1.2"
@@ -5204,6 +5209,7 @@ nyc@15.0.1:
     find-cache-dir "^3.2.0"
     find-up "^4.1.0"
     foreground-child "^2.0.0"
+    get-package-type "^0.1.0"
     glob "^7.1.6"
     istanbul-lib-coverage "^3.0.0"
     istanbul-lib-hook "^3.0.0"
@@ -5247,11 +5253,6 @@ object-copy@^0.1.0:
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
-object-deep-contain@1.0.23:
-  version "1.0.23"
-  resolved "https://registry.yarnpkg.com/object-deep-contain/-/object-deep-contain-1.0.23.tgz#5e0e76634cc8b5d0291395dcdb897d2c37290dbc"
-  integrity sha512-y//xnySc0wul+bKzjbuMMkV31sX3AqXq83CzxoY3GvxoEYaRWRwOddGr2n704w0wCmSIcvlAZZbUnL5MJbsF6A==
-
 object-deep-contain@1.0.24:
   version "1.0.24"
   resolved "https://registry.yarnpkg.com/object-deep-contain/-/object-deep-contain-1.0.24.tgz#6d1088f00545eca1dd160100d3e7ba7ca94aaf73"
@@ -5267,21 +5268,26 @@ 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@13.0.2:
-  version "13.0.2"
-  resolved "https://registry.yarnpkg.com/object-scan/-/object-scan-13.0.2.tgz#6c77818699d09d8b4e3192c94960e72ba2315260"
-  integrity sha512-fzvo5Jr+zzCcIdauqNhBjYboM7bAV6bUBp3dviqoyhwDVhfNxFy4hlcvqsdIcsLyeoSqTamRXUcVVoSzvhTPFw==
-
 object-scan@13.0.3:
   version "13.0.3"
   resolved "https://registry.yarnpkg.com/object-scan/-/object-scan-13.0.3.tgz#2e8b19ffa6b527407fcd897946af26fd54861f8f"
   integrity sha512-Y/c67L3mFd0zDerQuzv3jEAqQzQXsnPwesr772PKo2LbcQ/liwk+XYvja8neUvOpYMPXbWzhYtN3gi1YYQ87mA==
 
+object-scan@13.1.0:
+  version "13.1.0"
+  resolved "https://registry.yarnpkg.com/object-scan/-/object-scan-13.1.0.tgz#97f4648455fe8b207cd797abf77bc6ac8777e48d"
+  integrity sha512-97xvtdijuenZUTRUvkgXLj+ilFiH/X+VmD7B8jDDAggUKQi/3mXZ/bzIwEOi4auvA/yQfC2Px0jy0FB+qIu/TA==
+
 object-treeify@1.1.24:
   version "1.1.24"
   resolved "https://registry.yarnpkg.com/object-treeify/-/object-treeify-1.1.24.tgz#ff3be5a93635d0f79af5e8a06d08c9bd3600e1a6"
   integrity sha512-ttlIN3MoqnhevarRtDNELvNjQ85Wguq2zSkR2N9DGFM3pFWMjsz7tSqbjX7lx16BmFwLOwBa3w0TY1jJajklFg==
 
+object-treeify@1.1.25:
+  version "1.1.25"
+  resolved "https://registry.yarnpkg.com/object-treeify/-/object-treeify-1.1.25.tgz#eb634c397bfc6512a28f569809079c93f41fe6d0"
+  integrity sha512-6Abx0xlXDnYd50JkQefvoIly3jWOu8/PqH4lh8p2/aMFEx5TjsUGHt0H9NHfzt+pCwOhpPgNYofD8e2YywIXig==
+
 object-visit@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
@@ -6435,21 +6441,21 @@ rimraf@^3.0.0:
   dependencies:
     glob "^7.1.3"
 
-robo-config@3.7.2:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/robo-config/-/robo-config-3.7.2.tgz#844312e34cd8ae1eb4a741cf883829d2f99477c5"
-  integrity sha512-mKF7Gn1F9Wna3q4ww6aX6V/ai2Dvtt/db0h8ZPo+P8oQi6KhQDmA5o1Lu97cca2RnARWhyWbU3n16kIobKcC+Q==
+robo-config@3.7.5:
+  version "3.7.5"
+  resolved "https://registry.yarnpkg.com/robo-config/-/robo-config-3.7.5.tgz#6991278f28d555c30e1a64f2d2119ccebf802981"
+  integrity sha512-6ktvQ95EncrzHvVMTHke6k5MLykzTR+NJMWDeXV/RmkfXYK23VY9eO+wm6gq9TDeuJzc4Ga20DQJnccWZq8WlA==
   dependencies:
     app-root-path "3.0.0"
     deepmerge "4.2.2"
     joi-strict "1.2.2"
     lodash.clonedeep "4.5.0"
     lodash.difference "4.5.0"
     lodash.get "4.4.2"
-    object-deep-contain "1.0.23"
-    object-scan "13.0.2"
+    object-deep-contain "1.0.24"
+    object-scan "13.0.3"
     object-treeify "1.1.24"
-    smart-fs "1.11.11"
+    smart-fs "1.11.12"
 
 run-async@^0.1.0:
   version "0.1.0"
@@ -6678,20 +6684,6 @@ smart-buffer@^4.1.0:
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.1.0.tgz#91605c25d91652f4661ea69ccf45f1b331ca21ba"
   integrity sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw==
 
-smart-fs@1.11.11:
-  version "1.11.11"
-  resolved "https://registry.yarnpkg.com/smart-fs/-/smart-fs-1.11.11.tgz#8ccb0dfaf5d7174981aa7f6f44bfbafa35b021cd"
-  integrity sha512-qpQ45ACg3kTFEyYi36nb2TpAZqQvW68YoIwl38/VPjNt4ffJ9YGL6jhisTaD6MT9KhWHMshCRlG1QbBRabqGyg==
-  dependencies:
-    fs-extra "9.0.0"
-    js-yaml "3.13.1"
-    json-stringify-pretty-compact "2.0.0"
-    lodash.clonedeep "4.5.0"
-    lodash.isequal "4.5.0"
-    object-align "1.0.11"
-    xml-js "1.6.11"
-    yaml-boost "1.9.21"
-
 smart-fs@1.11.12:
   version "1.11.12"
   resolved "https://registry.yarnpkg.com/smart-fs/-/smart-fs-1.11.12.tgz#37e8a98105d4e5658d860d5d3a4e0e55cb8e287d"