Skip to content

Commit

Permalink
🔀 Merge pull request #373 from jpanther:dependabot/npm_and_yarn/chart…
Browse files Browse the repository at this point in the history
….js-4.0.1

📌 Bump chart.js from 3.9.1 to 4.0.1
  • Loading branch information
jpanther authored Nov 21, 2022
2 parents c54e1fd + 2aa46c6 commit 05dbc6c
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 30 deletions.
13 changes: 0 additions & 13 deletions assets/lib/chart/chart.min.js

This file was deleted.

14 changes: 14 additions & 0 deletions assets/lib/chart/chart.umd.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions layouts/partials/vendor.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
{{ end }}
{{/* Chart */}}
{{ if .Page.HasShortcode "chart" }}
{{ $chartLib := resources.Get "lib/chart/chart.min.js" }}
{{ $chartLib := resources.Get "lib/chart/chart.umd.js" }}
{{ $chartConfig := resources.Get "js/chart.js" }}
{{ $chartConfig := $chartConfig | resources.Minify }}
{{ $chartJS := slice $chartLib $chartConfig | resources.Concat "js/chart.bundle.js" | resources.Fingerprint "sha512" }}
Expand All @@ -31,6 +31,6 @@
<script defer src="{{ $katexRenderJS.RelPermalink }}" integrity="{{ $katexRenderJS.Data.Integrity }}" onload="renderMathInElement(document.body);"></script>
{{ $katexFonts := resources.Match "lib/katex/fonts/*" }}
{{ range $katexFonts }}
<!-- {{ .RelPermalink }} -->
{{ .Publish }}
{{ end }}
{{ end }}
23 changes: 13 additions & 10 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
"version": "2.4.1",
"description": "Congo theme for Hugo",
"scripts": {
"preinstall": "rimraf assets/vendor",
"preinstall": "rimraf assets/lib",
"postinstall": "vendor-copy",
"assets": "rimraf assets/vendor && vendor-copy",
"assets": "rimraf assets/lib && vendor-copy",
"dev": "NODE_ENV=development ./node_modules/tailwindcss/lib/cli.js -i ./assets/css/main.css -o ./assets/css/compiled/main.css --jit -w",
"build": "NODE_ENV=production ./node_modules/tailwindcss/lib/cli.js -i ./assets/css/main.css -o ./assets/css/compiled/main.css --jit",
"example": "hugo server --source exampleSite --themesDir ../.. --buildDrafts -b http://localhost/congo/ -p 8008",
Expand All @@ -30,7 +30,7 @@
"homepage": "https://github.com/jpanther/congo#readme",
"devDependencies": {
"@tailwindcss/typography": "^0.5.8",
"chart.js": "^3.9.1",
"chart.js": "^4.0.1",
"fuse.js": "^6.6.2",
"katex": "^0.16.3",
"mermaid": "^9.2.2",
Expand All @@ -48,8 +48,8 @@
"to": "assets/lib/mermaid/mermaid.min.js"
},
{
"from": "node_modules/chart.js/dist/chart.min.js",
"to": "assets/lib/chart/chart.min.js"
"from": "node_modules/chart.js/dist/chart.umd.js",
"to": "assets/lib/chart/chart.umd.js"
},
{
"from": "node_modules/katex/dist/katex.min.js",
Expand Down

0 comments on commit 05dbc6c

Please sign in to comment.