Skip to content

Commit

Permalink
Merge next into master (#259)
Browse files Browse the repository at this point in the history
* chore: remove express (#227)

* Feat/updates for v5 (#246)

* Sync gitignore with fastify/skeleton

* Update workflows for fastify v5

* Update all dependencies

* merge

---------

Signed-off-by: Gürgün Dayıoğlu <hey@gurgun.day>
Co-authored-by: Gürgün Dayıoğlu <hey@gurgun.day>

* update fastify deps

---------

Signed-off-by: Gürgün Dayıoğlu <hey@gurgun.day>
Co-authored-by: Uzlopak <aras.abbasi@googlemail.com>
Co-authored-by: Gürgün Dayıoğlu <hey@gurgun.day>
Co-authored-by: Nicholas Rayburn <52075362+nrayburn-tech@users.noreply.github.com>
  • Loading branch information
4 people authored Jul 13, 2024
1 parent 2075e4b commit b5408d8
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 96 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ jobs:
with:
lint: true
license-check: true
node-versions: '["14", "16", "18", "20", "21", "22"]'
node-versions: '["18", "20", "21", "22"]'
10 changes: 5 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ lerna-debug.log*
# Diagnostic reports (https://nodejs.org/api/report.html)
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json

# Clinic
.clinic

# Runtime data
pids
*.pid
Expand Down Expand Up @@ -135,18 +138,15 @@ dist
# macOS files
.DS_Store

# Clinic
.clinic

# lock files
bun.lockb
package-lock.json
pnpm-lock.yaml
yarn.lock
bun.lockb

# editor files
.vscode
.idea

#tap files
# tap files
.tap/
7 changes: 2 additions & 5 deletions .taprc
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
ts: false
jsx: false
flow: false
check-coverage: false
disable-coverage: true

files:
- test/**/*test.js
- test/**/*test.js
19 changes: 0 additions & 19 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ async function third (instance, opts) {
* <a href="#override"><code>instance.<b>override()</b></code></a>
* <a href="#onClose"><code>instance.<b>onClose()</b></code></a>
* <a href="#close"><code>instance.<b>close()</b></code></a>
* <a href="#express"><code>avvio.<b>express()</b></code></a>
* <a href="#toJSON"><code>avvio.<b>toJSON()</b></code></a>
* <a href="#prettyPrint"><code>avvio.<b>prettyPrint()</b></code></a>

Expand Down Expand Up @@ -444,24 +443,6 @@ also start the boot sequence.
Start the boot sequence, if it was not started yet.
Returns the `app` instance.

-------------------------------------------------------
<a name="express"></a>

### avvio.express(app)

Same as:

```js
const app = express()
const avvio = require('avvio')

avvio(app, {
expose: {
use: 'load'
}
})
```

-------------------------------------------------------
<a name="override"></a>

Expand Down
7 changes: 0 additions & 7 deletions boot.js
Original file line number Diff line number Diff line change
Expand Up @@ -605,10 +605,3 @@ function encapsulateThreeParam (func, that) {
}

module.exports = Boot
module.exports.express = function (app) {
return Boot(app, {
expose: {
use: 'load'
}
})
}
13 changes: 6 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,14 @@
},
"homepage": "https://github.com/fastify/avvio#readme",
"devDependencies": {
"@fastify/pre-commit": "^2.0.2",
"@types/node": "^20.1.0",
"express": "^4.17.1",
"standard": "^17.0.0",
"tap": "^16.0.0",
"typescript": "^5.0.2"
"@fastify/pre-commit": "^2.1.0",
"@types/node": "^20.11.29",
"standard": "^17.1.0",
"tap": "^18.7.1",
"typescript": "^5.4.2"
},
"dependencies": {
"@fastify/error": "^3.3.0",
"@fastify/error": "^4.0.0",
"fastq": "^1.17.1"
}
}
52 changes: 0 additions & 52 deletions test/express.test.js

This file was deleted.

0 comments on commit b5408d8

Please sign in to comment.