Merge pull request #745 from blackflux/dev

[Gally]: master <- dev
blackflux · Mar 8, 2021 · d12401f · d12401f
2 parents 27dc260 + 3c7422b
commit d12401f
Show file tree

Hide file tree

Showing 7 changed files with 556 additions and 395 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,5 +1,5 @@
 {
-  "presets": [["latest-node", {"target": "10"}]],
+  "presets": [["latest-node", {"target": "12"}]],
   "plugins": [],
   "sourceMaps": false
 }
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,38 +3,38 @@ workflows:
   node-multi-build:
     jobs:
       - gally-create-pr
-      - test-node-v14:
+      - test-node-v15:
           requires:
             - gally-create-pr
-      - test-node-v12:
+      - test-node-v14:
           requires:
             - gally-create-pr
-      - test-node-v10:
+      - test-node-v12:
           requires:
             - gally-create-pr
       - gally-auto-approve:
           requires:
             - gally-create-pr
+            - test-node-v15
             - test-node-v14
             - test-node-v12
-            - test-node-v10
           filters:
             branches:
               only: /dependabot\/.*/
       - release:
           requires:
             - gally-create-pr
+            - test-node-v15
             - test-node-v14
             - test-node-v12
-            - test-node-v10
           filters:
             branches:
               only: master
 version: 2
 jobs:
   gally-create-pr:
     docker:
-      - image: 'circleci/node:12'
+      - image: 'circleci/node:14'
     steps:
       - checkout
       - run: sudo yarn global add gally
@@ -71,14 +71,9 @@ jobs:
       - run: >-
           (git add . && git diff-index --quiet HEAD --) || (git status && exit
           1);
-      - run:
-          command: |
-            if [[ "${CIRCLE_BRANCH}" == "master" ]]; then
-              yarn run coveralls
-            fi
-  test-node-v10:
+  release:
     docker:
-      - image: 'circleci/node:10'
+      - image: 'circleci/node:14'
     steps:
       - checkout
       - run:
@@ -104,13 +99,29 @@ jobs:
           key: 'yarn-packages-{{ checksum "yarn.lock" }}'
           paths:
             - ~/.cache/yarn
-      - run: yarn test
+      - run: yarn run semantic-release
+  gally-auto-approve:
+    docker:
+      - image: 'circleci/node:14'
+    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: >-
-          (git add . && git diff-index --quiet HEAD --) || (git status && exit
-          1);
-  release:
+          ga approve $CIRCLE_PR_NUMBER --condition
+          "base.ref=dev&state=open&user.login=dependabot-preview[bot]"
+  test-node-v14:
     docker:
-      - image: 'circleci/node:12'
+      - image: 'circleci/node:14'
     steps:
       - checkout
       - run:
@@ -136,29 +147,18 @@ jobs:
           key: 'yarn-packages-{{ checksum "yarn.lock" }}'
           paths:
             - ~/.cache/yarn
-      - run: yarn run semantic-release
-  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: yarn test
       - run: >-
-          ga approve $CIRCLE_PR_NUMBER --condition
-          "base.ref=dev&state=open&user.login=dependabot-preview[bot]"
-  test-node-v14:
+          (git add . && git diff-index --quiet HEAD --) || (git status && exit
+          1);
+      - run:
+          command: |
+            if [[ "${CIRCLE_BRANCH}" == "master" ]]; then
+              yarn run coveralls
+            fi
+  test-node-v15:
     docker:
-      - image: 'circleci/node:14'
+      - image: 'circleci/node:15'
     steps:
       - checkout
       - run:

diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,6 +1,10 @@
 {
   "root": true,
-  "extends": ["airbnb-base", "plugin:mocha/recommended"],
+  "extends": [
+    "airbnb-base",
+    "plugin:mocha/recommended",
+    "plugin:markdown/recommended"
+  ],
   "rules": {
     "@blackflux/rules/istanbul-prevent-ignore": 1,
     "@blackflux/rules/kebab-case-enforce": 1,
@@ -37,6 +41,6 @@
   },
   "env": {"es6": true, "node": true, "mocha": true},
   "globals": {},
-  "plugins": ["json", "mocha", "markdown", "@blackflux/rules"],
+  "plugins": ["json", "mocha", "@blackflux/rules"],
   "parser": "babel-eslint"
 }
diff --git a/.gally.json b/.gally.json
@@ -23,9 +23,9 @@
         "strict": true,
         "contexts": [
           "ci/circleci: gally-create-pr",
+          "ci/circleci: test-node-v15",
           "ci/circleci: test-node-v14",
-          "ci/circleci: test-node-v12",
-          "ci/circleci: test-node-v10"
+          "ci/circleci: test-node-v12"
         ]
       },
       "enforce_admins": true,

diff --git a/.roboconfig.json b/.roboconfig.json
@@ -8,7 +8,7 @@
       "packageName": "object-hash-strict",
       "projectName": "object-hash-strict",
       "owner": "simlu",
-      "nodeVersion": "10",
+      "nodeVersion": "12",
       "ownerName": "Lukas Siemon",
       "mergeBot": "MrsFlux"
     }

diff --git a/package.json b/package.json
@@ -38,25 +38,25 @@
   },
   "homepage": "https://github.com/blackflux/object-hash-strict#readme",
   "devDependencies": {
-    "@babel/cli": "7.12.10",
-    "@babel/core": "7.12.10",
-    "@babel/register": "7.12.10",
+    "@babel/cli": "7.13.0",
+    "@babel/core": "7.13.8",
+    "@babel/register": "7.13.8",
     "@blackflux/eslint-plugin-rules": "1.3.45",
-    "@blackflux/robo-config-plugin": "4.0.1",
+    "@blackflux/robo-config-plugin": "4.1.3",
     "babel-eslint": "10.1.0",
-    "chai": "4.2.0",
+    "babel-preset-latest-node": "5.4.0",
+    "chai": "4.3.3",
     "coveralls": "3.1.0",
-    "eslint": "7.17.0",
+    "eslint": "7.21.0",
     "eslint-config-airbnb-base": "14.2.1",
     "eslint-plugin-import": "2.22.1",
     "eslint-plugin-json": "2.1.2",
-    "eslint-plugin-markdown": "1.0.2",
-    "eslint-plugin-mocha": "8.0.0",
-    "js-gardener": "2.0.184",
+    "eslint-plugin-markdown": "2.0.0",
+    "eslint-plugin-mocha": "8.1.0",
+    "js-gardener": "2.0.186",
     "node-tdd": "2.19.1",
     "nyc": "15.1.0",
-    "semantic-release": "17.3.2",
-    "babel-preset-latest-node": "5.2.0"
+    "semantic-release": "17.4.1"
   },
   "licenses": [
     {
@@ -65,7 +65,7 @@
     }
   ],
   "engines": {
-    "node": ">= 10"
+    "node": ">= 12"
   },
   "nyc": {
     "exclude": [
@@ -102,6 +102,6 @@
   ],
   "dependencies": {
     "object-hash": "2.1.1",
-    "object-scan": "13.8.0"
+    "object-scan": "13.9.1"
   }
 }