Merge pull request #1169 from blackflux/dev

[Gally]: master <- dev
blackflux · Jun 15, 2022 · 88d886a · 88d886a
2 parents e15d67a + e80899d
commit 88d886a
Show file tree

Hide file tree

Showing 23 changed files with 1,805 additions and 5,867 deletions.
diff --git a/.babelrc b/.babelrc
diff --git a/.c8rc.json b/.c8rc.json
@@ -0,0 +1,28 @@
+{
+  "exclude": [
+    "gardener.js",
+    "node_modules/*",
+    "coverage/*",
+    "lib/*",
+    "test/hot.js"
+  ],
+  "temp-directory": "./coverage/.c8_output",
+  "reports-dir": "./coverage",
+  "check-coverage": true,
+  "per-file": false,
+  "lines": 100,
+  "statements": 100,
+  "functions": 100,
+  "branches": 100,
+  "include": [
+    "**/*.js"
+  ],
+  "reporter": [
+    "lcov",
+    "text-summary"
+  ],
+  "extension": [],
+  "all": true,
+  "skip-full": true,
+  "clean": true
+}
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -9,15 +9,15 @@ workflows:
       - test-node-v14:
           requires:
             - gally-create-pr
-      - test-node-v12:
+      - test-node-v18:
           requires:
             - gally-create-pr
       - gally-auto-approve:
           requires:
             - gally-create-pr
             - test-node-v16
             - test-node-v14
-            - test-node-v12
+            - test-node-v18
           filters:
             branches:
               only: /dependabot\/.*/
@@ -26,7 +26,7 @@ workflows:
             - gally-create-pr
             - test-node-v16
             - test-node-v14
-            - test-node-v12
+            - test-node-v18
           filters:
             branches:
               only: master
@@ -67,10 +67,30 @@ jobs:
           key: yarn-packages-{{ checksum "yarn.lock" }}
           paths:
             - ~/.cache/yarn
+      - run: yarn global add semantic-release
       - run: yarn run semantic-release
-  test-node-v12:
+  gally-auto-approve:
     docker:
-      - image: circleci/node:12
+      - 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: >-
+          ga approve $CIRCLE_PR_NUMBER --condition
+          "base.ref=dev&state=open&user.login=dependabot-preview[bot]"
+  test-node-v14:
+    docker:
+      - image: circleci/node:14
     steps:
       - checkout
       - run:
@@ -100,28 +120,14 @@ jobs:
       - run: >-
           (git add . && git diff-index --quiet HEAD --) || (git status && exit
           1);
-  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: >-
-          ga approve $CIRCLE_PR_NUMBER --condition
-          "base.ref=dev&state=open&user.login=dependabot-preview[bot]"
-  test-node-v14:
+          command: |
+            if [[ "${CIRCLE_BRANCH}" == "master" ]]; then
+              yarn run coveralls
+            fi
+  test-node-v16:
     docker:
-      - image: circleci/node:14
+      - image: circleci/node:16
     steps:
       - checkout
       - run:
@@ -151,14 +157,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-v16:
+  test-node-v18:
     docker:
-      - image: circleci/node:16
+      - image: cimg/node:18.0
     steps:
       - checkout
       - run:

diff --git a/.eslintrc.json b/.eslintrc.json
@@ -6,7 +6,7 @@
     "plugin:markdown/recommended"
   ],
   "rules": {
-    "@blackflux/rules/istanbul-prevent-ignore": 1,
+    "@blackflux/rules/c8-prevent-ignore": 1,
     "@blackflux/rules/kebab-case-enforce": 1,
     "max-len": ["error", {"code": 120}],
     "mocha/no-exclusive-tests": "error",
@@ -37,10 +37,13 @@
     "@blackflux/rules/prevent-typeof-object": 1,
     "mocha/no-mocha-arrows": 0,
     "mocha/no-hooks-for-single-case": 0,
-    "import/no-useless-path-segments": [2, {"commonjs": true}]
+    "import/no-useless-path-segments": [2, {"commonjs": true}],
+    "import/extensions": [2, "always"],
+    "import/prefer-default-export": 0
   },
   "env": {"es6": true, "node": true, "mocha": true},
   "globals": {},
   "plugins": ["json", "mocha", "@blackflux/rules"],
-  "parser": "babel-eslint"
+  "parser": "@babel/eslint-parser",
+  "parserOptions": {"requireConfigFile": false}
 }
diff --git a/.gally.json b/.gally.json
@@ -25,7 +25,7 @@
           "ci/circleci: gally-create-pr",
           "ci/circleci: test-node-v16",
           "ci/circleci: test-node-v14",
-          "ci/circleci: test-node-v12"
+          "ci/circleci: test-node-v18"
         ]
       },
       "enforce_admins": true,

diff --git a/.roboconfig.json b/.roboconfig.json
@@ -8,9 +8,10 @@
       "packageName": "secure-chest",
       "projectName": "secure-chest",
       "owner": "simlu",
-      "nodeVersion": "12",
+      "nodeVersion": "14",
       "ownerName": "Lukas Siemon",
-      "mergeBot": "MrsFlux"
+      "mergeBot": "MrsFlux",
+      "nccEnabled": false
     }
   }
 }
diff --git a/.roboconfig.lock b/.roboconfig.lock
@@ -1,6 +1,6 @@
 {
   "@blackflux/robo-config-plugin": [
-    ".babelrc",
+    ".c8rc.json",
     ".circleci/config.yml",
     ".dependabot/config.yml",
     ".editorconfig",
@@ -16,6 +16,7 @@
     "gardener.js",
     "package.json",
     "src/index.js",
+    "test/hot.js",
     "test/index.spec.js"
   ]
 }