Skip to content

Commit

Permalink
update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
denwilliams committed Sep 10, 2024
1 parent f8eb399 commit c659d20
Show file tree
Hide file tree
Showing 11 changed files with 3,817 additions and 50 deletions.
4 changes: 1 addition & 3 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ module.exports = {
plugins: ["@typescript-eslint"],
extends: [
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:prettier/recommended",
"prettier/@typescript-eslint",
"plugin:@typescript-eslint/recommended"
],
ignorePatterns: ["dist/**/*"],
};
29 changes: 11 additions & 18 deletions .github/workflows/npm-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,27 @@ on: push

jobs:
test-prom-client-versions:
strategy:
matrix:
prom-client-version: [11, 12, 13, 14, 15]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
with:
node-version: 12
- run: npm install

- run: npm install prom-client@12
- run: npm run build
- run: npm test

- run: npm install prom-client@13
- run: npm run build
- run: npm test

- run: npm install prom-client@14
node-version: 20
- run: npm ci
- run: npm i -D prom-client@${{matrix.prom-client-version}}
- run: npm run build
- run: npm test
publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 12
- run: npm install
- run: npm test
- uses: JS-DevTools/npm-publish@v1
node-version: 20
- run: npm cit
- uses: JS-DevTools/npm-publish@v3
with:
token: ${{ secrets.NPM_TOKEN }}
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,4 @@ node_modules
# Users Environment Variables
.lock-wscript

# Ignore lock because this is a module
package-lock.json

.vscode
12 changes: 6 additions & 6 deletions lib/common.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ import { format } from "./common";
test("formatting", (t) => {
t.is(
format(undefined, "level", ["example %s", 100, "after"]),
"level example 100 after"
"level example 100 after",
);

t.is(
format("prefix", "level", ["example %s", 100, "after"]),
`level ${yellow("prefix")}: example 100 after`
`level ${yellow("prefix")}: example 100 after`,
);

t.is(
format("prefix", "level", ["example %s", 100, { prop: "value" }]),
`level ${yellow("prefix")}: example 100 { prop: 'value' }`
`level ${yellow("prefix")}: example 100 { prop: 'value' }`,
);

const err = new Error("message");
Expand All @@ -27,14 +27,14 @@ test("formatting", (t) => {

t.is(
format("prefix", "level", [err]),
`level ${yellow("prefix")}: ${err.stack}`
`level ${yellow("prefix")}: ${err.stack}`,
);

// Node 12 now logs stack, not just message.
// Check startsWith for consistency between versions.
t.true(
format("prefix", "level", ["example %s", err]).startsWith(
`level ${yellow("prefix")}: example Error: message`
)
`level ${yellow("prefix")}: example Error: message`,
),
);
});
2 changes: 1 addition & 1 deletion lib/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export function format(
prefix: string | undefined,
level: string,
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types,@typescript-eslint/no-explicit-any
args: any
args: any,
): string {
return level + " " + formatPrefix(prefix) + util.format.apply(null, args);
}
4 changes: 2 additions & 2 deletions lib/metrics.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ test("logger metrics", async (t) => {
},
});
const logger = metricsMiddleware(registry)(
new LokeLogger({ streams: [stream] })
new LokeLogger({ streams: [stream] }),
);

logger.debug();
Expand All @@ -38,7 +38,7 @@ test("prefix passes through", (t) => {
});

const logger = metricsMiddleware(registry)(
new LokeLogger({ streams: [stream], prefix: "PREFIX" })
new LokeLogger({ streams: [stream], prefix: "PREFIX" }),
);

logger.log("prefixed message");
Expand Down
Binary file modified lib/metrics.test.ts.snap
Binary file not shown.
3 changes: 3 additions & 0 deletions lib/metrics.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import { Counter, Registry } from "prom-client";
import chalk from "chalk";
import { LokeLogger } from "./logger";

chalk.level = 0;

type Middleware = (next: LokeLogger) => LokeLogger;

const wrap = (next: LokeLogger, wrapper: Partial<LokeLogger>): LokeLogger =>
Expand Down
2 changes: 1 addition & 1 deletion lib/streams/console.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export class ConsoleStream extends Writable {
constructor(
stdout: NodeJS.WritableStream = process.stdout,
stderr: NodeJS.WritableStream = process.stderr,
systemdPrefix = false
systemdPrefix = false,
) {
super({ objectMode: true });
this.stdout = stdout;
Expand Down
Loading

0 comments on commit c659d20

Please sign in to comment.