Skip to content

Commit

Permalink
Merge pull request #63 from adonisjs/next
Browse files Browse the repository at this point in the history
Merge to develop for final release
  • Loading branch information
thetutlage committed Jan 5, 2024
2 parents d77c024 + 582d7b5 commit 2f7fae0
Show file tree
Hide file tree
Showing 33 changed files with 1,769 additions and 788 deletions.
170 changes: 170 additions & 0 deletions .github/labels.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,170 @@
[
{
"name": "Priority: Critical",
"color": "ea0056",
"description": "The issue needs urgent attention",
"aliases": []
},
{
"name": "Priority: High",
"color": "5666ed",
"description": "Look into this issue before picking up any new work",
"aliases": []
},
{
"name": "Priority: Medium",
"color": "f4ff61",
"description": "Try to fix the issue for the next patch/minor release",
"aliases": []
},
{
"name": "Priority: Low",
"color": "87dfd6",
"description": "Something worth considering, but not a top priority for the team",
"aliases": []
},
{
"name": "Semver: Alpha",
"color": "008480",
"description": "Will make it's way to the next alpha version of the package",
"aliases": []
},
{
"name": "Semver: Major",
"color": "ea0056",
"description": "Has breaking changes",
"aliases": []
},
{
"name": "Semver: Minor",
"color": "fbe555",
"description": "Mainly new features and improvements",
"aliases": []
},
{
"name": "Semver: Next",
"color": "5666ed",
"description": "Will make it's way to the bleeding edge version of the package",
"aliases": []
},
{
"name": "Semver: Patch",
"color": "87dfd6",
"description": "A bug fix",
"aliases": []
},
{
"name": "Status: Abandoned",
"color": "ffffff",
"description": "Dropped and not into consideration",
"aliases": ["wontfix"]
},
{
"name": "Status: Accepted",
"color": "e5fbf2",
"description": "The proposal or the feature has been accepted for the future versions",
"aliases": []
},
{
"name": "Status: Blocked",
"color": "ea0056",
"description": "The work on the issue or the PR is blocked. Check comments for reasoning",
"aliases": []
},
{
"name": "Status: Completed",
"color": "008672",
"description": "The work has been completed, but not released yet",
"aliases": []
},
{
"name": "Status: In Progress",
"color": "73dbc4",
"description": "Still banging the keyboard",
"aliases": ["in progress"]
},
{
"name": "Status: On Hold",
"color": "f4ff61",
"description": "The work was started earlier, but is on hold now. Check comments for reasoning",
"aliases": ["On Hold"]
},
{
"name": "Status: Review Needed",
"color": "fbe555",
"description": "Review from the core team is required before moving forward",
"aliases": []
},
{
"name": "Status: Awaiting More Information",
"color": "89f8ce",
"description": "Waiting on the issue reporter or PR author to provide more information",
"aliases": []
},
{
"name": "Status: Need Contributors",
"color": "7057ff",
"description": "Looking for contributors to help us move forward with this issue or PR",
"aliases": []
},
{
"name": "Type: Bug",
"color": "ea0056",
"description": "The issue has indentified a bug",
"aliases": ["bug"]
},
{
"name": "Type: Security",
"color": "ea0056",
"description": "Spotted security vulnerability and is a top priority for the core team",
"aliases": []
},
{
"name": "Type: Duplicate",
"color": "00837e",
"description": "Already answered or fixed previously",
"aliases": ["duplicate"]
},
{
"name": "Type: Enhancement",
"color": "89f8ce",
"description": "Improving an existing feature",
"aliases": ["enhancement"]
},
{
"name": "Type: Feature Request",
"color": "483add",
"description": "Request to add a new feature to the package",
"aliases": []
},
{
"name": "Type: Invalid",
"color": "dbdbdb",
"description": "Doesn't really belong here. Maybe use discussion threads?",
"aliases": ["invalid"]
},
{
"name": "Type: Question",
"color": "eceafc",
"description": "Needs clarification",
"aliases": ["help wanted", "question"]
},
{
"name": "Type: Documentation Change",
"color": "7057ff",
"description": "Documentation needs some improvements",
"aliases": ["documentation"]
},
{
"name": "Type: Dependencies Update",
"color": "00837e",
"description": "Bump dependencies",
"aliases": ["dependencies"]
},
{
"name": "Good First Issue",
"color": "008480",
"description": "Want to contribute? Just filter by this label",
"aliases": ["good first issue"]
}
]
4 changes: 2 additions & 2 deletions .github/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ daysUntilClose: 7

