Skip to content

Commit b14c4bc

Browse files
committed
Update to CSS v8
Latest version of ODRL evaluator depended on Comunica v4. CSS v8 also has this version. Some of the package.json issues were to get around Components.js dependency issues, where Components.js depends on Comunica v2 through rdf-parse, causing it to import wrong components.
1 parent e1689fe commit b14c4bc

90 files changed

Lines changed: 4990 additions & 2795 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.

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,16 @@
7878
"devDependencies": {
7979
"@commitlint/cli": "^16.1.0",
8080
"@commitlint/config-conventional": "^16.0.0",
81+
"@comunica/bus-rdf-parse-html": "^4.4.0",
8182
"@types/node": "^20.19.1",
8283
"@typescript-eslint/eslint-plugin": "^5.12.1",
8384
"@typescript-eslint/parser": "^5.12.1",
8485
"@vitest/coverage-v8": "^3.2.4",
8586
"chalk": "^5.4.1",
86-
"componentsjs-generator": "^3.1.2",
87+
"componentsjs-generator": "^4.3.0",
8788
"eslint": "^8.10.0",
8889
"jest-rdf": "^1.8.1",
90+
"rdf-parse": "^4.0.0",
8991
"shx": "^0.3.4",
9092
"syncpack": "^13.0.2",
9193
"tsx": "^4.19.2",

packages/css/config/default.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"@context": [
3-
"https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^7.0.0/components/context.jsonld",
3+
"https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^8.0.0/components/context.jsonld",
44
"https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/uma-css/^0.0.0/components/context.jsonld"
55
],
66
"import": [

packages/css/config/demo.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"@context": [
3-
"https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^7.0.0/components/context.jsonld",
3+
"https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^8.0.0/components/context.jsonld",
44
"https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/uma-css/^0.0.0/components/context.jsonld"
55
],
66
"import": [

packages/css/config/ldp/authorization/readers/uma.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"@context": [
3-
"https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^7.0.0/components/context.jsonld",
4-
"https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/uma-css/^0.0.0/components/context.jsonld"
3+
"https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^8.0.0/components/context.jsonld",
4+
"https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/uma-css/^0.0.0/components/context.jsonld",
5+
"https://linkedsoftwaredependencies.org/bundles/npm/asynchronous-handlers/^1.0.0/components/context.jsonld"
56
],
67
"@graph": [
78
{
Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"@context": [
3-
"https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^7.0.0/components/context.jsonld",
4-
"https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/uma-css/^0.0.0/components/context.jsonld"
3+
"https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^8.0.0/components/context.jsonld",
4+
"https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/uma-css/^0.0.0/components/context.jsonld",
5+
"https://linkedsoftwaredependencies.org/bundles/npm/asynchronous-handlers/^1.0.0/components/context.jsonld"
56
],
67
"import": [
78
"uma-css:config/ldp/authorization/readers/uma.json"
@@ -10,7 +11,9 @@
1011
{
1112
"comment": "There are no auth-specific resources, but this ID still has to exist.",
1213
"@id": "urn:solid-server:default:AuthResourceHttpHandler",
13-
"@type": "UnsupportedAsyncHandler"
14+
"@type": "StaticThrowHandler",
15+
"onlyHandle": false,
16+
"factory": { "@id": "urn:solid-server:default:UnsupportedErrorFactory" }
1417
}
1518
]
1619
}

packages/css/config/uma/demo.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"@context": [
3-
"https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^7.0.0/components/context.jsonld",
4-
"https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/uma-css/^0.0.0/components/context.jsonld"
3+
"https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^8.0.0/components/context.jsonld",
4+
"https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/uma-css/^0.0.0/components/context.jsonld",
5+
"https://linkedsoftwaredependencies.org/bundles/npm/asynchronous-handlers/^1.0.0/components/context.jsonld"
56
],
67
"@graph": [
78
{

packages/css/config/uma/overrides/authorization-handler.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"@context": [
3-
"https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^7.0.0/components/context.jsonld",
3+
"https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^8.0.0/components/context.jsonld",
44
"https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/uma-css/^0.0.0/components/context.jsonld"
55
],
66
"@graph": [

packages/css/config/uma/overrides/authorizer.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"@context": [
3-
"https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^7.0.0/components/context.jsonld",
3+
"https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^8.0.0/components/context.jsonld",
44
"https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/uma-css/^0.0.0/components/context.jsonld"
55
],
66
"@graph": [
@@ -13,10 +13,7 @@
1313
"overrideParameters": {
1414
"@type": "UmaAuthorizer",
1515
"authorizer": {
16-
"@type": "PermissionBasedAuthorizer",
17-
"resourceSet": {
18-
"@id": "urn:solid-server:default:CachedResourceSet"
19-
}
16+
"@type": "PermissionBasedAuthorizer"
2017
},
2118
"umaClient": {
2219
"@id": "urn:solid-server:default:UmaClient"

packages/css/config/uma/overrides/jwks.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"@context": [
3-
"https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^7.0.0/components/context.jsonld",
3+
"https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^8.0.0/components/context.jsonld",
44
"https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/uma-css/^0.0.0/components/context.jsonld"
55
],
66
"@graph": [
@@ -11,7 +11,7 @@
1111
"overrideInstance": { "@id": "urn:solid-server:default:BaseHttpHandler" },
1212
"overrideSteps": [{
1313
"@type": "OverrideListInsertAt",
14-
"overrideParameter": { "@id": "WaterfallHandler:_handlers" },
14+
"overrideParameter": { "@id": "StatusWaterfallHandler:_handlers" },
1515
"overrideTarget": 0,
1616
"overrideValue": {
1717
"@id": "urn:solid-server:default:JwksRouterHandler",

packages/css/config/uma/overrides/modes.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"@context": [
3-
"https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^7.0.0/components/context.jsonld",
4-
"https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/uma-css/^0.0.0/components/context.jsonld"
3+
"https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^8.0.0/components/context.jsonld",
4+
"https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/uma-css/^0.0.0/components/context.jsonld",
5+
"https://linkedsoftwaredependencies.org/bundles/npm/asynchronous-handlers/^1.0.0/components/context.jsonld"
56
],
67
"@graph": [
78
{

0 commit comments

Comments
 (0)