Update D3, Billborad, Datatables and FileSaver.js dependencies to lat…

…est version
govCMS · Aug 25, 2023 · 370bcf7 · 370bcf7
1 parent abefdb2
commit 370bcf7
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/dvf.info.yml b/dvf.info.yml
@@ -2,4 +2,4 @@ name: Data Visualisation Framework
 description: 'Data Visualisation Framework makes it easy to generate visualisations from different data sources.'
 type: module
 package: Data Visualisation Framework
-core_version_requirement: ^9.3 || ^10
+core_version_requirement: ^9 || ^10
diff --git a/dvf.libraries.yml b/dvf.libraries.yml
@@ -6,10 +6,10 @@ billboard:
  url: https://github.com/naver/billboard.js/blob/master/LICENSE
  gpl-compatible: true
  js:
- https://cdnjs.cloudflare.com/ajax/libs/billboard.js/3.0.3/billboard.min.js: { type: external, minified: true }
+ https://cdnjs.cloudflare.com/ajax/libs/billboard.js/3.9.3/billboard.min.js: { type: external, minified: true }
  css:
  component:
- https://cdnjs.cloudflare.com/ajax/libs/billboard.js/3.0.3/billboard.min.css: { type: external, minified: true }
+ https://cdnjs.cloudflare.com/ajax/libs/billboard.js/3.9.3/billboard.min.css: { type: external, minified: true }
 
 d3:
  remote: https://github.com/d3/d3
@@ -19,7 +19,7 @@ d3:
  url: https://github.com/d3/d3/blob/master/LICENSE
  gpl-compatible: true
  js:
- https://cdnjs.cloudflare.com/ajax/libs/d3/6.7.0/d3.min.js: { type: external, minified: true }
+ https://cdnjs.cloudflare.com/ajax/libs/d3/7.8.5/d3.min.js: { type: external, minified: true }
 
 datatables:
  remote: https://github.com/DataTables/DataTables
@@ -29,10 +29,10 @@ datatables:
  url: https://github.com/DataTables/DataTables/blob/master/license.txt
  gpl-compatible: true
  js:
- https://cdn.datatables.net/v/dt/dt-1.10.25/datatables.min.js: { type: external, minified: true }
+ https://cdn.datatables.net/1.13.6/js/jquery.dataTables.min.js: { type: external, minified: true }
  css:
  component:
- https://cdn.datatables.net/v/dt/dt-1.10.25/datatables.min.css: { type: external, minified: true }
+ https://cdn.datatables.net/1.13.6/css/jquery.dataTables.min.css: { type: external, minified: true }
 
 filesaver:
  remote: https://github.com/eligrey/FileSaver.js
@@ -41,7 +41,7 @@ filesaver:
  name: MIT
  url: https://github.com/eligrey/FileSaver.js/blob/master/LICENSE.md
  js:
- https://cdnjs.cloudflare.com/ajax/libs/FileSaver.js/1.3.8/FileSaver.min.js: { type: external, minified: true }
+ https://cdnjs.cloudflare.com/ajax/libs/FileSaver.js/2.0.5/FileSaver.min.js: { type: external, minified: true }
 
 jquery.dvfCharts:
  version: "1.0.0"

diff --git a/dvf_ckan/dvf_ckan.info.yml b/dvf_ckan/dvf_ckan.info.yml
@@ -2,7 +2,7 @@ name: CKAN Data Visualisation
 description: 'CKAN integration for the Data Visualisation Framework module.'
 type: module
 package: Data Visualisation Framework
-core_version_requirement: ^9.3 || ^10
+core_version_requirement: ^9 || ^10
 dependencies:
  - ckan_connect:ckan_connect
  - dvf:dvf
diff --git a/dvf_csv/dvf_csv.info.yml b/dvf_csv/dvf_csv.info.yml
@@ -2,6 +2,6 @@ name: CSV Data Visualisation
 description: 'CSV integration for the Data Visualisation Framework module.'
 type: module
 package: Data Visualisation Framework
-core_version_requirement: ^9.3 || ^10
+core_version_requirement: ^9 || ^10
 dependencies:
  - dvf:dvf
diff --git a/dvf_json/dvf_json.info.yml b/dvf_json/dvf_json.info.yml
@@ -2,6 +2,6 @@ name: JSON Data Visualisation
 description: 'JSON integration for the Data Visualisation Framework module.'
 type: module
 package: Data Visualisation Framework
-core_version_requirement: ^9.3 || ^10
+core_version_requirement: ^9 || ^10
 dependencies:
  - dvf:dvf
diff --git a/src/DvfHelpers.php b/src/DvfHelpers.php
@@ -48,7 +48,7 @@ public function transformMachineName($string) {
  * The link.
  */
  public function getHelpPageLink($template_name) {
- return new FormattableMarkup('<span class="dvf-admin-popup"><a href="/dvf/help/' . $template_name . '">Help</a> &#x29c9;</span>', []);
+ return new FormattableMarkup('<span class="dvf-admin-popup"><a href="/dvf/help/@template_name">Help</a> &#x29c9;</span>', ['@template_name' => $template_name]);
  }
 
  /**