revert previous changes

add montserrat b64 for regular/bold/italic
import as globalstyle
remove redundant dependencies

Author: eatyourpeas

Diff for: package-lock.json

@@ -30,7 +30,6 @@
     "react-dom": "18.2.0"
   },
   "dependencies": {
-    "@fontsource/montserrat": "^5.0.19",
     "sass": "1.70.0",
     "styled-components": "6.1.8",
     "victory": "36.9.1"

Diff for: package.json

@@ -8,9 +8,6 @@ import json from '@rollup/plugin-json';
 import versionInjector from 'rollup-plugin-version-injector';
 import image from '@rollup/plugin-image';
 import dts from 'rollup-plugin-dts';
-import autoprefixer from 'autoprefixer';
-import copy from 'rollup-plugin-copy';
-import url from '@rollup/plugin-url';
 
 const packageJson = require('./package.json');
 const production = !process.env.ROLLUP_WATCH;
@@ -45,10 +42,7 @@ export default [
         ],
         plugins: [
             postcss({
-                plugins: [autoprefixer()],
                 extensions: ['.css'],
-                minimize: true,
-                extract: true, // Include styles in the JS bundle
             }),
             peerDepsExternal(),
             resolve(),
@@ -61,31 +55,11 @@ export default [
             json(),
             versionInjector(),
             image(),
-            url({
-                include: ['**/*.woff', '**/*.woff2', '**/*.ttf', '**/*.eot', '**/*.svg'],
-                limit: 10000, // Adjust the limit as needed
-                emitFiles: true,
-                fileName: '[dirname][name][extname]', // Preserve the original file name
-            }),
-            copy({
-                // copy the fonts from node_modules/@fontsource/montserrat/files/* to dist/fonts/*
-                targets: [
-                    {
-                        src: 'node_modules/@fontsource/montserrat/files/*',
-                        dest: 'dist/fonts/montserrat',
-                    },
-                    {
-                        src: 'node_modules/@fontsource/dancing-script/files/*',
-                        dest: 'dist/fonts/dancing-script',
-                    },
-                ],
-            }),
         ],
     },
     {
         input: 'src/index.ts',
         output: [{ file: 'dist/types.d.ts', format: 'es' }],
-        // external: [/\.css$/],
         external: [],
         plugins: [dts.default()],
     },

Diff for: rollup.config.mjs

@@ -15,8 +15,6 @@ import {
     VictoryPortal,
 } from 'victory';
 
-import { createGlobalStyle } from 'styled-components';
-
 // helper functions
 import { getDomainsAndData, getVisibleData } from '../functions/getDomainsAndData';
 import { yAxisLabel } from '../functions/yAxisLabel';
@@ -252,6 +250,8 @@ function CentileChart({
         setUserDomains(null);
     }, [storedChildMeasurements]);
 
+
+
     return (
         <MainContainer>
             <TopContainer>

Diff for: src/CentileChart/CentileChart.tsx

@@ -1,5 +1,6 @@
 // packages/libraries
 import * as React from 'react';
+
 import { createGlobalStyle } from 'styled-components';
 
 // props and interfaces
@@ -18,29 +19,42 @@ import { nameForReference } from '../functions/nameForReference'
 import { nameForMeasurementMethod } from '../functions/nameForMeasurementMethod';
 import { stylesForTheme } from '../functions/stylesForTheme';
 
-// Supports weights 400-700
-import '@fontsource/montserrat';
-import '@fontsource/dancing-script';
+
+import { montserratRegular } from '../fonts/montserrat-b64';
+import { montserratBold } from '../fonts/montserrat-bold-b64';
+import { montserratItalic } from '../fonts/montserrat-italic-b64';
 
 // const VERSION_LOG = '[VI]Version: {version} - built on {date}[/VI]'; 
 const VERSION = '[VI]v{version}[/VI]'; // uses version injector plugin to Rollup to report package.json version
 
 const GlobalStyle = createGlobalStyle`
   @font-face {
     font-family: 'Montserrat';
-    src: local('Montserrat'), local('Montserrat-Regular'),
-         url('public/fonts/montserrat/montserrat-latin-400-normal.woff2') format('woff2'),
-         url('public/fonts/montserrat/montserrat-latin-400-normal.woff') format('woff');
+    src: url(${montserratRegular}) format('ttf'),
     font-weight: 400;
     font-style: normal;
   }
+  
+  @font-face {
+    font-family: 'Montserrat-Bold';
+    src: url(${montserratBold}) format('ttf'),
+    font-weight: 700;
+    font-style: bold;
+  }
+  
+  @font-face {
+    font-family: 'Montserrat-Italic';
+    src: url(${montserratItalic}) format('ttf'),
+    font-weight: 400;
+    font-style: italic;
+  }
 
   body {
     font-family: 'Montserrat', sans-serif;
   }
 
   h1, h2, h3, h4, h5, h6 {
-    font-family: 'Arial', sans-serif;
+    font-family: 'Montserrat', sans-serif;
 }`;
 
 const RCPCHChart: React.FC<RCPCHChartProps> = ({

Diff for: src/RCPCHChart/RCPCHChart.tsx

@@ -66,18 +66,18 @@ function makeAllStyles(
         toolTipMain: {
             fontSize: chartStyle?.tooltipTextStyle?.size ?? 14,
             fill: chartStyle?.tooltipTextStyle?.colour ?? black,
-            fontFamily: chartStyle?.tooltipTextStyle?.name ?? 'Montserrat',
+            fontFamily: 'Montserrat', // chartStyle?.tooltipTextStyle?.name ??
             fontStyle: chartStyle?.tooltipTextStyle?.style ?? 'normal',
             textAnchor: "start"
         },
         chartTitle: {
-            fontFamily: chartStyle?.titleStyle?.name ?? 'Arial',
+            fontFamily: 'Montserrat-Bold', //chartStyle?.titleStyle?.name ?? 'Arial'
             color: chartStyle?.titleStyle?.colour ?? black,
             fontSize: chartStyle?.titleStyle?.size ?? 14,
             fontStyle: chartStyle?.titleStyle?.style === 'italic' ? 'italic' : 'normal',
         },
         chartSubTitle: {
-            fontFamily: chartStyle?.subTitleStyle?.name ?? 'Arial',
+            fontFamily: 'Montserrat-Italic', //chartStyle?.subTitleStyle?.name ?? 'Arial'
             color: chartStyle?.subTitleStyle?.colour ?? black,
             fontSize: chartStyle?.subTitleStyle?.size ?? 14,
             fontStyle: chartStyle?.subTitleStyle?.style === 'italic' ? 'italic' : 'normal',