Skip to content

Commit

Permalink
Upgrade SemApps packages with BC
Browse files Browse the repository at this point in the history
  • Loading branch information
srosset81 committed Sep 30, 2022
1 parent 57eac0f commit a51ae4d
Show file tree
Hide file tree
Showing 13 changed files with 172 additions and 137 deletions.
2 changes: 1 addition & 1 deletion boilerplate/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@activitypods/events": "1.1.0",
"@activitypods/marketplace": "1.1.0",
"@activitypods/messages": "1.1.0",
"@semapps/notifications": "0.4.0-alpha.32",
"@semapps/notifications": "0.4.0-alpha.45",
"dotenv-flow": "^3.2.0",
"ioredis": "^4.17.3",
"moleculer": "^0.14.19",
Expand Down
2 changes: 1 addition & 1 deletion boilerplate/services/core.service.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module.exports = {
settings: {
baseUrl: CONFIG.HOME_URL,
baseDir: path.resolve(__dirname, '..'),
fuseki: {
triplestore: {
url: CONFIG.SPARQL_ENDPOINT,
user: CONFIG.JENA_USER,
password: CONFIG.JENA_PASSWORD,
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"prettier": "prettier --single-quote --print-width 120 --write --ignore-path .gitignore '**/*.js'",
"link-all": "lerna exec --parallel --scope @activitypods/** -- yarn link",
"unlink-all": "lerna exec --parallel --scope @activitypods/** -- yarn unlink",
"link-semapps-packages": "yarn link @semapps/activitypub @semapps/auth @semapps/backup @semapps/fuseki-admin @semapps/importer @semapps/inference @semapps/jsonld @semapps/ldp @semapps/middlewares @semapps/mime-types @semapps/notifications @semapps/pod @semapps/signature @semapps/sparql-endpoint @semapps/triplestore @semapps/webacl @semapps/webfinger @semapps/webhooks @semapps/webid"
"link-semapps-packages": "yarn link @semapps/activitypub @semapps/auth @semapps/backup @semapps/core @semapps/importer @semapps/inference @semapps/jsonld @semapps/ldp @semapps/middlewares @semapps/mime-types @semapps/notifications @semapps/pod @semapps/signature @semapps/sparql-endpoint @semapps/triplestore @semapps/webacl @semapps/webfinger @semapps/webhooks @semapps/webid",
"unlink-semapps-packages": "yarn unlink @semapps/activitypub @semapps/auth @semapps/backup @semapps/core @semapps/importer @semapps/inference @semapps/jsonld @semapps/ldp @semapps/middlewares @semapps/mime-types @semapps/notifications @semapps/pod @semapps/signature @semapps/sparql-endpoint @semapps/triplestore @semapps/webacl @semapps/webfinger @semapps/webhooks @semapps/webid"
},
"devDependencies": {
"lerna": "^4.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/announcer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"license": "Apache-2.0",
"author": "Virtual Assembly",
"dependencies": {
"@semapps/activitypub": "0.4.0-alpha.32",
"@semapps/ldp": "0.4.0-alpha.32"
"@semapps/activitypub": "0.4.0-alpha.45",
"@semapps/ldp": "0.4.0-alpha.45"
},
"publishConfig": {
"access": "public"
Expand Down
6 changes: 3 additions & 3 deletions packages/contacts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
"license": "Apache-2.0",
"author": "Virtual Assembly",
"dependencies": {
"@semapps/activitypub": "0.4.0-alpha.32",
"@semapps/ldp": "0.4.0-alpha.32",
"@semapps/mime-types": "0.4.0-alpha.32",
"@semapps/activitypub": "0.4.0-alpha.45",
"@semapps/ldp": "0.4.0-alpha.45",
"@semapps/mime-types": "0.4.0-alpha.45",
"moleculer": "^0.14.19",
"moleculer-cron": "^0.0.2"
},
Expand Down
1 change: 0 additions & 1 deletion packages/core/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ Core [ActivityPods](../../README.md) services
- [WebfingerService](https://semapps.org/docs/middleware/webfinger)
- [WebIdService](https://semapps.org/docs/middleware/webid)
- [AuthLocalService](https://semapps.org/docs/middleware/auth)
- [FusekiAdminService](https://semapps.org/docs/middleware/fuseki-admin)
- [SignatureService](https://semapps.org/docs/middleware/signature)
- SparqlEndpointService
- PodService
Expand Down
23 changes: 11 additions & 12 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,17 @@
"dependencies": {
"@activitypods/announcer": "1.1.0",
"@activitypods/synchronizer": "1.1.0",
"@semapps/activitypub": "0.4.0-alpha.32",
"@semapps/auth": "0.4.0-alpha.32",
"@semapps/fuseki-admin": "0.4.0-alpha.32",
"@semapps/jsonld": "0.4.0-alpha.32",
"@semapps/ldp": "0.4.0-alpha.32",
"@semapps/pod": "0.4.0-alpha.32",
"@semapps/signature": "0.4.0-alpha.32",
"@semapps/sparql-endpoint": "0.4.0-alpha.32",
"@semapps/triplestore": "0.4.0-alpha.32",
"@semapps/webacl": "0.4.0-alpha.32",
"@semapps/webfinger": "0.4.0-alpha.32",
"@semapps/webid": "0.4.0-alpha.32",
"@semapps/activitypub": "0.4.0-alpha.45",
"@semapps/auth": "0.4.0-alpha.45",
"@semapps/jsonld": "0.4.0-alpha.45",
"@semapps/ldp": "0.4.0-alpha.45",
"@semapps/pod": "0.4.0-alpha.45",
"@semapps/signature": "0.4.0-alpha.45",
"@semapps/sparql-endpoint": "0.4.0-alpha.45",
"@semapps/triplestore": "0.4.0-alpha.45",
"@semapps/webacl": "0.4.0-alpha.45",
"@semapps/webfinger": "0.4.0-alpha.45",
"@semapps/webid": "0.4.0-alpha.45",
"moleculer": "^0.14.19",
"moleculer-web": "^0.10.0-beta1",
"url-join": "^4.0.1"
Expand Down
19 changes: 5 additions & 14 deletions packages/core/service.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ const path = require('path');
const urlJoin = require('url-join');
const { ActivityPubService, ActivityMappingService, ProxyService } = require('@semapps/activitypub');
const { AuthLocalService } = require('@semapps/auth');
const FusekiAdminService = require('@semapps/fuseki-admin');
const { JsonLdService } = require('@semapps/jsonld');
const { LdpService, DocumentTaggerMixin } = require('@semapps/ldp');
const { PodService } = require('@semapps/pod');
Expand All @@ -24,7 +23,7 @@ const CoreService = {
settings: {
baseUrl: null,
baseDir: null,
fuseki: {
triplestore: {
url: null,
user: null,
password: null,
Expand All @@ -33,7 +32,7 @@ const CoreService = {
queueServiceUrl: null,
},
created() {
let { baseUrl, baseDir, fuseki, jsonContext, queueServiceUrl } = this.settings;
let { baseUrl, baseDir, triplestore, jsonContext, queueServiceUrl } = this.settings;

// If an external JSON context is not provided, we will use a local one
const localJsonContext = urlJoin(baseUrl, '_system', 'context.json');
Expand Down Expand Up @@ -63,14 +62,6 @@ const CoreService = {
},
});

this.broker.createService(FusekiAdminService, {
settings: {
url: fuseki.url,
user: fuseki.user,
password: fuseki.password,
},
});

this.broker.createService(JsonLdService, {
settings: {
baseUri: baseUrl,
Expand Down Expand Up @@ -144,9 +135,9 @@ const CoreService = {

this.broker.createService(TripleStoreService, {
settings: {
sparqlEndpoint: fuseki.url,
jenaUser: fuseki.user,
jenaPassword: fuseki.password,
url: triplestore.url,
user: triplestore.user,
password: triplestore.password,
},
});

Expand Down
6 changes: 3 additions & 3 deletions packages/events/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
"dependencies": {
"@activitypods/announcer": "1.1.0",
"@activitypods/synchronizer": "1.1.0",
"@semapps/activitypub": "0.4.0-alpha.32",
"@semapps/ldp": "0.4.0-alpha.32",
"@semapps/mime-types": "0.4.0-alpha.32",
"@semapps/activitypub": "0.4.0-alpha.45",
"@semapps/ldp": "0.4.0-alpha.45",
"@semapps/mime-types": "0.4.0-alpha.45",
"moleculer-cron": "^0.0.2"
},
"publishConfig": {
Expand Down
4 changes: 2 additions & 2 deletions packages/marketplace/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"dependencies": {
"@activitypods/announcer": "1.1.0",
"@activitypods/synchronizer": "1.1.0",
"@semapps/activitypub": "0.4.0-alpha.32",
"@semapps/ldp": "0.4.0-alpha.32"
"@semapps/activitypub": "0.4.0-alpha.45",
"@semapps/ldp": "0.4.0-alpha.45"
},
"publishConfig": {
"access": "public"
Expand Down
4 changes: 2 additions & 2 deletions packages/messages/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"license": "Apache-2.0",
"author": "Virtual Assembly",
"dependencies": {
"@semapps/activitypub": "0.4.0-alpha.32",
"@semapps/ldp": "0.4.0-alpha.32"
"@semapps/activitypub": "0.4.0-alpha.45",
"@semapps/ldp": "0.4.0-alpha.45"
},
"publishConfig": {
"access": "public"
Expand Down
6 changes: 3 additions & 3 deletions packages/synchronizer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
"license": "Apache-2.0",
"author": "Virtual Assembly",
"dependencies": {
"@semapps/activitypub": "0.4.0-alpha.32",
"@semapps/ldp": "0.4.0-alpha.32",
"@semapps/mime-types": "0.4.0-alpha.32"
"@semapps/activitypub": "0.4.0-alpha.45",
"@semapps/ldp": "0.4.0-alpha.45",
"@semapps/mime-types": "0.4.0-alpha.45"
},
"publishConfig": {
"access": "public"
Expand Down
Loading

0 comments on commit a51ae4d

Please sign in to comment.