Merge remote-tracking branch 'origin/AC-2661' into Hammer_PlatForm_Health_246_Scope_29092022

Author: glo71317

app/code/Magento/Backend/view/adminhtml/web/js/dashboard/chart.js

@@ -9,6 +9,7 @@ define([
     'chartJs',
     'jquery-ui-modules/widget',
     'chartjs/chartjs-adapter-moment',
+    'chartjs/es6-shim.min',
     'moment'
 ], function ($, Chart) {
     'use strict';

app/code/Magento/Ui/view/base/requirejs-config.js

@@ -7,6 +7,7 @@ var config = {
     deps: [],
     shim: {
         'chartjs/chartjs-adapter-moment': ['moment'],
+        'chartjs/es6-shim.min': {},
         'tiny_mce_5/tinymce.min': {
             exports: 'tinyMCE'
         }

app/design/frontend/Magento/blank/etc/view.xml

@@ -261,6 +261,7 @@
     <exclude>
         <item type="file">Lib::chartjs/Chart.min.js</item>
         <item type="file">Lib::chartjs/chartjs-adapter-moment.js</item>
+        <item type="file">Lib::chartjs/es6-shim.min.js</item>
         <item type="file">Lib::jquery/jquery.min.js</item>
         <item type="file">Lib::jquery/jquery-ui.js</item>
         <item type="file">Lib::jquery/colorpicker/js/colorpicker.js</item>

app/design/frontend/Magento/luma/etc/view.xml

@@ -272,6 +272,7 @@
     <exclude>
         <item type="file">Lib::chartjs/Chart.min.js</item>
         <item type="file">Lib::chartjs/chartjs-adapter-moment.js</item>
+        <item type="file">Lib::chartjs/es6-shim.min.js</item>
         <item type="file">Lib::jquery/jquery.min.js</item>
         <item type="file">Lib::jquery/jquery-ui.js</item>
         <item type="file">Lib::jquery/colorpicker/js/colorpicker.js</item>