Skip to content
Snippets Groups Projects
Commit 0e0529a2 authored by Daniel Cothran's avatar Daniel Cothran
Browse files

Merge branch charts:5.0.x into 3391197-enable-support-for

parents 59724597 a866ee16
No related branches found
No related tags found
2 merge requests!113fixed the issue,!75Resolve #3391197 "Enable support for"
Hide whitespace changes
Inline Side-by-side
Showing
with 148 additions and 85 deletions
charts.module
+ 2
− 3
View file @ 0e0529a2
...@@ -84,7 +84,7 @@ function template_preprocess_charts_chart(&$variables) { ...@@ -84,7 +84,7 @@ function template_preprocess_charts_chart(&$variables) {
]; ];
$variables['content_prefix'] = $element['#content_prefix']; $variables['content_prefix'] = $element['#content_prefix'];
$variables['content_suffix'] = $element['#content_suffix']; $variables['content_suffix'] = $element['#content_suffix'];
$config = \Drupal::service('config.factory')->getEditable('charts.settings'); $config = \Drupal::config('charts.settings');
$variables['debug'] = []; $variables['debug'] = [];
if (!empty($config->get('advanced.debug'))) { if (!empty($config->get('advanced.debug'))) {
$variables['debug'] = [ $variables['debug'] = [
...@@ -155,8 +155,7 @@ function charts_library_info_alter(&$libraries, $extension) { ...@@ -155,8 +155,7 @@ function charts_library_info_alter(&$libraries, $extension) {
} }
// Only try to apply cdn changes if the cdn requirements is on. // Only try to apply cdn changes if the cdn requirements is on.
$config = \Drupal::service('config.factory') $config = \Drupal::config('charts.settings');
->getEditable('charts.settings');
if (!$config->get('advanced.requirements.cdn')) { if (!$config->get('advanced.requirements.cdn')) {
return; return;
} }
......
charts.post_update.php
+ 19
− 0
View file @ 0e0529a2
...@@ -161,3 +161,22 @@ function charts_post_update_resave_views_to_account_calculated_library_dependenc ...@@ -161,3 +161,22 @@ function charts_post_update_resave_views_to_account_calculated_library_dependenc
} }
return t('This site did not have any chart related views.'); return t('This site did not have any chart related views.');
} }
/**
* Setting charts config module dependencies based on the selected library.
*/
function charts_post_update_setting_charts_config_module_dependencies(&$sandbox) {
$config = \Drupal::service('config.factory')
->getEditable('charts.settings');
$settings = $config->get('charts_default_settings');
$library = $settings['library'] ?? '';
$type = $settings['type'] ?? '';
if ($library || $type) {
/** @var \Drupal\charts\EventSubscriber\ConfigImportSubscriber $config_import_subscriber */
$config_import_subscriber = \Drupal::service('charts.config_import_subscriber');
$config->set('dependencies', $config_import_subscriber->calculateDependencies($library, $type))
->save();
return 'Updated chart settings dependencies';
}
return 'The default config for charts did not have a library and type set. So no dependencies were set.';
}
charts.services.yml
+ 14
− 0
View file @ 0e0529a2
...@@ -2,6 +2,20 @@ services: ...@@ -2,6 +2,20 @@ services:
plugin.manager.charts: plugin.manager.charts:
class: Drupal\charts\ChartManager class: Drupal\charts\ChartManager
parent: default_plugin_manager parent: default_plugin_manager
plugin.manager.charts_type: plugin.manager.charts_type:
class: Drupal\charts\TypeManager class: Drupal\charts\TypeManager
arguments: ['@module_handler', '@cache.discovery', '@event_dispatcher'] arguments: ['@module_handler', '@cache.discovery', '@event_dispatcher']
charts.plugins_uninstall_validator:
class: Drupal\charts\PluginsUninstallValidator
tags:
- { name: module_install.uninstall_validator }
arguments: ['@config.factory']
lazy: true
charts.config_import_subscriber:
class: Drupal\charts\EventSubscriber\ConfigImportSubscriber
arguments: ['@plugin.manager.charts', '@plugin.manager.charts_type']
tags:
- { name: event_subscriber }
config/install/charts.settings.yml
+ 1
− 0
View file @ 0e0529a2
dependencies: []
charts_default_settings: charts_default_settings:
library: '' library: ''
type: line type: line
......
config/schema/charts.settings.schema.yml
+ 3
− 0
View file @ 0e0529a2
...@@ -19,3 +19,6 @@ charts.settings: ...@@ -19,3 +19,6 @@ charts.settings:
cdn: cdn:
type: boolean type: boolean
label: 'Check if CDN is being used for external libraries' label: 'Check if CDN is being used for external libraries'
dependencies:
type: config_dependencies
label: 'Dependencies'
modules/charts_api_example/src/Controller/ChartsApiExample.php
+ 1
− 0
View file @ 0e0529a2
...@@ -324,6 +324,7 @@ class ChartsApiExample extends ControllerBase { ...@@ -324,6 +324,7 @@ class ChartsApiExample extends ControllerBase {
'#type' => 'chart', '#type' => 'chart',
'#tooltips' => $charts_settings->get('charts_default_settings.display.tooltips'), '#tooltips' => $charts_settings->get('charts_default_settings.display.tooltips'),
'#title' => $this->t('@library Scatter Chart', ['@library' => ucfirst($library)]), '#title' => $this->t('@library Scatter Chart', ['@library' => ucfirst($library)]),
'#data_markers' => TRUE,
'#chart_type' => 'scatter', '#chart_type' => 'scatter',
'series' => [ 'series' => [
'#type' => 'chart_data', '#type' => 'chart_data',
......
modules/charts_billboard/README.md
+ 5
− 5
View file @ 0e0529a2
...@@ -19,13 +19,13 @@ directories other than "/vendor" (e.g. "/libraries") using Composer. ...@@ -19,13 +19,13 @@ directories other than "/vendor" (e.g. "/libraries") using Composer.
"type": "package", "type": "package",
"package": { "package": {
"name": "billboardjs/billboard", "name": "billboardjs/billboard",
"version": "3.4.1", "version": "3.10.3",
"type": "drupal-library", "type": "drupal-library",
"extra": { "extra": {
"installer-name": "billboard" "installer-name": "billboard"
}, },
"dist": { "dist": {
"url": "https://registry.npmjs.org/billboard.js/-/billboard.js-3.4.1.tgz", "url": "https://registry.npmjs.org/billboard.js/-/billboard.js-3.10.3.tgz",
"type": "tar" "type": "tar"
} }
} }
...@@ -34,13 +34,13 @@ directories other than "/vendor" (e.g. "/libraries") using Composer. ...@@ -34,13 +34,13 @@ directories other than "/vendor" (e.g. "/libraries") using Composer.
"type": "package", "type": "package",
"package": { "package": {
"name": "d3/d3", "name": "d3/d3",
"version": "4.9.1", "version": "6.7.0",
"type": "drupal-library", "type": "drupal-library",
"extra": { "extra": {
"installer-name": "d3" "installer-name": "d3"
}, },
"dist": { "dist": {
"url": "https://cdnjs.cloudflare.com/ajax/libs/d3/4.9.1/d3.js", "url": "https://cdnjs.cloudflare.com/ajax/libs/d3/6.7.0/d3.js",
"type": "file" "type": "file"
}, },
"require": { "require": {
...@@ -114,4 +114,4 @@ the code below. ...@@ -114,4 +114,4 @@ the code below.
7. Run the following command; you should find that new directories have been 7. Run the following command; you should find that new directories have been
created under "/libraries". created under "/libraries".
composer require --prefer-dist billboardjs/billboard:3.4.1 d3/d3:4.9.1 composer require --prefer-dist billboardjs/billboard:3.10.3 d3/d3:6.7.0
modules/charts_billboard/charts_billboard.install
+ 1
− 1
View file @ 0e0529a2
...@@ -14,7 +14,7 @@ function charts_billboard_requirements($phase) { ...@@ -14,7 +14,7 @@ function charts_billboard_requirements($phase) {
switch ($phase) { switch ($phase) {
case 'runtime': case 'runtime':
$library_path = charts_billboard_find_library(); $library_path = charts_billboard_find_library();
$config = \Drupal::service('config.factory')->getEditable('charts.settings'); $config = \Drupal::config('charts.settings');
$cdn = $config->get('advanced.requirements.cdn') ?? FALSE; $cdn = $config->get('advanced.requirements.cdn') ?? FALSE;
if (!$library_path) { if (!$library_path) {
......
modules/charts_billboard/charts_billboard.libraries.yml
+ 3
− 3
View file @ 0e0529a2
...@@ -18,14 +18,14 @@ d3: ...@@ -18,14 +18,14 @@ d3:
js: js:
/libraries/d3/d3.min.js: { } /libraries/d3/d3.min.js: { }
billboard: billboard:
remote: 'https://naver.github.io/billboard.js/release/3.7.5/dist/billboard.min.js' remote: 'https://naver.github.io/billboard.js/release/3.10.3/dist/billboard.min.js'
version: 3.7.5 version: 3.10.3
license: license:
name: MIT name: MIT
url: 'https://opensource.org/licenses/MIT' url: 'https://opensource.org/licenses/MIT'
gpl-compatible: true gpl-compatible: true
cdn: cdn:
/libraries/billboard/: https://naver.github.io/billboard.js/release/3.7.5/ /libraries/billboard/: https://naver.github.io/billboard.js/release/3.10.3/
css: css:
theme: theme:
/libraries/billboard/dist/billboard.min.css: { } /libraries/billboard/dist/billboard.min.css: { }
......
modules/charts_billboard/composer.json
+ 6
− 6
View file @ 0e0529a2
...@@ -8,21 +8,21 @@ ...@@ -8,21 +8,21 @@
}, },
"license": "GPL-2.0+", "license": "GPL-2.0+",
"require": { "require": {
"billboardjs/billboard": "1.6.2", "billboardjs/billboard": "3.10.3",
"d3/d3": "4.9.1" "d3/d3": "6.7.0"
}, },
"repositories": [ "repositories": [
{ {
"type": "package", "type": "package",
"package": { "package": {
"name": "billboardjs/billboard", "name": "billboardjs/billboard",
"version": "1.6.2", "version": "3.10.3",
"type": "drupal-library", "type": "drupal-library",
"extra": { "extra": {
"installer-name": "billboard" "installer-name": "billboard"
}, },
"dist": { "dist": {
"url": "https://github.com/naver/billboard.js/archive/1.6.2.zip", "url": "https://github.com/naver/billboard.js/archive/3.10.3.zip",
"type": "zip" "type": "zip"
} }
} }
...@@ -31,13 +31,13 @@ ...@@ -31,13 +31,13 @@
"type": "package", "type": "package",
"package": { "package": {
"name": "d3/d3", "name": "d3/d3",
"version": "4.9.1", "version": "6.7.0",
"type": "drupal-library", "type": "drupal-library",
"extra": { "extra": {
"installer-name": "d3" "installer-name": "d3"
}, },
"dist": { "dist": {
"url": "https://cdnjs.cloudflare.com/ajax/libs/d3/4.9.1/d3.min.js", "url": "https://cdnjs.cloudflare.com/ajax/libs/d3/6.7.0/d3.min.js",
"type": "file" "type": "file"
}, },
"require": { "require": {
......
modules/charts_c3/charts_c3.install
+ 1
− 1
View file @ 0e0529a2
...@@ -14,7 +14,7 @@ function charts_c3_requirements($phase) { ...@@ -14,7 +14,7 @@ function charts_c3_requirements($phase) {
switch ($phase) { switch ($phase) {
case 'runtime': case 'runtime':
$library_path = charts_c3_find_library(); $library_path = charts_c3_find_library();
$config = \Drupal::service('config.factory')->getEditable('charts.settings'); $config = \Drupal::config('charts.settings');
$cdn = $config->get('advanced.requirements.cdn') ?? FALSE; $cdn = $config->get('advanced.requirements.cdn') ?? FALSE;
if (!$library_path) { if (!$library_path) {
......
modules/charts_chartjs/README.md
+ 41
− 15
View file @ 0e0529a2
...@@ -40,13 +40,22 @@ remove "web/" from the lines below: ...@@ -40,13 +40,22 @@ remove "web/" from the lines below:
"extra": { "extra": {
"installer-types": ["npm-asset"], "installer-types": ["npm-asset"],
"installer-paths": { "installer-paths": {
"web/libraries/chartjs": ["npm-asset/chart.js"], "web/libraries/chart.js": ["npm-asset/chart.js"],
"web/libraries/chartjs-adapter-date-fns": [ "web/libraries/chartjs-adapter-date-fns": [
"npm-asset/chartjs-adapter-date-fns" "npm-asset/chartjs-adapter-date-fns"
], ],
}, },
} }
NOTE: If this isn't working, try instead adding:
"extra": {
"installer-types": ["npm-asset"],
"installer-paths": {
...
"web/libraries/{$name}": ["type:drupal-library", "vendor:npm-asset"]
},
}
4. This and the following step is optional but recommended. The reason for 4. This and the following step is optional but recommended. The reason for
them is that when installing the Chart.js package with Composer, them is that when installing the Chart.js package with Composer,
additional files are added into the library directory. These files are not additional files are added into the library directory. These files are not
...@@ -59,11 +68,19 @@ them. So: create a new directory in your project root called "scripts". ...@@ -59,11 +68,19 @@ them. So: create a new directory in your project root called "scripts".
#!/usr/bin/env bash #!/usr/bin/env bash
set -eu set -eu
declare -a directories=( declare -a directories=(
"web/libraries/chartjs/auto" "web/libraries/chart.js/auto"
"web/libraries/chartjs/helpers" "web/libraries/chart.js/helpers"
"web/libraries/chartjs/types" "web/libraries/chart.js/types"
"web/libraries/chartjs/dist/chunks" "web/libraries/chart.js/dist/chunks"
"web/libraries/chartjs/dist/docs" "web/libraries/chart.js/dist/docs"
"web/libraries/chart.js/dist/controllers"
"web/libraries/chart.js/dist/core"
"web/libraries/chart.js/dist/elements"
"web/libraries/chart.js/dist/helpers"
"web/libraries/chart.js/dist/platform"
"web/libraries/chart.js/dist/plugins"
"web/libraries/chart.js/dist/scales"
"web/libraries/chart.js/dist/types"
) )
counter=0 counter=0
echo "Deleting unneeded directories inside web/libraries/chartjs" echo "Deleting unneeded directories inside web/libraries/chartjs"
...@@ -77,13 +94,22 @@ them. So: create a new directory in your project root called "scripts". ...@@ -77,13 +94,22 @@ them. So: create a new directory in your project root called "scripts".
done done
echo "$counter folders were deleted" echo "$counter folders were deleted"
declare -a files=( declare -a files=(
"web/libraries/chartjs/README.md" "web/libraries/chart.js/README.md"
"web/libraries/chartjs/LICENSE.md" "web/libraries/chart.js/LICENSE.md"
"web/libraries/chartjs/package.json" "web/libraries/chart.js/package.json"
"web/libraries/chartjs/dist/helpers.esm.js" "web/libraries/chart.js/dist/helpers.esm.js"
"web/libraries/chartjs/dist/helpers.mjs" "web/libraries/chart.js/dist/helpers.mjs"
"web/libraries/chartjs/dist/chart.mjs" "web/libraries/chart.js/dist/chart.mjs"
"web/libraries/chartjs/dist/chart.esm.js" "web/libraries/chart.js/dist/chart.esm.js"
"web/libraries/chart.js/dist/chart.cjs"
"web/libraries/chart.js/dist/chart.cjs.map"
"web/libraries/chart.js/dist/helpers.js"
"web/libraries/chart.js/dist/helpers.js.map"
"web/libraries/chart.js/dist/helpers.cjs"
"web/libraries/chart.js/dist/helpers.cjs.map"
"web/libraries/chart.js/dist/index.d.ts"
"web/libraries/chart.js/dist/index.umd.d.ts"
"web/libraries/chart.js/dist/types.d.ts"
"web/libraries/chartjs-adapter-date-fns/README.md" "web/libraries/chartjs-adapter-date-fns/README.md"
"web/libraries/chartjs-adapter-date-fns/LICENSE.md" "web/libraries/chartjs-adapter-date-fns/LICENSE.md"
"web/libraries/chartjs-adapter-date-fns/package.json" "web/libraries/chartjs-adapter-date-fns/package.json"
...@@ -119,5 +145,5 @@ them. So: create a new directory in your project root called "scripts". ...@@ -119,5 +145,5 @@ them. So: create a new directory in your project root called "scripts".
7. Run the following command; you should find that new directories have been 7. Run the following command; you should find that new directories have been
created under "/libraries". created under "/libraries".
composer require --prefer-dist npm-asset/chart.js:^3.3 composer require --prefer-dist npm-asset/chart.js:^4.4
npm-asset/chartjs-adapter-date-fns:^2 npm-asset/chartjs-adapter-date-fns:^3.0
modules/charts_chartjs/charts_chartjs.install
+ 2
− 2
View file @ 0e0529a2
...@@ -14,7 +14,7 @@ function charts_chartjs_requirements($phase) { ...@@ -14,7 +14,7 @@ function charts_chartjs_requirements($phase) {
switch ($phase) { switch ($phase) {
case 'runtime': case 'runtime':
$library_path = charts_chartjs_find_library(); $library_path = charts_chartjs_find_library();
$config = \Drupal::service('config.factory')->getEditable('charts.settings'); $config = \Drupal::config('charts.settings');
$cdn = $config->get('advanced.requirements.cdn') ?? FALSE; $cdn = $config->get('advanced.requirements.cdn') ?? FALSE;
if (!$library_path) { if (!$library_path) {
...@@ -86,7 +86,7 @@ function charts_chartjs_find_library() { ...@@ -86,7 +86,7 @@ function charts_chartjs_find_library() {
$searchdir[] = $site_name . '/libraries'; $searchdir[] = $site_name . '/libraries';
foreach ($searchdir as $dir) { foreach ($searchdir as $dir) {
if (file_exists($dir . '/chartjs/dist/chart.js')) { if (file_exists($dir . '/chartjs/dist/chart.js') || file_exists($dir . '/chartjs/dist/chart.umd.js')) {
return $dir . '/chartjs'; return $dir . '/chartjs';
} }
} }
......
modules/charts_chartjs/charts_chartjs.libraries.yml
+ 3
− 3
View file @ 0e0529a2
...@@ -7,10 +7,10 @@ charts_chartjs: ...@@ -7,10 +7,10 @@ charts_chartjs:
gpl-compatible: false gpl-compatible: false
# @todo # @todo
cdn: cdn:
/libraries/chartjs/: https://unpkg.com/chart.js@3.7.1/ /libraries/chart.js/: https://unpkg.com/chart.js@4.4.0/
/libraries/chartjs-adapter-date-fns/: https://unpkg.com/chartjs-adapter-date-fns@2.0.0/ /libraries/chartjs-adapter-date-fns/: https://unpkg.com/chartjs-adapter-date-fns@3.0.0/
js: js:
/libraries/chartjs/dist/chart.js: { } /libraries/chart.js/dist/chart.umd.js: { }
/libraries/chartjs-adapter-date-fns/dist/chartjs-adapter-date-fns.bundle.js: { } /libraries/chartjs-adapter-date-fns/dist/chartjs-adapter-date-fns.bundle.js: { }
dependencies: dependencies:
- core/drupal - core/drupal
......
modules/charts_chartjs/composer.json
+ 2
− 2
View file @ 0e0529a2
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
}, },
"require": { "require": {
"oomphinc/composer-installers-extender": "^2", "oomphinc/composer-installers-extender": "^2",
"npm-asset/chart.js": "^3.3", "npm-asset/chart.js": "^4.4",
"npm-asset/chartjs-adapter-date-fns": "^2" "npm-asset/chartjs-adapter-date-fns": "^3.0"
}, },
"extra": { "extra": {
"installer-types": [ "installer-types": [
......
modules/charts_chartjs/src/Plugin/chart/Library/Chartjs.php
+ 1
− 1
View file @ 0e0529a2
...@@ -384,7 +384,7 @@ class Chartjs extends ChartBase { ...@@ -384,7 +384,7 @@ class Chartjs extends ChartBase {
if (!empty($item['color'])) { if (!empty($item['color'])) {
unset($item['color']); unset($item['color']);
} }
return array_values($item); return gettype($item) === 'array' ? array_values($item) : $item;
}, $element[$child]['#data']); }, $element[$child]['#data']);
} }
} }
......
modules/charts_highcharts/README.md
+ 16
− 16
View file @ 0e0529a2
...@@ -18,13 +18,13 @@ facilitates the installation of packages into directories other than ...@@ -18,13 +18,13 @@ facilitates the installation of packages into directories other than
"type": "package", "type": "package",
"package": { "package": {
"name": "highcharts/highcharts", "name": "highcharts/highcharts",
"version": "10.0.0", "version": "11.1.0",
"type": "drupal-library", "type": "drupal-library",
"extra": { "extra": {
"installer-name": "highcharts" "installer-name": "highcharts"
}, },
"dist": { "dist": {
"url": "https://code.highcharts.com/10.0.0/highcharts.js", "url": "https://code.highcharts.com/11.1.0/highcharts.js",
"type": "file" "type": "file"
}, },
"require": { "require": {
...@@ -36,13 +36,13 @@ facilitates the installation of packages into directories other than ...@@ -36,13 +36,13 @@ facilitates the installation of packages into directories other than
"type": "package", "type": "package",
"package": { "package": {
"name": "highcharts/more", "name": "highcharts/more",
"version": "10.0.0", "version": "11.1.0",
"type": "drupal-library", "type": "drupal-library",
"extra": { "extra": {
"installer-name": "highcharts_more" "installer-name": "highcharts_more"
}, },
"dist": { "dist": {
"url": "https://code.highcharts.com/10.0.0/highcharts-more.js", "url": "https://code.highcharts.com/11.1.0/highcharts-more.js",
"type": "file" "type": "file"
}, },
"require": { "require": {
...@@ -54,13 +54,13 @@ facilitates the installation of packages into directories other than ...@@ -54,13 +54,13 @@ facilitates the installation of packages into directories other than
"type": "package", "type": "package",
"package": { "package": {
"name": "highcharts/exporting", "name": "highcharts/exporting",
"version": "10.0.0", "version": "11.1.0",
"type": "drupal-library", "type": "drupal-library",
"extra": { "extra": {
"installer-name": "highcharts_exporting" "installer-name": "highcharts_exporting"
}, },
"dist": { "dist": {
"url": "https://code.highcharts.com/10.0.0/modules/exporting.js", "url": "https://code.highcharts.com/11.1.0/modules/exporting.js",
"type": "file" "type": "file"
}, },
"require": { "require": {
...@@ -72,13 +72,13 @@ facilitates the installation of packages into directories other than ...@@ -72,13 +72,13 @@ facilitates the installation of packages into directories other than
"type": "package", "type": "package",
"package": { "package": {
"name": "highcharts/export-data", "name": "highcharts/export-data",
"version": "10.0.0", "version": "11.1.0",
"type": "drupal-library", "type": "drupal-library",
"extra": { "extra": {
"installer-name": "highcharts_export-data" "installer-name": "highcharts_export-data"
}, },
"dist": { "dist": {
"url": "https://code.highcharts.com/10.0.0/modules/export-data.js", "url": "https://code.highcharts.com/11.1.0/modules/export-data.js",
"type": "file" "type": "file"
}, },
"require": { "require": {
...@@ -90,13 +90,13 @@ facilitates the installation of packages into directories other than ...@@ -90,13 +90,13 @@ facilitates the installation of packages into directories other than
"type": "package", "type": "package",
"package": { "package": {
"name": "highcharts/accessibility", "name": "highcharts/accessibility",
"version": "10.0.0", "version": "11.1.0",
"type": "drupal-library", "type": "drupal-library",
"extra": { "extra": {
"installer-name": "highcharts_accessibility" "installer-name": "highcharts_accessibility"
}, },
"dist": { "dist": {
"url": "https://code.highcharts.com/10.0.0/modules/accessibility.js", "url": "https://code.highcharts.com/11.1.0/modules/accessibility.js",
"type": "file" "type": "file"
}, },
"require": { "require": {
...@@ -108,13 +108,13 @@ facilitates the installation of packages into directories other than ...@@ -108,13 +108,13 @@ facilitates the installation of packages into directories other than
"type": "package", "type": "package",
"package": { "package": {
"name": "highcharts/3d", "name": "highcharts/3d",
"version": "10.0.0", "version": "11.1.0",
"type": "drupal-library", "type": "drupal-library",
"extra": { "extra": {
"installer-name": "highcharts_3d" "installer-name": "highcharts_3d"
}, },
"dist": { "dist": {
"url": "https://code.highcharts.com/10.0.0/highcharts-3d.js", "url": "https://code.highcharts.com/11.1.0/highcharts-3d.js",
"type": "file" "type": "file"
}, },
"require": { "require": {
...@@ -123,8 +123,8 @@ facilitates the installation of packages into directories other than ...@@ -123,8 +123,8 @@ facilitates the installation of packages into directories other than
} }
} }
4. Run `composer require --prefer-dist highcharts/highcharts:10.0.0 4. Run `composer require --prefer-dist highcharts/highcharts:11.1.0
highcharts/more:10.0.0 highcharts/exporting:10.0.0 highcharts/more:11.1.0 highcharts/exporting:11.1.0
highcharts/export-data:10.0.0 highcharts/accessibility:10.0.0 highcharts/export-data:11.1.0 highcharts/accessibility:11.1.0
highcharts/3d:10.0.0` - you should find that new directories have been highcharts/3d:11.1.0` - you should find that new directories have been
created under "/libraries" created under "/libraries"
modules/charts_highcharts/charts_highcharts.install
+ 1
− 1
View file @ 0e0529a2
...@@ -14,7 +14,7 @@ function charts_highcharts_requirements($phase) { ...@@ -14,7 +14,7 @@ function charts_highcharts_requirements($phase) {
switch ($phase) { switch ($phase) {
case 'runtime': case 'runtime':
$library_path = charts_highcharts_find_library(); $library_path = charts_highcharts_find_library();
$config = \Drupal::service('config.factory')->getEditable('charts.settings'); $config = \Drupal::config('charts.settings');
$cdn = $config->get('advanced.requirements.cdn') ?? FALSE; $cdn = $config->get('advanced.requirements.cdn') ?? FALSE;
if (!$library_path) { if (!$library_path) {
......
modules/charts_highcharts/charts_highcharts.libraries.yml
+ 8
− 8
View file @ 0e0529a2
...@@ -15,10 +15,10 @@ highcharts: ...@@ -15,10 +15,10 @@ highcharts:
url: https://creativecommons.org/licenses/by-nc/3.0/ url: https://creativecommons.org/licenses/by-nc/3.0/
gpl-compatible: false gpl-compatible: false
cdn: cdn:
/libraries/highcharts/highcharts.js: https://code.highcharts.com/10.0.0/highcharts.js /libraries/highcharts/highcharts.js: https://code.highcharts.com/11.1.0/highcharts.js
/libraries/highcharts_more/highcharts-more.js: https://code.highcharts.com/10.0.0/highcharts-more.js /libraries/highcharts_more/highcharts-more.js: https://code.highcharts.com/11.1.0/highcharts-more.js
/libraries/highcharts_accessibility/accessibility.js: https://code.highcharts.com/10.0.0/modules/accessibility.js /libraries/highcharts_accessibility/accessibility.js: https://code.highcharts.com/11.1.0/modules/accessibility.js
/libraries/highcharts_3d/highcharts-3d.js: https://code.highcharts.com/10.0.0/highcharts-3d.js /libraries/highcharts_3d/highcharts-3d.js: https://code.highcharts.com/11.1.0/highcharts-3d.js
js: js:
/libraries/highcharts/highcharts.js: { } /libraries/highcharts/highcharts.js: { }
/libraries/highcharts_more/highcharts-more.js: { } /libraries/highcharts_more/highcharts-more.js: { }
...@@ -35,8 +35,8 @@ highcharts_exporting: ...@@ -35,8 +35,8 @@ highcharts_exporting:
url: https://creativecommons.org/licenses/by-nc/3.0/ url: https://creativecommons.org/licenses/by-nc/3.0/
gpl-compatible: false gpl-compatible: false
cdn: cdn:
/libraries/highcharts_exporting/exporting.js: https://code.highcharts.com/10.0.0/modules/exporting.js /libraries/highcharts_exporting/exporting.js: https://code.highcharts.com/11.1.0/modules/exporting.js
/libraries/highcharts_export-data/export-data.js: https://code.highcharts.com/10.0.0/modules/export-data.js /libraries/highcharts_export-data/export-data.js: https://code.highcharts.com/11.1.0/modules/export-data.js
js: js:
/libraries/highcharts_exporting/exporting.js: { } /libraries/highcharts_exporting/exporting.js: { }
/libraries/highcharts_export-data/export-data.js: { } /libraries/highcharts_export-data/export-data.js: { }
...@@ -52,8 +52,8 @@ texture: ...@@ -52,8 +52,8 @@ texture:
url: https://creativecommons.org/licenses/by-nc/3.0/ url: https://creativecommons.org/licenses/by-nc/3.0/
gpl-compatible: false gpl-compatible: false
cdn: cdn:
/libraries/highcharts_pattern-fill/pattern-fill.js: https://code.highcharts.com/10.0.0/modules/pattern-fill.js /libraries/highcharts_pattern-fill/pattern-fill.js: https://code.highcharts.com/11.1.0/modules/pattern-fill.js
/libraries/highcharts_high-contrast-light/high-contrast-light.js: https://code.highcharts.com/10.0.0/themes/high-contrast-light.js /libraries/highcharts_high-contrast-light/high-contrast-light.js: https://code.highcharts.com/11.1.0/themes/high-contrast-light.js
js: js:
/libraries/highcharts_pattern-fill/pattern-fill.js: { } /libraries/highcharts_pattern-fill/pattern-fill.js: { }
/libraries/highcharts_high-contrast-light/high-contrast-light.js: { } /libraries/highcharts_high-contrast-light/high-contrast-light.js: { }
......
modules/charts_highcharts/composer.json
+ 18
− 18
View file @ 0e0529a2
...@@ -8,25 +8,25 @@ ...@@ -8,25 +8,25 @@
}, },
"license": "GPL-2.0+", "license": "GPL-2.0+",
"require": { "require": {
"highcharts/3d": "10.0.0", "highcharts/3d": "11.1.0",
"highcharts/accessibility": "10.0.0", "highcharts/accessibility": "11.1.0",
"highcharts/export-data": "10.0.0", "highcharts/export-data": "11.1.0",
"highcharts/exporting": "10.0.0", "highcharts/exporting": "11.1.0",
"highcharts/highcharts": "10.0.0", "highcharts/highcharts": "11.1.0",
"highcharts/more": "10.0.0" "highcharts/more": "11.1.0"
}, },
"repositories": { "repositories": {
"highcharts": { "highcharts": {
"type": "package", "type": "package",
"package": { "package": {
"name": "highcharts/highcharts", "name": "highcharts/highcharts",
"version": "10.0.0", "version": "11.1.0",
"type": "drupal-library", "type": "drupal-library",
"extra": { "extra": {
"installer-name": "highcharts" "installer-name": "highcharts"
}, },
"dist": { "dist": {
"url": "https://code.highcharts.com/10.0.0/highcharts.js", "url": "https://code.highcharts.com/11.1.0/highcharts.js",
"type": "file" "type": "file"
}, },
"require": { "require": {
...@@ -38,13 +38,13 @@ ...@@ -38,13 +38,13 @@
"type": "package", "type": "package",
"package": { "package": {
"name": "highcharts/3d", "name": "highcharts/3d",
"version": "10.0.0", "version": "11.1.0",
"type": "drupal-library", "type": "drupal-library",
"extra": { "extra": {
"installer-name": "highcharts_3d" "installer-name": "highcharts_3d"
}, },
"dist": { "dist": {
"url": "https://code.highcharts.com/10.0.0/highcharts-3d.js", "url": "https://code.highcharts.com/11.1.0/highcharts-3d.js",
"type": "file" "type": "file"
}, },
"require": { "require": {
...@@ -56,13 +56,13 @@ ...@@ -56,13 +56,13 @@
"type": "package", "type": "package",
"package": { "package": {
"name": "highcharts/accessibility", "name": "highcharts/accessibility",
"version": "10.0.0", "version": "11.1.0",
"type": "drupal-library", "type": "drupal-library",
"extra": { "extra": {
"installer-name": "highcharts_accessibility" "installer-name": "highcharts_accessibility"
}, },
"dist": { "dist": {
"url": "https://code.highcharts.com/10.0.0/modules/accessibility.js", "url": "https://code.highcharts.com/11.1.0/modules/accessibility.js",
"type": "file" "type": "file"
}, },
"require": { "require": {
...@@ -74,13 +74,13 @@ ...@@ -74,13 +74,13 @@
"type": "package", "type": "package",
"package": { "package": {
"name": "highcharts/export-data", "name": "highcharts/export-data",
"version": "10.0.0", "version": "11.1.0",
"type": "drupal-library", "type": "drupal-library",
"extra": { "extra": {
"installer-name": "highcharts_export-data" "installer-name": "highcharts_export-data"
}, },
"dist": { "dist": {
"url": "https://code.highcharts.com/10.0.0/modules/export-data.js", "url": "https://code.highcharts.com/11.1.0/modules/export-data.js",
"type": "file" "type": "file"
}, },
"require": { "require": {
...@@ -92,13 +92,13 @@ ...@@ -92,13 +92,13 @@
"type": "package", "type": "package",
"package": { "package": {
"name": "highcharts/exporting", "name": "highcharts/exporting",
"version": "10.0.0", "version": "11.1.0",
"type": "drupal-library", "type": "drupal-library",
"extra": { "extra": {
"installer-name": "highcharts_exporting" "installer-name": "highcharts_exporting"
}, },
"dist": { "dist": {
"url": "https://code.highcharts.com/10.0.0/modules/exporting.js", "url": "https://code.highcharts.com/11.1.0/modules/exporting.js",
"type": "file" "type": "file"
}, },
"require": { "require": {
...@@ -110,13 +110,13 @@ ...@@ -110,13 +110,13 @@
"type": "package", "type": "package",
"package": { "package": {
"name": "highcharts/more", "name": "highcharts/more",
"version": "10.0.0", "version": "11.1.0",
"type": "drupal-library", "type": "drupal-library",
"extra": { "extra": {
"installer-name": "highcharts_more" "installer-name": "highcharts_more"
}, },
"dist": { "dist": {
"url": "https://code.highcharts.com/10.0.0/highcharts-more.js", "url": "https://code.highcharts.com/11.1.0/highcharts-more.js",
"type": "file" "type": "file"
}, },
"require": { "require": {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment