Merge pull request #1422 from blackflux/dev

[Gally]: master <- dev

Author: simlu

.c8rc.json

@@ -12,7 +12,8 @@
     "gardener.js",
     "node_modules/*",
     "coverage/*",
-    "lib/*"
+    "lib/*",
+    "test/hot.js"
   ],
   "extension": [],
   "skip-full": true,

.circleci/config.yml

@@ -9,15 +9,15 @@ workflows:
       - test-node-v14:
           requires:
             - gally-create-pr
-      - test-node-v17:
+      - test-node-v18:
           requires:
             - gally-create-pr
       - gally-auto-approve:
           requires:
             - gally-create-pr
             - test-node-v16
             - test-node-v14
-            - test-node-v17
+            - test-node-v18
           filters:
             branches:
               only: /dependabot\/.*/
@@ -26,7 +26,7 @@ workflows:
             - gally-create-pr
             - test-node-v16
             - test-node-v14
-            - test-node-v17
+            - test-node-v18
           filters:
             branches:
               only: master
@@ -157,9 +157,9 @@ jobs:
       - run: >-
           (git add . && git diff-index --quiet HEAD --) || (git status && exit
           1);
-  test-node-v17:
+  test-node-v18:
     docker:
-      - image: circleci/node:17
+      - image: cimg/node:18.0
     steps:
       - checkout
       - run:

.eslintrc.json

@@ -38,7 +38,8 @@
     "mocha/no-mocha-arrows": 0,
     "mocha/no-hooks-for-single-case": 0,
     "import/no-useless-path-segments": [2, {"commonjs": true}],
-    "import/extensions": [2, "always"]
+    "import/extensions": [2, "always"],
+    "import/prefer-default-export": 0
   },
   "env": {"es6": true, "node": true, "mocha": true},
   "globals": {},

.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-v17"
+          "ci/circleci: test-node-v18"
         ]
       },
       "enforce_admins": true,

.roboconfig.json

@@ -10,7 +10,8 @@
       "owner": "simlu",
       "nodeVersion": "14",
       "ownerName": "Lukas Siemon",
-      "mergeBot": "MrsFlux"
+      "mergeBot": "MrsFlux",
+      "nccEnabled": true
     }
   }
 }

.roboconfig.lock

@@ -16,6 +16,7 @@
     "gardener.js",
     "package.json",
     "src/index.js",
+    "test/hot.js",
     "test/index.spec.js"
   ]
 }

CONFDOCS.md

