diff --git a/lib/capability-discovery.js b/lib/capability-discovery.js index f96fe021d..dfdaac39c 100644 --- a/lib/capability-discovery.js +++ b/lib/capability-discovery.js @@ -33,7 +33,7 @@ function serviceCapabilityDocument () { const ldp = req.app.locals.ldp res.json({ // Add the server root url - root: req.app.locals.ldp.resourceMapper.resolveUrl(req.hostname, req.path), + root: ldp.resourceMapper.resolveUrl(req.hostname, req.path), // Add the 'apps' urls section apps: req.app.locals.appUrls, api: { @@ -44,8 +44,8 @@ function serviceCapabilityDocument () { // Create new user (see IdentityProvider.post() in identity-provider.js) new: new URL('/api/accounts/new', ldp.serverUri), recover: new URL('/api/accounts/recover', ldp.serverUri), - signin: req.app.locals.ldp.resourceMapper.resolveUrl(req.hostname, '/login'), - signout: req.app.locals.ldp.resourceMapper.resolveUrl(req.hostname, '/logout'), + signin: ldp.resourceMapper.resolveUrl(req.hostname, '/login'), + signout: ldp.resourceMapper.resolveUrl(req.hostname, '/logout'), validateToken: new URL('/api/accounts/validateToken', ldp.serverUri) } } diff --git a/lib/handlers/index.js b/lib/handlers/index.js index 6c80c6b44..93c99a437 100644 --- a/lib/handlers/index.js +++ b/lib/handlers/index.js @@ -13,7 +13,7 @@ async function handler (req, res, next) { const requestedType = negotiator.mediaType() try { - const { path: filename } = await req.app.locals.ldp.resourceMapper.mapUrlToFile({ url: req }) + const { path: filename } = await ldp.resourceMapper.mapUrlToFile({ url: req }) const stats = await ldp.stat(filename) if (!stats.isDirectory()) { diff --git a/package-lock.json b/package-lock.json index cb4ea3d91..9e1f8fff8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -118,9 +118,9 @@ "dev": true }, "@babel/polyfill": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.4.4.tgz", - "integrity": "sha512-WlthFLfhQQhh+A2Gn5NSFl0Huxz36x86Jn+E9OW7ibK8edKPq+KLy4apM1yDpQ8kJOVi1OVjpP4vSDLdrI04dg==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.6.0.tgz", + "integrity": "sha512-q5BZJI0n/B10VaQQvln1IlDK3BTBJFbADx7tv+oXDPIDZuTo37H5Adb9jhlXm/fEN4Y7/64qD9mnrJJG7rmaTw==", "requires": { "core-js": "^2.6.5", "regenerator-runtime": "^0.13.2" @@ -2148,6 +2148,11 @@ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000989.tgz", "integrity": "sha512-vrMcvSuMz16YY6GSVZ0dWDTJP8jqk3iFQ/Aq5iqblPwxSVVZI+zxDyTX0VPqtQsDnfdrBDcsmhgTEOh5R8Lbpw==" }, + "canonicalize": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/canonicalize/-/canonicalize-1.0.1.tgz", + "integrity": "sha512-N3cmB3QLhS5TJ5smKFf1w42rJXWe6C1qP01z4dxJiI5v269buii4fLHWETDyf7yEd0azGLNC63VxNMiPd2u0Cg==" + }, "capture-stack-trace": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz", @@ -2198,9 +2203,9 @@ "dev": true }, "chat-pane": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/chat-pane/-/chat-pane-1.2.7.tgz", - "integrity": "sha512-itsMQWUNjajgdEiTNaRMl/7y9FEpCNrPNldfu+Dj+iJPE5Y0OIBOwzx6hoyItiJYsQSfMcsFiGss2Ie5U4YZtQ==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/chat-pane/-/chat-pane-1.3.0.tgz", + "integrity": "sha512-yxOHFAhiwYHT3Cj4E18W94h+wwUv17NRuaN+fXcO/ahh7SBCglcDoGZOUq5DNilXRRroBZ5PMpYa7Otsl/CBzg==", "requires": { "babel-preset-env": "^1.6.1", "babel-preset-metalab": "^1.0.0", @@ -2401,9 +2406,9 @@ "integrity": "sha512-6S062WDQUXi6hOfkO/sBPVwE5ASXY4G2+b4atvhJfSsuUUhIaUKlkjLe9692Ipyt5/a+IPF5aVTu3V5gvXq5cg==" }, "colors": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz", - "integrity": "sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==" + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", + "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==" }, "combine-source-map": { "version": "0.8.0", @@ -2584,10 +2589,11 @@ } }, "jsonld": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/jsonld/-/jsonld-1.7.0.tgz", - "integrity": "sha512-vqdw1px6pjim4k7dQir6CyxmkVhoClmwZPM/rw3r5KZZv/zDRBvYEpR0u/NTnuwfe9xHKUIGlVTq3PRJTvLRHQ==", + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/jsonld/-/jsonld-1.8.0.tgz", + "integrity": "sha512-a3bwbR0wqFstxKsGoimUIIKBdfJ+yb9kWK+WK7MpVyvfYtITMpUtF3sNoN1wG/W+jGDgya0ACRh++jtTozxtyQ==", "requires": { + "canonicalize": "^1.0.1", "rdf-canonize": "^1.0.2", "request": "^2.88.0", "semver": "^5.6.0", @@ -3273,9 +3279,9 @@ "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" }, "electron-to-chromium": { - "version": "1.3.250", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.250.tgz", - "integrity": "sha512-2OAU91iUw83QvzuWJPfT+FMj+O+DC1EyTx1QBFcc9WZzOQSfZEAWINpdLWElxkgfiqTvQRDOKg0DkMZd9QoNug==" + "version": "1.3.264", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.264.tgz", + "integrity": "sha512-z8E7WkrrquCuGYv+kKyybuZIbdms+4PeHp7Zm2uIgEhAigP0bOwqXILItwj0YO73o+QyHY/7XtEfP5DsHOWQgQ==" }, "elliptic": { "version": "6.5.0", @@ -4091,6 +4097,74 @@ "pane-registry": "^1.0.4", "rdflib": "^1.0.4", "solid-ui": "^1.1.0" + }, + "dependencies": { + "async": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/async/-/async-3.1.0.tgz", + "integrity": "sha512-4vx/aaY6j/j3Lw3fbCHNWP0pPaTCew3F6F3hYyl/tHs/ndmV1q7NW9T5yuJ2XAGwdQrP+6Wu20x06U4APo/iQQ==" + }, + "jsonld": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/jsonld/-/jsonld-1.8.0.tgz", + "integrity": "sha512-a3bwbR0wqFstxKsGoimUIIKBdfJ+yb9kWK+WK7MpVyvfYtITMpUtF3sNoN1wG/W+jGDgya0ACRh++jtTozxtyQ==", + "requires": { + "canonicalize": "^1.0.1", + "rdf-canonize": "^1.0.2", + "request": "^2.88.0", + "semver": "^5.6.0", + "xmldom": "0.1.19" + }, + "dependencies": { + "xmldom": { + "version": "0.1.19", + "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz", + "integrity": "sha1-Yx/Ad3bv2EEYvyUXGzftTQdaCrw=" + } + } + }, + "n3": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/n3/-/n3-1.2.0.tgz", + "integrity": "sha512-3VZD31lRyG2JoAa7imyhAIUZbqaZk4FSsa5QenNjUhNNJKomMLcwuhAOyl+i/suT7UB2H16Ta/7tSUP+Hkq/EQ==" + }, + "rdflib": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/rdflib/-/rdflib-1.0.4.tgz", + "integrity": "sha512-rnK48WLbj0sIBQwgSazPEJNhgYyfnCLgizGWo+g2TArntvFOzmH0fiChyQIOtvAaFbr3r0uPsbqm4LaB5c+t5A==", + "requires": { + "@babel/runtime": "^7.5.5", + "async": "^3.1.x", + "jsonld": "^1.6.2", + "n3": "^1.2.0", + "solid-auth-cli": "^1.0.8", + "solid-auth-client": "^2.3.0", + "xmldom": "^0.1.27" + } + }, + "solid-auth-cli": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/solid-auth-cli/-/solid-auth-cli-1.0.8.tgz", + "integrity": "sha512-cZYNLM6/BDwbcywsrfFRIrGVjTPc/f3snubabqd1WRCvNwW7wkvpo0yvoHp3NQjVAfKHw5kIrZtaV8IRHPK/KQ==", + "requires": { + "@solid/cli": "^0.1.1", + "async": "^2.6.1", + "isomorphic-fetch": "^2.2.1", + "jsonld": "^1.4.0", + "n3": "^1.0.3", + "solid-rest": "^1.0.7" + }, + "dependencies": { + "async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "requires": { + "lodash": "^4.17.14" + } + } + } + } } }, "follow-redirects": { @@ -5250,6 +5324,74 @@ "pane-registry": "^1.0.4", "rdflib": "^1.0.4", "solid-ui": "^1.1.0" + }, + "dependencies": { + "async": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/async/-/async-3.1.0.tgz", + "integrity": "sha512-4vx/aaY6j/j3Lw3fbCHNWP0pPaTCew3F6F3hYyl/tHs/ndmV1q7NW9T5yuJ2XAGwdQrP+6Wu20x06U4APo/iQQ==" + }, + "jsonld": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/jsonld/-/jsonld-1.8.0.tgz", + "integrity": "sha512-a3bwbR0wqFstxKsGoimUIIKBdfJ+yb9kWK+WK7MpVyvfYtITMpUtF3sNoN1wG/W+jGDgya0ACRh++jtTozxtyQ==", + "requires": { + "canonicalize": "^1.0.1", + "rdf-canonize": "^1.0.2", + "request": "^2.88.0", + "semver": "^5.6.0", + "xmldom": "0.1.19" + }, + "dependencies": { + "xmldom": { + "version": "0.1.19", + "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz", + "integrity": "sha1-Yx/Ad3bv2EEYvyUXGzftTQdaCrw=" + } + } + }, + "n3": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/n3/-/n3-1.2.0.tgz", + "integrity": "sha512-3VZD31lRyG2JoAa7imyhAIUZbqaZk4FSsa5QenNjUhNNJKomMLcwuhAOyl+i/suT7UB2H16Ta/7tSUP+Hkq/EQ==" + }, + "rdflib": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/rdflib/-/rdflib-1.0.4.tgz", + "integrity": "sha512-rnK48WLbj0sIBQwgSazPEJNhgYyfnCLgizGWo+g2TArntvFOzmH0fiChyQIOtvAaFbr3r0uPsbqm4LaB5c+t5A==", + "requires": { + "@babel/runtime": "^7.5.5", + "async": "^3.1.x", + "jsonld": "^1.6.2", + "n3": "^1.2.0", + "solid-auth-cli": "^1.0.8", + "solid-auth-client": "^2.3.0", + "xmldom": "^0.1.27" + } + }, + "solid-auth-cli": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/solid-auth-cli/-/solid-auth-cli-1.0.8.tgz", + "integrity": "sha512-cZYNLM6/BDwbcywsrfFRIrGVjTPc/f3snubabqd1WRCvNwW7wkvpo0yvoHp3NQjVAfKHw5kIrZtaV8IRHPK/KQ==", + "requires": { + "@solid/cli": "^0.1.1", + "async": "^2.6.1", + "isomorphic-fetch": "^2.2.1", + "jsonld": "^1.4.0", + "n3": "^1.0.3", + "solid-rest": "^1.0.7" + }, + "dependencies": { + "async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "requires": { + "lodash": "^4.17.14" + } + } + } + } } }, "istanbul-lib-coverage": { @@ -5747,16 +5889,83 @@ } }, "mashlib": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/mashlib/-/mashlib-1.1.1.tgz", - "integrity": "sha512-sdlVTzvgAGLTDD9KRBSyL4uOtX6XRuqJdiwbf5dWyB9S/zTkgtd+UR9IAICJyuo440b415y9ySl611Nj+ByeRQ==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/mashlib/-/mashlib-1.1.2.tgz", + "integrity": "sha512-uHfbl0/sWHdakHqrzmd/JZUDYt7/Ch89sNdzWKdfn+2dPCgG+nq+oxJYa71AIq/vmSv/gM2hehHFSYAy5HY0+Q==", "requires": { "normalize.css": "^8.0.1", "rdflib": "^1.0.4", "solid-namespace": "^0.2.0", - "solid-panes": "^2.0.0" + "solid-panes": "^2.0.1", + "solid-ui": "^1.2.0" }, "dependencies": { + "async": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/async/-/async-3.1.0.tgz", + "integrity": "sha512-4vx/aaY6j/j3Lw3fbCHNWP0pPaTCew3F6F3hYyl/tHs/ndmV1q7NW9T5yuJ2XAGwdQrP+6Wu20x06U4APo/iQQ==" + }, + "jsonld": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/jsonld/-/jsonld-1.8.0.tgz", + "integrity": "sha512-a3bwbR0wqFstxKsGoimUIIKBdfJ+yb9kWK+WK7MpVyvfYtITMpUtF3sNoN1wG/W+jGDgya0ACRh++jtTozxtyQ==", + "requires": { + "canonicalize": "^1.0.1", + "rdf-canonize": "^1.0.2", + "request": "^2.88.0", + "semver": "^5.6.0", + "xmldom": "0.1.19" + }, + "dependencies": { + "xmldom": { + "version": "0.1.19", + "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz", + "integrity": "sha1-Yx/Ad3bv2EEYvyUXGzftTQdaCrw=" + } + } + }, + "n3": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/n3/-/n3-1.2.0.tgz", + "integrity": "sha512-3VZD31lRyG2JoAa7imyhAIUZbqaZk4FSsa5QenNjUhNNJKomMLcwuhAOyl+i/suT7UB2H16Ta/7tSUP+Hkq/EQ==" + }, + "rdflib": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/rdflib/-/rdflib-1.0.4.tgz", + "integrity": "sha512-rnK48WLbj0sIBQwgSazPEJNhgYyfnCLgizGWo+g2TArntvFOzmH0fiChyQIOtvAaFbr3r0uPsbqm4LaB5c+t5A==", + "requires": { + "@babel/runtime": "^7.5.5", + "async": "^3.1.x", + "jsonld": "^1.6.2", + "n3": "^1.2.0", + "solid-auth-cli": "^1.0.8", + "solid-auth-client": "^2.3.0", + "xmldom": "^0.1.27" + } + }, + "solid-auth-cli": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/solid-auth-cli/-/solid-auth-cli-1.0.8.tgz", + "integrity": "sha512-cZYNLM6/BDwbcywsrfFRIrGVjTPc/f3snubabqd1WRCvNwW7wkvpo0yvoHp3NQjVAfKHw5kIrZtaV8IRHPK/KQ==", + "requires": { + "@solid/cli": "^0.1.1", + "async": "^2.6.1", + "isomorphic-fetch": "^2.2.1", + "jsonld": "^1.4.0", + "n3": "^1.0.3", + "solid-rest": "^1.0.7" + }, + "dependencies": { + "async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "requires": { + "lodash": "^4.17.14" + } + } + } + }, "solid-namespace": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/solid-namespace/-/solid-namespace-0.2.0.tgz", @@ -5790,6 +5999,74 @@ "pane-registry": "^1.0.4", "rdflib": "^1.0.4", "solid-ui": "^1.1.0" + }, + "dependencies": { + "async": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/async/-/async-3.1.0.tgz", + "integrity": "sha512-4vx/aaY6j/j3Lw3fbCHNWP0pPaTCew3F6F3hYyl/tHs/ndmV1q7NW9T5yuJ2XAGwdQrP+6Wu20x06U4APo/iQQ==" + }, + "jsonld": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/jsonld/-/jsonld-1.8.0.tgz", + "integrity": "sha512-a3bwbR0wqFstxKsGoimUIIKBdfJ+yb9kWK+WK7MpVyvfYtITMpUtF3sNoN1wG/W+jGDgya0ACRh++jtTozxtyQ==", + "requires": { + "canonicalize": "^1.0.1", + "rdf-canonize": "^1.0.2", + "request": "^2.88.0", + "semver": "^5.6.0", + "xmldom": "0.1.19" + }, + "dependencies": { + "xmldom": { + "version": "0.1.19", + "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz", + "integrity": "sha1-Yx/Ad3bv2EEYvyUXGzftTQdaCrw=" + } + } + }, + "n3": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/n3/-/n3-1.2.0.tgz", + "integrity": "sha512-3VZD31lRyG2JoAa7imyhAIUZbqaZk4FSsa5QenNjUhNNJKomMLcwuhAOyl+i/suT7UB2H16Ta/7tSUP+Hkq/EQ==" + }, + "rdflib": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/rdflib/-/rdflib-1.0.4.tgz", + "integrity": "sha512-rnK48WLbj0sIBQwgSazPEJNhgYyfnCLgizGWo+g2TArntvFOzmH0fiChyQIOtvAaFbr3r0uPsbqm4LaB5c+t5A==", + "requires": { + "@babel/runtime": "^7.5.5", + "async": "^3.1.x", + "jsonld": "^1.6.2", + "n3": "^1.2.0", + "solid-auth-cli": "^1.0.8", + "solid-auth-client": "^2.3.0", + "xmldom": "^0.1.27" + } + }, + "solid-auth-cli": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/solid-auth-cli/-/solid-auth-cli-1.0.8.tgz", + "integrity": "sha512-cZYNLM6/BDwbcywsrfFRIrGVjTPc/f3snubabqd1WRCvNwW7wkvpo0yvoHp3NQjVAfKHw5kIrZtaV8IRHPK/KQ==", + "requires": { + "@solid/cli": "^0.1.1", + "async": "^2.6.1", + "isomorphic-fetch": "^2.2.1", + "jsonld": "^1.4.0", + "n3": "^1.0.3", + "solid-rest": "^1.0.7" + }, + "dependencies": { + "async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "requires": { + "lodash": "^4.17.14" + } + } + } + } } }, "merge-descriptors": { @@ -8901,15 +9178,15 @@ } }, "solid-panes": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/solid-panes/-/solid-panes-2.0.0.tgz", - "integrity": "sha512-YefyjJjJA79IPvPbsXf80UWxL3qABz/x88rxlzd8yEWheD6w5yiLAQtvXIqFpoY7wK6jO/Uegts6EK5qLmqyjQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/solid-panes/-/solid-panes-2.0.1.tgz", + "integrity": "sha512-EvS34io7yI6ETHfZKuefWpm/8LeogxXWql/EjokH6iScQQ+AWrS5SviELYjPpZ7Ua+WolmqCeJ07MOFFl/fMiw==", "requires": { "@babel/polyfill": "^7.4.4", "@solid/better-simple-slideshow": "^0.1.0", "babel-preset-env": "^1.6.1", "babel-preset-metalab": "^1.0.0", - "chat-pane": "^1.2.7", + "chat-pane": "^1.3.0", "contacts-pane": "^1.0.4", "folder-pane": "^1.1.0", "issue-pane": "^1.1.0", @@ -8918,7 +9195,7 @@ "pane-registry": "^1.0.4", "rdflib": "^1.0.4", "solid-namespace": "^0.2.0", - "solid-ui": "^1.1.0", + "solid-ui": "^1.2.0", "source-pane": "^1.0.3", "ts-lint": "^4.5.1", "tslint": "^5.19.0", @@ -8933,6 +9210,11 @@ "color-convert": "^1.9.0" } }, + "async": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/async/-/async-3.1.0.tgz", + "integrity": "sha512-4vx/aaY6j/j3Lw3fbCHNWP0pPaTCew3F6F3hYyl/tHs/ndmV1q7NW9T5yuJ2XAGwdQrP+6Wu20x06U4APo/iQQ==" + }, "chalk": { "version": "2.4.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", @@ -8943,6 +9225,72 @@ "supports-color": "^5.3.0" } }, + "diff": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.1.tgz", + "integrity": "sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==" + }, + "jsonld": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/jsonld/-/jsonld-1.8.0.tgz", + "integrity": "sha512-a3bwbR0wqFstxKsGoimUIIKBdfJ+yb9kWK+WK7MpVyvfYtITMpUtF3sNoN1wG/W+jGDgya0ACRh++jtTozxtyQ==", + "requires": { + "canonicalize": "^1.0.1", + "rdf-canonize": "^1.0.2", + "request": "^2.88.0", + "semver": "^5.6.0", + "xmldom": "0.1.19" + }, + "dependencies": { + "xmldom": { + "version": "0.1.19", + "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz", + "integrity": "sha1-Yx/Ad3bv2EEYvyUXGzftTQdaCrw=" + } + } + }, + "n3": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/n3/-/n3-1.2.0.tgz", + "integrity": "sha512-3VZD31lRyG2JoAa7imyhAIUZbqaZk4FSsa5QenNjUhNNJKomMLcwuhAOyl+i/suT7UB2H16Ta/7tSUP+Hkq/EQ==" + }, + "rdflib": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/rdflib/-/rdflib-1.0.4.tgz", + "integrity": "sha512-rnK48WLbj0sIBQwgSazPEJNhgYyfnCLgizGWo+g2TArntvFOzmH0fiChyQIOtvAaFbr3r0uPsbqm4LaB5c+t5A==", + "requires": { + "@babel/runtime": "^7.5.5", + "async": "^3.1.x", + "jsonld": "^1.6.2", + "n3": "^1.2.0", + "solid-auth-cli": "^1.0.8", + "solid-auth-client": "^2.3.0", + "xmldom": "^0.1.27" + } + }, + "solid-auth-cli": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/solid-auth-cli/-/solid-auth-cli-1.0.8.tgz", + "integrity": "sha512-cZYNLM6/BDwbcywsrfFRIrGVjTPc/f3snubabqd1WRCvNwW7wkvpo0yvoHp3NQjVAfKHw5kIrZtaV8IRHPK/KQ==", + "requires": { + "@solid/cli": "^0.1.1", + "async": "^2.6.1", + "isomorphic-fetch": "^2.2.1", + "jsonld": "^1.4.0", + "n3": "^1.0.3", + "solid-rest": "^1.0.7" + }, + "dependencies": { + "async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "requires": { + "lodash": "^4.17.14" + } + } + } + }, "solid-namespace": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/solid-namespace/-/solid-namespace-0.2.0.tgz", @@ -8957,15 +9305,15 @@ } }, "tslint": { - "version": "5.19.0", - "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.19.0.tgz", - "integrity": "sha512-1LwwtBxfRJZnUvoS9c0uj8XQtAnyhWr9KlNvDIdB+oXyT+VpsOAaEhEgKi1HrZ8rq0ki/AAnbGSv4KM6/AfVZw==", + "version": "5.20.0", + "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.20.0.tgz", + "integrity": "sha512-2vqIvkMHbnx8acMogAERQ/IuINOq6DFqgF8/VDvhEkBqQh/x6SP0Y+OHnKth9/ZcHQSroOZwUQSN18v8KKF0/g==", "requires": { "@babel/code-frame": "^7.0.0", "builtin-modules": "^1.1.1", "chalk": "^2.3.0", "commander": "^2.12.1", - "diff": "^3.2.0", + "diff": "^4.0.1", "glob": "^7.1.1", "js-yaml": "^3.13.1", "minimatch": "^3.0.4", @@ -9047,9 +9395,9 @@ } }, "solid-ui": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/solid-ui/-/solid-ui-1.1.0.tgz", - "integrity": "sha512-GxLpdUVCjUTd/lT8oBtk6rnYc6RE088Nf+wCmfAkSTXVkfxW1a/BWACXqnBYaNW6RBYcty2/4Bw1TKmkzL0A/A==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/solid-ui/-/solid-ui-1.2.0.tgz", + "integrity": "sha512-UnNrmVGtFLBsj6WNvQ1HQ5IH9pL8ge7HY4krF6wja5YUGWKnqnvSIF1j9bSdUvy0CTi+TXnKk0lAjDHIkCbaxQ==", "requires": { "escape-html": "^1.0.3", "mime-types": "^2.1.24", @@ -9060,11 +9408,89 @@ "solid-namespace": "0.2.0" }, "dependencies": { + "async": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/async/-/async-3.1.0.tgz", + "integrity": "sha512-4vx/aaY6j/j3Lw3fbCHNWP0pPaTCew3F6F3hYyl/tHs/ndmV1q7NW9T5yuJ2XAGwdQrP+6Wu20x06U4APo/iQQ==" + }, + "jsonld": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/jsonld/-/jsonld-1.8.0.tgz", + "integrity": "sha512-a3bwbR0wqFstxKsGoimUIIKBdfJ+yb9kWK+WK7MpVyvfYtITMpUtF3sNoN1wG/W+jGDgya0ACRh++jtTozxtyQ==", + "requires": { + "canonicalize": "^1.0.1", + "rdf-canonize": "^1.0.2", + "request": "^2.88.0", + "semver": "^5.6.0", + "xmldom": "0.1.19" + }, + "dependencies": { + "xmldom": { + "version": "0.1.19", + "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz", + "integrity": "sha1-Yx/Ad3bv2EEYvyUXGzftTQdaCrw=" + } + } + }, + "n3": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/n3/-/n3-1.2.0.tgz", + "integrity": "sha512-3VZD31lRyG2JoAa7imyhAIUZbqaZk4FSsa5QenNjUhNNJKomMLcwuhAOyl+i/suT7UB2H16Ta/7tSUP+Hkq/EQ==" + }, "node-uuid": { "version": "1.4.8", "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz", "integrity": "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc=" }, + "rdflib": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/rdflib/-/rdflib-1.0.4.tgz", + "integrity": "sha512-rnK48WLbj0sIBQwgSazPEJNhgYyfnCLgizGWo+g2TArntvFOzmH0fiChyQIOtvAaFbr3r0uPsbqm4LaB5c+t5A==", + "requires": { + "@babel/runtime": "^7.5.5", + "async": "^3.1.x", + "jsonld": "^1.6.2", + "n3": "^1.2.0", + "solid-auth-cli": "^1.0.8", + "solid-auth-client": "^2.3.0", + "xmldom": "^0.1.27" + } + }, + "solid-auth-cli": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/solid-auth-cli/-/solid-auth-cli-1.0.8.tgz", + "integrity": "sha512-cZYNLM6/BDwbcywsrfFRIrGVjTPc/f3snubabqd1WRCvNwW7wkvpo0yvoHp3NQjVAfKHw5kIrZtaV8IRHPK/KQ==", + "requires": { + "@solid/cli": "^0.1.1", + "async": "^2.6.1", + "isomorphic-fetch": "^2.2.1", + "jsonld": "^1.4.0", + "n3": "^1.0.3", + "solid-rest": "^1.0.7" + }, + "dependencies": { + "async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "requires": { + "lodash": "^4.17.14" + } + } + } + }, + "solid-auth-client": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/solid-auth-client/-/solid-auth-client-2.3.1.tgz", + "integrity": "sha512-lWTdXW94agrwNmtH0KkO0QG6qjGN+QPKo9SHdN0pESqR/wehEF10HcD52pYMthcxjdK5k/Lw84qnCLrf5SN/6A==", + "requires": { + "@babel/runtime": "^7.0.0", + "@solid/oidc-rp": "^0.8.0", + "auth-header": "^1.0.0", + "commander": "^2.11.0", + "isomorphic-fetch": "^2.2.1" + } + }, "solid-namespace": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/solid-namespace/-/solid-namespace-0.2.0.tgz", diff --git a/package.json b/package.json index 19f5b2b8c..552b5d460 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,7 @@ "ip-range-check": "0.0.2", "is-ip": "^2.0.0", "li": "^1.0.1", - "mashlib": "^1.1.1", + "mashlib": "^1.1.2", "mime-types": "^2.1.11", "mkdir-recursive": "^0.4.0", "negotiator": "^0.6.0",