From 34268840bc926631e2fef46bfa784736729a6c72 Mon Sep 17 00:00:00 2001 From: openactive-bot Date: Mon, 12 May 2025 09:45:31 +0000 Subject: [PATCH] Update data models and dataset site template --- .../package-lock.json | 38 +++++++++---------- .../package.json | 4 +- .../OpenActive.DatasetSite.NET.csproj | 2 +- .../metadata/DatasetSiteMustacheTemplate.cs | 18 ++++----- README.md | 6 +-- version.json | 2 +- 6 files changed, 35 insertions(+), 35 deletions(-) diff --git a/OpenActive.DatasetSite.NET.Generator/package-lock.json b/OpenActive.DatasetSite.NET.Generator/package-lock.json index 59ff3bb..0010bb7 100644 --- a/OpenActive.DatasetSite.NET.Generator/package-lock.json +++ b/OpenActive.DatasetSite.NET.Generator/package-lock.json @@ -5,14 +5,14 @@ "requires": true, "dependencies": { "@openactive/data-models": { - "version": "2.0.290", - "resolved": "https://registry.npmjs.org/@openactive/data-models/-/data-models-2.0.290.tgz", - "integrity": "sha512-YTCp+ZULBgPeE3yZT1nWB12pVFVMRO28PhBRGF0yQdeiTFjU0hf/MO2ziYBv1DY/fZ8HNpwk0gofJ1Y3dvdRCg==" + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/@openactive/data-models/-/data-models-3.0.9.tgz", + "integrity": "sha512-4W67esDUF6mUQmAQ7M7ym1DVbqBQYCu282d2FSXx0hoIwbAJlXhyw+SZGMYTQTCknW+NfGYg6mflBnsXkXL/uQ==" }, "@openactive/dataset-site-template": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@openactive/dataset-site-template/-/dataset-site-template-7.0.0.tgz", - "integrity": "sha512-FXcZVneCHUKBp3FPz4FXvKQsv93Hj5EErH0Vd37E+uAhcl4cl0ZXKFfYSNNdMRmLwretUzKctJ+kEopxMXwCmQ==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@openactive/dataset-site-template/-/dataset-site-template-8.0.0.tgz", + "integrity": "sha512-yOG84vyUpX04iB4oPZkWGDg6YDNI/0QuAxZSxN3W5U88bqrD8db1od6NMioxv/hdlLUC1EGPraITeMnkW1MZ2Q==", "requires": { "extract-zip": "^2.0.1", "mustache": "^4.1.0" @@ -45,9 +45,9 @@ "integrity": "sha512-mNhVdZHdtKHMMxbqzNK3RzkBcN1cux3AvuCYGTvjEIQT2uheH3eCAyYsbMbh2Bq8nXkeOWs1kyDiF7geWRFQ4Q==" }, "@types/yauzl": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz", - "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==", + "version": "2.10.3", + "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz", + "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==", "optional": true, "requires": { "@types/node": "*" @@ -103,11 +103,11 @@ "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", + "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", "requires": { - "ms": "2.1.2" + "ms": "^2.1.3" } }, "delayed-stream": { @@ -233,9 +233,9 @@ } }, "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "mustache": { "version": "4.2.0", @@ -274,9 +274,9 @@ } }, "pump": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz", + "integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==", "requires": { "end-of-stream": "^1.1.0", "once": "^1.3.1" diff --git a/OpenActive.DatasetSite.NET.Generator/package.json b/OpenActive.DatasetSite.NET.Generator/package.json index f83732f..8da4ee4 100644 --- a/OpenActive.DatasetSite.NET.Generator/package.json +++ b/OpenActive.DatasetSite.NET.Generator/package.json @@ -11,8 +11,8 @@ "author": "Nick Evans", "license": "MIT", "dependencies": { - "@openactive/data-models": "^2.0.290", - "@openactive/dataset-site-template": "^7.0.0", + "@openactive/data-models": "^3.0.9", + "@openactive/dataset-site-template": "^8.0.0", "fs-extra": "^7.0.1", "sync-request": "^6.0.0" } diff --git a/OpenActive.DatasetSite.NET/OpenActive.DatasetSite.NET.csproj b/OpenActive.DatasetSite.NET/OpenActive.DatasetSite.NET.csproj index 843f1ca..a98d6dd 100644 --- a/OpenActive.DatasetSite.NET/OpenActive.DatasetSite.NET.csproj +++ b/OpenActive.DatasetSite.NET/OpenActive.DatasetSite.NET.csproj @@ -27,7 +27,7 @@ - + diff --git a/OpenActive.DatasetSite.NET/metadata/DatasetSiteMustacheTemplate.cs b/OpenActive.DatasetSite.NET/metadata/DatasetSiteMustacheTemplate.cs index 967136d..28b0dec 100644 --- a/OpenActive.DatasetSite.NET/metadata/DatasetSiteMustacheTemplate.cs +++ b/OpenActive.DatasetSite.NET/metadata/DatasetSiteMustacheTemplate.cs @@ -6,7 +6,7 @@ public static class DatasetSiteMustacheTemplate public const string SingleTemplateFileContent = @" - + @@ -1419,9 +1419,9 @@ This stylesheet href must reference a self-hosted 'datasetsite.styles.v7.css' fi

Error: Static Assets Not Found

This HTML page must reference self-hosted static assets located at the relative or absolute path configured by ""staticAssetsPathUrl"" in the mustache template source data.

-

""staticAssetsPathUrl"" is currently set to ""{{staticAssetsPathUrl}}"", and this page has failed to access this file: 

{{staticAssetsPathUrl}}/datasetsite.styles.v7.css

+

""staticAssetsPathUrl"" is currently set to ""{{staticAssetsPathUrl}}"", and this page has failed to access this file: 

{{staticAssetsPathUrl}}/datasetsite.styles.v8.css

Please ensure that the assets at this location exactly match those in - datasetsite-csp.static.zip version 7.

+ datasetsite-csp.static.zip version 8.

See the ""CSP compatible template"" documentation for more information

diff --git a/README.md b/README.md index 32049d7..ed12e0f 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ Simply call one of the Render methods detailed below to output self-contained HT Returns a string corresponding to the compiled HTML, based on an embedded version of `datasetsite.mustache`, the provided `settings`, and `supportedOpportunityTypes`. -If `staticAssetsPathUrl` is provided, the [CSP-compatible template](https://developer.openactive.io/publishing-data/dataset-sites#template-hosting-options) is rendered. In this case you must ensure that you are serving the contents of [CSP compatible static assets archive v7](https://unpkg.com/@openactive/dataset-site-template@7.0.0/dist/datasetsite-csp.static.zip) at this location. +If `staticAssetsPathUrl` is provided, the [CSP-compatible template](https://developer.openactive.io/publishing-data/dataset-sites#template-hosting-options) is rendered. In this case you must ensure that you are serving the contents of [CSP compatible static assets archive v8](https://unpkg.com/@openactive/dataset-site-template@8.0.0/dist/datasetsite-csp.static.zip) at this location. `supportedOpportunityTypes` must be a `List`, which auto-generates the metadata associated which each feed using best-practice values. @@ -133,7 +133,7 @@ var dataFeedDescriptions = new List { }; ``` -If `staticAssetsPathUrl` is provided, the [CSP-compatible template](https://developer.openactive.io/publishing-data/dataset-sites#template-hosting-options) is rendered. In this case you must ensure that you are serving the contents of [CSP compatible static assets archive v7](https://unpkg.com/@openactive/dataset-site-template@7.0.0/dist/datasetsite-csp.static.zip) at this location. +If `staticAssetsPathUrl` is provided, the [CSP-compatible template](https://developer.openactive.io/publishing-data/dataset-sites#template-hosting-options) is rendered. In this case you must ensure that you are serving the contents of [CSP compatible static assets archive v8](https://unpkg.com/@openactive/dataset-site-template@8.0.0/dist/datasetsite-csp.static.zip) at this location. #### Example @@ -227,7 +227,7 @@ Returns a string corresponding to the compiled HTML, based on an embedded versio The `dataset` argument must be an object of type `OpenActive.NET.Dataset`, and must contain the properties required to render the dataset site. -If `staticAssetsPathUrl` is provided, the [CSP-compatible template](https://developer.openactive.io/publishing-data/dataset-sites#template-hosting-options) is rendered. In this case you must ensure that you are serving the contents of [CSP compatible static assets archive v7](https://unpkg.com/@openactive/dataset-site-template@7.0.0/dist/datasetsite-csp.static.zip) at this location. +If `staticAssetsPathUrl` is provided, the [CSP-compatible template](https://developer.openactive.io/publishing-data/dataset-sites#template-hosting-options) is rendered. In this case you must ensure that you are serving the contents of [CSP compatible static assets archive v8](https://unpkg.com/@openactive/dataset-site-template@8.0.0/dist/datasetsite-csp.static.zip) at this location. #### Example diff --git a/version.json b/version.json index a483f79..4c95797 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "7.0", + "version": "8.0", "publicReleaseRefSpec": [ "^refs/heads/master$" ],