Skip to content

Commit 45eb7d6

Browse files
authored
Merge pull request #2368 from blackflux/dev
[Gally]: master <- dev
2 parents 313793f + eabf846 commit 45eb7d6

41 files changed

Lines changed: 3009 additions & 2516 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.circleci/config.yml

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,46 @@
11
workflows:
2-
version: 2
32
node-multi-build:
43
jobs:
54
- gally-create-pr
6-
- test-node-v18:
5+
- test-node-v20:
76
requires:
87
- gally-create-pr
9-
- test-node-v16:
8+
- test-node-v23:
109
requires:
1110
- gally-create-pr
12-
- test-node-v20:
11+
- test-node-v22:
1312
requires:
1413
- gally-create-pr
1514
- gally-auto-approve:
1615
requires:
1716
- gally-create-pr
18-
- test-node-v18
19-
- test-node-v16
2017
- test-node-v20
18+
- test-node-v23
19+
- test-node-v22
2120
filters:
2221
branches:
2322
only: /dependabot\/.*/
2423
- release:
2524
requires:
2625
- gally-create-pr
27-
- test-node-v18
28-
- test-node-v16
2926
- test-node-v20
27+
- test-node-v23
28+
- test-node-v22
3029
filters:
3130
branches:
3231
only: master
33-
version: 2
32+
version: 2.1
3433
jobs:
3534
gally-create-pr:
3635
docker:
37-
- image: cimg/node:16.20
36+
- image: cimg/node:20.11
3837
steps:
3938
- checkout
4039
- run: sudo yarn global add gally
4140
- run: ga promote $CIRCLE_BRANCH
4241
release:
4342
docker:
44-
- image: cimg/node:16.20
43+
- image: cimg/node:22.13
4544
steps:
4645
- checkout
4746
- run:
@@ -71,7 +70,7 @@ jobs:
7170
- run: yarn run semantic-release
7271
gally-auto-approve:
7372
docker:
74-
- image: cimg/node:16.20
73+
- image: cimg/node:20.11
7574
steps:
7675
- run:
7776
name: Set PR number
@@ -88,9 +87,9 @@ jobs:
8887
- run: >-
8988
ga approve $CIRCLE_PR_NUMBER --condition
9089
"base.ref=dev&state=open&user.login=dependabot-preview[bot]"
91-
test-node-v16:
90+
test-node-v20:
9291
docker:
93-
- image: cimg/node:16.20
92+
- image: cimg/node:20.18
9493
steps:
9594
- checkout
9695
- run:
@@ -120,9 +119,9 @@ jobs:
120119
- run: >-
121120
(git add . && git diff-index --quiet HEAD --) || (git status && exit
122121
1);
123-
test-node-v18:
122+
test-node-v23:
124123
docker:
125-
- image: cimg/node:18.16
124+
- image: cimg/node:23.6
126125
steps:
127126
- checkout
128127
- run:
@@ -152,9 +151,9 @@ jobs:
152151
- run: >-
153152
(git add . && git diff-index --quiet HEAD --) || (git status && exit
154153
1);
155-
test-node-v20:
154+
test-node-v22:
156155
docker:
157-
- image: cimg/node:20.4
156+
- image: cimg/node:22.13
158157
steps:
159158
- checkout
160159
- run:

.eslintrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"extends": [
44
"airbnb-base",
55
"plugin:mocha/recommended",
6-
"plugin:markdown/recommended"
6+
"plugin:markdown/recommended-legacy"
77
],
88
"rules": {
99
"@blackflux/rules/c8-prevent-ignore": 1,

.gally.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@
4848
"strict": true,
4949
"contexts": [
5050
"ci/circleci: gally-create-pr",
51-
"ci/circleci: test-node-v18",
52-
"ci/circleci: test-node-v16",
53-
"ci/circleci: test-node-v20"
51+
"ci/circleci: test-node-v20",
52+
"ci/circleci: test-node-v23",
53+
"ci/circleci: test-node-v22"
5454
]
5555
},
5656
"enforce_admins": false,

.roboconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"packageName": "lambda-serverless-api",
99
"projectName": "lambda-serverless-api",
1010
"owner": "simlu",
11-
"nodeVersion": "16",
11+
"nodeVersion": "20",
1212
"ownerName": "Lukas Siemon",
1313
"mergeBot": "MrsFlux",
1414
"nccEnabled": false

.roboconfig.lock

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"package.json",
1919
"src/index.js",
2020
"test/hot.js",
21-
"test/index.spec.js"
21+
"test/index.spec.js",
22+
"test/reg.js"
2223
]
2324
}

CONFDOCS.md

Lines changed: 44 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Documents configuration tasks managed by [robo-config](https://github.com/blackf
88
- <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>
99
- <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>
1010
- <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>
11+
- <a name="blackfluxrobo-config-plugin-task-idx-ref-structtest-reg">:clipboard:</a> <a href="#blackfluxrobo-config-plugin-task-ref-structtest-reg">`struct/test-reg`</a>
1112
- <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>
1213
- <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>
1314
- <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>
@@ -87,7 +88,8 @@ Manage various configuration files for an open source npm package on github.
8788
<code>│&nbsp;&nbsp;└─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-srcindexjs">index.js</a></code><br/>
8889
<code>└─&nbsp;test</code><br/>
8990
<code>&nbsp;&nbsp;&nbsp;├─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-testhotjs">hot.js</a></code><br/>
90-
<code>&nbsp;&nbsp;&nbsp;└─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-testindexspecjs">index.spec.js</a></code><br/>
91+
<code>&nbsp;&nbsp;&nbsp;├─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-testindexspecjs">index.spec.js</a></code><br/>
92+
<code>&nbsp;&nbsp;&nbsp;└─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-testregjs">reg.js</a></code><br/>
9193
</ul>
9294
</td>
9395
<td align="left" valign="top">
@@ -151,7 +153,8 @@ Manage basic project structure for npm package on github.
151153
<code>│&nbsp;&nbsp;└─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-srcindexjs">index.js</a></code><br/>
152154
<code>└─&nbsp;test</code><br/>
153155
<code>&nbsp;&nbsp;&nbsp;├─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-testhotjs">hot.js</a></code><br/>
154-
<code>&nbsp;&nbsp;&nbsp;└─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-testindexspecjs">index.spec.js</a></code><br/>
156+
<code>&nbsp;&nbsp;&nbsp;├─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-testindexspecjs">index.spec.js</a></code><br/>
157+
<code>&nbsp;&nbsp;&nbsp;└─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-testregjs">reg.js</a></code><br/>
155158
</ul>
156159
</td>
157160
<td align="left" valign="top">
@@ -224,7 +227,8 @@ Manage basic project structure for npm package on github.
224227
<code>│&nbsp;&nbsp;└─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-srcindexjs">index.js</a></code><br/>
225228
<code>└─&nbsp;test</code><br/>
226229
<code>&nbsp;&nbsp;&nbsp;├─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-testhotjs">hot.js</a></code><br/>
227-
<code>&nbsp;&nbsp;&nbsp;└─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-testindexspecjs">index.spec.js</a></code><br/>
230+
<code>&nbsp;&nbsp;&nbsp;├─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-testindexspecjs">index.spec.js</a></code><br/>
231+
<code>&nbsp;&nbsp;&nbsp;└─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-testregjs">reg.js</a></code><br/>
228232
</ul>
229233
</td>
230234
<td align="left" valign="top">
@@ -244,11 +248,40 @@ Manage basic project structure for npm package on github.
244248
</tbody>
245249
</table>
246250

251+
###### :clipboard: <a name="blackfluxrobo-config-plugin-task-ref-structtest-reg">struct/test-reg</a> (<a href="#blackfluxrobo-config-plugin-task-idx-ref-structtest-reg">`index`</a>)
252+
253+
_Updating <a href="#blackfluxrobo-config-plugin-target-ref-testregjs">test/reg.js</a> using <a href="#blackfluxrobo-config-plugin-strat-ref-overwrite">overwrite</a>._
254+
255+
- Create register file.
256+
257+
<table>
258+
<tbody>
259+
<tr>
260+
<th>Targets</th>
261+
<th>Requires</th>
262+
</tr>
263+
<tr>
264+
<td align="left" valign="top">
265+
<ul>
266+
<code>project</code><br/>
267+
<code>└─&nbsp;test</code><br/>
268+
<code>&nbsp;&nbsp;&nbsp;└─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-testregjs">reg.js</a></code><br/>
269+
</ul>
270+
</td>
271+
<td align="left" valign="top">
272+
<ul>
273+
<li><a href="#blackfluxrobo-config-plugin-req-ref-javascript">javascript</a></li>
274+
</ul>
275+
</td>
276+
</tr>
277+
</tbody>
278+
</table>
279+
247280
###### :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>)
248281

249282
_Updating <a href="#blackfluxrobo-config-plugin-target-ref-testhotjs">test/hot.js</a> using <a href="#blackfluxrobo-config-plugin-strat-ref-overwrite">overwrite</a>._
250283

251-
- Create custom loader file.
284+
- Create loader file.
252285

253286
<table>
254287
<tbody>
@@ -1651,11 +1684,17 @@ The code owner is the gatekeeper of the project, ultimately responsible for all
16511684

16521685
Execute all configured js-gardener tasks.
16531686

1687+
### <a name="blackfluxrobo-config-plugin-target-ref-testregjs">test/reg.js</a>
1688+
1689+
:small_blue_diamond: `other`
1690+
1691+
*Registration hook to load custom loader.*
1692+
16541693
### <a name="blackfluxrobo-config-plugin-target-ref-testhotjs">test/hot.js</a>
16551694

16561695
:small_blue_diamond: `other`
16571696

1658-
*Custom loader to allow hot reloading of files for testing.*
1697+
*Loader to allow hot reloading of files for testing.*
16591698

16601699
### <a name="blackfluxrobo-config-plugin-target-ref-readmemd">README.md</a> ([`link`](https://help.github.com/en/articles/about-readmes))
16611700

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export default api;
5454

5555
then hook the router endpoint into the [Serverless Framework](https://serverless.com/) configuration as
5656

57-
```yaml
57+
```
5858
functions:
5959
router:
6060
handler: handler.router

eslint.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export default [
1313
...compat.extends(
1414
'airbnb-base',
1515
'plugin:mocha/recommended',
16-
'plugin:markdown/recommended'
16+
'plugin:markdown/recommended-legacy'
1717
),
1818
...compat.env({ es6: true, node: true, mocha: true }),
1919
...compat.plugins('json', 'mocha'),

package.json

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,27 @@
1414
],
1515
"author": "Lukas Siemon",
1616
"devDependencies": {
17-
"@aws-sdk/client-s3": "^3.414.0",
18-
"@babel/core": "7.22.20",
19-
"@babel/eslint-parser": "7.22.15",
20-
"@babel/register": "7.22.15",
21-
"@blackflux/eslint-plugin-rules": "3.0.1",
22-
"@blackflux/robo-config-plugin": "9.1.16",
23-
"aws-sdk-wrap": "13.1.0",
24-
"c8": "8.0.1",
25-
"chai": "4.3.8",
26-
"eslint": "8.49.0",
17+
"@aws-sdk/client-s3": "^3.735.0",
18+
"@babel/core": "7.26.7",
19+
"@babel/eslint-parser": "7.26.5",
20+
"@babel/register": "7.25.9",
21+
"@blackflux/eslint-plugin-rules": "4.0.0",
22+
"@blackflux/robo-config-plugin": "10.0.0",
23+
"aws-sdk-wrap": "13.3.2",
24+
"c8": "10.1.3",
25+
"chai": "5.1.2",
26+
"eslint": "9.19.0",
2727
"eslint-config-airbnb-base": "15.0.0",
28-
"eslint-plugin-import": "2.28.1",
29-
"eslint-plugin-json": "3.1.0",
30-
"eslint-plugin-markdown": "3.0.1",
31-
"eslint-plugin-mocha": "10.1.0",
32-
"js-gardener": "5.0.2",
33-
"lambda-tdd": "6.3.7",
28+
"eslint-plugin-import": "2.31.0",
29+
"eslint-plugin-json": "4.0.1",
30+
"eslint-plugin-markdown": "5.1.0",
31+
"eslint-plugin-mocha": "10.5.0",
32+
"js-gardener": "6.0.2",
33+
"lambda-tdd": "8.0.0",
3434
"minimist": "1.2.8",
35-
"moment-timezone": "0.5.43",
36-
"nock": "13.3.3",
37-
"node-tdd": "4.0.1",
35+
"moment-timezone": "0.5.47",
36+
"nock": "14.0.0",
37+
"node-tdd": "6.0.0",
3838
"request": "2.88.2",
3939
"request-promise": "4.2.6"
4040
},
@@ -43,9 +43,9 @@
4343
"clean": "rm -rf lib",
4444
"build": "cp -rf ./src ./lib",
4545
"build-clean": "yarn run clean && yarn run build",
46-
"test-simple": "c8 mocha --experimental-loader=./test/hot.js \"./test/**/*.spec.js\"",
46+
"test-simple": "c8 mocha --import=./test/reg.js \"./test/**/*.spec.js\"",
4747
"test": "yarn run clean && yarn run gardener && yarn run test-simple",
48-
"semantic-release": "yarn run build-clean && npx semantic-release",
48+
"semantic-release": "yarn run build-clean && yarn exec semantic-release",
4949
"gardener": "node gardener.js",
5050
"docker": "docker run --net host -u`id -u`:`id -g` -v $(pwd):/user/project -v ~/.aws:/user/.aws -v ~/.npmrc:/user/.npmrc -w /user/project -it --entrypoint /bin/bash",
5151
"t": "yarn test",
@@ -64,7 +64,7 @@
6464
}
6565
],
6666
"engines": {
67-
"node": ">= 16"
67+
"node": ">= 20"
6868
},
6969
"repository": {
7070
"type": "git",
@@ -77,22 +77,22 @@
7777
"lib"
7878
],
7979
"dependencies": {
80-
"@turf/kinks": "6.5.0",
81-
"joi-strict": "3.0.1",
82-
"lambda-async": "3.0.0",
83-
"lambda-monitor-logger": "5.0.1",
80+
"@turf/kinks": "7.2.0",
81+
"joi-strict": "4.0.0",
82+
"lambda-async": "4.0.0",
83+
"lambda-monitor-logger": "6.0.0",
8484
"lodash.clonedeep": "4.5.0",
8585
"lodash.difference": "4.5.0",
8686
"lodash.get": "4.4.2",
8787
"lodash.set": "4.3.2",
88-
"lru-cache-ext": "4.1.1",
89-
"object-fields": "4.0.0",
90-
"object-hash-strict": "4.0.1",
91-
"object-scan": "19.0.2",
92-
"painless-version": "3.0.0",
88+
"lru-cache-ext": "5.0.0",
89+
"object-fields": "5.0.0",
90+
"object-hash-strict": "5.0.0",
91+
"object-scan": "20.0.0",
92+
"painless-version": "4.0.0",
9393
"route-recognizer": "0.3.4",
94-
"serialize-error": "11.0.2",
95-
"smart-fs": "4.0.1",
94+
"serialize-error": "12.0.0",
95+
"smart-fs": "5.0.1",
9696
"stack-trace": "1.0.0-pre2",
9797
"swagger-parser": "10.0.3",
9898
"turf-polygon": "1.0.3"

src/param/json.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class Json extends Abstract {
1717
if (valid && this.stringInput) {
1818
try {
1919
valueParsed = JSON.parse(value);
20-
} catch (e) {
20+
} catch {
2121
valid = false;
2222
}
2323
}

0 commit comments

Comments
 (0)