From 05378a1d28256b68ac843944a58a5f90398777bf Mon Sep 17 00:00:00 2001 From: Werner Kramer Date: Wed, 13 Dec 2023 11:39:06 +0100 Subject: [PATCH 1/3] Update @deltares libraries --- package-lock.json | 46 +++++++++++++++++++++++----------------------- package.json | 6 +++--- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/package-lock.json b/package-lock.json index bc91f74cc..0e674a61a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,9 +8,9 @@ "name": "fews-weboc-next", "version": "0.6.0", "dependencies": { - "@deltares/fews-pi-requests": "^0.6.3", - "@deltares/fews-ssd-requests": "^0.3.1-alpha.1", - "@deltares/fews-ssd-webcomponent": "^0.3.1-alpha.1", + "@deltares/fews-pi-requests": "^1.0.0-rc.0", + "@deltares/fews-ssd-requests": "^1.0.0-rc.1", + "@deltares/fews-ssd-webcomponent": "^1.0.0-rc.1", "@deltares/fews-web-oc-charts": "^3.0.0-alpha.18", "@deltares/fews-wms-requests": "^0.1.11-alpha.4", "@studiometa/vue-mapbox-gl": "^2.2.0", @@ -254,9 +254,9 @@ } }, "node_modules/@deltares/fews-pi-requests": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/@deltares/fews-pi-requests/-/fews-pi-requests-0.6.3.tgz", - "integrity": "sha512-oq0LpxiS21rYmSugRcxlgBESTvHejw+opCbZZG8IwnCqzjcOO1O7c1lEAfc1v3mNHZYgDQ4dDxrAbt8xHkyDeg==", + "version": "1.0.0-rc.0", + "resolved": "https://registry.npmjs.org/@deltares/fews-pi-requests/-/fews-pi-requests-1.0.0-rc.0.tgz", + "integrity": "sha512-LejFRqidveOt8F38TLaFxDWsxAO+vwjgpCGfWratgsRB7z8K/FhBZ16Q72hzEp3AYfQcwGAdHccWs/fh7DUfmw==", "dependencies": { "@deltares/fews-web-oc-utils": "^0.2.1-alpha.1" }, @@ -265,9 +265,9 @@ } }, "node_modules/@deltares/fews-ssd-requests": { - "version": "0.3.1-alpha.1", - "resolved": "https://registry.npmjs.org/@deltares/fews-ssd-requests/-/fews-ssd-requests-0.3.1-alpha.1.tgz", - "integrity": "sha512-phLprV3BTYZwErW8ikwv2bB9blYF+GiMPGBa7rtGireKIJdYBC5bp3xFS56o+ptiAWuBOphqk4kkD6Xii8DBNw==", + "version": "1.0.0-rc.1", + "resolved": "https://registry.npmjs.org/@deltares/fews-ssd-requests/-/fews-ssd-requests-1.0.0-rc.1.tgz", + "integrity": "sha512-KNiXqXRxk6IxclTXjHBdsihMsrUCTan6qP+mZpkxoEV1FtnxR0Yrkbp+PixBcpk9FBMtJ+I0vCCujqLEJE49ew==", "dependencies": { "@deltares/fews-web-oc-utils": "^0.2.1-alpha.1" }, @@ -276,11 +276,11 @@ } }, "node_modules/@deltares/fews-ssd-webcomponent": { - "version": "0.3.1-alpha.1", - "resolved": "https://registry.npmjs.org/@deltares/fews-ssd-webcomponent/-/fews-ssd-webcomponent-0.3.1-alpha.1.tgz", - "integrity": "sha512-LWcTGERPGPzFYHiSgrxPsWa2jaG+/UrXQp1TskNMCYpxAztmyHcO8h7E/i/OH+vfSBjpJaCK1Kcv9CqOO2EVgw==", + "version": "1.0.0-rc.1", + "resolved": "https://registry.npmjs.org/@deltares/fews-ssd-webcomponent/-/fews-ssd-webcomponent-1.0.0-rc.1.tgz", + "integrity": "sha512-1PxMJKxsVb5T5K2DD0ttoKR/fUVhTu+ZX6rfhYxNbbldQlREMvATCi/Tet1JQQt6dPqb9SWkMYDXFSkwz1GSWg==", "dependencies": { - "@deltares/fews-ssd-requests": "^0.3.1-alpha.1", + "@deltares/fews-ssd-requests": "^1.0.0-rc.1", "@stencil/core": "^2.17.4" } }, @@ -5951,27 +5951,27 @@ "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==" }, "@deltares/fews-pi-requests": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/@deltares/fews-pi-requests/-/fews-pi-requests-0.6.3.tgz", - "integrity": "sha512-oq0LpxiS21rYmSugRcxlgBESTvHejw+opCbZZG8IwnCqzjcOO1O7c1lEAfc1v3mNHZYgDQ4dDxrAbt8xHkyDeg==", + "version": "1.0.0-rc.0", + "resolved": "https://registry.npmjs.org/@deltares/fews-pi-requests/-/fews-pi-requests-1.0.0-rc.0.tgz", + "integrity": "sha512-LejFRqidveOt8F38TLaFxDWsxAO+vwjgpCGfWratgsRB7z8K/FhBZ16Q72hzEp3AYfQcwGAdHccWs/fh7DUfmw==", "requires": { "@deltares/fews-web-oc-utils": "^0.2.1-alpha.1" } }, "@deltares/fews-ssd-requests": { - "version": "0.3.1-alpha.1", - "resolved": "https://registry.npmjs.org/@deltares/fews-ssd-requests/-/fews-ssd-requests-0.3.1-alpha.1.tgz", - "integrity": "sha512-phLprV3BTYZwErW8ikwv2bB9blYF+GiMPGBa7rtGireKIJdYBC5bp3xFS56o+ptiAWuBOphqk4kkD6Xii8DBNw==", + "version": "1.0.0-rc.1", + "resolved": "https://registry.npmjs.org/@deltares/fews-ssd-requests/-/fews-ssd-requests-1.0.0-rc.1.tgz", + "integrity": "sha512-KNiXqXRxk6IxclTXjHBdsihMsrUCTan6qP+mZpkxoEV1FtnxR0Yrkbp+PixBcpk9FBMtJ+I0vCCujqLEJE49ew==", "requires": { "@deltares/fews-web-oc-utils": "^0.2.1-alpha.1" } }, "@deltares/fews-ssd-webcomponent": { - "version": "0.3.1-alpha.1", - "resolved": "https://registry.npmjs.org/@deltares/fews-ssd-webcomponent/-/fews-ssd-webcomponent-0.3.1-alpha.1.tgz", - "integrity": "sha512-LWcTGERPGPzFYHiSgrxPsWa2jaG+/UrXQp1TskNMCYpxAztmyHcO8h7E/i/OH+vfSBjpJaCK1Kcv9CqOO2EVgw==", + "version": "1.0.0-rc.1", + "resolved": "https://registry.npmjs.org/@deltares/fews-ssd-webcomponent/-/fews-ssd-webcomponent-1.0.0-rc.1.tgz", + "integrity": "sha512-1PxMJKxsVb5T5K2DD0ttoKR/fUVhTu+ZX6rfhYxNbbldQlREMvATCi/Tet1JQQt6dPqb9SWkMYDXFSkwz1GSWg==", "requires": { - "@deltares/fews-ssd-requests": "^0.3.1-alpha.1", + "@deltares/fews-ssd-requests": "^1.0.0-rc.1", "@stencil/core": "^2.17.4" } }, diff --git a/package.json b/package.json index a61de1479..576dc98ac 100644 --- a/package.json +++ b/package.json @@ -15,9 +15,9 @@ "sonar": "sonar-scanner -Dsonar.host.url=$SONAR_URL -Dsonar.login=$SONAR_TOKEN -Dsonar.projectKey=$SONAR_KEY -Dsonar.projectName='Delft-FEWS Web OC'" }, "dependencies": { - "@deltares/fews-pi-requests": "^0.6.3", - "@deltares/fews-ssd-requests": "^0.3.1-alpha.1", - "@deltares/fews-ssd-webcomponent": "^0.3.1-alpha.1", + "@deltares/fews-pi-requests": "^1.0.0-rc.0", + "@deltares/fews-ssd-requests": "^1.0.0-rc.1", + "@deltares/fews-ssd-webcomponent": "^1.0.0-rc.1", "@deltares/fews-web-oc-charts": "^3.0.0-alpha.18", "@deltares/fews-wms-requests": "^0.1.11-alpha.4", "@studiometa/vue-mapbox-gl": "^2.2.0", From f64bbeed247409cde76d8f1e00af234e966b62f6 Mon Sep 17 00:00:00 2001 From: Werner Kramer Date: Wed, 13 Dec 2023 11:41:06 +0100 Subject: [PATCH 2/3] Update vite --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0e674a61a..789eff6bc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -50,7 +50,7 @@ "prettier": "3.0.3", "sonarqube-scanner": "^3.1.0", "typescript": "^5.2.2", - "vite": "^4.5.0", + "vite": "^4.5.1", "vite-plugin-vuetify": "^1.0.2", "vue-tsc": "^1.8.22" } @@ -5153,9 +5153,9 @@ } }, "node_modules/vite": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.0.tgz", - "integrity": "sha512-ulr8rNLA6rkyFAlVWw2q5YJ91v098AFQ2R0PRFwPzREXOUJQPtFUG0t+/ZikhaOCDqFoDhN6/v8Sq0o4araFAw==", + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.1.tgz", + "integrity": "sha512-AXXFaAJ8yebyqzoNB9fu2pHoo/nWX+xZlaRwoeYUxEqBO+Zj4msE5G+BhGBll9lYEKv9Hfks52PAF2X7qDYXQA==", "devOptional": true, "dependencies": { "esbuild": "^0.18.10", @@ -9497,9 +9497,9 @@ } }, "vite": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.0.tgz", - "integrity": "sha512-ulr8rNLA6rkyFAlVWw2q5YJ91v098AFQ2R0PRFwPzREXOUJQPtFUG0t+/ZikhaOCDqFoDhN6/v8Sq0o4araFAw==", + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.1.tgz", + "integrity": "sha512-AXXFaAJ8yebyqzoNB9fu2pHoo/nWX+xZlaRwoeYUxEqBO+Zj4msE5G+BhGBll9lYEKv9Hfks52PAF2X7qDYXQA==", "devOptional": true, "requires": { "esbuild": "^0.18.10", diff --git a/package.json b/package.json index 576dc98ac..cdaa3655c 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "prettier": "3.0.3", "sonarqube-scanner": "^3.1.0", "typescript": "^5.2.2", - "vite": "^4.5.0", + "vite": "^4.5.1", "vite-plugin-vuetify": "^1.0.2", "vue-tsc": "^1.8.22" }, From 3ea86cb2d2db940bfc4ff7e080506d5861e7d3d2 Mon Sep 17 00:00:00 2001 From: Werner Kramer Date: Wed, 13 Dec 2023 11:43:37 +0100 Subject: [PATCH 3/3] Formatting --- docs/public/deployments/azure/azure-pipelines-archive.yml | 2 +- docs/public/deployments/azure/azure-pipelines.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/public/deployments/azure/azure-pipelines-archive.yml b/docs/public/deployments/azure/azure-pipelines-archive.yml index 9300fd433..19d0e48c6 100644 --- a/docs/public/deployments/azure/azure-pipelines-archive.yml +++ b/docs/public/deployments/azure/azure-pipelines-archive.yml @@ -44,4 +44,4 @@ steps: api_location: '' skip_app_build: 'true' verbose: 'true' - azure_static_web_apps_api_token: $(deployment_token) \ No newline at end of file + azure_static_web_apps_api_token: $(deployment_token) diff --git a/docs/public/deployments/azure/azure-pipelines.yml b/docs/public/deployments/azure/azure-pipelines.yml index 74b7e38d2..5a58265ac 100644 --- a/docs/public/deployments/azure/azure-pipelines.yml +++ b/docs/public/deployments/azure/azure-pipelines.yml @@ -37,7 +37,7 @@ steps: } - script: | - + npm install npm --version node --version @@ -46,7 +46,7 @@ steps: displayName: 'npm install and build of Web Operator Client' - task: AzureStaticWebApp@0 inputs: -# When used with skip_app_build: true, this value is the app's build output location. + # When used with skip_app_build: true, this value is the app's build output location. app_location: '/dist' api_location: '' skip_app_build: 'true'