Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# `@bedrock/core` ChangeLog

## 6.3.1 - 2025-08-xx

### Changed
- Update to support `eslint@9`.

## 6.3.0 - 2024-11-19

### Added
Expand Down
19 changes: 4 additions & 15 deletions .eslintrc.cjs → eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,8 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
module.exports = {
root: true,
env: {
node: true
},
extends: [
'digitalbazaar',
'digitalbazaar/jsdoc',
'digitalbazaar/module'
],
ignorePatterns: ['node_modules/'],
rules: {
'unicorn/prefer-node-protocol': 'error'
}
};
import config from '@digitalbazaar/eslint-config/node-recommended';

export default [
...config
];
2 changes: 1 addition & 1 deletion lib/helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

// eslint-disable-next-line max-len
// eslint-disable-next-line @stylistic/max-len
const PROPERTY_REGEX = /[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|$))/g;
const ESCAPE_REGEX = /\\(\\)?/g;

Expand Down
6 changes: 4 additions & 2 deletions lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,7 @@ async function _runWorker(startTime) {
if(config.ensureConfigOverride.enable) {
configOverrideSnapshot = _snapshotOverrideFields({
config,
fields: config.ensureConfigOverride.fields,
fields: config.ensureConfigOverride.fields
});
}

Expand Down Expand Up @@ -797,5 +797,7 @@ async function _logExit(code) {
logger.end();
});
await p;
} finally {}
} finally {
// contine regardles of error
Comment thread
davidlehn marked this conversation as resolved.
Outdated
}
}
6 changes: 3 additions & 3 deletions lib/loggers/fileLogger.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ cc({
export async function init({transports}) {
transports.app = new winston.transports.File({
...config.loggers.app,
format: formatters.fromConfig(config.loggers.app.bedrock),
format: formatters.fromConfig(config.loggers.app.bedrock)
});
transports.access = new winston.transports.File({
...config.loggers.access,
format: formatters.fromConfig(config.loggers.access.bedrock),
format: formatters.fromConfig(config.loggers.access.bedrock)
});
transports.error = new winston.transports.File({
...config.loggers.error,
format: formatters.fromConfig(config.loggers.error.bedrock),
format: formatters.fromConfig(config.loggers.error.bedrock)
});

// ensure all files are created and have ownership set to the
Expand Down
8 changes: 4 additions & 4 deletions lib/loggers/formatters.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export const bedrock = format(info => {
splat: undefined,
timestamp: undefined,
workerId: undefined,
workerPid: undefined,
workerPid: undefined
}, null, 2);
const workerInfo = `workerPid=${workerPid}, workerId=${workerId}`;
if(stringifiedRest !== '{}') {
Expand Down Expand Up @@ -89,7 +89,7 @@ export function fromConfig(config) {
}
fmts.push(
format.timestamp(),
modulePrefix(),
modulePrefix()
);
if(colorize) {
fmts.push(format.colorize());
Expand All @@ -99,12 +99,12 @@ export function fromConfig(config) {
} else if(formatter === 'json') {
fmt = format.combine(
format.timestamp(),
format.json(),
format.json()
);
} else if(formatter === 'logstash') {
fmt = format.combine(
format.timestamp(),
format.logstash(),
format.logstash()
);
}
} else {
Expand Down
6 changes: 3 additions & 3 deletions lib/loggers/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ container.add = function(id) {
const child = createChild.apply(wrapper, [childMeta]);
// if child `defaultMeta` is not set, add it to ensure that the parent
// meta is included
if(!Object.hasOwnProperty(child, 'defaultMeta')) {
if(!Object.prototype.hasOwnProperty.call(child, 'defaultMeta')) {
child.defaultMeta = {...wrapper.defaultMeta, ...childMeta};
}
return child;
Expand All @@ -104,7 +104,7 @@ if(cluster.isPrimary) {
access: null,
app: null,
console: null,
error: null,
error: null
};
}

Expand All @@ -119,7 +119,7 @@ container.init = async () => {
const transports = container.transports;
transports.console = new winston.transports.Console({
...config.loggers.console,
format: formatters.fromConfig(config.loggers.console.bedrock),
format: formatters.fromConfig(config.loggers.console.bedrock)
});

if(config.loggers.enableFileTransport) {
Expand Down
13 changes: 6 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
],
"scripts": {
"start": "node index.js",
"lint": "eslint ."
"lint": "eslint"
},
"repository": {
"type": "git",
Expand All @@ -36,12 +36,11 @@
"winston-transport": "^4.5.0"
},
"devDependencies": {
"eslint": "^8.57.0",
"eslint-config-digitalbazaar": "^5.0.1",
"eslint-plugin-jsdoc": "^50.4.1",
"eslint-plugin-unicorn": "^56.0.0",
"jsdoc": "^4.0.2",
"jsdoc-to-markdown": "^9.0.2"
"@digitalbazaar/eslint-config": "^6.0.0",
"eslint": "^9.34.0",
"eslint-plugin-jsdoc": "^54.3.0",
"eslint-plugin-unicorn": "^60.0.0",
"jsdoc": "^4.0.4"
},
"engines": {
"node": ">=18"
Expand Down
9 changes: 0 additions & 9 deletions test/mocha/.eslintrc

This file was deleted.