Skip to content

Commit 49d9a05

Browse files
bourgeoabourgeoa
authored
mashlib-v2
Mashlib v2
2 parents 971dfaf + 84c68ae commit 49d9a05

5 files changed

Lines changed: 1100 additions & 3732 deletions

File tree

‎README.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,20 @@ to show a novel way for your Solid project to interact with a Solid pod server.
2222
You can also join the Matrix chat [for solidcommunity.net](https://matrix.to/#/#solid_solidcommunity.net:gitter.im)
2323
or [for Pivot as piece of config+software](https://matrix.to/#/#solid_pivot:matrix.org).
2424

25+
## Changelog
26+
27+
### - mashlib v2.0.0
28+
29+
As from mashlib v2 the config/customise-me.json contains new parameters to :
30+
- remove CSS default `Markdown to Html converter`
31+
- include `mashlib chunks` in the static assets entries
32+
33+
### - removal of css-mashlib dependency
34+
35+
With the removal of css-mashlib dependency, templates are located in the `/templates folder`. The config/customise-me.json has been updated accordingly.
36+
37+
38+
2539
## Warning
2640
With Pivot's default settings, when a pod owner authenticates to a Solid app, this app can get full access to that user's data, on their own pod and elsewhere. This is not how we envision Solid's trinity of WebId's, Pods, and Solid apps, but it's what we have implemented so far. This is a problem that is not specific to Pivot, but that is shared among all WAC-based implementations of Solid.
2741

‎config/customise-me.json‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,16 @@
5757
"application/pdf"
5858
]
5959
},
60+
{
61+
"comment": "Remove the Markdown to HTML converter from the default chained converter",
62+
"@type": "Override",
63+
"overrideInstance": { "@id": "urn:solid-server:default:ChainedConverter" },
64+
"overrideSteps": [{
65+
"@type": "OverrideListRemove",
66+
"overrideParameter": { "@id": "ChainedConverter:_converters" },
67+
"overrideTarget": { "@id": "urn:solid-server:default:MarkdownToHtmlConverter" }
68+
}]
69+
},
6070
{
6171
"comment": "Serve Mashlib static files.",
6272
"@id": "urn:solid-server:default:StaticAssetHandler",
@@ -91,6 +101,26 @@
91101
"@type": "StaticAssetEntry",
92102
"relativeUrl": "/mashlib.min.js.map",
93103
"filePath": "./node_modules/mashlib/dist/mashlib.min.js.map"
104+
},
105+
{
106+
"@type": "StaticAssetEntry",
107+
"relativeUrl": "/841.mashlib.js",
108+
"filePath": "./node_modules/mashlib/dist/841.mashlibDo you know if .js"
109+
},
110+
{
111+
"@type": "StaticAssetEntry",
112+
"relativeUrl": "/841.mashlib.map",
113+
"filePath": "./node_modules/mashlib/dist/841.mashlib.map"
114+
},
115+
{
116+
"@type": "StaticAssetEntry",
117+
"relativeUrl": "/841.mashlib.min.js",
118+
"filePath": "./node_modules/mashlib/dist/841.mashlib.min.js"
119+
},
120+
{
121+
"@type": "StaticAssetEntry",
122+
"relativeUrl": "/841.mashlib.min.js.map",
123+
"filePath": "./node_modules/mashlib/dist/841.mashlib.min.js.map"
94124
}
95125
]
96126
}

