Skip to content

Feature: add option "serveIndex" to enable/disable serveIndex middleware #1752

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexander-akait merged 12 commits into from
Apr 5, 2019
Merged

Feature: add option "serveIndex" to enable/disable serveIndex middleware #1752

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c3fc4a7
add option serveIndex
EslamHiko Apr 1, 2019
325c5cb
setting the default option serveIndex value to be true
EslamHiko Apr 2, 2019
c3e4aca
add/remove contentBaseIndex feature to/from defaultFeatures using ser…
EslamHiko Apr 3, 2019
e426144
remove typeof and compare the option value directly with undefined
EslamHiko Apr 3, 2019
bee7cbc
add the option with the default value to options.js & simplifying the…
EslamHiko Apr 3, 2019
88a9252
setting options.serveIndex to a seperate variable
EslamHiko Apr 3, 2019
43337af
add Tests
EslamHiko Apr 3, 2019
f367fda
add Test case where you have a folder with index.html inside of it
EslamHiko Apr 3, 2019
bd56fdc
Merge branch 'master' into add-serve-index-option
evilebottnawi Apr 4, 2019
4c33da3
add (folder with index.html inside it) test case to serveIndex:true &…
EslamHiko Apr 5, 2019
dd3bafe
Merge branch 'add-serve-index-option' of https://github.com/EslamHiko…
EslamHiko Apr 5, 2019
f29502f
Merge branch 'master' into add-serve-index-option
evilebottnawi Apr 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion examples/api/simple/folder/simple.txt
View file
Open in desktop

This file was deleted.

25 changes: 13 additions & 12 deletions lib/Server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,17 +472,15 @@ class Server {
}
},
contentBaseIndex: () => {
if (this.serveIndex || typeof this.serveIndex === 'undefined') {
if (Array.isArray(contentBase)) {
contentBase.forEach((item) => {
app.get('*', serveIndex(item));
});
} else if (
!/^(https?:)?\/\//.test(contentBase) &&
typeof contentBase !== 'number'
) {
app.get('*', serveIndex(contentBase));
}
if (Array.isArray(contentBase)) {
contentBase.forEach((item) => {
app.get('*', serveIndex(item));
});
} else if (
!/^(https?:)?\/\//.test(contentBase) &&
typeof contentBase !== 'number'
) {
app.get('*', serveIndex(contentBase));
}
},
watchContentBase: () => {
Expand Down Expand Up @@ -555,7 +553,10 @@ class Server {

defaultFeatures.push('magicHtml');

if (contentBase !== false) {
if (
contentBase !== false &&
(options.serveIndex || typeof options.serveIndex === 'undefined')

@alexander-akait alexander-akait Apr 3, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't use typeof, we prefer using !

@EslamHiko EslamHiko Apr 3, 2019

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

      (options.serveIndex || options.serveIndex === undefined)

@evilebottnawi done

) {
defaultFeatures.push('contentBaseIndex');
}
// compress is placed last and uses unshift so that it will be the first middleware used
Expand Down