diff --git a/History.md b/History.md index 5380daf09c..884713e4ab 100644 --- a/History.md +++ b/History.md @@ -2212,7 +2212,7 @@ This is the first Express 5.0 alpha release, based off 4.10.1. * deps: connect@2.21.0 - deprecate `connect(middleware)` -- use `app.use(middleware)` instead - deprecate `connect.createServer()` -- use `connect()` instead - - fix `res.setHeader()` patch to work with with get -> append -> set pattern + - fix `res.setHeader()` patch to work with get -> append -> set pattern - deps: compression@~1.0.8 - deps: errorhandler@~1.1.1 - deps: express-session@~1.5.0 @@ -3423,8 +3423,8 @@ Shaw] * Added node v0.1.97 compatibility * Added support for deleting cookies via Request#cookie('key', null) * Updated haml submodule - * Fixed not-found page, now using using charset utf-8 - * Fixed show-exceptions page, now using using charset utf-8 + * Fixed not-found page, now using charset utf-8 + * Fixed show-exceptions page, now using charset utf-8 * Fixed view support due to fs.readFile Buffers * Changed; mime.type() no longer accepts ".type" due to node extname() changes @@ -3459,7 +3459,7 @@ Shaw] ================== * Added charset support via Request#charset (automatically assigned to 'UTF-8' when respond()'s - encoding is set to 'utf8' or 'utf-8'. + encoding is set to 'utf8' or 'utf-8'). * Added "encoding" option to Request#render(). Closes #299 * Added "dump exceptions" setting, which is enabled by default. * Added simple ejs template engine support @@ -3498,7 +3498,7 @@ Shaw] * Added [haml.js](http://github.com/visionmedia/haml.js) submodule; removed haml-js * Added callback function support to Request#halt() as 3rd/4th arg * Added preprocessing of route param wildcards using param(). Closes #251 - * Added view partial support (with collections etc) + * Added view partial support (with collections etc.) * Fixed bug preventing falsey params (such as ?page=0). Closes #286 * Fixed setting of multiple cookies. Closes #199 * Changed; view naming convention is now NAME.TYPE.ENGINE (for example page.html.haml) diff --git a/Readme-Guide.md b/Readme-Guide.md index 34d4648b9c..d42c4788bf 100644 --- a/Readme-Guide.md +++ b/Readme-Guide.md @@ -21,9 +21,6 @@ and so on. Badges should resolve properly (not display a broken image). Possible badges include: - npm version: `[![NPM Version][npm-image]][npm-url]` - npm downloads: `[![NPM Downloads][downloads-image]][downloads-url]` -- Build status: `[![Build Status][travis-image]][travis-url]` -- Test coverage: `[![Test Coverage][coveralls-image]][coveralls-url]` -- Tips: `[![Gratipay][gratipay-image]][gratipay-url]` **Summary**: Following badges, provide a one- or two-sentence description of what the module does. This should be the same as the npmjs.org blurb (which diff --git a/Readme.md b/Readme.md index b60d588c41..07fa4aadb2 100644 --- a/Readme.md +++ b/Readme.md @@ -4,9 +4,6 @@ [![NPM Version][npm-image]][npm-url] [![NPM Downloads][downloads-image]][downloads-url] - [![Linux Build][ci-image]][ci-url] - [![Windows Build][appveyor-image]][appveyor-url] - [![Test Coverage][coveralls-image]][coveralls-url] ```js const express = require('express') @@ -146,13 +143,6 @@ The current lead maintainer is [Douglas Christopher Wilson](https://github.com/d [MIT](LICENSE) -[ci-image]: https://img.shields.io/github/workflow/status/expressjs/express/ci/master.svg?label=linux [ci-url]: https://github.com/expressjs/express/actions?query=workflow%3Aci [npm-image]: https://img.shields.io/npm/v/express.svg -[npm-url]: https://npmjs.org/package/express -[downloads-image]: https://img.shields.io/npm/dm/express.svg -[downloads-url]: https://npmcharts.com/compare/express?minimal=true -[appveyor-image]: https://img.shields.io/appveyor/ci/dougwilson/express/master.svg?label=windows -[appveyor-url]: https://ci.appveyor.com/project/dougwilson/express -[coveralls-image]: https://img.shields.io/coveralls/expressjs/express/master.svg -[coveralls-url]: https://coveralls.io/r/expressjs/express?branch=master +[npm-url]: https://npmjs.org/package/express \ No newline at end of file diff --git a/examples/view-locals/index.js b/examples/view-locals/index.js index bb23c20b43..19260d6515 100644 --- a/examples/view-locals/index.js +++ b/examples/view-locals/index.js @@ -140,7 +140,7 @@ app.use('/api', function(req, res, next){ /* -app.all('/api/:splat*', function(req, res, next){ +app.all('/api/*', function(req, res, next){ res.locals.user = req.user; res.locals.sess = req.session; next(); diff --git a/test/AppAll.mjs b/test/AppAll.mjs index 5f2860719f..27707bed71 100644 --- a/test/AppAll.mjs +++ b/test/AppAll.mjs @@ -27,7 +27,7 @@ describe('app.all()', () => { const app = express() let n = 0 - app.all('/:splat*', (req, res, next) => { + app.all('/*', (req, res, next) => { if (n++) return done(new Error('DELETE called several times')) next() })