‎config/customise-me.ori.json‎

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
{
2+
"comment": "Basic overrides parameters for a production server",
3+
"@context": [
4+
"https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^7.0.0/components/context.jsonld",
5+
"https://linkedsoftwaredependencies.org/bundles/npm/@solid/pivot/^1.0.0/components/context.jsonld"
6+
],
7+
"@graph": [
8+
{
9+
"comment": "The settings of your email server.",
10+
"@type": "Override",
11+
"overrideInstance": {
12+
"@id": "urn:solid-server:default:EmailSender"
13+
},
14+
"overrideParameters": {
15+
"@type": "BaseEmailSender",
16+
"senderName": "no-reply@solidcommunity.net",
17+
"emailConfig_host": "smtp.sendgrid.net",
18+
"emailConfig_port": 465,
19+
"emailConfig_auth_user": "apikey",
20+
"emailConfig_auth_pass": "<fill me in>"
21+
}
22+
},
23+
{
24+
"comment": "The location of the new pod templates folder.",
25+
"@type": "Override",
26+
"overrideInstance": {
27+
"@id": "urn:solid-server:default:PodResourcesGenerator"
28+
},
29+
"overrideParameters": {
30+
"@type": "StaticFolderGenerator",
31+
"templateFolder": "templates/pod"
32+
}
33+
},
34+
{
35+
"comment": "Sets the maximum size of a single pod to 70MB.",
36+
"@type": "Override",
37+
"overrideInstance": {
38+
"@id": "urn:solid-server:default:QuotaStrategy"
39+
},
40+
"overrideParameters": {
41+
"@type": "PodQuotaStrategy",
42+
"limit_amount": 70000000,
43+
"limit_unit": "bytes"
44+
}
45+
},
46+
{
47+
"comment": "Serve Databrowser as default representation",
48+
"@id": "urn:solid-server:default:DefaultUiConverter",
49+
"@type": "ConstantConverter",
50+
"contentType": "text/html",
51+
"filePath": "./node_modules/mashlib/dist/databrowser.html",
52+
"options_container": true,
53+
"options_document": true,
54+
"options_minQuality": 1,
55+
"options_disabledMediaRanges": [
56+
"image/*",
57+
"application/pdf"
58+
]
59+
},
60+
{
61+
"comment": "Serve Mashlib static files.",
62+
"@id": "urn:solid-server:default:StaticAssetHandler",
63+
"@type": "StaticAssetHandler",
64+
"assets": [
65+
{
66+
"@type": "StaticAssetEntry",
67+
"relativeUrl": "/browse.html",
68+
"filePath": "./node_modules/mashlib/dist/browse.html"
69+
},
70+
{
71+
"@type": "StaticAssetEntry",
72+
"relativeUrl": "/mash.css",
73+
"filePath": "./node_modules/mashlib/dist/mash.css"
74+
},
75+
{
76+
"@type": "StaticAssetEntry",
77+
"relativeUrl": "/mashlib.js",
78+
"filePath": "./node_modules/mashlib/dist/mashlib.js"
79+
},
80+
{
81+
"@type": "StaticAssetEntry",
82+
"relativeUrl": "/mashlib.js.map",
83+
"filePath": "./node_modules/mashlib/dist/mashlib.js.map"
84+
},
85+
{
86+
"@type": "StaticAssetEntry",
87+
"relativeUrl": "/mashlib.min.js",
88+
"filePath": "./node_modules/mashlib/dist/mashlib.min.js"
89+
},
90+
{
91+
"@type": "StaticAssetEntry",
92+
"relativeUrl": "/mashlib.min.js.map",
93+
"filePath": "./node_modules/mashlib/dist/mashlib.min.js.map"
94+
},
95+
{
96+
"@type": "StaticAssetEntry",
97+
"relativeUrl": "/841.mashlib.js",
98+
"filePath": "./node_modules/mashlib/dist/841.mashlibDo you know if .js"
99+
},
100+
{
101+
"@type": "StaticAssetEntry",
102+
"relativeUrl": "/841.mashlib.map",
103+
"filePath": "./node_modules/mashlib/dist/841.mashlib.map"
104+
},
105+
{
106+
"@type": "StaticAssetEntry",
107+
"relativeUrl": "/841.mashlib.min.js",
108+
"filePath": "./node_modules/mashlib/dist/841.mashlib.min.js"
109+
},
110+
{
111+
"@type": "StaticAssetEntry",
112+
"relativeUrl": "/841.mashlib.min.js.map",
113+
"filePath": "./node_modules/mashlib/dist/841.mashlib.min.js.map"
114+
}
115+
]
116+
}
117+
]
118+
}
119+

0 commit comments

Comments
 (0)