Skip to content

Use stronger syntax parms for serveModule #411

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
Martii merged 1 commit into from
Nov 7, 2014
Merged

Use stronger syntax parms for serveModule #411

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 21 additions & 20 deletions routesStatic.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,33 @@
'use strict';

var express = require('express');
var path = require('path');
var url = require('url');

var express = require('express');

module.exports = function (aApp) {
var day = 1000 * 60 * 60 * 24;

// Static Files
function serveModule(aRoot, aModuleName, aModuleOption) {
var moduleRoot = path.join(__dirname, 'node_modules');
var moduleFile = null;
function serveModule(aModuleBase, aModuleBaseName, aModuleOption) {
var dirname = path.join(__dirname, 'node_modules');
var basename = null;

if (!aModuleOption || typeof aModuleOption === 'number') {
aApp.use(
path.join(aRoot, aModuleName),
url.resolve(aModuleBase, aModuleBaseName),
express.static(
path.join(moduleRoot, aModuleName),
path.join(dirname, aModuleBaseName),
{ maxage: aModuleOption }
)
);
} else {
for (moduleFile in aModuleOption) {
for (basename in aModuleOption) {
aApp.use(
path.join(aRoot, aModuleName, moduleFile),
url.resolve(aModuleBase, url.resolve(aModuleBaseName, basename)),
express.static(
path.join(moduleRoot, aModuleName, moduleFile),
{ maxage: aModuleOption[moduleFile].maxage }
path.join(dirname, aModuleBaseName, basename),
{ maxage: aModuleOption[basename].maxage }
)
);
}
Expand All @@ -34,34 +36,34 @@ module.exports = function (aApp) {

aApp.use(express.static(path.join(__dirname, 'public'), { maxage: day * 1 }));

serveModule('/redist/npm', 'bootstrap', {
serveModule('/redist/npm/', 'bootstrap/', {
'dist/js/bootstrap.js': { maxage: day * 1 }
});

serveModule('/redist/npm', 'bootstrap-markdown', {
serveModule('/redist/npm/', 'bootstrap-markdown/', {
'js/bootstrap-markdown.js': { maxage: day * 1 },
'css/bootstrap-markdown.min.css': { maxage: day * 1 }
});

serveModule('/redist/npm', 'font-awesome', {
serveModule('/redist/npm/', 'font-awesome/', {
'css/font-awesome.min.css': { maxage: day * 1 },
'fonts/fontawesome-webfont.eot': { maxage: day * 7 },
'fonts/fontawesome-webfont.svg': { maxage: day * 7 },
'fonts/fontawesome-webfont.ttf': { maxage: day * 7 },
'fonts/fontawesome-webfont.woff': { maxage: day * 7 },
'fonts/FontAwesome.otf': { maxage: day * 7 },
'fonts/FontAwesome.otf': { maxage: day * 7 }
});

serveModule('/redist/npm', 'jquery', {
serveModule('/redist/npm/', 'jquery/', {
'dist/jquery.js': { maxage: day * 7 },
'dist/jquery.min.map': { maxage: day * 7 }
});

serveModule('/redist/npm', 'marked', {
serveModule('/redist/npm/', 'marked/', {
'lib/marked.js': { maxage: day * 1 }
});

serveModule('/redist/npm', 'octicons', {
serveModule('/redist/npm/', 'octicons/', {
'octicons/octicons.css': { maxage: day * 1 },
'octicons/octicons-local.ttf': { maxage: day * 7 },
'octicons/octicons.eot': { maxage: day * 7 },
Expand All @@ -70,16 +72,15 @@ module.exports = function (aApp) {
'octicons/octicons.woff': { maxage: day * 7 }
});

serveModule('/redist/npm', 'select2', {
serveModule('/redist/npm/', 'select2/', {
'select2.js': { maxage: day * 1 },
'select2.css': { maxage: day * 1 },
'select2.png': { maxage: day * 30 },
'select2x2.png': { maxage: day * 30 },
'select2-spinner.gif': { maxage: day * 30 }
});

serveModule('/redist/npm', 'select2-bootstrap-css', {
serveModule('/redist/npm/', 'select2-bootstrap-css/', {
'select2-bootstrap.css': { maxage: day * 1 }
});

}