Skip to content

Commit 127e979

Browse files
authored
Merge pull request #132 from solid-contrib/css-v7.1.9
Css v7.1.9
2 parents 40a52c2 + a42711c commit 127e979

5 files changed

Lines changed: 497 additions & 470 deletions

File tree

README.md

Lines changed: 40 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,40 @@ or [for Pivot as piece of config+software](https://matrix.to/#/#solid_pivot:matr
2424

2525
## Changelog
2626

27-
### - mashlib >= v2.0.0
27+
### - CSS >= 7.1.9
28+
CSS >= 7.1.9 implements folder expansion from root in StaticAssets. Please replace the mashlib StaticAssets entries in your configuration file with the mashlib StaticAssets entries from `config/customise-me.json`
2829

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
30+
```
31+
{
32+
"comment": "Serve Mashlib static files from /dist/ folder.",
33+
"@id": "urn:solid-server:default:StaticAssetHandler",
34+
"@type": "StaticAssetHandler",
35+
"assets": [
36+
{
37+
"@type": "StaticAssetEntry",
38+
"relativeUrl": "/",
39+
"filePath": "./node_modules/mashlib/dist/"
40+
}
41+
]
42+
}
43+
```
44+
45+
### - mashlib >= v2.0.0
46+
As from mashlib v2 the `config/customise-me.json` contains a new parameter to add to your configuration file :
47+
- to remove CSS default `Markdown to Html converter`
48+
```json
49+
{
50+
"comment": "Remove the Markdown to HTML converter from the default chained converter",
51+
"@type": "Override",
52+
"overrideInstance": { "@id": "urn:solid-server:default:ChainedConverter" },
53+
"overrideSteps": [{
54+
"@type": "OverrideListRemove",
55+
"overrideParameter": { "@id": "ChainedConverter:_converters" },
56+
"overrideTarget": { "@id": "urn:solid-server:default:MarkdownToHtmlConverter" }
57+
}]
58+
}
59+
```
60+
- ~~include `mashlib chunks` in the static assets entries~~
3261

3362
### - removal of css-mashlib dependency
3463

@@ -94,12 +123,15 @@ openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -sha256 -days 3
94123
npm start
95124
```
96125

97-
Or on `http localhost`, use `config/dev-http-suffix.json`
126+
Or on `http localhost`
127+
```
128+
npm run start-dev/suffix # will start http://localhost:3100
129+
```
130+
98131
```
99-
npx community-solid-server -c ./config/dev-http-suffix.json ./custom-config.json -f ./data -p 3000 -b http://localhost:3000 -m .
132+
npm run start-dev/subdomain # will start http://localhost:3000
100133
```
101-
or `config/dev-http-subdomain.json`
102-
When using localhost with subdomain you must also declaree the subdomain in `/etc/hosts`.
134+
When using localhost with subdomain you must also declare the subdomain in `/etc/hosts`.
103135
To create an account `bob.localhost:3000` you shall add the following record
104136
```
105137
127.0.0.1 bob.localhost

config/customise-me.json

Lines changed: 3 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -68,59 +68,14 @@
6868
}]
6969
},
7070
{
71-
"comment": "Serve Mashlib static files.",
71+
"comment": "Serve Mashlib static files from /dist/ folder.",
7272
"@id": "urn:solid-server:default:StaticAssetHandler",
7373
"@type": "StaticAssetHandler",
7474
"assets": [
7575
{
7676
"@type": "StaticAssetEntry",
77-
"relativeUrl": "/browse.html",
78-
"filePath": "./node_modules/mashlib/dist/browse.html"
79-
},
80-
{
81-
"@type": "StaticAssetEntry",
82-
"relativeUrl": "/mash.css",
83-
"filePath": "./node_modules/mashlib/dist/mash.css"
84-
},
85-
{
86-
"@type": "StaticAssetEntry",
87-
"relativeUrl": "/mashlib.js",
88-
"filePath": "./node_modules/mashlib/dist/mashlib.js"
89-
},
90-
{
91-
"@type": "StaticAssetEntry",
92-
"relativeUrl": "/mashlib.js.map",
93-
"filePath": "./node_modules/mashlib/dist/mashlib.js.map"
94-
},
95-
{
96-
"@type": "StaticAssetEntry",
97-
"relativeUrl": "/mashlib.min.js",
98-
"filePath": "./node_modules/mashlib/dist/mashlib.min.js"
99-
},
100-
{
101-
"@type": "StaticAssetEntry",
102-
"relativeUrl": "/mashlib.min.js.map",
103-
"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.mashlib.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"
77+
"relativeUrl": "/",
78+
"filePath": "./node_modules/mashlib/dist/"
12479
}
12580
]
12681
}

config/customise-me.ori.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
{
9696
"@type": "StaticAssetEntry",
9797
"relativeUrl": "/841.mashlib.js",
98-
"filePath": "./node_modules/mashlib/dist/841.mashlibDo you know if .js"
98+
"filePath": "./node_modules/mashlib/dist/841.mashlib.js"
9999
},
100100
{
101101
"@type": "StaticAssetEntry",

0 commit comments

Comments
 (0)