Skip to content

Commit

Permalink
Merge pull request #583 from hitokoto-osc/dev
Browse files Browse the repository at this point in the history
chore: release v1.7.1
  • Loading branch information
greenhat616 committed Jul 9, 2023
2 parents 33816e6 + 5dec11b commit a390b94
Show file tree
Hide file tree
Showing 8 changed files with 1,766 additions and 2,843 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/Docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ on:
branches: [ dev ]

jobs:
Build & Deploy:
default:
name: Build & Deploy
runs-on: ubuntu-latest
steps:
-
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Node.js CI

on:
pull_request:
branches: [ master ]
branches: [ master, dev ]
push:
branches: [ master ]
branches: [ master, dev ]
jobs:
test:
name: Test
Expand Down
550 changes: 550 additions & 0 deletions .yarn/plugins/@yarnpkg/plugin-version.cjs

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,7 @@ plugins:
spec: "@yarnpkg/plugin-workspace-tools"
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
spec: "@yarnpkg/plugin-interactive-tools"
- path: .yarn/plugins/@yarnpkg/plugin-version.cjs
spec: "@yarnpkg/plugin-version"

yarnPath: .yarn/releases/yarn-3.6.1.cjs
3 changes: 2 additions & 1 deletion adapter/plugins.dev.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
module.exports = [
// Dev Plugins
['koa-livereload', require('koa-livereload')()],
// ['koa-livereload', require('koa-livereload')()],
// Nodemon is better then livereload plugin
]
27 changes: 20 additions & 7 deletions adapter/plugins.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,28 @@ module.exports = [
['RecoverError', require('../src/middlewares/recoverError')()],

// Basic Plugins
['koa-helmet', require('koa-helmet')()],
[
'koa-helmet',
require('koa-helmet')({
crossOriginEmbedderPolicy: false,
crossOriginResourcePolicy: {
policy: 'cross-origin',
},
}),
],
['koa-query-pretty', require('koa-query-pretty')()],
['koa-jsonp', require('@hitokoto/koa-jsonp')()],
[
'koa-bodyparser',
require('koa-bodyparser')({
'@koa/bodyparser',
require('@koa/bodyparser').bodyParser({
enableTypes: ['json', 'form'],
formLimit: '10mb',
jsonLimit: '10mb',
}),
],
[
'kcors',
require('kcors')({
'@koa/cors',
require('@koa/cors')({
origin: '*',
allowMethods: ['GET', 'HEAD', 'PUT', 'POST', 'DELETE', 'PATCH'],
exposeHeaders: ['X-Request-Id'],
Expand All @@ -39,11 +47,16 @@ module.exports = [
!nconf.get('server:compress_body') || [
'koa-compress',
require('koa-compress')({
filter: (contentType) => {
filter(contentType) {
return /text/i.test(contentType)
},
threshold: 2048,
flush: require('zlib').Z_SYNC_FLUSH,
gzip: {
flush: require('zlib').constants.Z_SYNC_FLUSH,
},
deflate: {
flush: require('zlib').constants.Z_SYNC_FLUSH,
},
}),
],
['logger', require('../src/middlewares/logger')()],
Expand Down
15 changes: 7 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hitokoto",
"version": "1.7.0-1",
"version": "1.7.1",
"description": "Fast & Powerful Hitokoto API Framework.",
"main": "core.js",
"engines": {
Expand Down Expand Up @@ -50,33 +50,34 @@
"eslint-plugin-html": "7.1.0",
"eslint-plugin-import": "2.27.5",
"eslint-plugin-jest": "27.2.2",
"eslint-plugin-n": "^16.0.0",
"eslint-plugin-prettier": "4.2.1",
"eslint-plugin-n": "^16.0.1",
"eslint-plugin-prettier": "5.0.0-alpha.2",
"eslint-plugin-promise": "6.1.1",
"husky": "8.0.3",
"jest": "29.6.1",
"jest-extended": "4.0.0",
"koa-livereload": "0.2.0",
"lint-staged": "13.2.3",
"nodemon": "3.0.1",
"nyc": "15.1.0",
"prettier": "3.0.0",
"regenerator-runtime": "0.13.11",
"release-it": "15.11.0",
"release-it": "16.1.0",
"supertest": "6.3.3",
"supervisor": "0.12.0"
},
"dependencies": {
"@hitokoto/koa-jsonp": "3.0.7",
"@hitokoto/koa-respond": "3.0.3",
"@koa/bodyparser": "^5.0.0",
"@koa/cors": "^4.0.0",
"@sentry/integrations": "7.57.0",
"@sentry/node": "7.57.0",
"@sentry/tracing": "7.57.0",
"NeteaseCloudMusicApi": "4.8.10",
"async": "3.2.4",
"bytes": "3.1.2",
"chalk": "4.1.2",
"commander": "9.5.0",
"commander": "11.0.0",
"cron": "2.3.1",
"fast-json-stringify": "5.7.0",
"flatstr": "1.0.12",
Expand All @@ -85,9 +86,7 @@
"ioredis": "5.3.2",
"joi": "17.9.2",
"js-yaml": "4.1.0",
"kcors": "2.2.2",
"koa": "2.14.2",
"koa-bodyparser": "4.4.1",
"koa-compress": "5.1.1",
"koa-favicon": "2.1.0",
"koa-helmet": "7.0.2",
Expand Down
Loading

0 comments on commit a390b94

Please sign in to comment.