Skip to content

Commit e364266

Browse files
committed
Directly serve mashlib's data browser bundle
This way, node-solid-server no longer needs to carry its own copy of the data browser, and mashlib can include additional assets, such as stylesheets.
1 parent 5adcd47 commit e364266

File tree

5 files changed

+54
-84
lines changed

5 files changed

+54
-84
lines changed

lib/create-app.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,7 @@ function createApp (argv = {}) {
6767

6868
// Serve the public 'common' directory (for shared CSS files, etc)
6969
app.use('/common', express.static(path.join(__dirname, '../common')))
70-
routeResolvedFile(app, '/common/js/', 'mashlib/dist/mashlib.js')
71-
routeResolvedFile(app, '/common/js/', 'mashlib/dist/mashlib.min.js')
72-
routeResolvedFile(app, '/common/js/', 'mashlib/dist/mashlib.min.js.map')
70+
app.use('/', express.static(path.join(__dirname, '../node_modules/mashlib/dist'), { index: false }))
7371
routeResolvedFile(app, '/common/js/', 'solid-auth-client/dist-lib/solid-auth-client.bundle.js')
7472
routeResolvedFile(app, '/common/js/', 'solid-auth-client/dist-lib/solid-auth-client.bundle.js.map')
7573
app.use('/.well-known', express.static(path.join(__dirname, '../common/well-known')))

lib/handlers/get.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ async function handler (req, res, next) {
8989

9090
if (useDataBrowser) {
9191
res.set('Content-Type', 'text/html')
92-
const defaultDataBrowser = _path.join(__dirname, '../../static/databrowser.html')
92+
const defaultDataBrowser = _path.join(__dirname, '../../node_modules/mashlib/dist/index.html')
9393
const dataBrowserPath = ldp.dataBrowserPath === 'default' ? defaultDataBrowser : ldp.dataBrowserPath
9494
debug(' sending data browser file: ' + dataBrowserPath)
9595
res.sendFile(dataBrowserPath)

package-lock.json

Lines changed: 51 additions & 45 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
"ip-range-check": "0.0.2",
8484
"is-ip": "^2.0.0",
8585
"li": "^1.0.1",
86-
"mashlib": "^0.7.19",
86+
"mashlib": "^0.8.0",
8787
"mime-types": "^2.1.11",
8888
"mkdir-recursive": "^0.4.0",
8989
"negotiator": "^0.6.0",

0 commit comments

Comments
 (0)