Skip to content

Commit

Permalink
Merge pull request #106 from homer0/homer0_next
Browse files Browse the repository at this point in the history
Update project
  • Loading branch information
homer0 authored Apr 7, 2024
2 parents 4e91054 + 95cf29b commit f33dccf
Show file tree
Hide file tree
Showing 22 changed files with 6,789 additions and 16,808 deletions.
13 changes: 9 additions & 4 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
const preset = require('@homer0/eslint-plugin/presets/typescript');

module.exports = preset({
rootDir: __dirname,
configs: ['node-typescript-with-prettier'],
});
module.exports = {
...preset({
rootDir: __dirname,
configs: ['node-typescript-with-prettier'],
}),
rules: {
'node/no-unsupported-features/es-syntax': 'off',
},
};
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
### How should it be tested manually?

```bash
npm test
pnpm test
```

### Notes
13 changes: 9 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,22 @@ jobs:
- name: Node.js
uses: actions/setup-node@v3
with:
node-version-file: '.nvmrc'
node-version: '20.8.1'
- uses: pnpm/action-setup@v2
with:
version: 8
- name: Install dependencies
env:
HUSKY_SKIP_INSTALL: 1
run: npm ci
- run: npx semantic-release
run: pnpm install --frozen-lockfile
- name: Install semantic-release
run: pnpm add semantic-release@^23.0.7 @semantic-release/changelog@^6.0.3 @semantic-release/git@^10.0.1
- run: pnpm exec semantic-release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
- name: Generate documentation
run: npm run docs
run: pnpm run docs
- name: Deploy documentation
uses: JamesIves/[email protected]
with:
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,12 @@ jobs:
- uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}
- run: npm ci
- run: npm run lint:all
- run: npm test
- uses: pnpm/action-setup@v2
with:
version: 8
- run: pnpm install --frozen-lockfile
- run: pnpm run lint:all
- run: pnpm test
- name: Coveralls
if: ${{ matrix.node == '18' }}
uses: coverallsapp/github-action@master
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ coverage
.DS_Store
npm-debug.log
yarn-error.log
pnpm-debug.log
/dist
/docs
.vscode
Expand Down
2 changes: 1 addition & 1 deletion .husky/post-merge
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npm install
pnpm install

2 changes: 1 addition & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npm run lint
pnpm run lint
2 changes: 1 addition & 1 deletion .husky/pre-push
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npm run types:check && npm test
pnpm run types:check && pnpm test
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.17
18.18
2 changes: 2 additions & 0 deletions documents/typescript.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ Unfortunately, since Express doesn't ship their own types, you'll need to instal

```bash
npm install --save-dev @types/express
# or
pnpm add --save-dev @types/express
```

## Middlewares
Expand Down
Loading

0 comments on commit f33dccf

Please sign in to comment.