chore: update chart.js and add to modules (#1244)

NUWCDIVNPT · Mar 18, 2024 · 0ebf434 · 0ebf434
1 parent 65ad7b6
commit 0ebf434
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 16 deletions.
diff --git a/client/build.sh b/client/build.sh
@@ -103,7 +103,6 @@ cp $SrcDir/js/Env.js.example $DistDir/js
 cp -r $SrcDir/js/modules $DistDir/js/modules
 cd $SrcDir/js
 uglifyjs \
-'chart.min.js' \
 'diff.js' \
 'diff2html.min.js' \
 'stigmanUtils.js' \

diff --git a/client/src/index.html b/client/src/index.html
@@ -6,6 +6,7 @@
 		<link rel="stylesheet" type="text/css" href="css/init.css" />
 		<link rel="icon" type="image/svg+xml" href="img/shield-green-check.svg">
 		<script type="text/javascript" src="js/Env.js"></script>
+		<script type="importmap">{"imports": {"@kurkle/color": "./js/modules/node_modules/@kurkle/color/dist/color.esm.js"}}</script>
 		<script type="module" src="js/init.js"></script>
 	</head>
 	<body>

diff --git a/client/src/js/chart.min.js b/client/src/js/chart.min.js
diff --git a/client/src/js/init.js b/client/src/js/init.js
@@ -30,6 +30,10 @@ async function loadResources() {
     }
     document.head.appendChild(link)
   }
+
+  const { Chart } = await import('./modules/node_modules/chart.js/auto/auto.js')
+  window.Chart = Chart
+
   for (const src of scripts) {
     const script = document.createElement('script')
     script.src = src
@@ -39,7 +43,7 @@ async function loadResources() {
   const { serializeError } = await import('./modules/node_modules/serialize-error/index.js')
   STIGMAN.serializeError = serializeError
   STIGMAN.ClientModules = await import('./modules/node_modules/@nuwcdivnpt/stig-manager-client-modules/index.js')
-
+  
   STIGMAN.isMinimizedSource = isMinimizedSource
 }
 

diff --git a/client/src/js/modules/package-lock.json b/client/src/js/modules/package-lock.json
diff --git a/client/src/js/modules/package.json b/client/src/js/modules/package.json
@@ -1,6 +1,7 @@
 {
   "dependencies": {
     "@nuwcdivnpt/stig-manager-client-modules": "^1.4.1",
+    "chart.js": "^4.4.2",
     "serialize-error": "^11.0.0"
   }
 }
diff --git a/client/src/js/resources.js b/client/src/js/resources.js
@@ -14,7 +14,6 @@ const scripts = [
   'ext/adapter/ext/ext-base-debug.js',
   'ext/ext-all-debug-w-comments.js',
   'ext/ux/GroupSummary.js',
-  'js/chart.min.js',
   'js/diff.js',
   'js/diff2html.min.js',
   'js/stigmanUtils.js',