Skip to content

Commit e21f5d7

Browse files
authored
Merge branch 'main' into dokieli/html-template-new-document
2 parents 4d16e73 + e1d9d5d commit e21f5d7

20 files changed

Lines changed: 7919 additions & 22836 deletions

.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ jobs:
2424
- 18.x
2525

2626
steps:
27-
- uses: actions/checkout@v2
27+
- uses: actions/checkout@v4
2828
- name: Use Node.js ${{ matrix.node-version }}
29-
uses: actions/setup-node@v1
29+
uses: actions/setup-node@v4
3030
with:
3131
node-version: ${{ matrix.node-version }}
3232
- run: npm ci
@@ -35,7 +35,7 @@ jobs:
3535
- run: npm run build --if-present
3636
- name: Save build
3737
if: matrix.node-version == '16.x'
38-
uses: actions/upload-artifact@v2
38+
uses: actions/upload-artifact@v4
3939
with:
4040
name: build
4141
path: |
@@ -47,10 +47,10 @@ jobs:
4747
needs: build
4848
runs-on: ubuntu-latest
4949
steps:
50-
- uses: actions/download-artifact@v2
50+
- uses: actions/download-artifact@v4
5151
with:
5252
name: build
53-
- uses: actions/setup-node@v1
53+
- uses: actions/setup-node@v4
5454
with:
5555
node-version: 16.x
5656
- uses: rlespinasse/github-slug-action@v3.x
@@ -68,7 +68,7 @@ jobs:
6868
runs-on: ubuntu-latest
6969
if: github.ref == 'refs/heads/main'
7070
steps:
71-
- uses: actions/download-artifact@v2
71+
- uses: actions/download-artifact@v4
7272
with:
7373
name: build
7474
- uses: actions/setup-node@v1

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v16.14.0
1+
v18.19.0

Documentation/conventions.md

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,24 @@ To add material to the meeting (let's say `https://example.com/agenda-meeting.ht
294294

295295
## Dokieli Document
296296

297-
A 'Dokieli Document' is an HTML document with some linked-data annotations, but otherwise just HTML. So the 'Dokieli Document' tool does not store data in triples in RDF sources like most other tools do, but instead allows you to run an online HTML editor right on your pod. When you click 'Save' in the Dokieli editor, the HTML document is written to your pod using a http PUT request, and in that sense this editor makes use of the LDP (read-write web) functionalities of your pod. You can also use Dokieli as a third-party app, on https://dokie.li.
297+
[dokieli](https://dokie.li/) is a clientside editor for decentralised article publishing, annotations, and social interactions. Source code is available from <https://github.com/linkeddata/dokieli>.
298+
299+
dokieli allows content creators to generate human- and machine-readable documents in HTML+RDFa, optionally embedding "data blocks" using the `<script type="">` mechanism to include content in Turtle, JSON-LD, and TriG. dokieli also employs mechanisms to use media types that are acceptable by a server (e.g., JSON-LD, Turtle, HTML+RDFa) when, for example, generating data for servers conforming to the [Solid Protocol](https://solidproject.org/ED/protocol), [Linked Data Platform](https://www.w3.org/TR/ldp/), [Linked Data Notifications](https://www.w3.org/TR/ldn/), [Web Annotation Protocol](https://www.w3.org/TR/annotation-protocol), or [ActivityPub](https://www.w3.org/TR/activitypub/).
300+
301+
The documents that are generated by dokieli are entirely *Linked Data* documents, in that all significant units of information are available in triple statements (as per data models it conforms to), in addition to being accessible by text-based web browsers or screen readers, especially in the case of HTML.
302+
303+
dokieli can parse, use, or generate RDF sources including (but not limited to):
304+
* [WebID](https://www.w3.org/2005/Incubator/webid/spec/identity/) for personal/agent identities.
305+
* [Web Access Control (WAC)](https://solidproject.org/TR/wac)/[Access Control Lists (ACL)](https://dbpedia.org/resource/Access_Control_List) to set permissions on Web resources.
306+
* W3C [Web Annotation Model](https://www.w3.org/TR/annotation-model/), W3C [Web Annotation Vocabulary](https://www.w3.org/TR/annotation-vocab/), W3C [Embedding Web Annotations in HTML](https://www.w3.org/TR/annotation-html), and W3C [Selectors and States](https://www.w3.org/TR/selectors-states/) to model and identify annotations (e.g., replies, peer-reviews, liking, resharing, bookmarking)
307+
* W3C [Activity Streams 2.0 vocabulary](https://www.w3.org/TR/activitystreams-vocabulary) for social activities.
308+
* W3C [ODRL Information Model](https://www.w3.org/TR/odrl-model/) and W3C [ODRL Vocabulary & Expression](https://www.w3.org/TR/odrl-vocab/) to represent statements about the usage of content and services.
309+
* [Memento](https://tools.ietf.org/html/rfc7089) for resource management, e.g., TimeMap.
310+
* [Creative Commons](https://creativecommons.org/) to assign license to individual contributions and annotations.
311+
* [Robust Links](http://robustlinks.mementoweb.org/) for hyperlinks (e.g., citations) and to show Link Decoration.
312+
* [schema.org](http://schema.org/), [SPAR Ontologies](http://www.sparontologies.net/), [PROV-O](https://www.w3.org/TR/prov-o/), and various other vocabularies.
313+
314+
Dokieli can also be used from any spawned instance, e.g., https://dokie.li/ , https://csarven.ca/, or as a Web browser extension. See https://dokie.li/docs and https://github.com/linkeddata/dokieli/blob/main/README.md#specifications for further documentation on data conventions and lists of specifications (protocols and data models) that dokieli conforms to.
298315

299316
## Folder
300317

jest.config.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ module.exports = {
44
testEnvironmentOptions: {
55
customExportConditions: ['node']
66
},
7+
moduleNameMapper: {
8+
'^[./a-zA-Z0-9$_-]+\\.ttl$': '<rootDir>/__mocks__/fileMock.js', // '\\.ttl$'
9+
},
710
collectCoverage: true,
811
// For some reason Jest is not measuring coverage without the below option.
912
// Unfortunately, despite `!(.test)`, it still measures coverage of test files as well:

0 commit comments

Comments
 (0)