From 94b7f267b18ce75621e0a790395f5cc8e34b7ce7 Mon Sep 17 00:00:00 2001 From: Mike Delez <60604010+mdelez@users.noreply.github.com> Date: Wed, 25 Oct 2023 12:09:50 +0200 Subject: [PATCH] chore(deps)!: bump js-lib to 9.0.0 (#1241) --- apps/dsp-app/src/config/config.0845-test-server.json | 2 -- apps/dsp-app/src/config/config.dev-server.json | 2 -- apps/dsp-app/src/config/config.dev.json | 2 -- apps/dsp-app/src/config/config.ls-test-server.json | 2 -- apps/dsp-app/src/config/config.prod.json | 3 --- apps/dsp-app/src/config/config.staging-server.json | 2 -- apps/dsp-app/src/config/config.test-server.json | 2 -- .../src/lib/app-config/app-config.service.spec.ts | 8 -------- .../app-config/src/lib/app-config/app-config.service.ts | 2 -- .../app-config/src/lib/app-config/app-config.spec.ts | 4 ---- .../shared/app-config/src/lib/app-config/app-config.ts | 2 -- package-lock.json | 8 ++++---- package.json | 2 +- 13 files changed, 5 insertions(+), 36 deletions(-) diff --git a/apps/dsp-app/src/config/config.0845-test-server.json b/apps/dsp-app/src/config/config.0845-test-server.json index e4e4ad7500..03d5dc7ad5 100644 --- a/apps/dsp-app/src/config/config.0845-test-server.json +++ b/apps/dsp-app/src/config/config.0845-test-server.json @@ -11,8 +11,6 @@ "geonameToken": "knora", "jsonWebToken": "", "logErrors": true, - "zioPrefix": ":5555", - "zioEndpoints": [], "iriBase": "http://rdfh.ch", "instrumentation": { "environment": "0845-test-server", diff --git a/apps/dsp-app/src/config/config.dev-server.json b/apps/dsp-app/src/config/config.dev-server.json index e06fda86d7..0f06c5f256 100644 --- a/apps/dsp-app/src/config/config.dev-server.json +++ b/apps/dsp-app/src/config/config.dev-server.json @@ -11,8 +11,6 @@ "geonameToken": "knora", "jsonWebToken": "", "logErrors": true, - "zioPrefix": ":5555", - "zioEndpoints": [], "iriBase": "http://rdfh.ch", "instrumentation": { "environment": "dev-server", diff --git a/apps/dsp-app/src/config/config.dev.json b/apps/dsp-app/src/config/config.dev.json index 074ea80f14..8cf4b8685d 100644 --- a/apps/dsp-app/src/config/config.dev.json +++ b/apps/dsp-app/src/config/config.dev.json @@ -11,8 +11,6 @@ "geonameToken": "knora", "jsonWebToken": "", "logErrors": true, - "zioPrefix": ":5555", - "zioEndpoints": [], "iriBase": "http://rdfh.ch", "instrumentation": { "environment": "local-dev", diff --git a/apps/dsp-app/src/config/config.ls-test-server.json b/apps/dsp-app/src/config/config.ls-test-server.json index aeb1c098a6..3121ad8356 100644 --- a/apps/dsp-app/src/config/config.ls-test-server.json +++ b/apps/dsp-app/src/config/config.ls-test-server.json @@ -11,8 +11,6 @@ "geonameToken": "knora", "jsonWebToken": "", "logErrors": true, - "zioPrefix": ":5555", - "zioEndpoints": [], "iriBase": "http://rdfh.ch", "instrumentation": { "environment": "ls-test-server", diff --git a/apps/dsp-app/src/config/config.prod.json b/apps/dsp-app/src/config/config.prod.json index 13b7bffecf..cee279db68 100644 --- a/apps/dsp-app/src/config/config.prod.json +++ b/apps/dsp-app/src/config/config.prod.json @@ -3,7 +3,6 @@ "apiProtocol": "http", "apiHost": "0.0.0.0", "apiPort": 3333, - "zioApiPort": 5555, "apiPath": "", "iiifProtocol": "http", "iiifHost": "0.0.0.0", @@ -12,8 +11,6 @@ "geonameToken": "knora", "jsonWebToken": "", "logErrors": false, - "zioPrefix": ":5555", - "zioEndpoints": [], "iriBase": "http://rdfh.ch", "instrumentation": { "environment": "prod", diff --git a/apps/dsp-app/src/config/config.staging-server.json b/apps/dsp-app/src/config/config.staging-server.json index ab1bf7ca06..523bba312d 100644 --- a/apps/dsp-app/src/config/config.staging-server.json +++ b/apps/dsp-app/src/config/config.staging-server.json @@ -11,8 +11,6 @@ "geonameToken": "knora", "jsonWebToken": "", "logErrors": true, - "zioPrefix": ":5555", - "zioEndpoints": [], "iriBase": "http://rdfh.ch", "instrumentation": { "environment": "staging-server", diff --git a/apps/dsp-app/src/config/config.test-server.json b/apps/dsp-app/src/config/config.test-server.json index 011a01d840..a03e8ed236 100644 --- a/apps/dsp-app/src/config/config.test-server.json +++ b/apps/dsp-app/src/config/config.test-server.json @@ -11,8 +11,6 @@ "geonameToken": "knora", "jsonWebToken": "", "logErrors": true, - "zioPrefix": ":5555", - "zioEndpoints": [], "iriBase": "http://rdfh.ch", "instrumentation": { "environment": "test-server", diff --git a/libs/vre/shared/app-config/src/lib/app-config/app-config.service.spec.ts b/libs/vre/shared/app-config/src/lib/app-config/app-config.service.spec.ts index c18ceb52a8..7128a6f985 100644 --- a/libs/vre/shared/app-config/src/lib/app-config/app-config.service.spec.ts +++ b/libs/vre/shared/app-config/src/lib/app-config/app-config.service.spec.ts @@ -23,8 +23,6 @@ describe('AppConfigService with dev config', () => { iiifPath: 'mypath', jsonWebToken: 'mytoken', logErrors: true, - zioPrefix: ':5555', - zioEndpoints: [], geonameToken: 'geoname_token', iriBase: 'http://rdfh.ch', instrumentation: { @@ -61,8 +59,6 @@ describe('AppConfigService with dev config', () => { expect(service.dspApiConfig.apiProtocol).toEqual('http'); expect(service.dspApiConfig.apiHost).toEqual('0.0.0.0'); expect(service.dspApiConfig.apiPort).toEqual(3333); - expect(service.dspApiConfig.zioPrefix).toEqual(':5555'); - expect(service.dspApiConfig.zioEndpoints).toEqual([]); expect(service.dspApiConfig.apiPath).toEqual('mypath'); expect(service.dspIiifConfig.iiifProtocol).toEqual('http'); expect(service.dspIiifConfig.iiifHost).toEqual('0.0.0.0'); @@ -106,8 +102,6 @@ describe('AppConfigService with prod config', () => { iiifPath: '', jsonWebToken: 'mytoken', logErrors: true, - zioPrefix: '/zio', - zioEndpoints: [], geonameToken: 'geoname_token', iriBase: 'http://rdfh.ch', instrumentation: { @@ -151,8 +145,6 @@ describe('AppConfigService with prod config', () => { expect(service.dspApiConfig.apiHost).toEqual('0.0.0.0'); expect(service.dspApiConfig.apiPort).toEqual(3333); expect(service.dspApiConfig.apiPath).toEqual(''); - expect(service.dspApiConfig.zioPrefix).toEqual('/zio'); - expect(service.dspApiConfig.zioEndpoints).toEqual([]); expect(service.dspIiifConfig.iiifProtocol).toEqual('https'); expect(service.dspIiifConfig.iiifHost).toEqual('0.0.0.0'); expect(service.dspIiifConfig.iiifPort).toEqual(1024); diff --git a/libs/vre/shared/app-config/src/lib/app-config/app-config.service.ts b/libs/vre/shared/app-config/src/lib/app-config/app-config.service.ts index 6fe94f86d9..7567e520f5 100644 --- a/libs/vre/shared/app-config/src/lib/app-config/app-config.service.ts +++ b/libs/vre/shared/app-config/src/lib/app-config/app-config.service.ts @@ -63,8 +63,6 @@ export class AppConfigService { c.apiPath, c.jsonWebToken, c.logErrors, - c.zioPrefix, - c.zioEndpoints ); // init iiif configuration diff --git a/libs/vre/shared/app-config/src/lib/app-config/app-config.spec.ts b/libs/vre/shared/app-config/src/lib/app-config/app-config.spec.ts index bb5c04db36..a02539c6ef 100644 --- a/libs/vre/shared/app-config/src/lib/app-config/app-config.spec.ts +++ b/libs/vre/shared/app-config/src/lib/app-config/app-config.spec.ts @@ -20,8 +20,6 @@ describe('app-config schema tests', () => { iiifPath: '', jsonWebToken: 'mytoken', logErrors: true, - zioPrefix: '/zio', - zioEndpoints: [], geonameToken: 'geoname_token', iriBase: 'http://rdfh.ch', instrumentation: { @@ -58,8 +56,6 @@ describe('app-config schema tests', () => { iiifPath: '', jsonWebToken: 'mytoken', logErrors: true, - zioPrefix: '/zio', - zioEndpoints: [], geonameToken: 'geoname_token', iriBase: 'http://rdfh.ch', instrumentation: { diff --git a/libs/vre/shared/app-config/src/lib/app-config/app-config.ts b/libs/vre/shared/app-config/src/lib/app-config/app-config.ts index 4d7413e77e..df38319106 100644 --- a/libs/vre/shared/app-config/src/lib/app-config/app-config.ts +++ b/libs/vre/shared/app-config/src/lib/app-config/app-config.ts @@ -84,8 +84,6 @@ export const AppConfig = z.object({ apiProtocol: z.enum(['http', 'https']), apiHost: z.string().nonempty("required 'apiHost' value missing in config"), apiPort: ApiPort, - zioPrefix: z.enum(['/zio', ':5555']), - zioEndpoints: z.array(z.string()), // array of strings apiPath: z.string(), iiifProtocol: z.enum(['http', 'https']), iiifHost: z diff --git a/package-lock.json b/package-lock.json index 199600cedd..bcd647d0ef 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,7 @@ "@angular/platform-browser-dynamic": "^16.1.5", "@angular/router": "^16.1.5", "@ckeditor/ckeditor5-angular": "^5.2.0", - "@dasch-swiss/dsp-js": "^8.3.6", + "@dasch-swiss/dsp-js": "^9.0.0", "@datadog/browser-logs": "^4.42.2", "@datadog/browser-rum": "^4.42.2", "@ngrx/component-store": "^16.1.0", @@ -4633,9 +4633,9 @@ } }, "node_modules/@dasch-swiss/dsp-js": { - "version": "8.3.6", - "resolved": "https://registry.npmjs.org/@dasch-swiss/dsp-js/-/dsp-js-8.3.6.tgz", - "integrity": "sha512-YCYShvNrxWgoYEa4wCLAd8PMK0ARdW1H9kfj+Tz4bt2b2wgscdyZVsCMSEEDwRr01iAoAFxTRw6tr/ozfAQxzg==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/@dasch-swiss/dsp-js/-/dsp-js-9.0.0.tgz", + "integrity": "sha512-GiCVaZA9v81l3CThO87ymQ3IXKlSJPWAN/6wAvkIix3judQjO63SFw7CZ0og6r9s3v+kWb8vIRk61v5zM2JhJQ==", "dependencies": { "@babel/helper-compilation-targets": "^7.16.7", "@types/jsonld": "^1.5.6", diff --git a/package.json b/package.json index 7bfb95d461..2e5c97deef 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@angular/platform-browser-dynamic": "^16.1.5", "@angular/router": "^16.1.5", "@ckeditor/ckeditor5-angular": "^5.2.0", - "@dasch-swiss/dsp-js": "^8.3.6", + "@dasch-swiss/dsp-js": "^9.0.0", "@datadog/browser-logs": "^4.42.2", "@datadog/browser-rum": "^4.42.2", "@ngrx/component-store": "^16.1.0",