Update chart.js to v2.9.3 and moment.js to v2.24

[XhmikosR]

Also, switch to the plain chart.js build since their bundle included moment.js, thus include moment before chart.

By submitting this pull request, I confirm the following: {please fill any appropriate checkboxes, e.g: [X]}

{Please ensure that your pull request is for the 'devel' branch!}

• I have read and understood the contributors guide, as well as this entire template.
• I have made only one major change in my proposed changes.
• I have commented my proposed changes within the code.
• I have tested my proposed changes.
• I am willing to help maintain this change if there are issues with it later.
• I give this submission freely and claim no ownership.
• It is compatible with the EUPL 1.2 license
• I have squashed any insignificant commits. (git rebase)
• I have Signed Off all commits. (git commit --signoff)

---

This is untested

The chartjs bundle had moment.js bundled. This patch switches to the normal dist file and includes moment.js separately.

[DL6ER]

This changes the animation for the charts.

devel

your branch

[XhmikosR]

Hmm, I'll change the changelog, some defaults might have changed.

[XhmikosR]

@DL6ER can you try again please? I downgraded to the same chart.js version, but kept the plain build so that we don't include moment.js 2x.

[DL6ER]

Else than my comment, everything seems to work.

However, why did you remove the conditional inclusion of moment.js? It is needed by only a small subset of pages and doesn't need to be loaded everywhere.

Furthermore, how does the update of moment.js work? You removed the bundle and added a new file only saying:

/*!
* Chart.js v2.9.3
* https://www.chartjs.org
* (c) 2019 Chart.js Contributors
* Released under the MIT License
*/

There is no mentioning about a contained moment.js. This is very unfortunate.

[XhmikosR]

The previous chart.js bundle build included moment.js already. So you had it in all pages already.

https://www.chartjs.org/docs/latest/getting-started/installation.html#bundled-build

But we still included moment.js individually. This makes sure we don't load moment.js twice.

[XhmikosR]

So, wait does the issue still happen with my latest push?

[DL6ER]

No. I'm just wondering that you removed

• scripts/vendor/Chart.bundle.min.js
• scripts/vendor/moment.min.js
  and added
• scripts/vendor/Chart.min.js

Nothing is suggesting any more that moment is bundled into Chart.

If this is still the case, shouldn't the updated file be called Chart.bundle as well? This should also remove the adding/removing as the files seem identical:

[XhmikosR]

I didn't remove moment.js. It's there, minified.

This patch is using the plan chart.js without moment.js, which we already had and just updated it.

[DL6ER]

I see, I got tricked by Github's interface which seems to suggest that moment.min.js was removed

while it was actually just shortened to one line.

[pralor-bot]

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/pi-hole-5-1-released/35577/1