Skip to content

Commit

Permalink
Merge branch 'modernize' of github.com:MapColonies/error-express-hand…
Browse files Browse the repository at this point in the history
…ler into modernize
  • Loading branch information
CptSchnitz committed Sep 19, 2024
2 parents 05a60b2 + d341fea commit 67b554c
Show file tree
Hide file tree
Showing 10 changed files with 42 additions and 49 deletions.
3 changes: 1 addition & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ about: Create a report to help us improve
title: ''
labels: 'bug'
assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:

1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
Expand All @@ -23,6 +23,5 @@ A clear and concise description of what you expected to happen.
**Screenshots**
If applicable, add screenshots to help explain your problem.


**Additional context**
Add any other context about the problem here.
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ about: Suggest an idea for this project
title: ''
labels: 'enhancement'
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
Expand Down
21 changes: 11 additions & 10 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,21 @@
Make sure you've read the contributing guidelines (CONTRIBUTING.md)
-->

| Question | Answer |
| ---------------- | -------------------------------------------------------------------------- |
| Bug fix | ✔/✖ |
| New feature | ✔/✖ |
| Breaking change | ✔/✖ |
| Deprecations | ✔/✖ |
| Documentation | ✔/✖ |
| Tests added | ✔/✖ |
| Chore | ✔/✖ |
| Question | Answer |
| --------------- | ------ |
| Bug fix | ✔/✖ |
| New feature | ✔/✖ |
| Breaking change | ✔/✖ |
| Deprecations | ✔/✖ |
| Documentation | ✔/✖ |
| Tests added | ✔/✖ |
| Chore | ✔/✖ |

Related issues: #XXX , #XXX ...
Closes #XXX ...

Further information:
Further information:

<!--
Here you can provide more information regarding any of the questions written above.
In addition, you can add screenshots, ask the maintainers questions.
Expand Down
24 changes: 12 additions & 12 deletions .github/actions/init-npm/action.yaml
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
name: init-npm
description: 'Initialize the repo with npm and install all the dependencies'
inputs:
inputs:
node-version:
description: 'Node.js version'
required: true
default: '20.x'
runs:
using: composite
steps:
- name: Set up Node.js
uses: actions/setup-node@v4
with:
node-version: ${{ inputs.node-version }}
cache: npm
- name: Install TS Project dependencies
shell: bash
run: npm ci
- name: build
shell: bash
run: npm run build
- name: Set up Node.js
uses: actions/setup-node@v4
with:
node-version: ${{ inputs.node-version }}
cache: npm
- name: Install TS Project dependencies
shell: bash
run: npm ci
- name: build
shell: bash
run: npm run build
24 changes: 12 additions & 12 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ updates:
- dependency-type: production
directory: /
commit-message:
prefix: "build(deps)"
prefix: 'build(deps)'
groups:
map-colonies:
patterns:
- "@map-colonies/*"
- '@map-colonies/*'
opentelemetry:
patterns:
- "@opentelemetry/*"
- '@opentelemetry/*'
patch:
update-types:
- patch
Expand All @@ -27,28 +27,28 @@ updates:
allow:
- dependency-type: development
ignore:
- dependency-name: "@map-colonies/schemas"
- dependency-name: '@map-colonies/schemas'
directory: /
commit-message:
prefix: "build(dev-deps)"
prefix: 'build(dev-deps)'
groups:
map-colonies:
patterns:
- "@map-colonies/*"
- '@map-colonies/*'
opentelemetry:
patterns:
- "@opentelemetry/*"
- '@opentelemetry/*'
types:
patterns:
- "@types/*"
- '@types/*'
dev-patch:
update-types:
- patch

# github deps
- package-ecosystem: github-actions
schedule:
schedule:
interval: weekly
commit-message:
prefix: "ci(deps)"
directory: "/"
prefix: 'ci(deps)'
directory: '/'
4 changes: 2 additions & 2 deletions .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: publish

on:
workflow_dispatch:
release:
release:
types: [published]

jobs:
publish:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
steps:
- name: Check out TS Project Git repository
uses: actions/checkout@v4

- name: Init nodejs
uses: ./.github/actions/init-npm

Expand Down
6 changes: 0 additions & 6 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
dist
.github
.gitignore
CHANGELOG.md
commitlint.config.js
package-lock.json
package.json
README.md
tsbuildconfig.json
tsconfig.json
coverage
4 changes: 2 additions & 2 deletions commitlint.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module.exports = {
extends: ["@commitlint/config-conventional"],
extends: ['@commitlint/config-conventional'],
rules: {
"scope-enum": [2, "always", ["deps", "dev-deps", "configurations", "error-handler"]],
'scope-enum': [2, 'always', ['deps', 'dev-deps', 'configurations', 'error-handler']],
},
};
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "@map-colonies/tsconfig/tsconfig-library",
"include": ["src","tests"],
"include": ["src", "tests"],
"exclude": ["dist", "node_modules"]
}

0 comments on commit 67b554c

Please sign in to comment.