Merge branch 'mashlib-bundle' into dev

Author: megoth

lib/create-app.js

@@ -67,9 +67,7 @@ function createApp (argv = {}) {
 
   // Serve the public 'common' directory (for shared CSS files, etc)
   app.use('/common', express.static(path.join(__dirname, '../common')))
-  routeResolvedFile(app, '/common/js/', 'mashlib/dist/mashlib.js')
-  routeResolvedFile(app, '/common/js/', 'mashlib/dist/mashlib.min.js')
-  routeResolvedFile(app, '/common/js/', 'mashlib/dist/mashlib.min.js.map')
+  app.use('/', express.static(path.join(__dirname, '../node_modules/mashlib/dist'), { index: false }))
   routeResolvedFile(app, '/common/js/', 'solid-auth-client/dist-lib/solid-auth-client.bundle.js')
   routeResolvedFile(app, '/common/js/', 'solid-auth-client/dist-lib/solid-auth-client.bundle.js.map')
   app.use('/.well-known', express.static(path.join(__dirname, '../common/well-known')))

lib/handlers/get.js

@@ -89,7 +89,7 @@ async function handler (req, res, next) {
 
     if (useDataBrowser) {
       res.set('Content-Type', 'text/html')
-      const defaultDataBrowser = _path.join(__dirname, '../../static/databrowser.html')
+      const defaultDataBrowser = _path.join(__dirname, '../../node_modules/mashlib/dist/index.html')
       const dataBrowserPath = ldp.dataBrowserPath === 'default' ? defaultDataBrowser : ldp.dataBrowserPath
       debug('   sending data browser file: ' + dataBrowserPath)
       res.sendFile(dataBrowserPath)

package-lock.json

@@ -83,7 +83,7 @@
     "ip-range-check": "0.0.2",
     "is-ip": "^2.0.0",
     "li": "^1.0.1",
-    "mashlib": "^0.7.19",
+    "mashlib": "^0.8.0",
     "mime-types": "^2.1.11",
     "mkdir-recursive": "^0.4.0",
     "negotiator": "^0.6.0",