Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 40 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,40 @@ or [for Pivot as piece of config+software](https://matrix.to/#/#solid_pivot:matr

## Changelog

### - mashlib >= v2.0.0
### - CSS >= 7.1.9
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`

As from mashlib v2 the config/customise-me.json contains new parameters to :
- remove CSS default `Markdown to Html converter`
- include `mashlib chunks` in the static assets entries
```
{
"comment": "Serve Mashlib static files from /dist/ folder.",
"@id": "urn:solid-server:default:StaticAssetHandler",
"@type": "StaticAssetHandler",
"assets": [
{
"@type": "StaticAssetEntry",
"relativeUrl": "/",
"filePath": "./node_modules/mashlib/dist/"
}
]
}
```

### - mashlib >= v2.0.0
As from mashlib v2 the `config/customise-me.json` contains a new parameter to add to your configuration file :
- to remove CSS default `Markdown to Html converter`
```json
{
"comment": "Remove the Markdown to HTML converter from the default chained converter",
"@type": "Override",
"overrideInstance": { "@id": "urn:solid-server:default:ChainedConverter" },
"overrideSteps": [{
"@type": "OverrideListRemove",
"overrideParameter": { "@id": "ChainedConverter:_converters" },
"overrideTarget": { "@id": "urn:solid-server:default:MarkdownToHtmlConverter" }
}]
}
```
- ~~include `mashlib chunks` in the static assets entries~~

### - removal of css-mashlib dependency

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

Or on `http localhost`, use `config/dev-http-suffix.json`
Or on `http localhost`
```
npm run start-dev/suffix # will start http://localhost:3100
```

```
npx community-solid-server -c ./config/dev-http-suffix.json ./custom-config.json -f ./data -p 3000 -b http://localhost:3000 -m .
npm run start-dev/subdomain # will start http://localhost:3000
```
or `config/dev-http-subdomain.json`
When using localhost with subdomain you must also declaree the subdomain in `/etc/hosts`.
When using localhost with subdomain you must also declare the subdomain in `/etc/hosts`.
To create an account `bob.localhost:3000` you shall add the following record
```
127.0.0.1 bob.localhost
Expand Down
51 changes: 3 additions & 48 deletions config/customise-me.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,59 +68,14 @@
}]
},
{
"comment": "Serve Mashlib static files.",
"comment": "Serve Mashlib static files from /dist/ folder.",
"@id": "urn:solid-server:default:StaticAssetHandler",
"@type": "StaticAssetHandler",
"assets": [
{
"@type": "StaticAssetEntry",
"relativeUrl": "/browse.html",
"filePath": "./node_modules/mashlib/dist/browse.html"
},
{
"@type": "StaticAssetEntry",
"relativeUrl": "/mash.css",
"filePath": "./node_modules/mashlib/dist/mash.css"
},
{
"@type": "StaticAssetEntry",
"relativeUrl": "/mashlib.js",
"filePath": "./node_modules/mashlib/dist/mashlib.js"
},
{
"@type": "StaticAssetEntry",
"relativeUrl": "/mashlib.js.map",
"filePath": "./node_modules/mashlib/dist/mashlib.js.map"
},
{
"@type": "StaticAssetEntry",
"relativeUrl": "/mashlib.min.js",
"filePath": "./node_modules/mashlib/dist/mashlib.min.js"
},
{
"@type": "StaticAssetEntry",
"relativeUrl": "/mashlib.min.js.map",
"filePath": "./node_modules/mashlib/dist/mashlib.min.js.map"
},
{
"@type": "StaticAssetEntry",
"relativeUrl": "/841.mashlib.js",
"filePath": "./node_modules/mashlib/dist/841.mashlib.js"
},
{
"@type": "StaticAssetEntry",
"relativeUrl": "/841.mashlib.map",
"filePath": "./node_modules/mashlib/dist/841.mashlib.map"
},
{
"@type": "StaticAssetEntry",
"relativeUrl": "/841.mashlib.min.js",
"filePath": "./node_modules/mashlib/dist/841.mashlib.min.js"
},
{
"@type": "StaticAssetEntry",
"relativeUrl": "/841.mashlib.min.js.map",
"filePath": "./node_modules/mashlib/dist/841.mashlib.min.js.map"
"relativeUrl": "/",
"filePath": "./node_modules/mashlib/dist/"
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion config/customise-me.ori.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
{
"@type": "StaticAssetEntry",
"relativeUrl": "/841.mashlib.js",
"filePath": "./node_modules/mashlib/dist/841.mashlibDo you know if .js"
"filePath": "./node_modules/mashlib/dist/841.mashlib.js"
},
{
"@type": "StaticAssetEntry",
Expand Down
Loading
Loading