Skip to content

Commit fb201fb

Browse files
michielbdejongmichielbdejong
committed
Merge branch 'main' into tasks
2 parents cfb24f0 + 44a31e0 commit fb201fb

337 files changed

Lines changed: 59006 additions & 6405 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/bookmarks-ci.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ run-name: ${{ github.actor }} is running jest
33
on:
44
push:
55
paths:
6-
- bookmarks/**
6+
- bookmarks/soukai/**
7+
- bookmarks/vanilla/**
78
- .github/workflows/bookmarks-ci.yml
89
jobs:
910
test-bookmarks-vanilla:

‎.github/workflows/bookmarks-rdflib-ci-cd.yml‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
name: Bookmarks rdflib CI/CD
2+
3+
on:
4+
push:
5+
paths:
6+
- bookmarks/rdflib/**
7+
- .github/workflows/bookmarks-rdflib-ci-cd.yml
8+
9+
jobs:
10+
build:
11+
runs-on: ubuntu-latest
12+
defaults:
13+
run:
14+
working-directory: ./bookmarks/rdflib/
15+
strategy:
16+
matrix:
17+
node-version: [ 20 ]
18+
steps:
19+
- uses: actions/checkout@v3
20+
- name: Use Node.js ${{ matrix.node-version }}
21+
uses: actions/setup-node@v3
22+
with:
23+
node-version: ${{ matrix.node-version }}
24+
25+
- run: npm ci
26+
- run: npm run lint
27+
- run: npm run build
28+
- run: npm test
29+
- run: npm run test:e2e
30+
- name: Save e2e test data
31+
uses: actions/upload-artifact@v4
32+
with:
33+
name: e2e-test-data
34+
path: |
35+
bookmarks/rdflib/src/e2e-tests/.test-data/
36+
retention-days: 1
37+
- name: Save build
38+
uses: actions/upload-artifact@v4
39+
with:
40+
name: build
41+
path: |
42+
bookmarks/rdflib/dist/
43+
bookmarks/rdflib/README.md
44+
bookmarks/rdflib/package.json
45+
retention-days: 1
46+
47+
npm-publish:
48+
if: github.ref == 'refs/heads/main'
49+
needs: build
50+
runs-on: ubuntu-latest
51+
outputs:
52+
prereleaseVersion: ${{ steps.prerelease.outputs.version }}
53+
steps:
54+
- uses: actions/download-artifact@v4
55+
with:
56+
name: build
57+
- uses: actions/setup-node@v3
58+
with:
59+
node-version: lts/*
60+
- uses: rlespinasse/github-slug-action@v4.4.1
61+
- name: prerelease version
62+
run: |
63+
echo "::set-output name=version::$(npm version prerelease --preid ${GITHUB_SHA_SHORT} --no-git-tag-version)"
64+
id: prerelease
65+
- run: echo prerelease version is ${{ steps.prerelease.outputs.version }}
66+
- uses: JS-DevTools/npm-publish@v3
67+
name: Publish @solid-data-modules/bookmarks-rdflib
68+
with:
69+
token: ${{ secrets.NPM_TOKEN }}
70+
tag: ${{ env.GITHUB_REF_SLUG }}
71+
access: public
72+
73+
npm-release-latest:
74+
if: github.ref == 'refs/heads/main'
75+
needs: build
76+
runs-on: ubuntu-latest
77+
steps:
78+
- uses: actions/download-artifact@v4
79+
with:
80+
name: build
81+
- uses: actions/setup-node@v3
82+
with:
83+
node-version: lts/*
84+
- uses: JS-DevTools/npm-publish@v3
85+
name: Release @solid-data-modules/bookmarks-rdflib
86+
with:
87+
token: ${{ secrets.NPM_TOKEN }}
88+
tag: latest
89+
access: public

‎.github/workflows/chats-rdflib-ci-cd.yml‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
name: Chats rdflib CI/CD
2+
3+
on:
4+
push:
5+
paths:
6+
- chats/rdflib/**
7+
- .github/workflows/chats-rdflib-ci-cd.yml
8+
9+
jobs:
10+
build:
11+
runs-on: ubuntu-latest
12+
defaults:
13+
run:
14+
working-directory: ./chats/rdflib/
15+
strategy:
16+
matrix:
17+
node-version: [ 20 ]
18+
steps:
19+
- uses: actions/checkout@v3
20+
- name: Use Node.js ${{ matrix.node-version }}
21+
uses: actions/setup-node@v3
22+
with:
23+
node-version: ${{ matrix.node-version }}
24+
25+
- run: npm ci
26+
- run: npm run lint
27+
- run: npm run build
28+
- run: npm test
29+
- run: npm run test:e2e
30+
- name: Save e2e test data
31+
uses: actions/upload-artifact@v4
32+
with:
33+
name: e2e-test-data
34+
path: |
35+
chats/rdflib/src/e2e-tests/.test-data/
36+
retention-days: 1
37+
- name: Save build
38+
uses: actions/upload-artifact@v4
39+
with:
40+
name: build
41+
path: |
42+
chats/rdflib/dist/
43+
chats/rdflib/README.md
44+
chats/rdflib/package.json
45+
retention-days: 1
46+
47+
npm-publish:
48+
if: github.ref == 'refs/heads/main'
49+
needs: build
50+
runs-on: ubuntu-latest
51+
outputs:
52+
prereleaseVersion: ${{ steps.prerelease.outputs.version }}
53+
steps:
54+
- uses: actions/download-artifact@v4
55+
with:
56+
name: build
57+
- uses: actions/setup-node@v3
58+
with:
59+
node-version: lts/*
60+
- uses: rlespinasse/github-slug-action@v4.4.1
61+
- name: prerelease version
62+
run: |
63+
echo "::set-output name=version::$(npm version prerelease --preid ${GITHUB_SHA_SHORT} --no-git-tag-version)"
64+
id: prerelease
65+
- run: echo prerelease version is ${{ steps.prerelease.outputs.version }}
66+
- uses: JS-DevTools/npm-publish@v3
67+
name: Publish @solid-data-modules/chats-rdflib
68+
with:
69+
token: ${{ secrets.NPM_TOKEN }}
70+
tag: ${{ env.GITHUB_REF_SLUG }}
71+
access: public
72+
73+
npm-release-latest:
74+
if: github.ref == 'refs/heads/main'
75+
needs: build
76+
runs-on: ubuntu-latest
77+
steps:
78+
- uses: actions/download-artifact@v4
79+
with:
80+
name: build
81+
- uses: actions/setup-node@v3
82+
with:
83+
node-version: lts/*
84+
- uses: JS-DevTools/npm-publish@v3
85+
name: Release @solid-data-modules/chats-rdflib
86+
with:
87+
token: ${{ secrets.NPM_TOKEN }}
88+
tag: latest
89+
access: public

‎.github/workflows/contacts-ci-cd.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ jobs:
4040
name: build
4141
path: |
4242
contacts/dist/
43+
contacts/README.md
4344
contacts/package.json
4445
retention-days: 1
4546

‎.github/workflows/pages.yml‎

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,43 @@ jobs:
5959
working-directory: ./bookmarks/soukai
6060
run: npm run build:doc
6161

62+
######################
63+
###################### bookmarks/rdflib module
64+
65+
- name: Install bookmarks/rdflib dev dependencies
66+
working-directory: ./bookmarks/rdflib
67+
run: npm ci --only=dev
68+
69+
- name: Build bookmarks/rdflib doc
70+
working-directory: ./bookmarks/rdflib
71+
run: npm run build:doc
72+
73+
######################
74+
###################### chats/rdflib module
75+
76+
- name: Install chats/rdflib dev dependencies
77+
working-directory: ./chats/rdflib
78+
run: npm ci --only=dev
79+
80+
- name: Build chats/rdflib doc
81+
working-directory: ./chats/rdflib
82+
run: npm run build:doc
83+
84+
######################
85+
###################### rdflib utils
86+
87+
- name: Install rdflib utils dev dependencies
88+
working-directory: ./utils/rdflib
89+
run: npm ci --only=dev
90+
91+
- name: Build utils/rdflib doc
92+
working-directory: ./utils/rdflib
93+
run: npm run build:doc
94+
6295
######################
6396

6497
- name: Upload pages
65-
uses: actions/upload-pages-artifact@v1
98+
uses: actions/upload-pages-artifact@v3
6699
with:
67100
path: 'gh-pages'
68101

@@ -75,4 +108,4 @@ jobs:
75108
steps:
76109
- name: Deploy to GitHub Pages
77110
id: deployment
78-
uses: actions/deploy-pages@v1
111+
uses: actions/deploy-pages@v4

‎.github/workflows/rdflib-utils-ci-cd.yml‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
name: RDFLib utils CI/CD
2+
3+
on:
4+
push:
5+
paths:
6+
- utils/rdflib/**
7+
- .github/workflows/rdflib-utils-ci-cd.yml
8+
9+
jobs:
10+
build:
11+
runs-on: ubuntu-latest
12+
defaults:
13+
run:
14+
working-directory: ./utils/rdflib/
15+
strategy:
16+
matrix:
17+
node-version: [ 20 ]
18+
steps:
19+
- uses: actions/checkout@v3
20+
- name: Use Node.js ${{ matrix.node-version }}
21+
uses: actions/setup-node@v3
22+
with:
23+
node-version: ${{ matrix.node-version }}
24+
25+
- run: npm ci
26+
- run: npm run lint
27+
- run: npm run build
28+
- run: npm test
29+
- name: Save build
30+
uses: actions/upload-artifact@v4
31+
with:
32+
name: build
33+
path: |
34+
utils/rdflib/dist/
35+
utils/rdflib/README.md
36+
utils/rdflib/package.json
37+
retention-days: 1
38+
39+
npm-publish:
40+
if: github.ref == 'refs/heads/main'
41+
needs: build
42+
runs-on: ubuntu-latest
43+
outputs:
44+
prereleaseVersion: ${{ steps.prerelease.outputs.version }}
45+
steps:
46+
- uses: actions/download-artifact@v4
47+
with:
48+
name: build
49+
- uses: actions/setup-node@v3
50+
with:
51+
node-version: lts/*
52+
- uses: rlespinasse/github-slug-action@v4.4.1
53+
- name: prerelease version
54+
run: |
55+
echo "::set-output name=version::$(npm version prerelease --preid ${GITHUB_SHA_SHORT} --no-git-tag-version)"
56+
id: prerelease
57+
- run: echo prerelease version is ${{ steps.prerelease.outputs.version }}
58+
- uses: JS-DevTools/npm-publish@v3
59+
name: Publish @solid-data-modules/rdflib-utils
60+
with:
61+
token: ${{ secrets.NPM_TOKEN }}
62+
tag: ${{ env.GITHUB_REF_SLUG }}
63+
access: public
64+
65+
npm-release-latest:
66+
if: github.ref == 'refs/heads/main'
67+
needs: build
68+
runs-on: ubuntu-latest
69+
steps:
70+
- uses: actions/download-artifact@v4
71+
with:
72+
name: build
73+
- uses: actions/setup-node@v3
74+
with:
75+
node-version: lts/*
76+
- uses: JS-DevTools/npm-publish@v3
77+
name: Release @solid-data-modules/rdflib-utils
78+
with:
79+
token: ${{ secrets.NPM_TOKEN }}
80+
tag: latest
81+
access: public

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@ node_modules
33
bookmarks/node_modules
44
bookmarks/dist
55
bookmarks/soukai/demo/.vite
6-
gh-pages
6+
gh-pages
7+
solid-typeindex-support
8+
soukai-solid-utils

‎Milestones-MoU-Annex.pdf‎

166 KB
Binary file not shown.

‎README.md‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
# data-modules
2+
This project is [funded](https://nlnet.nl/project/SolidDataModules/) by <img src="https://nlnet.nl/logo/banner.svg" style="width: 5%; margin: 0 1% 0 1%;">
3+
/ <img src="https://nlnet.nl/image/logos/NGI0Entrust_tag.svg" style="width: 5%; margin: 0 1% 0 1%;">
4+
25
Solid Data Modules are snippets of JavaScript code that handle the reading and writing of one specific
36
type of data in the user's Solid pod, regardless of how the different data formats used by various Solid apps,
47
and how they evolve.
@@ -9,19 +12,15 @@ and how they evolve.
912

1013
[Our plan](https://hackmd.io/@michielbdejong/HyIMjmoxn)
1114

12-
Weekly meeting: Fridays 4pm-5pm Amsterdam time in https://meet.jit.si/solid-data-modules
13-
1415
## Data types covered
15-
### _(coming soon)_
1616
Data types for which we will produce Solid Data Modules:
17-
* bookmarks
18-
* chat
19-
* contacts
20-
* maps
21-
* tasks
17+
* [bookmarks](./bookmarks)
18+
* [chats](./chats)
19+
* [contacts](./contacts)
20+
* [profile](./profile) (stub)
21+
* [tasks](./tasks) (coming soon)
2222

2323
## Paradigms covered
24-
### _(coming soon)_
2524
The "vanilla" version of each of these data modules will be usable in combination with just an
2625
authenticated fetcher, such as [Solid Auth Fetcher](https://github.com/solid-contrib/solid-auth-fetcher),
2726
or the fetcher from the [Inrupt JS Libs](https://docs.inrupt.com/developer-tools/javascript/client-libraries/authentication/).
@@ -30,4 +29,4 @@ Apart from this "vanilla" version, we will also package each data module for use
3029
* [rdflib](https://github.com/linkeddata/rdflib.js)
3130
* [LDO](https://github.com/o-development/ldo)
3231

33-
Create a new module [Link to tutorial](./new-module.md)
32+
Create a new module [Link to tutorial](./new-module.md)

0 commit comments

Comments
 (0)