@@ -8,6 +8,7 @@ Documents configuration tasks managed by [robo-config](https://github.com/blackf
   - <a name="blackfluxrobo-config-plugin-task-idx-ref-structnpm-default">:open_file_folder:</a> <a href="#blackfluxrobo-config-plugin-task-ref-structnpm-default">`struct/#npm-default`</a>
     - <a name="blackfluxrobo-config-plugin-task-idx-ref-structforce-gardener">:clipboard:</a> <a href="#blackfluxrobo-config-plugin-task-ref-structforce-gardener">`struct/force-gardener`</a>
     - <a name="blackfluxrobo-config-plugin-task-idx-ref-structnpm-base">:open_file_folder:</a> <a href="#blackfluxrobo-config-plugin-task-ref-structnpm-base">`struct/#npm-base`</a>
+      - <a name="blackfluxrobo-config-plugin-task-idx-ref-structtest-hot">:clipboard:</a> <a href="#blackfluxrobo-config-plugin-task-ref-structtest-hot">`struct/test-hot`</a>
       - <a name="blackfluxrobo-config-plugin-task-idx-ref-structtemplate-readme">:clipboard:</a> <a href="#blackfluxrobo-config-plugin-task-ref-structtemplate-readme">`struct/template-readme`</a>
       - <a name="blackfluxrobo-config-plugin-task-idx-ref-structtemplate-mocharc">:clipboard:</a> <a href="#blackfluxrobo-config-plugin-task-ref-structtemplate-mocharc">`struct/template-mocharc`</a>
       - <a name="blackfluxrobo-config-plugin-task-idx-ref-structtemplate-index-test">:clipboard:</a> <a href="#blackfluxrobo-config-plugin-task-ref-structtemplate-index-test">`struct/template-index-test`</a>
@@ -88,6 +89,7 @@ Manage various configuration files for an open source npm package on github.
 <code>├─&nbsp;src</code><br/>
 <code>│&nbsp;&nbsp;└─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-srcindexjs">index.js</a></code><br/>
 <code>└─&nbsp;test</code><br/>
+<code>&nbsp;&nbsp;&nbsp;├─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-testhotjs">hot.js</a></code><br/>
 <code>&nbsp;&nbsp;&nbsp;└─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-testindexspecjs">index.spec.js</a></code><br/>
         </ul>
       </td>
@@ -116,6 +118,7 @@ Manage various configuration files for an open source npm package on github.
       <td align="left" valign="top">
         <ul>
           <li><a href="#blackfluxrobo-config-plugin-var-ref-packagename">packageName</a></li>
+          <li><a href="#blackfluxrobo-config-plugin-var-ref-nccenabled">nccEnabled</a></li>
           <li><a href="#blackfluxrobo-config-plugin-var-ref-nodeversion">nodeVersion</a></li>
           <li><a href="#blackfluxrobo-config-plugin-var-ref-repokey">repoKey</a></li>
           <li><a href="#blackfluxrobo-config-plugin-var-ref-ownername">ownerName</a></li>
@@ -150,6 +153,7 @@ Manage basic project structure for npm package on github.
 <code>├─&nbsp;src</code><br/>
 <code>│&nbsp;&nbsp;└─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-srcindexjs">index.js</a></code><br/>
 <code>└─&nbsp;test</code><br/>
+<code>&nbsp;&nbsp;&nbsp;├─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-testhotjs">hot.js</a></code><br/>
 <code>&nbsp;&nbsp;&nbsp;└─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-testindexspecjs">index.spec.js</a></code><br/>
         </ul>
       </td>
@@ -221,6 +225,7 @@ Manage basic project structure for npm package on github.
 <code>├─&nbsp;src</code><br/>
 <code>│&nbsp;&nbsp;└─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-srcindexjs">index.js</a></code><br/>
 <code>└─&nbsp;test</code><br/>
+<code>&nbsp;&nbsp;&nbsp;├─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-testhotjs">hot.js</a></code><br/>
 <code>&nbsp;&nbsp;&nbsp;└─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-testindexspecjs">index.spec.js</a></code><br/>
         </ul>
       </td>
@@ -241,6 +246,35 @@ Manage basic project structure for npm package on github.
   </tbody>
 </table>
 
+###### :clipboard: <a name="blackfluxrobo-config-plugin-task-ref-structtest-hot">struct/test-hot</a> (<a href="#blackfluxrobo-config-plugin-task-idx-ref-structtest-hot">`index`</a>)
+
+_Updating <a href="#blackfluxrobo-config-plugin-target-ref-testhotjs">test/hot.js</a> using <a href="#blackfluxrobo-config-plugin-strat-ref-overwrite">overwrite</a>._
+
+- Create custom loader file.
+
+<table>
+  <tbody>
+    <tr>
+      <th>Targets</th>
+      <th>Requires</th>
+    </tr>
+    <tr>
+      <td align="left" valign="top">
+        <ul>
+<code>project</code><br/>
+<code>└─&nbsp;test</code><br/>
+<code>&nbsp;&nbsp;&nbsp;└─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-testhotjs">hot.js</a></code><br/>
+        </ul>
+      </td>
+      <td align="left" valign="top">
+        <ul>
+          <li><a href="#blackfluxrobo-config-plugin-req-ref-javascript">javascript</a></li>
+        </ul>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
 ###### :clipboard: <a name="blackfluxrobo-config-plugin-task-ref-structtemplate-readme">struct/template-readme</a> (<a href="#blackfluxrobo-config-plugin-task-idx-ref-structtemplate-readme">`index`</a>)
 
 _Updating <a href="#blackfluxrobo-config-plugin-target-ref-readmemd">README.md</a> using <a href="#blackfluxrobo-config-plugin-strat-ref-create-only">create-only</a>._
@@ -465,6 +499,7 @@ Manage package.json for npm package on github.
       </td>
       <td align="left" valign="top">
         <ul>
+          <li><a href="#blackfluxrobo-config-plugin-var-ref-nccenabled">nccEnabled</a></li>
           <li><a href="#blackfluxrobo-config-plugin-var-ref-nodeversion">nodeVersion</a></li>
           <li><a href="#blackfluxrobo-config-plugin-var-ref-repokey">repoKey</a></li>
           <li><a href="#blackfluxrobo-config-plugin-var-ref-packagename">packageName</a></li>
@@ -485,6 +520,7 @@ _Updating <a href="#blackfluxrobo-config-plugin-target-ref-packagejson">package.
     <tr>
       <th>Targets</th>
       <th>Requires</th>
+      <th>Variables</th>
     </tr>
     <tr>
       <td align="left" valign="top">
@@ -498,6 +534,11 @@ _Updating <a href="#blackfluxrobo-config-plugin-target-ref-packagejson">package.
           <li><a href="#blackfluxrobo-config-plugin-req-ref-javascript">javascript</a></li>
         </ul>
       </td>
+      <td align="left" valign="top">
+        <ul>
+          <li><a href="#blackfluxrobo-config-plugin-var-ref-nccenabled">nccEnabled</a></li>
+        </ul>
+      </td>
     </tr>
   </tbody>
 </table>
@@ -1698,6 +1739,13 @@ Enables displaying of a status badge indicated whether the dependencies are outd
 The name of the project as published to npm.
 Note that for scoped packages the name can differ significantly from the repo name.
 
+### <a name="blackfluxrobo-config-plugin-var-ref-nccenabled">nccEnabled</a>  : `boolean`
+
+*Enable ncc for service.*
+
+Uses NCC to compile service.
+Please ensure that the service still works after ncc compilation.
+
 ### <a name="blackfluxrobo-config-plugin-var-ref-nodeversion">nodeVersion</a>  : `string`
 
 *The minimum node version targeted.*
@@ -1746,6 +1794,12 @@ The code owner is the gatekeeper of the project, ultimately responsible for all
 
 Execute all configured js-gardener tasks.
 
+### <a name="blackfluxrobo-config-plugin-target-ref-testhotjs">test/hot.js</a>  
+
+:small_blue_diamond: `other`
+
+*Custom loader to allow hot reloading of files for testing.*
+
 ### <a name="blackfluxrobo-config-plugin-target-ref-readmemd">README.md</a> ([`link`](https://help.github.com/en/articles/about-readmes)) 
 
 :small_blue_diamond: `nostruct`

gardener.js

@@ -1,10 +1,9 @@
-// eslint-disable-next-line import/no-extraneous-dependencies
+/* eslint-disable import/no-extraneous-dependencies */
 import gardener from 'js-gardener';
-
-import { fileURLToPath } from 'url';
+import fs from 'smart-fs';
 import process from 'process';
 
-if (process.argv[1] === fileURLToPath(import.meta.url)) {
+if (process.argv[1] === fs.filename(import.meta.url)) {
   gardener({
     skip: []
   }).catch(() => process.exit(1));

package.json

@@ -11,32 +11,34 @@
     "joi-strict": "2.0.1",
     "lodash.set": "4.3.2",
     "object-fields": "3.0.1",
-    "object-scan": "17.1.0"
+    "object-scan": "18.1.2"
   },
   "devDependencies": {
-    "@babel/core": "7.17.2",
-    "@babel/eslint-parser": "7.17.0",
-    "@babel/register": "7.17.0",
+    "@babel/core": "7.18.5",
+    "@babel/eslint-parser": "7.18.2",
+    "@babel/register": "7.17.7",
     "@blackflux/eslint-plugin-rules": "2.1.0",
-    "@blackflux/robo-config-plugin": "7.0.2",
-    "c8": "7.11.0",
+    "@blackflux/robo-config-plugin": "7.8.5",
+    "@vercel/ncc": "0.34.0",
+    "c8": "7.11.3",
     "chai": "4.3.6",
     "coveralls": "3.1.1",
-    "eslint": "8.8.0",
+    "eslint": "8.17.0",
     "eslint-config-airbnb-base": "15.0.0",
-    "eslint-plugin-import": "2.25.4",
+    "eslint-plugin-import": "2.26.0",
     "eslint-plugin-json": "3.1.0",
     "eslint-plugin-markdown": "2.2.1",
-    "eslint-plugin-mocha": "10.0.3",
+    "eslint-plugin-mocha": "10.0.5",
     "js-gardener": "3.0.5",
     "lodash.get": "4.4.2",
-    "lodash.shuffle": "4.2.0"
+    "lodash.shuffle": "4.2.0",
+    "smart-fs": "3.0.1"
   },
   "scripts": {
     "clean": "rm -rf lib",
-    "build": "cp -rf ./src ./lib",
+    "build": "cp -rf ./src ./lib && ncc build -m -o lib && mv lib/index.js lib/index.min.js && cp src/index.js lib/index.js && rm lib/package.json",
     "build-clean": "yarn run clean && yarn run build",
-    "test-simple": "c8 mocha \"./test/**/*.spec.js\"",
+    "test-simple": "c8 mocha --experimental-loader=./test/hot.js \"./test/**/*.spec.js\"",
     "test": "yarn run clean && yarn run gardener && yarn run test-simple",
     "coveralls": "node ./node_modules/coveralls/bin/coveralls.js < ./coverage/lcov.info",
     "semantic-release": "yarn run build-clean && npx semantic-release",
@@ -47,7 +49,8 @@
     "tsv": "yarn run test-simple --verbose",
     "u": "yarn upgrade --latest --force",
     "i": "yarn install --frozen-lockfile",
-    "it": "yarn run i && yarn run t"
+    "it": "yarn run i && yarn run t",
+    "ncc-analyze": "yarn clean && ncc build -m -s -o lib && npx source-map-explorer lib/index.js --only-mapped --html source.html && yarn clean"
   },
   "keywords": [
     "object",

src/module/plugin.js

@@ -1,5 +1,5 @@
-import assert from 'assert';
 import Joi from 'joi-strict';
+import assert from '../util/assert.js';
 import validationCompile from './plugin/validation-compile.js';
 import validationExtractKeys from './plugin/validation-extract-keys.js';
 import joinPath from './plugin/join-path.js';