Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: lukeed/sirv
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.3.1
Choose a base ref
...
head repository: lukeed/sirv
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v0.4.0
Choose a head ref
  • 4 commits
  • 6 files changed
  • 2 contributors

Commits on Apr 23, 2019

  1. fix(sirv-cli): pass headers for opts.single passthru (#23) 

    * pass an empty headers object on no match

`send()` in `sirv` expects headers to be defined on the request.

* spacing
    @bryanwood @lukeed
    bryanwood authored and lukeed committed Apr 23, 2019

    Unverified

    The email in this signature doesn’t match the committer email.
    GPG key ID: 063CCCAD04182D32
    Expired
    Learn about vigilant mode
    Copy the full SHA
    1f515fe View commit details

  2. v0.3.2

    @lukeed
    lukeed committed Apr 23, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    dtzWill Will Dietz
    GPG key ID: EBB0EA4124809D02
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6120ecf View commit details

  3. feat: pass req, res to opts.onNoMatch handler

    @lukeed
    lukeed committed Apr 23, 2019
    Copy the full SHA
    abe9d69 View commit details

  4. v0.4.0

    @lukeed
    lukeed committed Apr 23, 2019
    Copy the full SHA
    2fb5bac View commit details
Showing with 9 additions and 9 deletions.
  1. +1 −1 lerna.json
  2. +1 −1 packages/sirv-cli/boot.js
  3. +2 −2 packages/sirv-cli/package.json
  4. +3 −3 packages/sirv/index.js
  5. +1 −1 packages/sirv/package.json
  6. +1 −1 packages/sirv/readme.md
2 changes: 1 addition & 1 deletion lerna.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"lerna": "2.8.0",
"version": "0.3.1",
"version": "0.4.0",
"npmClient": "yarn",
"packages": [
"packages/*"
2 changes: 1 addition & 1 deletion packages/sirv-cli/boot.js
View file
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@ module.exports = function (dir, opts) {
}

if (opts.single) {
opts.onNoMatch = res => fn({ path:'/' }, res, r => (r.statusCode=404,r.end()));
opts.onNoMatch = (req, res) => (req.path='/',fn(req, res, r => (r.statusCode=404,r.end())));
}

fn = sirv(dir, opts);
4 changes: 2 additions & 2 deletions packages/sirv-cli/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sirv-cli",
"version": "0.3.1",
"version": "0.4.0",
"description": "A lightweight CLI program to serve static sites~!",
"repository": "lukeed/sirv",
"license": "MIT",
@@ -24,7 +24,7 @@
"kleur": "^3.0.0",
"local-access": "^1.0.1",
"sade": "^1.4.0",
"sirv": "^0.3.1",
"sirv": "^0.4.0",
"tinydate": "^1.0.0"
}
}
6 changes: 3 additions & 3 deletions packages/sirv/index.js
View file
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ function find(uri, extns) {
return data;
}

function is404(res) {
function is404(req, res) {
return (res.statusCode=404,res.end());
}

@@ -83,7 +83,7 @@ module.exports = function (dir, opts={}) {
let uri = decodeURIComponent(req.path || req.pathname || parser(req).pathname);
let arr = uri.includes('.') ? [uri] : toAssume(uri, extensions);
let file = arr.map(x => join(dir, x)).find(fs.existsSync);
if (!file) return next ? next() : isNotFound(res);
if (!file) return next ? next() : isNotFound(req, res);

let stats = fs.statSync(file);
setHeaders(res, uri, stats);
@@ -118,7 +118,7 @@ module.exports = function (dir, opts={}) {
return function (req, res, next) {
let pathname = decodeURIComponent(req.path || req.pathname || parser(req).pathname);
let data = find(pathname, extensions);
if (!data) return next ? next() : isNotFound(res);
if (!data) return next ? next() : isNotFound(req, res);

setHeaders(res, pathname, data.stats);
send(req, res, data.abs, data.stats, data.headers);
2 changes: 1 addition & 1 deletion packages/sirv/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sirv",
"version": "0.3.1",
"version": "0.4.0",
"description": "The optimized & lightweight middleware for serving requests to static assets",
"repository": "lukeed/sirv",
"license": "MIT",
2 changes: 1 addition & 1 deletion packages/sirv/readme.md
View file
Original file line number Diff line number Diff line change
@@ -105,7 +105,7 @@ Type: `Function`

A custom function to run if a file cannot be found for a given request. <br>By default, `sirv` will send a basic `(404) Not found` response.

The function receives the current `res <ServerResponse>` as its only argument.
The function receives the current `req <IncomingMessage>, res <ServerResponse>` pair for as its two arguments.

> **Note:** This won't run if a `next` callback has been provided to the middleware; see [`sirv`](#sirvdir-opts) description.