# Issues with these labels will never be considered stale
exemptLabels:
- "Type: Security"
- 'Type: Security'

# Label to use when marking an issue as stale
staleLabel: "Status: Abandoned"
staleLabel: 'Status: Abandoned'

# Comment to post when marking an issue as stale. Set to `false` to disable
markComment: >
Expand Down
14 changes: 14 additions & 0 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: checks
on:
- push
- pull_request

jobs:
test:
uses: adonisjs/.github/.github/workflows/test.yml@main

lint:
uses: adonisjs/.github/.github/workflows/lint.yml@main

typecheck:
uses: adonisjs/.github/.github/workflows/typecheck.yml@main
22 changes: 0 additions & 22 deletions .github/workflows/test.yml

This file was deleted.

7 changes: 4 additions & 3 deletions .husky/commit-msg
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"
HUSKY_GIT_PARAMS=$1 node ./node_modules/@adonisjs/mrm-preset/validate-commit/conventional/validate.js
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npx --no -- commitlint --edit
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# The MIT License

Copyright 2022 Harminder Virk, contributors
Copyright (c) 2023 Harminder Virk

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down
49 changes: 15 additions & 34 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,44 +1,28 @@
<div align="center">
<img src="https://res.cloudinary.com/adonisjs/image/upload/q_100/v1558612869/adonis-readme_zscycu.jpg" width="600px">
</div>
# @adonisjs/logger

<br />

<div align="center">
<h3>AdonisJS Logger</h3>
<p>AdonisJS logger built on top of <a href="http://getpino.io/#/">pino</a> for speed and minimal runtime overhead.</p>
</div>
[![gh-workflow-image]][gh-workflow-url] [![npm-image]][npm-url] ![][typescript-image] [![license-image]][license-url]

<br />
## Introduction
AdonisJS Logger is built on top of [Pino](https://getpino.io/#/). Additionally, we have added support to create multiple named loggers, and make it easy to type-hint Logger as a container dependency.

<div align="center">
## Official Documentation
The documentation is available on the [AdonisJS website](https://docs.adonisjs.com/guides/logger)

[![gh-workflow-image]][gh-workflow-url] [![npm-image]][npm-url] ![][typescript-image] [![license-image]][license-url] [![synk-image]][synk-url]
## Contributing
One of the primary goals of AdonisJS is to have a vibrant community of users and contributors who believes in the principles of the framework.

</div>
We encourage you to read the [contribution guide](https://github.com/adonisjs/.github/blob/main/docs/CONTRIBUTING.md) before contributing to the framework.

<div align="center">
<h3>
<a href="https://adonisjs.com">
Website
</a>
<span> | </span>
<a href="https://docs.adonisjs.com/guides/logger">
Guides
</a>
<span> | </span>
<a href="CONTRIBUTING.md">
Contributing
</a>
</h3>
</div>
## Code of Conduct
In order to ensure that the AdonisJS community is welcoming to all, please review and abide by the [Code of Conduct](https://github.com/adonisjs/.github/blob/main/docs/CODE_OF_CONDUCT.md).

<div align="center">
<sub>Built with ❤︎ by <a href="https://twitter.com/AmanVirk1">Harminder Virk</a>
</div>
## License
AdonisJS logger is open-sourced software licensed under the [MIT license](LICENSE.md).

[gh-workflow-image]: https://img.shields.io/github/workflow/status/adonisjs/logger/test?style=for-the-badge
[gh-workflow-url]: https://github.com/adonisjs/logger/actions/workflows/test.yml "Github action"
[gh-workflow-image]: https://img.shields.io/github/actions/workflow/status/adonisjs/logger/checks.yml?style=for-the-badge
[gh-workflow-url]: https://github.com/adonisjs/logger/actions/workflows/checks.yml "Github action"

[typescript-image]: https://img.shields.io/badge/Typescript-294E80.svg?style=for-the-badge&logo=typescript
[typescript-url]: "typescript"
Expand All @@ -48,6 +32,3 @@

[license-image]: https://img.shields.io/npm/l/@adonisjs/logger?color=blueviolet&style=for-the-badge
[license-url]: LICENSE.md "license"

[synk-image]: https://img.shields.io/snyk/vulnerabilities/github/adonisjs/env?label=Synk%20Vulnerabilities&style=for-the-badge
[synk-url]: https://snyk.io/test/github/adonisjs/env?targetFile=package.json "synk"
Loading

0 comments on commit 2f7fae0

Please sign in to comment.